[ARQ-2058] Updates testNG to use 6.9.10 (closes #117)

arquillian · Nov 11, 2016 · 3fa56bf · 3fa56bf
1 parent 7413f71
commit 3fa56bf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/build/pom.xml b/build/pom.xml
@@ -26,7 +26,7 @@
         <version.javax.inject_javax.inject>1</version.javax.inject_javax.inject>
         <version.junit_junit>4.12</version.junit_junit>
         <version.mockito_all>1.8.3</version.mockito_all>
-        <version.testng_testng>5.14.6</version.testng_testng>
+        <version.testng_testng>6.9.10</version.testng_testng>
     </properties>
 
     <!-- Dependency Management -->

diff --git a/testng/container/src/main/java/org/jboss/arquillian/testng/container/TestNGTestRunner.java b/testng/container/src/main/java/org/jboss/arquillian/testng/container/TestNGTestRunner.java
@@ -60,16 +60,6 @@ private XmlSuite createSuite(Class<?> className, String methodName)
       XmlSuite suite = new XmlSuite();
       suite.setName("Arquillian");
 
-      // TestNG >= 6.3 has removed this method
-      try
-      {
-         Method method = XmlSuite.class.getMethod("setAnnotations", String.class);
-         method.invoke(suite, "JDK");
-      }
-      catch (Exception e) {
-         // no-op
-      }
-
       XmlTest test = new XmlTest(suite);
       test.setName("Arquillian - " + className);
       List<XmlClass> testClasses = new ArrayList<XmlClass>();

diff --git a/testng/core/src/test/java/org/jboss/arquillian/testng/TestNGTestBaseClass.java b/testng/core/src/test/java/org/jboss/arquillian/testng/TestNGTestBaseClass.java
@@ -35,7 +35,6 @@
 import org.mockito.stubbing.Answer;
 import org.testng.TestListenerAdapter;
 import org.testng.TestNG;
-import org.testng.internal.AnnotationTypeEnum;
 import org.testng.xml.XmlClass;
 import org.testng.xml.XmlSuite;
 import org.testng.xml.XmlTest;
@@ -204,7 +203,7 @@ private XmlSuite createSuite(String[] groups, Class<?>... classes)
    {
       XmlSuite suite = new XmlSuite();
       suite.setName("Arquillian - TEST");
-      suite.setAnnotations(AnnotationTypeEnum.JDK.getName());
+
       suite.setConfigFailurePolicy("continue");
       XmlTest test = new XmlTest(suite);
       if(groups != null)