fix(ARQ-2086): test failures not reported with recent versions of TestNG

arquillian · Nov 27, 2017 · 5eddd66 · 5eddd66
1 parent ac59fd1
commit 5eddd66
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/build/pom.xml b/build/pom.xml
@@ -26,7 +26,7 @@
     <version.javax.inject>1</version.javax.inject>
     <version.junit>4.12</version.junit>
     <version.mockito_all>1.10.19</version.mockito_all>
-    <version.testng>6.9.10</version.testng>
+    <version.testng>6.13</version.testng>
     <version.assertj>2.5.0</version.assertj>
   </properties>
 

diff --git a/testng/container/src/main/java/org/jboss/arquillian/testng/container/TestListener.java b/testng/container/src/main/java/org/jboss/arquillian/testng/container/TestListener.java
@@ -61,7 +61,7 @@ public TestResult getTestResult() {
             return TestResult.failed(
                 context.getFailedTests().getAllResults().iterator().next().getThrowable());
         } else if (context.getSkippedTests().size() > 0) {
-            return TestResult.skipped();
+            return TestResult.skipped().setThrowable(context.getSkippedTests().getAllResults().iterator().next().getThrowable());
         }
         if (context.getPassedTests().size() > 0) {
             return TestResult.passed().setThrowable(

diff --git a/...va/org/jboss/arquillian/testng/container/ShouldProvideVariousTestResultsToTestRunner.java b/...va/org/jboss/arquillian/testng/container/ShouldProvideVariousTestResultsToTestRunner.java
@@ -19,6 +19,7 @@
 
 import java.lang.reflect.Method;
 import org.testng.Assert;
+import org.testng.SkipException;
 import org.testng.annotations.DataProvider;
 
 public class ShouldProvideVariousTestResultsToTestRunner {
@@ -42,6 +43,11 @@ public void shouldProvideFailingTestToRunner() throws Exception {
         Assert.fail("Failing by design");
     }
 
+    @org.testng.annotations.Test
+    public void shouldProvideSkippingTestToRunner() throws Exception {
+        throw new SkipException("Skipping test", new Throwable("Skip exception"));
+    }
+
     @org.testng.annotations.Test(dataProvider = "xx")
     public void shouldBeAbleToUseOtherDataProviders(Method m) throws Exception {
         Assert.assertNotNull(m);

diff --git a/...ntainer/src/test/java/org/jboss/arquillian/testng/container/TestNGTestRunnerTestCase.java b/...ntainer/src/test/java/org/jboss/arquillian/testng/container/TestNGTestRunnerTestCase.java
@@ -20,6 +20,7 @@
 import org.jboss.arquillian.testng.Arquillian;
 import org.junit.Assert;
 import org.junit.Test;
+import org.testng.SkipException;
 
 public class TestNGTestRunnerTestCase extends Arquillian {
     @Test
@@ -44,6 +45,17 @@ public void shouldReturnFailedTest() throws Exception {
         Assert.assertEquals(AssertionError.class, result.getThrowable().getClass());
     }
 
+    @Test
+    public void shouldReturnSkippedTest() throws Exception {
+        TestNGTestRunner runner = new TestNGTestRunner();
+        TestResult result =
+            runner.execute(ShouldProvideVariousTestResultsToTestRunner.class, "shouldProvideSkippingTestToRunner");
+
+        Assert.assertNotNull(result);
+        Assert.assertEquals(TestResult.Status.SKIPPED, result.getStatus());
+        Assert.assertEquals(SkipException.class, result.getThrowable().getClass());
+    }
+
     @Test
     public void shouldReturnFailedTestAfterConfigurationError() throws Exception {
         TestNGTestRunner runner = new TestNGTestRunner();

diff --git a/testng/core/src/main/java/org/jboss/arquillian/testng/Arquillian.java b/testng/core/src/main/java/org/jboss/arquillian/testng/Arquillian.java
@@ -188,6 +188,9 @@ public Object getInstance() {
                     }
                 }
                 testResult.setThrowable(result.getThrowable());
+
+                // setting status as failed.
+                testResult.setStatus(2);
             }
 
             // calculate test end time. this is overwritten in the testng invoker..

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
@@ -142,7 +142,7 @@ private XmlSuite createSuite(String[] groups, Class<?>... classes) {
         XmlSuite suite = new XmlSuite();
         suite.setName("Arquillian - TEST");
 
-        suite.setConfigFailurePolicy("continue");
+        suite.setConfigFailurePolicy(XmlSuite.FailurePolicy.CONTINUE);
         XmlTest test = new XmlTest(suite);
         if (groups != null) {
             test.setIncludedGroups(Arrays.asList(groups));
@@ -208,4 +208,4 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
             return result;
         }
     }
-}
+}