Merge pull request #7836 from troizet/php_phpunit_skipped_tests

PHP: Fixed incorrect display of skipped tests in the Test Results window for PHPUnit.
apache · Oct 8, 2024 · 8cab2ae · 8cab2ae
2 parents 71fb2b0 + c270fac
commit 8cab2ae
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 1 deletion.
diff --git a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/run/PhpUnitLogParser.java b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/run/PhpUnitLogParser.java
@@ -38,7 +38,7 @@
  */
 public final class PhpUnitLogParser extends DefaultHandler {
 
-    enum Content { NONE, ERROR, FAILURE };
+    enum Content { NONE, ERROR, FAILURE, SKIPPED };
     private static final Logger LOGGER = Logger.getLogger(PhpUnitLogParser.class.getName());
     private static final String NO_FILE = "NO_FILE"; // NOI18N
 
@@ -90,6 +90,8 @@ public void startElement(String uri, String localName, String qName, Attributes
             startTestFailure(attributes);
         } else if ("error".equals(qName)) { // NOI18N
             startTestError(attributes);
+        } else if ("skipped".equals(qName)) { // NOI18N
+            startTestSkipped(attributes);
         }
     }
 
@@ -111,6 +113,7 @@ public void characters(char[] ch, int start, int length) throws SAXException {
         switch (content) {
             case FAILURE:
             case ERROR:
+            case SKIPPED:
                 buffer.append(new String(ch, start, length));
                 break;
             case NONE:
@@ -169,6 +172,11 @@ private void startTestFailure(Attributes attributes) {
         content = Content.FAILURE;
     }
 
+    private void startTestSkipped(Attributes attributes) {
+        content = Content.SKIPPED;
+        testCase.setSkippedStatus();
+    }
+
     private void endTestContent() {
         assert testCase != null;
         assert buffer.length() > 0;

diff --git a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/run/TestCaseVo.java b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/run/TestCaseVo.java
@@ -155,6 +155,11 @@ public void setFailureStatus() {
         status = TestCase.Status.FAILED;
     }
 
+    public void setSkippedStatus() {
+        assert status == TestCase.Status.PASSED : "Expected PASSED status but was: " + status; // NOI18N
+        status = TestCase.Status.SKIPPED;
+    }
+
     public TestCase.Status getStatus() {
         return status;
     }
@@ -167,6 +172,10 @@ public boolean isFailure() {
         return status.equals(TestCase.Status.FAILED);
     }
 
+    public boolean isSkipped() {
+        return status.equals(TestCase.Status.SKIPPED);
+    }
+
     @Override
     public String toString() {
         return String.format("TestCaseVo{name: %s, file: %s, line: %d, time: %d, status: %s, stacktrace: %s}", name, file, line, time, status, stacktrace); // NOI18N

diff --git a/php/php.phpunit/test/unit/data/phpunit-log-skipped-tests.xml b/php/php.phpunit/test/unit/data/phpunit-log-skipped-tests.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="CLI Arguments" tests="17" assertions="14" errors="0" failures="2" skipped="3" time="0.035194">
+    <testsuite name="CalculatorTest" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" tests="17" assertions="14" errors="0" failures="2" skipped="3" time="0.035194">
+      <testcase name="testPlus" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="47" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.007517"/>
+      <testcase name="testPlus2" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="54" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.012255">
+        <failure type="PHPUnit\Framework\ExpectationFailedException">CalculatorTest::testPlus2
+Failed asserting that 1 matches expected 2.
+
+/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php:55</failure>
+      </testcase>
+      <testcase name="testPlus3" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="64" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.001137"/>
+      <testcase name="testPlus4" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="71" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.000984"/>
+      <testcase name="testMinus" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="78" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.001094"/>
+      <testcase name="testMinus2" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="85" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.000989"/>
+      <testcase name="testMinus3" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="92" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.000950"/>
+      <testcase name="testMinus4" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="99" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.000978"/>
+      <testcase name="testMultiply" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="106" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.000964"/>
+      <testcase name="testMultiply2" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="113" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.000983"/>
+      <testcase name="testMultiply3" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="120" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.000961"/>
+      <testcase name="testMultiply4" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="127" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.001048"/>
+      <testcase name="testMultiply5" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="134" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.001190"/>
+      <testcase name="testDivide" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="141" class="CalculatorTest" classname="CalculatorTest" assertions="1" time="0.001630">
+        <failure type="PHPUnit\Framework\ExpectationFailedException">CalculatorTest::testDivide
+Failed asserting that 0 matches expected 2.
+
+/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php:142</failure>
+      </testcase>
+      <testcase name="testDivide2" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="149" class="CalculatorTest" classname="CalculatorTest" assertions="0" time="0.000000">
+        <skipped/>
+      </testcase>
+      <testcase name="testDivide3" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="160" class="CalculatorTest" classname="CalculatorTest" assertions="0" time="0.001233">
+        <skipped/>
+      </testcase>
+      <testcase name="testModulo" file="/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php" line="170" class="CalculatorTest" classname="CalculatorTest" assertions="0" time="0.001281">
+        <skipped/>
+      </testcase>
+    </testsuite>
+  </testsuite>
+</testsuites>
diff --git a/php/php.phpunit/test/unit/src/org/netbeans/modules/php/phpunit/run/PhpUnitLogParserTest.java b/php/php.phpunit/test/unit/src/org/netbeans/modules/php/phpunit/run/PhpUnitLogParserTest.java
@@ -24,6 +24,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.Reader;
+import java.util.Arrays;
 import org.netbeans.junit.NbTestCase;
 import org.netbeans.modules.php.spi.testing.run.TestCase;
 
@@ -295,6 +296,22 @@ public void testParseLogNETBEANS1851() throws Exception {
         assertEquals("Risky Test", testCase.getStackTrace()[0]);
     }
 
+    public void testParseLogSkippedTests() throws Exception {
+        Reader reader = createReader("phpunit-log-skipped-tests.xml");
+        TestSessionVo testSession = new TestSessionVo(null);
+
+        PhpUnitLogParser.parse(reader, testSession);
+
+        assertSame(1, testSession.getTestSuites().size());
+        TestSuiteVo testSuite = testSession.getTestSuites().get(0);
+        assertEquals("CalculatorTest", testSuite.getName());
+        assertEquals("/home/troizet/NetBeansProjects/Calculator-PHPUnit/test/src/CalculatorTest.php", testSuite.getFile());
+        TestCaseVo testCase = testSuite.getTestCases().get(15);
+        assertEquals("testDivide3", testCase.getName());
+        assertTrue(testCase.isSkipped());
+        assertTrue(Arrays.asList(testCase.getStackTrace()).isEmpty());
+    }
+
     private Reader createReader(String filename) throws FileNotFoundException {
         return new BufferedReader(new FileReader(new File(getDataDir(), filename)));
     }