[testng] 25/355: Remove com.google.inject.internal imports.

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit cfa90639c1755eb4e44e5bb35d33d7436dc581b2
Author: Cedric Beust <cedric at beust.com>
Date:   Mon Aug 19 23:48:25 2013 -0700

    Remove com.google.inject.internal imports.
---
 src/main/java/org/testng/xml/XmlDependencies.java        |  7 +++----
 src/main/java/org/testng/xml/XmlGroups.java              |  7 +++----
 src/main/java/org/testng/xml/dom/TestNGTagFactory.java   |  2 +-
 src/test/java/test/dependent/InstanceSkipSampleTest.java |  5 ++---
 src/test/java/test/mustache/MustacheTest.java            | 13 ++++++-------
 src/test/java/test/thread/B.java                         |  7 +++----
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/testng/xml/XmlDependencies.java b/src/main/java/org/testng/xml/XmlDependencies.java
index 59aab56..e4b24c2 100644
--- a/src/main/java/org/testng/xml/XmlDependencies.java
+++ b/src/main/java/org/testng/xml/XmlDependencies.java
@@ -1,13 +1,12 @@
 package org.testng.xml;
 
-import static org.testng.collections.CollectionUtils.hasElements;
-
-import com.google.inject.internal.Maps;
+import java.util.Map;
 
+import org.testng.collections.Maps;
 import org.testng.reporters.XMLStringBuffer;
 import org.testng.xml.dom.OnElement;
 
-import java.util.Map;
+import static org.testng.collections.CollectionUtils.hasElements;
 
 public class XmlDependencies {
 
diff --git a/src/main/java/org/testng/xml/XmlGroups.java b/src/main/java/org/testng/xml/XmlGroups.java
index ffe594e..0ce68b0 100644
--- a/src/main/java/org/testng/xml/XmlGroups.java
+++ b/src/main/java/org/testng/xml/XmlGroups.java
@@ -1,13 +1,12 @@
 package org.testng.xml;
 
-import static org.testng.collections.CollectionUtils.hasElements;
-
-import com.google.inject.internal.Lists;
+import java.util.List;
 
+import org.testng.collections.Lists;
 import org.testng.reporters.XMLStringBuffer;
 import org.testng.xml.dom.Tag;
 
-import java.util.List;
+import static org.testng.collections.CollectionUtils.hasElements;
 
 public class XmlGroups {
 
diff --git a/src/main/java/org/testng/xml/dom/TestNGTagFactory.java b/src/main/java/org/testng/xml/dom/TestNGTagFactory.java
index 70e169e..4e03fd5 100644
--- a/src/main/java/org/testng/xml/dom/TestNGTagFactory.java
+++ b/src/main/java/org/testng/xml/dom/TestNGTagFactory.java
@@ -2,7 +2,7 @@ package org.testng.xml.dom;
 
 import java.util.Map;
 
-import com.google.inject.internal.Maps;
+import org.testng.collections.Maps;
 
 public class TestNGTagFactory implements ITagFactory {
 
diff --git a/src/test/java/test/dependent/InstanceSkipSampleTest.java b/src/test/java/test/dependent/InstanceSkipSampleTest.java
index 040ce63..3f8d415 100644
--- a/src/test/java/test/dependent/InstanceSkipSampleTest.java
+++ b/src/test/java/test/dependent/InstanceSkipSampleTest.java
@@ -1,12 +1,11 @@
 package test.dependent;
 
-import com.google.inject.internal.Lists;
+import java.util.List;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Factory;
 import org.testng.annotations.Test;
-
-import java.util.List;
+import org.testng.collections.Lists;
 
 /**
  * Verify that only instances that fail cause dependency failures. In other words,
diff --git a/src/test/java/test/mustache/MustacheTest.java b/src/test/java/test/mustache/MustacheTest.java
index 502143e..79f00f9 100644
--- a/src/test/java/test/mustache/MustacheTest.java
+++ b/src/test/java/test/mustache/MustacheTest.java
@@ -1,12 +1,5 @@
 package test.mustache;
 
-import com.google.inject.internal.Maps;
-
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.mustache.Mustache;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,6 +7,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import org.testng.collections.Maps;
+import org.testng.mustache.Mustache;
+
 @Test
 public class MustacheTest {
 
diff --git a/src/test/java/test/thread/B.java b/src/test/java/test/thread/B.java
index d5ccff0..edf4966 100644
--- a/src/test/java/test/thread/B.java
+++ b/src/test/java/test/thread/B.java
@@ -1,12 +1,11 @@
 package test.thread;
 
-import com.google.inject.internal.Maps;
-
-import org.testng.annotations.Test;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.testng.annotations.Test;
+import org.testng.collections.Maps;
+
 public class B {
   public static Map<Long, Long> m_threadIds = Maps.newHashMap();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git