Merge pull request #993 from fredden/test-coverage-no-mutation-changes

Improve test coverage
ergebnis · Dec 6, 2023 · 93537bc · 93537bc
2 parents a09478a + a5a835f
commit 93537bc
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 11 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -36,17 +36,11 @@
     <MixedAssignment>
       <code>$value</code>
     </MixedAssignment>
-    <UnusedForeachValue>
-      <code>$value</code>
-    </UnusedForeachValue>
   </file>
   <file src="src/Vendor/Composer/VersionConstraintNormalizer.php">
     <MixedAssignment>
       <code>$value</code>
     </MixedAssignment>
-    <UnusedForeachValue>
-      <code>$value</code>
-    </UnusedForeachValue>
   </file>
   <file src="test/Fixture/FormatNormalizer/NormalizeNormalizesJson/Scenario.php">
     <PossiblyUnusedMethod>

diff --git a/src/Format/JsonEncodeOptions.php b/src/Format/JsonEncodeOptions.php
@@ -47,7 +47,7 @@ public static function fromJson(Json $json): self
         $jsonEncodeOptions = 0;
 
         if (!\str_contains($json->encoded(), '\/')) {
-            $jsonEncodeOptions |= \JSON_UNESCAPED_SLASHES;
+            $jsonEncodeOptions = \JSON_UNESCAPED_SLASHES;
         }
 
         if (1 !== \preg_match('/(\\\\+)u([0-9a-f]{4})/i', $json->encoded())) {

diff --git a/src/Format/NewLine.php b/src/Format/NewLine.php
@@ -30,7 +30,7 @@ private function __construct(private readonly string $value)
      */
     public static function fromString(string $value): self
     {
-        if (1 !== \preg_match('/^(?>\r\n|\n|\r)$/', $value)) {
+        if ("\n" !== $value && "\r" !== $value && "\r\n" !== $value) {
             throw Exception\InvalidNewLineString::fromString($value);
         }
 

diff --git a/src/Vendor/Composer/PackageHashNormalizer.php b/src/Vendor/Composer/PackageHashNormalizer.php
@@ -51,7 +51,7 @@ public function normalize(Json $json): Json
 
         foreach ($objectPropertiesThatShouldBeNormalized as $name => $value) {
             /** @var array<string, string> $packages */
-            $packages = (array) $decoded->{$name};
+            $packages = (array) $value;
 
             if ([] === $packages) {
                 continue;

diff --git a/src/Vendor/Composer/VersionConstraintNormalizer.php b/src/Vendor/Composer/VersionConstraintNormalizer.php
@@ -50,7 +50,7 @@ public function normalize(Json $json): Json
         }
 
         foreach ($objectPropertiesThatShouldBeNormalized as $name => $value) {
-            $packages = (array) $decoded->{$name};
+            $packages = (array) $value;
 
             if ([] === $packages) {
                 continue;

diff --git a/...malizesJson/Json/IsObject/HasEntries/Yes/HasProperty/RequireAndRequireDev/normalized.json b/...malizesJson/Json/IsObject/HasEntries/Yes/HasProperty/RequireAndRequireDev/normalized.json
@@ -0,0 +1,10 @@
+{
+    "description": "This test exists to cover certain mutants from infection/infection",
+    "require": {},
+    "require-dev": {
+        "ergebnis/overlapping-version-constraints-1": "^1.0 || 3.4.5",
+        "ergebnis/overlapping-version-constraints-2": "^1.0 || ^2.0",
+        "ergebnis/separator-mixing": "^1.0 || ^1.2 >=1.2.4 <1.2.7",
+        "ergebnis/whitespace-around-version": "*"
+    }
+}
diff --git a/...ormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/RequireAndRequireDev/original.json b/...ormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/RequireAndRequireDev/original.json
@@ -0,0 +1,10 @@
+{
+  "description": "This test exists to cover certain mutants from infection/infection",
+  "require": {},
+  "require-dev": {
+    "ergebnis/whitespace-around-version": " * ",
+    "ergebnis/overlapping-version-constraints-1": "3.4.5 || ^1.0 || ^1.1 || ^1.2",
+    "ergebnis/overlapping-version-constraints-2": "^1.0 || ^2.0 || ^1.1 || ^2.1",
+    "ergebnis/separator-mixing": "^1.0 | ^1.1 || ^1.2,<1.2.7 >=1.2.4 || ^1.4"
+  }
+}
diff --git a/...bject/HasEntries/Yes/HasProperty/Suggest/HasEntries/Yes/IsSortedByKey/Yes/normalized.json b/...bject/HasEntries/Yes/HasProperty/Suggest/HasEntries/Yes/IsSortedByKey/Yes/normalized.json
@@ -1,5 +1,6 @@
 {
     "homepage": "https://getcomposer.org/doc/04-schema.md#suggest",
+    "require": {},
     "suggest": {
         "php": "Nothing works without it",
         "hhvm": "Okay",

diff --git a/...sObject/HasEntries/Yes/HasProperty/Suggest/HasEntries/Yes/IsSortedByKey/Yes/original.json b/...sObject/HasEntries/Yes/HasProperty/Suggest/HasEntries/Yes/IsSortedByKey/Yes/original.json
@@ -1,5 +1,6 @@
 {
   "homepage": "https://getcomposer.org/doc/04-schema.md#suggest",
+  "require": {},
   "suggest": {
     "php": "Nothing works without it",
     "hhvm": "Okay",

diff --git a/...ContainsPackagesAndVersionConstraints/HasEntries/Yes/IsSortedByPackage/No/normalized.json b/...ContainsPackagesAndVersionConstraints/HasEntries/Yes/IsSortedByPackage/No/normalized.json
@@ -5,6 +5,7 @@
         "ext-foo": "*",
         "lib-baz": "*",
         "composer-plugin-api": "*",
+        "0-test/sort-order": "*",
         "acquia/drupal-environment-detector": "*",
         "ergebnis/php-cs-fixer-config": "*",
         "ergebnis/test-util": "*"

diff --git a/...ueContainsPackagesAndVersionConstraints/HasEntries/Yes/IsSortedByPackage/No/original.json b/...ueContainsPackagesAndVersionConstraints/HasEntries/Yes/IsSortedByPackage/No/original.json
@@ -7,6 +7,7 @@
     "acquia/drupal-environment-detector": "*",
     "ext-foo": "*",
     "composer-plugin-api": "*",
+    "0-test/sort-order": "*",
     "php": "*"
   }
 }
diff --git a/test/Unit/Format/IndentTest.php b/test/Unit/Format/IndentTest.php
@@ -43,6 +43,7 @@ public function testFromSizeAndStyleRejectsInvalidSize(int $size): void
         $style = self::faker()->randomElement(\array_keys(Format\Indent::CHARACTERS));
 
         $this->expectException(Exception\InvalidIndentSize::class);
+        $this->expectExceptionMessage(\sprintf('Size needs to be greater than %d, but %d is not.', 0, $size));
 
         Format\Indent::fromSizeAndStyle(
             $size,
@@ -76,6 +77,7 @@ public function testFromSizeAndStyleRejectsInvalidStyle(): void
         $style = $faker->sentence();
 
         $this->expectException(Exception\InvalidIndentStyle::class);
+        $this->expectExceptionMessage(\sprintf('Style needs to be one of "space", "tab", but "%s" is not.', $style));
 
         Format\Indent::fromSizeAndStyle(
             $size,

diff --git a/test/Unit/Format/JsonEncodeOptionsTest.php b/test/Unit/Format/JsonEncodeOptionsTest.php
@@ -112,7 +112,7 @@ public static function provideJsonEncodeOptionsAndEncoded(): array
             [
                 \JSON_UNESCAPED_SLASHES,
                 '{
-  "name": "Andreas M\u00f6ller",
+  "name": "Andreas M\u00F6ller",
   "url": "https://github.com/ergebnis/json-normalizer"
 }',
             ],

diff --git a/test/Unit/Format/NewLineTest.php b/test/Unit/Format/NewLineTest.php
@@ -26,6 +26,7 @@ final class NewLineTest extends Framework\TestCase
     public function testFromStringRejectsInvalidNewLineString(string $string): void
     {
         $this->expectException(Exception\InvalidNewLineString::class);
+        $this->expectExceptionMessage(\sprintf('"%s" is not a valid new-line character sequence.', $string));
 
         Format\NewLine::fromString($string);
     }

diff --git a/test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php b/test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php
@@ -23,6 +23,7 @@
 use Ergebnis\Json\Normalizer\WithFinalNewLineNormalizer;
 use PHPUnit\Framework;
 
+#[Framework\Attributes\CoversClass(SchemaNormalizer::class)]
 #[Framework\Attributes\CoversClass(Vendor\Composer\BinNormalizer::class)]
 #[Framework\Attributes\CoversClass(Vendor\Composer\ComposerJsonNormalizer::class)]
 #[Framework\Attributes\CoversClass(Vendor\Composer\ConfigHashNormalizer::class)]