Enhancement: Extract assertion that normalizes JSON before comparing

ergebnis · Dec 29, 2020 · 93e964a · 93e964a
1 parent a2fe0ee
commit 93e964a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 13 deletions.
diff --git a/test/Unit/AbstractNormalizerTestCase.php b/test/Unit/AbstractNormalizerTestCase.php
@@ -14,6 +14,7 @@
 namespace Ergebnis\Json\Normalizer\Test\Unit;
 
 use Ergebnis\Json\Normalizer\NormalizerInterface;
+use Ergebnis\Json\Printer;
 use Ergebnis\Test\Util\Helper;
 use PHPUnit\Framework;
 
@@ -50,4 +51,21 @@ final protected function className(): string
 
         return $className;
     }
+
+    final protected static function assertJsonStringEqualsJsonStringNormalized(string $expected, string $actual): void
+    {
+        $printer = new Printer\Printer();
+
+        $normalize = static function (string $json) use ($printer): string {
+            self::assertJson($json);
+
+            $normalized = \json_encode(\json_decode($json));
+
+            self::assertIsString($normalized);
+
+            return $printer->print($normalized);
+        };
+
+        self::assertSame($normalize($expected), $normalize($actual));
+    }
 }
diff --git a/test/Unit/Vendor/Composer/AbstractComposerTestCase.php b/test/Unit/Vendor/Composer/AbstractComposerTestCase.php
@@ -39,7 +39,7 @@ final public function testNormalizeDoesNotModifyWhenJsonDecodedIsNotAnObject(str
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame($json->encoded(), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     /**

diff --git a/test/Unit/Vendor/Composer/BinNormalizerTest.php b/test/Unit/Vendor/Composer/BinNormalizerTest.php
@@ -42,7 +42,7 @@ public function testNormalizeDoesNotModifyOtherProperty(): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame($json->encoded(), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     public function testNormalizeDoesNotModifyBinIfPropertyExistsAsString(): void
@@ -63,7 +63,7 @@ public function testNormalizeDoesNotModifyBinIfPropertyExistsAsString(): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame($json->encoded(), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     public function testNormalizeSortsBinIfPropertyExistsAsArray(): void
@@ -102,6 +102,6 @@ public function testNormalizeSortsBinIfPropertyExistsAsArray(): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame(\json_encode(\json_decode($expected->encoded())), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($expected->encoded(), $normalized->encoded());
     }
 }
diff --git a/test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php b/test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php
@@ -218,7 +218,7 @@ public function testNormalizeNormalizes(): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame(\json_encode(\json_decode($expected->encoded())), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($expected->encoded(), $normalized->encoded());
     }
 
     /**

diff --git a/test/Unit/Vendor/Composer/ConfigHashNormalizerTest.php b/test/Unit/Vendor/Composer/ConfigHashNormalizerTest.php
@@ -42,7 +42,7 @@ public function testNormalizeDoesNotModifyOtherProperty(): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame($json->encoded(), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     /**
@@ -62,7 +62,7 @@ public function testNormalizeIgnoresEmptyConfigHash(string $property): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame($json->encoded(), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     /**
@@ -104,7 +104,7 @@ public function testNormalizeSortsConfigHashIfPropertyExists(string $property):
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame(\json_encode(\json_decode($expected->encoded())), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($expected->encoded(), $normalized->encoded());
     }
 
     /**

diff --git a/test/Unit/Vendor/Composer/PackageHashNormalizerTest.php b/test/Unit/Vendor/Composer/PackageHashNormalizerTest.php
@@ -42,7 +42,7 @@ public function testNormalizeDoesNotModifyOtherProperty(): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame($json->encoded(), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     /**
@@ -62,7 +62,7 @@ public function testNormalizeIgnoresEmptyPackageHash(string $property): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame(\json_encode(\json_decode($json->encoded())), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     /**
@@ -112,7 +112,7 @@ public function testNormalizeSortsPackageHashIfPropertyExists(string $property):
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame(\json_encode(\json_decode($expected->encoded())), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($expected->encoded(), $normalized->encoded());
     }
 
     /**

diff --git a/test/Unit/Vendor/Composer/VersionConstraintNormalizerTest.php b/test/Unit/Vendor/Composer/VersionConstraintNormalizerTest.php
@@ -44,7 +44,7 @@ public function testNormalizeDoesNotModifyOtherProperty(string $constraint): voi
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame($json->encoded(), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     /**
@@ -76,7 +76,7 @@ public function testNormalizeIgnoresEmptyPackageHash(string $property): void
 
         $normalized = $normalizer->normalize($json);
 
-        self::assertSame(\json_encode(\json_decode($json->encoded())), $normalized->encoded());
+        self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
             $normalized = $normalizer->normalize($json);
-            self::assertSame($json->encoded(), $normalized->encoded());
+            self::assertJsonStringEqualsJsonStringNormalized($json->encoded(), $normalized->encoded());
         }
         /**
@@ Expand Down @@