Use "@<data-set-name>" --filter CLI option compatible error format

Author: staabm

src/Framework/TestCase.php

@@ -854,24 +854,6 @@ final public function dataSetAsString(): string
         return '';
     }
 
-    /**
-     * Returns the data set as a string compatible with the --filter CLI option.
-     *
-     * @internal This method is not covered by the backward compatibility promise for PHPUnit
-     */
-    final public function dataSetAsFilterString(): string
-    {
-        if ($this->data !== []) {
-            if (is_int($this->dataName)) {
-                return sprintf('#%d', $this->dataName);
-            }
-
-            return sprintf('%s', $this->dataName);
-        }
-
-        return '';
-    }
-
     /**
      * @internal This method is not covered by the backward compatibility promise for PHPUnit
      */
@@ -881,8 +863,9 @@ final public function dataSetAsStringWithData(): string
             return '';
         }
 
-        return $this->dataSetAsString() . sprintf(
-            ' (%s)',
+        return sprintf(
+            '%s with data (%s)',
+            $this->dataSetAsFilterString(),
             Exporter::shortenedRecursiveExport($this->data),
         );
     }
@@ -1284,6 +1267,24 @@ protected function onNotSuccessfulTest(Throwable $t): never
         throw $t;
     }
 
+    /**
+     * Returns the data set as a string compatible with the --filter CLI option.
+     *
+     * @internal This method is not covered by the backward compatibility promise for PHPUnit
+     */
+    private function dataSetAsFilterString(): string
+    {
+        if ($this->data !== []) {
+            if (is_int($this->dataName)) {
+                return sprintf('#%d', $this->dataName);
+            }
+
+            return sprintf('@%s', $this->dataName);
+        }
+
+        return '';
+    }
+
     /**
      * @throws AssertionFailedError
      * @throws Exception

src/Runner/Filter/NameFilterIterator.php

@@ -109,7 +109,7 @@ private function prepareFilter(string $filter): array
             //  * testDetermineJsonError@JSON.*
             elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) {
                 $filter = sprintf(
-                    '%s.*with data set "%s"$',
+                    '%s.*with data set "@%s"$',
                     $matches[1],
                     $matches[2],
                 );

tests/end-to-end/data-provider/dependency-result.phpt

@@ -19,7 +19,7 @@ Time: %s, Memory: %s
 
 There was 1 error:
 
-1) PHPUnit\TestFixture\DataProviderDependencyResultTest::testAdd with data set #2 (2, 0)
+1) PHPUnit\TestFixture\DataProviderDependencyResultTest::testAdd#2 with data (2, 0)
 Error: Cannot use positional argument after named argument during unpacking
 
 ERRORS!

tests/end-to-end/logging/teamcity/teamcity-data-provider.phpt

@@ -29,7 +29,7 @@ Time: %s, Memory: %s
 
 There was 1 failure:
 
-1) PHPUnit\TestFixture\TeamCity\DataProviderTest::testOne with data set #1 (false)
+1) PHPUnit\TestFixture\TeamCity\DataProviderTest::testOne#1 with data (false)
 Failed asserting that false is true.
 
 %sDataProviderTest.php:28

tests/end-to-end/regression/5616.phpt

@@ -19,7 +19,7 @@ Time: %s, Memory: %s MB
 
 There was 1 failure:
 
-1) PHPUnit\TestFixture\Issue5616\Issue5616Test::testOne with data set #0 (1, '2', 3.0, true)
+1) PHPUnit\TestFixture\Issue5616\Issue5616Test::testOne#0 with data (1, '2', 3.0, true)
 Failed asserting that false is true.
 
 %sIssue5616Test.php:%d

tests/end-to-end/regression/6222.phpt

@@ -26,17 +26,17 @@ Failed asserting that false is true.
 
 %sIssue6222Test.php:%d
 
-2) PHPUnit\TestFixture\Issue6222\Issue6222Test::testOneCasePassing with data set #1 (2)
+2) PHPUnit\TestFixture\Issue6222\Issue6222Test::testOneCasePassing#1 with data (2)
 Failed asserting that 2 is identical to 1.
 
 %sIssue6222Test.php:%d
 
-3) PHPUnit\TestFixture\Issue6222\Issue6222Test::testZeroCasesPassing with data set #0 (1)
+3) PHPUnit\TestFixture\Issue6222\Issue6222Test::testZeroCasesPassing#0 with data (1)
 Failed asserting that 1 is identical to 3.
 
 %sIssue6222Test.php:%d
 
-4) PHPUnit\TestFixture\Issue6222\Issue6222Test::testZeroCasesPassing with data set #1 (2)
+4) PHPUnit\TestFixture\Issue6222\Issue6222Test::testZeroCasesPassing#1 with data (2)
 Failed asserting that 2 is identical to 3.
 
 %sIssue6222Test.php:%d

tests/end-to-end/testdox/data-provider-with-string-data-set-name.phpt

@@ -20,8 +20,8 @@ Runtime:       %s
 Time: %s, Memory: %s
 
 Data Provider With String Data Set Name (PHPUnit\TestFixture\TestDox\DataProviderWithStringDataSetName)
- ✔ Something that works with data set "data set name"
- ✘ Something that does not work with data set "data set name"
+ ✔ Something that works with data set "@data set name"
+ ✘ Something that does not work with data set "@data set name"
    │
    │ Failed asserting that false is true.
    │

tests/end-to-end/testdox/formatter-method-does-not-exist.phpt

@@ -24,7 +24,7 @@ Formatter Method Does Not Exist (PHPUnit\TestFixture\TestDox\FormatterMethodDoes
 
 There was 1 PHPUnit error:
 
-1) PHPUnit\TestFixture\TestDox\FormatterMethodDoesNotExistTest::testOne with data set #0 ('string')
+1) PHPUnit\TestFixture\TestDox\FormatterMethodDoesNotExistTest::testOne#0 with data ('string')
 Method PHPUnit\TestFixture\TestDox\FormatterMethodDoesNotExistTest::formatter() cannot be used as a TestDox formatter because it does not exist
 
 %sFormatterMethodDoesNotExistTest.php:%d

tests/end-to-end/testdox/formatter-method-is-not-public.phpt

@@ -24,7 +24,7 @@ Formatter Method Is Not Public (PHPUnit\TestFixture\TestDox\FormatterMethodIsNot
 
 There was 1 PHPUnit error:
 
-1) PHPUnit\TestFixture\TestDox\FormatterMethodIsNotPublicTest::testOne with data set #0 ('string')
+1) PHPUnit\TestFixture\TestDox\FormatterMethodIsNotPublicTest::testOne#0 with data ('string')
 Method PHPUnit\TestFixture\TestDox\FormatterMethodIsNotPublicTest::formatter() cannot be used as a TestDox formatter because it is not public
 
 %sFormatterMethodIsNotPublicTest.php:%d

tests/end-to-end/testdox/formatter-method-is-not-static.phpt

@@ -24,7 +24,7 @@ Formatter Method Is Not Static (PHPUnit\TestFixture\TestDox\FormatterMethodIsNot
 
 There was 1 PHPUnit error:
 
-1) PHPUnit\TestFixture\TestDox\FormatterMethodIsNotStaticTest::testOne with data set #0 ('string')
+1) PHPUnit\TestFixture\TestDox\FormatterMethodIsNotStaticTest::testOne#0 with data ('string')
 Method PHPUnit\TestFixture\TestDox\FormatterMethodIsNotStaticTest::formatter() cannot be used as a TestDox formatter because it is not static
 
 %sFormatterMethodIsNotStaticTest.php:%d