Skip to content

Commit de06de1

Browse files
authored
Drop <testsuites> name attribute that doesn't exist in PHPUnit (#1042)
* Regenerate fixtures from bare PHPUnit * Drop `<testsuites>` name attribute that doesn't exist in PHPUnit
1 parent bc788bd commit de06de1

File tree

12 files changed

+101
-100
lines changed

12 files changed

+101
-100
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,4 @@ regenerate-fixture-results: vendor
8787
find test/fixtures/ -type f -name "*.xml" -print0 | xargs -0 sed -i 's#$(PWD)#.#g'
8888
find test/fixtures/ -type f -name "*.xml" -print0 | xargs -0 sed -i 's#time="........"#time="1.234567"#g'
8989
sed -i 's#name="./test/fixtures/common_results"#name=""#g' test/fixtures/common_results/combined.xml
90+
sed -i 's#name="CLI Arguments"#name=""#g' test/fixtures/common_results/combined.xml

src/JUnit/Writer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
/** @internal */
2424
final readonly class Writer
2525
{
26-
private const TESTSUITES_NAME = 'PHPUnit tests';
2726
private DOMDocument $document;
2827

2928
public function __construct()
@@ -48,7 +47,6 @@ private function getXml(TestSuite $testSuite): string
4847
{
4948
$xmlTestsuites = $this->document->createElement('testsuites');
5049
$xmlTestsuites->appendChild($this->createSuiteNode($testSuite));
51-
$xmlTestsuites->setAttribute('name', self::TESTSUITES_NAME);
5250
$this->document->appendChild($xmlTestsuites);
5351

5452
$xml = $this->document->saveXML();
@@ -60,7 +58,7 @@ private function getXml(TestSuite $testSuite): string
6058
private function createSuiteNode(TestSuite $parentSuite): DOMElement
6159
{
6260
$suiteNode = $this->document->createElement('testsuite');
63-
$suiteNode->setAttribute('name', $parentSuite->name !== self::TESTSUITES_NAME ? $parentSuite->name : '');
61+
$suiteNode->setAttribute('name', $parentSuite->name);
6462
if ($parentSuite->file !== '') {
6563
$suiteNode->setAttribute('file', $parentSuite->file);
6664
}

test/fixtures/common_results/combined.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites name="PHPUnit tests">
2+
<testsuites>
33
<testsuite name="" tests="7" assertions="3" errors="1" failures="1" skipped="2" time="1.234567">
44
<testsuite name="ParaTest\Tests\fixtures\common_results\ErrorTest" file="./test/fixtures/common_results/ErrorTest.php" tests="1" assertions="0" errors="1" failures="0" skipped="0" time="1.234567">
55
<testcase name="testError" file="./test/fixtures/common_results/ErrorTest.php" line="13" class="ParaTest\Tests\fixtures\common_results\ErrorTest" classname="ParaTest.Tests.fixtures.common_results.ErrorTest" assertions="0" time="1.234567">

test/fixtures/common_results/junit/ErrorTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites name="PHPUnit tests">
2+
<testsuites>
33
<testsuite name="ParaTest\Tests\fixtures\common_results\ErrorTest" file="./test/fixtures/common_results/ErrorTest.php" tests="1" assertions="0" errors="1" failures="0" skipped="0" time="1.234567">
44
<testcase name="testError" file="./test/fixtures/common_results/ErrorTest.php" line="13" class="ParaTest\Tests\fixtures\common_results\ErrorTest" classname="ParaTest.Tests.fixtures.common_results.ErrorTest" assertions="0" time="1.234567">
55
<error type="RuntimeException">ParaTest\Tests\fixtures\common_results\ErrorTest::testError

test/fixtures/common_results/junit/FailureTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites name="PHPUnit tests">
2+
<testsuites>
33
<testsuite name="ParaTest\Tests\fixtures\common_results\FailureTest" file="./test/fixtures/common_results/FailureTest.php" tests="1" assertions="1" errors="0" failures="1" skipped="0" time="1.234567">
44
<testcase name="testFailure" file="./test/fixtures/common_results/FailureTest.php" line="12" class="ParaTest\Tests\fixtures\common_results\FailureTest" classname="ParaTest.Tests.fixtures.common_results.FailureTest" assertions="1" time="1.234567">
55
<failure type="PHPUnit\Framework\ExpectationFailedException">ParaTest\Tests\fixtures\common_results\FailureTest::testFailure

test/fixtures/common_results/junit/IncompleteTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites name="PHPUnit tests">
2+
<testsuites>
33
<testsuite name="ParaTest\Tests\fixtures\common_results\IncompleteTest" file="./test/fixtures/common_results/IncompleteTest.php" tests="1" assertions="0" errors="0" failures="0" skipped="1" time="1.234567">
44
<testcase name="testIncomplete" file="./test/fixtures/common_results/IncompleteTest.php" line="12" class="ParaTest\Tests\fixtures\common_results\IncompleteTest" classname="ParaTest.Tests.fixtures.common_results.IncompleteTest" assertions="0" time="1.234567">
55
<skipped/>

test/fixtures/common_results/junit/RiskyTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites name="PHPUnit tests">
2+
<testsuites>
33
<testsuite name="ParaTest\Tests\fixtures\common_results\RiskyTest" file="./test/fixtures/common_results/RiskyTest.php" tests="1" assertions="0" errors="0" failures="0" skipped="0" time="1.234567">
44
<testcase name="testRisky" file="./test/fixtures/common_results/RiskyTest.php" line="12" class="ParaTest\Tests\fixtures\common_results\RiskyTest" classname="ParaTest.Tests.fixtures.common_results.RiskyTest" assertions="0" time="1.234567"/>
55
</testsuite>

test/fixtures/common_results/junit/SkippedTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites name="PHPUnit tests">
2+
<testsuites>
33
<testsuite name="ParaTest\Tests\fixtures\common_results\SkippedTest" file="./test/fixtures/common_results/SkippedTest.php" tests="1" assertions="0" errors="0" failures="0" skipped="1" time="1.234567">
44
<testcase name="testSkipped" file="./test/fixtures/common_results/SkippedTest.php" line="12" class="ParaTest\Tests\fixtures\common_results\SkippedTest" classname="ParaTest.Tests.fixtures.common_results.SkippedTest" assertions="0" time="1.234567">
55
<skipped/>

test/fixtures/common_results/junit/SuccessTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites name="PHPUnit tests">
2+
<testsuites>
33
<testsuite name="ParaTest\Tests\fixtures\common_results\SuccessTest" file="./test/fixtures/common_results/SuccessTest.php" tests="1" assertions="1" errors="0" failures="0" skipped="0" time="1.234567">
44
<testcase name="testSuccess" file="./test/fixtures/common_results/SuccessTest.php" line="12" class="ParaTest\Tests\fixtures\common_results\SuccessTest" classname="ParaTest.Tests.fixtures.common_results.SuccessTest" assertions="1" time="1.234567"/>
55
</testsuite>

test/fixtures/common_results/junit/WarningTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<testsuites name="PHPUnit tests">
2+
<testsuites>
33
<testsuite name="ParaTest\Tests\fixtures\common_results\WarningTest" file="./test/fixtures/common_results/WarningTest.php" tests="1" assertions="1" errors="0" failures="0" skipped="0" time="1.234567">
44
<testcase name="testWarning" file="./test/fixtures/common_results/WarningTest.php" line="16" class="ParaTest\Tests\fixtures\common_results\WarningTest" classname="ParaTest.Tests.fixtures.common_results.WarningTest" assertions="1" time="1.234567"/>
55
</testsuite>

0 commit comments

Comments
 (0)