[JENKINS-13113] xUnit plugins detects MSTEST "NotExecuted" as success…

…ed instead of skipped Update XSL to count NotExecuted test as skipped. Minor improvements to testsuite time duration.
jenkinsci · May 15, 2018 · 5100d71 · 5100d71
1 parent ed47674
commit 5100d71
Show file tree

Hide file tree

Showing 10 changed files with 208 additions and 78 deletions.
diff --git a/src/main/resources/org/jenkinsci/plugins/xunit/types/ctest-to-junit.xsl b/src/main/resources/org/jenkinsci/plugins/xunit/types/ctest-to-junit.xsl
@@ -2,7 +2,7 @@
 <!--
 The MIT License (MIT)
 
-Copyright (c) 2014, Gregory Boissinot
+Copyright (c) 2014, Gregory Boissinot, Falco Nikolas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/test/java/org/jenkinsci/plugins/xunit/types/MSTestTest.java b/src/test/java/org/jenkinsci/plugins/xunit/types/MSTestTest.java
@@ -41,7 +41,8 @@ public static Collection<Object[]> data() {
                                               { "mstest_4_tests_2_classes", 3 }, //
                                               { "mstest_vs_2010", 4 }, //
                                               { "mstest_more_than_one_minute_test", 5 }, //
-                                              { "JENKINS-10911", 6 } //
+                                              { "JENKINS-10911", 6 }, //
+                                              { "JENKINS-13113 tests with outcome NotExecuted are counted as skipped", 7 } //
         });
     }
 

diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase1/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase1/result.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-    <testsuite name="MSTestSuite" tests="2" time="0" failures="1" errors="0" skipped="0">
+    <testsuite name="MSTestSuite" tests="2" time="0.484" failures="1" errors="0" skipped="0">
-        <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci" time="0.016"/>
+        <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci" time="0.016" />
         <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci_2" time="0.101">
-            <failure>
+            <failure message="Assert.AreEqual failed. Expected:&lt;2&gt;. Actual:&lt;1&gt;. "> at FunctionsTest.FibonacciTest.CalculaFibonacci_2() in E:\Koiti\Dev\GitHudsonTest\FunctionsTest\FibonacciTest.cs:line 72</failure>
-                MESSAGE:
-                Assert.AreEqual failed. Expected:&lt;2&gt;. Actual:&lt;1&gt;.
-                +++++++++++++++++++
-                STACK TRACE:
-                at FunctionsTest.FibonacciTest.CalculaFibonacci_2() in
-                E:\Koiti\Dev\GitHudsonTest\FunctionsTest\FibonacciTest.cs:line 72
-            </failure>
         </testcase>
     </testsuite>
-</testsuites>
+</testsuites>
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase2/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase2/result.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-    <testsuite name="MSTestSuite" tests="2" time="0" failures="1" errors="0" skipped="0">
+    <testsuite name="MSTestSuite" tests="2" time="1.062" failures="1" errors="0" skipped="0">
         <testcase classname="GoodGuyTest.GoodGuyTest" name="TestYell" time="0.044">
-            <failure>
+            <failure message="Assert.AreEqual failed. Expected:&lt;lala!&gt;. Actual:&lt;Lele!!&gt;. "> at GoodGuyTest.GoodGuyTest.TestYell() in C:\PostIt\MultipleTests\GoodGuyTest\GoodGuyTest.cs:line 16
-                MESSAGE:
-                Assert.AreEqual failed. Expected:&lt;lala!&gt;. Actual:&lt;Lele!!&gt;.
-                +++++++++++++++++++
-                STACK TRACE:
-                at GoodGuyTest.GoodGuyTest.TestYell() in C:\PostIt\MultipleTests\GoodGuyTest\GoodGuyTest.cs:line 16
             </failure>
         </testcase>
-        <testcase classname="ProjectNumberOneTest.BoringGuyTest" name="TestYell" time="0.023"/>
+        <testcase classname="ProjectNumberOneTest.BoringGuyTest" name="TestYell" time="0.023" />
     </testsuite>
-</testsuites>
+</testsuites>
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase3/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase3/result.xml
@@ -1,27 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-    <testsuite name="MSTestSuite" tests="4" time="0" failures="2" errors="0" skipped="0">
+    <testsuite name="MSTestSuite" tests="4" time="0.188" failures="2" errors="0" skipped="0">
-        <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci" time="0.004"/>
+        <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci" time="0.004" />
         <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci_2" time="0.036">
-            <failure>
+            <failure message="Assert.AreEqual failed. Expected:&lt;2&gt;. Actual:&lt;1&gt;. "> at FunctionsTest.FibonacciTest.CalculaFibonacci_2() in E:\Koiti\Dev\GitHudsonTest\FunctionsTest\FibonacciTest.cs:line 72
-                MESSAGE:
-                Assert.AreEqual failed. Expected:&lt;2&gt;. Actual:&lt;1&gt;.
-                +++++++++++++++++++
-                STACK TRACE:
-                at FunctionsTest.FibonacciTest.CalculaFibonacci_2() in
-                E:\Koiti\Dev\GitHudsonTest\FunctionsTest\FibonacciTest.cs:line 72
             </failure>
         </testcase>
-        <testcase classname="FunctionsTest.SpecialCharRemoverTest" name="RemoveSpecialChar" time="0.001"/>
+        <testcase classname="FunctionsTest.SpecialCharRemoverTest" name="RemoveSpecialChar" time="0.001" />
         <testcase classname="FunctionsTest.SpecialCharRemoverTest" name="REmoveSpecialChar2" time="0.001">
-            <failure>
+            <failure message="Assert.AreEqual failed. Expected:&lt;pao&gt;. Actual:&lt;paao&gt;. "> at FunctionsTest.SpecialCharRemoverTest.REmoveSpecialChar2() in E:\Koiti\Dev\GitHudsonTest\FunctionsTest\SpecialCharRemoverTest.cs:line 76
-                MESSAGE:
-                Assert.AreEqual failed. Expected:&lt;pao&gt;. Actual:&lt;paao&gt;.
-                +++++++++++++++++++
-                STACK TRACE:
-                at FunctionsTest.SpecialCharRemoverTest.REmoveSpecialChar2() in
-                E:\Koiti\Dev\GitHudsonTest\FunctionsTest\SpecialCharRemoverTest.cs:line 76
             </failure>
         </testcase>
     </testsuite>
-</testsuites>
+</testsuites>
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase4/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase4/result.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites
+<testsuites>
-        >
+    <testsuite name="MSTestSuite" tests="2" time="0.992" failures="1" errors="0" skipped="0">
-    <testsuite name="MSTestSuite" tests="2" time="0" failures="1" errors="0" skipped="0">
+        <testcase classname="TestProject1.UnitTest1" name="TestMethod1" time="0.018" />
-        <testcase classname="TestProject1.UnitTest1" name="TestMethod1" time="0.018"/>
         <testcase classname="TestProject1.UnitTest1" name="TestMethod2" time="0.102">
-            <failure>
+            <failure message="Assert.Fail failed. "> at TestProject1.UnitTest1.TestMethod2() in c:\users\carlos\documents\visual studio 2010\Projects\TestProject1\TestProject1\UnitTest1.cs:line 71
-                MESSAGE:
-                Assert.Fail failed.
-                +++++++++++++++++++
-                STACK TRACE:
-                at TestProject1.UnitTest1.TestMethod2() in c:\users\carlos\documents\visual studio
-                2010\Projects\TestProject1\TestProject1\UnitTest1.cs:line 71
             </failure>
         </testcase>
     </testsuite>

diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase5/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase5/result.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites
+<testsuites>
-        >
+    <testsuite name="MSTestSuite" tests="2" time="0.484" failures="1" errors="0" skipped="0">
-    <testsuite name="MSTestSuite" tests="2" time="0" failures="1" errors="0" skipped="0">
+        <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci" time="130.016" />
-        <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci" time="130.016"/>
         <testcase classname="FunctionsTest.FibonacciTest" name="CalculaFibonacci_2" time="0.101">
-            <failure>
+            <failure message="Assert.AreEqual failed. Expected:&lt;2&gt;. Actual:&lt;1&gt;. "> at FunctionsTest.FibonacciTest.CalculaFibonacci_2() in E:\Koiti\Dev\GitHudsonTest\FunctionsTest\FibonacciTest.cs:line 72
-                MESSAGE:
-                Assert.AreEqual failed. Expected:&lt;2&gt;. Actual:&lt;1&gt;.
-                +++++++++++++++++++
-                STACK TRACE:
-                at FunctionsTest.FibonacciTest.CalculaFibonacci_2() in
-                E:\Koiti\Dev\GitHudsonTest\FunctionsTest\FibonacciTest.cs:line 72
             </failure>
         </testcase>
     </testsuite>
-</testsuites>
+</testsuites>
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase6/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/mstest/testcase6/result.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-    <testsuite name="MSTestSuite" tests="15" time="0" failures="1" errors="0" skipped="1">
+    <testsuite name="MSTestSuite" tests="15" time="1.453" failures="1" errors="0" skipped="1">
         <testcase classname="AccountTest2.AccountTest" name="AccountConstructorTest" time="0.051" />
         <testcase classname="AccountTest2.AccountTest" name="AddToBalanceTest" time="0.015" />
         <testcase classname="AccountTest2.AccountTest" name="ApplyInterestTest" time="0.003" />
@@ -11,23 +11,12 @@
         <testcase classname="AccountTest2.AccountTest" name="InterestRateTest" time="0.001" />
         <testcase classname="AccountTest2.AccountTest" name="MinimumBalanceTest" time="0.001" />
         <testcase classname="AccountTest2.AccountTest" name="MTestFail" time="0.060">
-            <failure>
+            <failure message="Assert.Fail failed. Always fails"> at AccountTest2.AccountTest.MTestFail() in c:\Jenkins_Home\jobs\NUnit_Quick_Learning\workspace\AccountTest2\AccountMTest.cs:line 253
-                MESSAGE:
-                Assert.Fail failed. Always fails
-                +++++++++++++++++++
-                STACK TRACE:
-                at AccountTest2.AccountTest.MTestFail() in c:\Jenkins_Home\jobs\NUnit_Quick_Learning\workspace\AccountTest2\AccountMTest.cs:line 253
             </failure>
         </testcase>
         <testcase classname="AccountTest2.AccountTest" name="MTestInconclusive" time="0.002">
-            <skipped />
+            <skipped message="Assert.Inconclusive failed. Inconclusive result"> at AccountTest2.AccountTest.MTestInconclusive() in c:\Jenkins_Home\jobs\NUnit_Quick_Learning\workspace\AccountTest2\AccountMTest.cs:line 247
-            <system-out>
+            </skipped>
-                MESSAGE:
-                Assert.Inconclusive failed. Inconclusive result
-                +++++++++++++++++++
-                STACK TRACE:
-                at AccountTest2.AccountTest.MTestInconclusive() in c:\Jenkins_Home\jobs\NUnit_Quick_Learning\workspace\AccountTest2\AccountMTest.cs:line 247
-            </system-out>
         </testcase>
         <testcase classname="AccountTest2.AccountTest" name="TransferFundsTest" time="0.003" />
         <testcase classname="AccountTest2.AccountTest" name="WithdrawTest" time="0.002" />