Update expectations after expanding StatusTest

sebastianbergmann · May 7, 2022 · 9267e53 · 9267e53
1 parent 254150e
commit 9267e53
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 52 deletions.
diff --git a/tests/end-to-end/logging/log-junit.phpt b/tests/end-to-end/logging/log-junit.phpt
@@ -15,7 +15,7 @@ PHPUnit\TextUI\Application::main();
 --EXPECTF--
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="PHPUnit\SelfTest\Basic\StatusTest" file="%sStatusTest.php" tests="14" assertions="4" errors="4" warnings="2" failures="2" skipped="4" time="%f">
+  <testsuite name="PHPUnit\SelfTest\Basic\StatusTest" file="%sStatusTest.php" tests="14" assertions="4" errors="4" warnings="2" failures="2" skipped="5" time="%f">
     <testcase name="testSuccess" file="%sStatusTest.php" line="%d" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" assertions="1" time="%f"/>
     <testcase name="testFailure" file="%sStatusTest.php" line="%d" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" assertions="1" time="%f">
       <failure type="PHPUnit\Framework\ExpectationFailedException">PHPUnit\SelfTest\Basic\StatusTest::testFailure%A

diff --git a/tests/end-to-end/logging/log-teamcity.phpt b/tests/end-to-end/logging/log-teamcity.phpt
@@ -13,7 +13,7 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Application::main();
 --EXPECTF--
-##teamcity[testCount count='14' flowId='%d']
+##teamcity[testCount count='15' flowId='%d']
 
 ##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\StatusTest' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest' flowId='%d']
 
@@ -23,25 +23,25 @@ PHPUnit\TextUI\Application::main();
 
 ##teamcity[testStarted name='testFailure' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testFailure' flowId='%d']
 
-##teamcity[testFailed name='testFailure' message='Failed asserting that false is true.' details='%sStatusTest.php:35|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testFailure' message='Failed asserting that false is true.' details='%sStatusTest.php:36|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testFailure' duration='%d' flowId='%d']
 
 ##teamcity[testStarted name='testError' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testError' flowId='%d']
 
-##teamcity[testFailed name='testError' message='RuntimeException' details='%sStatusTest.php:40|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testError' message='RuntimeException' details='%sStatusTest.php:41|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testError' duration='%d' flowId='%d']
 
 ##teamcity[testStarted name='testIncomplete' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testIncomplete' flowId='%d']
 
-##teamcity[testIgnored name='testIncomplete' message='' details='%sStatusTest.php:45|n' duration='%d' flowId='%d']
+##teamcity[testIgnored name='testIncomplete' message='' details='%sStatusTest.php:46|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testIncomplete' duration='%d' flowId='%d']
 
 ##teamcity[testStarted name='testSkipped' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSkipped' flowId='%d']
 
-##teamcity[testIgnored name='testSkipped' message='' details='%sStatusTest.php:50|n' duration='%d' flowId='%d']
+##teamcity[testIgnored name='testSkipped' message='' details='%sStatusTest.php:51|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testSkipped' duration='%d' flowId='%d']
 
@@ -61,25 +61,27 @@ PHPUnit\TextUI\Application::main();
 
 ##teamcity[testStarted name='testFailureWithMessage' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testFailureWithMessage' flowId='%d']
 
-##teamcity[testFailed name='testFailureWithMessage' message='failure with custom message|nFailed asserting that false is true.' details='%sStatusTest.php:69|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testFailureWithMessage' message='failure with custom message|nFailed asserting that false is true.' details='%sStatusTest.php:70|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testFailureWithMessage' duration='%d' flowId='%d']
 
 ##teamcity[testStarted name='testErrorWithMessage' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testErrorWithMessage' flowId='%d']
 
-##teamcity[testFailed name='testErrorWithMessage' message='RuntimeException: error with custom message' details='%sStatusTest.php:74|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testErrorWithMessage' message='RuntimeException: error with custom message' details='%sStatusTest.php:75|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testErrorWithMessage' duration='%d' flowId='%d']
 
 ##teamcity[testStarted name='testIncompleteWithMessage' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testIncompleteWithMessage' flowId='%d']
 
-##teamcity[testIgnored name='testIncompleteWithMessage' message='incomplete with custom message' details='%sStatusTest.php:79|n' duration='%d' flowId='%d']
+##teamcity[testIgnored name='testIncompleteWithMessage' message='incomplete with custom message' details='%sStatusTest.php:80|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testIncompleteWithMessage' duration='%d' flowId='%d']
 
+##teamcity[testIgnored name='testSkippedByMetadata' message='PHP > 9000 is required.' details='' duration='%d' flowId='%d']
+
 ##teamcity[testStarted name='testSkippedWithMessage' locationHint='php_qn://%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSkippedWithMessage' flowId='%d']
 
-##teamcity[testIgnored name='testSkippedWithMessage' message='skipped with custom message' details='%sStatusTest.php:84|n' duration='%d' flowId='%d']
+##teamcity[testIgnored name='testSkippedWithMessage' message='skipped with custom message' details='%sStatusTest.php:90|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testSkippedWithMessage' duration='%d' flowId='%d']
 

diff --git a/tests/end-to-end/logging/teamcity-directory.phpt b/tests/end-to-end/logging/teamcity-directory.phpt
@@ -11,111 +11,113 @@ require_once __DIR__ . '/../../bootstrap.php';
 
 PHPUnit\TextUI\Application::main();
 --EXPECTF--
-##teamcity[testCount count='20' flowId='%d']
+##teamcity[testCount count='21' flowId='%d']
 
-##teamcity[testSuiteStarted name='%s' flowId='%d']
+##teamcity[testSuiteStarted name='%stests/end-to-end/_files/basic/unit' flowId='%d']
 
-##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\SetUpBeforeClassTest' locationHint='%sSetUpBeforeClassTest.php::\PHPUnit\SelfTest\Basic\SetUpBeforeClassTest' flowId='%d']
+##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\SetUpBeforeClassTest' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/SetUpBeforeClassTest.php::\PHPUnit\SelfTest\Basic\SetUpBeforeClassTest' flowId='%d']
 
-##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\SetUpTest' locationHint='%sSetUpTest.php::\PHPUnit\SelfTest\Basic\SetUpTest' flowId='%d']
+##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\SetUpTest' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/SetUpTest.php::\PHPUnit\SelfTest\Basic\SetUpTest' flowId='%d']
 
-##teamcity[testFailed name='testOneWithSetUpException' message='RuntimeException: throw exception in setUp' details='%sSetUpTest.php:30|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testOneWithSetUpException' message='RuntimeException: throw exception in setUp' details='%stests/end-to-end/_files/basic/unit/SetUpTest.php:30|n' duration='%d' flowId='%d']
 
-##teamcity[testFailed name='testTwoWithSetUpException' message='RuntimeException: throw exception in setUp' details='%sSetUpTest.php:30|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testTwoWithSetUpException' message='RuntimeException: throw exception in setUp' details='%stests/end-to-end/_files/basic/unit/SetUpTest.php:30|n' duration='%d' flowId='%d']
 
 ##teamcity[testSuiteFinished name='PHPUnit\SelfTest\Basic\SetUpTest' flowId='%d']
 
-##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\StatusTest' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest' flowId='%d']
+##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\StatusTest' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest' flowId='%d']
 
-##teamcity[testStarted name='testSuccess' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSuccess' flowId='%d']
+##teamcity[testStarted name='testSuccess' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSuccess' flowId='%d']
 
 ##teamcity[testFinished name='testSuccess' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testFailure' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testFailure' flowId='%d']
+##teamcity[testStarted name='testFailure' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testFailure' flowId='%d']
 
-##teamcity[testFailed name='testFailure' message='Failed asserting that false is true.' details='%sStatusTest.php:35|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testFailure' message='Failed asserting that false is true.' details='%stests/end-to-end/_files/basic/unit/StatusTest.php:36|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testFailure' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testError' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testError' flowId='%d']
+##teamcity[testStarted name='testError' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testError' flowId='%d']
 
-##teamcity[testFailed name='testError' message='RuntimeException' details='%sStatusTest.php:40|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testError' message='RuntimeException' details='%stests/end-to-end/_files/basic/unit/StatusTest.php:41|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testError' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testIncomplete' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testIncomplete' flowId='%d']
+##teamcity[testStarted name='testIncomplete' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testIncomplete' flowId='%d']
 
-##teamcity[testIgnored name='testIncomplete' message='' details='%sStatusTest.php:45|n' duration='%d' flowId='%d']
+##teamcity[testIgnored name='testIncomplete' message='' details='%stests/end-to-end/_files/basic/unit/StatusTest.php:46|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testIncomplete' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testSkipped' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSkipped' flowId='%d']
+##teamcity[testStarted name='testSkipped' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSkipped' flowId='%d']
 
-##teamcity[testIgnored name='testSkipped' message='' details='%sStatusTest.php:50|n' duration='%d' flowId='%d']
+##teamcity[testIgnored name='testSkipped' message='' details='%stests/end-to-end/_files/basic/unit/StatusTest.php:51|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testSkipped' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testRisky' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testRisky' flowId='%d']
+##teamcity[testStarted name='testRisky' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testRisky' flowId='%d']
 
 ##teamcity[testFailed name='testRisky' message='This test did not perform any assertions' details='' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testRisky' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testWarning' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testWarning' flowId='%d']
+##teamcity[testStarted name='testWarning' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testWarning' flowId='%d']
 
 ##teamcity[testFinished name='testWarning' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testSuccessWithMessage' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSuccessWithMessage' flowId='%d']
+##teamcity[testStarted name='testSuccessWithMessage' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSuccessWithMessage' flowId='%d']
 
 ##teamcity[testFinished name='testSuccessWithMessage' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testFailureWithMessage' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testFailureWithMessage' flowId='%d']
+##teamcity[testStarted name='testFailureWithMessage' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testFailureWithMessage' flowId='%d']
 
-##teamcity[testFailed name='testFailureWithMessage' message='failure with custom message|nFailed asserting that false is true.' details='%sStatusTest.php:69|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testFailureWithMessage' message='failure with custom message|nFailed asserting that false is true.' details='%stests/end-to-end/_files/basic/unit/StatusTest.php:70|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testFailureWithMessage' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testErrorWithMessage' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testErrorWithMessage' flowId='%d']
+##teamcity[testStarted name='testErrorWithMessage' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testErrorWithMessage' flowId='%d']
 
-##teamcity[testFailed name='testErrorWithMessage' message='RuntimeException: error with custom message' details='%sStatusTest.php:74|n' duration='%d' flowId='%d']
+##teamcity[testFailed name='testErrorWithMessage' message='RuntimeException: error with custom message' details='%stests/end-to-end/_files/basic/unit/StatusTest.php:75|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testErrorWithMessage' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testIncompleteWithMessage' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testIncompleteWithMessage' flowId='%d']
+##teamcity[testStarted name='testIncompleteWithMessage' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testIncompleteWithMessage' flowId='%d']
 
-##teamcity[testIgnored name='testIncompleteWithMessage' message='incomplete with custom message' details='%sStatusTest.php:79|n' duration='%d' flowId='%d']
+##teamcity[testIgnored name='testIncompleteWithMessage' message='incomplete with custom message' details='%stests/end-to-end/_files/basic/unit/StatusTest.php:80|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testIncompleteWithMessage' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testSkippedWithMessage' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSkippedWithMessage' flowId='%d']
+##teamcity[testIgnored name='testSkippedByMetadata' message='PHP > 9000 is required.' details='' duration='%d' flowId='%d']
 
-##teamcity[testIgnored name='testSkippedWithMessage' message='skipped with custom message' details='%sStatusTest.php:84|n' duration='%d' flowId='%d']
+##teamcity[testStarted name='testSkippedWithMessage' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testSkippedWithMessage' flowId='%d']
+
+##teamcity[testIgnored name='testSkippedWithMessage' message='skipped with custom message' details='%stests/end-to-end/_files/basic/unit/StatusTest.php:90|n' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testSkippedWithMessage' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testRiskyWithMessage' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testRiskyWithMessage' flowId='%d']
+##teamcity[testStarted name='testRiskyWithMessage' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testRiskyWithMessage' flowId='%d']
 
 ##teamcity[testFailed name='testRiskyWithMessage' message='This test did not perform any assertions' details='' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testRiskyWithMessage' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testWarningWithMessage' locationHint='%sStatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testWarningWithMessage' flowId='%d']
+##teamcity[testStarted name='testWarningWithMessage' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/StatusTest.php::\PHPUnit\SelfTest\Basic\StatusTest::testWarningWithMessage' flowId='%d']
 warning with custom message
 
 ##teamcity[testFinished name='testWarningWithMessage' duration='%d' flowId='%d']
 
 ##teamcity[testSuiteFinished name='PHPUnit\SelfTest\Basic\StatusTest' flowId='%d']
 
-##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\TearDownAfterClassTest' locationHint='%sTearDownAfterClassTest.php::\PHPUnit\SelfTest\Basic\TearDownAfterClassTest' flowId='%d']
+##teamcity[testSuiteStarted name='PHPUnit\SelfTest\Basic\TearDownAfterClassTest' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/TearDownAfterClassTest.php::\PHPUnit\SelfTest\Basic\TearDownAfterClassTest' flowId='%d']
 
-##teamcity[testStarted name='testOne' locationHint='%sTearDownAfterClassTest.php::\PHPUnit\SelfTest\Basic\TearDownAfterClassTest::testOne' flowId='%d']
+##teamcity[testStarted name='testOne' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/TearDownAfterClassTest.php::\PHPUnit\SelfTest\Basic\TearDownAfterClassTest::testOne' flowId='%d']
 
 ##teamcity[testFinished name='testOne' duration='%d' flowId='%d']
 
-##teamcity[testStarted name='testTwo' locationHint='%sTearDownAfterClassTest.php::\PHPUnit\SelfTest\Basic\TearDownAfterClassTest::testTwo' flowId='%d']
+##teamcity[testStarted name='testTwo' locationHint='php_qn://%stests/end-to-end/_files/basic/unit/TearDownAfterClassTest.php::\PHPUnit\SelfTest\Basic\TearDownAfterClassTest::testTwo' flowId='%d']
 
 ##teamcity[testFinished name='testTwo' duration='%d' flowId='%d']
 
 ##teamcity[testSuiteFinished name='PHPUnit\SelfTest\Basic\TearDownAfterClassTest' flowId='%d']
 
-##teamcity[testSuiteFinished name='%s' flowId='%d']
+##teamcity[testSuiteFinished name='%stests/end-to-end/_files/basic/unit' flowId='%d']