some progress on test rewrites

chubbyphp · Mar 5, 2019 · d4119b7 · d4119b7
1 parent 0f1f0bf
commit d4119b7
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 137 deletions.
diff --git a/tests/Normalizer/CallbackLinkNormalizerTest.php b/tests/Normalizer/CallbackLinkNormalizerTest.php
@@ -22,7 +22,7 @@ class CallbackLinkNormalizerTest extends TestCase
 
     public function testNormalizeLink()
     {
-        $object = new \stdClass;
+        $object = new \stdClass();
 
         /** @var LinkInterface|MockObject $link */
         $link = $this->getMockByCalls(LinkInterface::class, [
@@ -62,7 +62,7 @@ function (
 
     public function testNormalizeLinkWithNull()
     {
-        $object = new \stdClass;
+        $object = new \stdClass();
 
         /** @var NormalizerContextInterface|MockObject $normalizerContext */
         $normalizerContext = $this->getMockByCalls(NormalizerContextInterface::class);
@@ -88,7 +88,7 @@ public function testNormalizeLinkWithWrongDataType()
             'The link normalizer callback needs to return a Psr\Link\LinkInterface|null, "string" given at path: "name"'
         );
 
-        $object = new \stdClass;
+        $object = new \stdClass();
 
         /** @var NormalizerContextInterface|MockObject $normalizerContext */
         $normalizerContext = $this->getMockByCalls(NormalizerContextInterface::class);

diff --git a/tests/Normalizer/DateTimeFieldNormalizerTest.php b/tests/Normalizer/DateTimeFieldNormalizerTest.php
@@ -24,8 +24,8 @@ public function testNormalizeFieldWithInvalidConstructArgument()
         $this->expectException(\TypeError::class);
         $this->expectExceptionMessage(
             'Chubbyphp\Serialization\Normalizer\DateTimeFieldNormalizer::__construct() expects parameter 1 to be '
-                . 'Chubbyphp\Serialization\Accessor\AccessorInterface|Chubbyphp\Serialization\Normalizer\\'
-                . 'FieldNormalizerInterface, DateTime given'
+                .'Chubbyphp\Serialization\Accessor\AccessorInterface|Chubbyphp\Serialization\Normalizer\\'
+                .'FieldNormalizerInterface, DateTime given'
         );
 
         new DateTimeFieldNormalizer(new \DateTime());

diff --git a/tests/Normalizer/FieldNormalizerTest.php b/tests/Normalizer/FieldNormalizerTest.php
@@ -21,14 +21,14 @@ class FieldNormalizerTest extends TestCase
 
     public function testNormalizeField()
     {
-        $object = new \stdClass;
+        $object = new \stdClass();
 
         /** @var NormalizerContextInterface|MockObject $context */
         $context = $this->getMockByCalls(NormalizerContextInterface::class);
 
         /** @var AccessorInterface|MockObject $accessor */
         $accessor = $this->getMockByCalls(AccessorInterface::class, [
-            Call::create('getValue')->with($object)->willReturn('name')
+            Call::create('getValue')->with($object)->willReturn('name'),
         ]);
 
         $fieldNormalizer = new FieldNormalizer($accessor);

diff --git a/tests/Normalizer/Relation/ReferenceOneFieldNormalizerTest.php b/tests/Normalizer/Relation/ReferenceOneFieldNormalizerTest.php
@@ -4,9 +4,10 @@
 
 namespace Chubbyphp\Tests\Serialization\Normalizer;
 
+use Chubbyphp\Mock\Call;
+use Chubbyphp\Mock\MockByCallsTrait;
 use Chubbyphp\Serialization\Accessor\AccessorInterface;
 use Chubbyphp\Serialization\Normalizer\NormalizerContextInterface;
-use Chubbyphp\Serialization\Normalizer\NormalizerInterface;
 use Chubbyphp\Serialization\Normalizer\Relation\ReferenceOneFieldNormalizer;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -16,158 +17,61 @@
  */
 class ReferenceOneFieldNormalizerTest extends TestCase
 {
+    use MockByCallsTrait;
+
     public function testNormalizeFieldWithNull()
     {
-        $object = $this->getObject();
-
-        $fieldNormalizer = new ReferenceOneFieldNormalizer($this->getIdentifierAccessor(), $this->getAccessor());
+        $object = new \stdClass;
 
-        $data = $fieldNormalizer->normalizeField(
-            'relation',
-            $object,
-            $this->getNormalizerContext(),
-            $this->getNormalizer()
-        );
+        /** @var AccessorInterface|MockObject $identifierAccessor */
+        $identifierAccessor = $this->getMockByCalls(AccessorInterface::class);
 
-        self::assertSame(null, $data);
-    }
+        /** @var AccessorInterface|MockObject $accessor */
+        $accessor = $this->getMockByCalls(AccessorInterface::class, [
+            Call::create('getValue')->with($object)->willReturn(null),
+        ]);
 
-    public function testNormalizeFieldWithObject()
-    {
-        $object = $this->getObject();
-        $object->setRelation($this->getRelation('id1'));
+        /** @var NormalizerContextInterface|MockObject $context */
+        $context = $this->getMockByCalls(NormalizerContextInterface::class);
 
-        $fieldNormalizer = new ReferenceOneFieldNormalizer($this->getIdentifierAccessor(), $this->getAccessor());
+        $fieldNormalizer = new ReferenceOneFieldNormalizer($identifierAccessor, $accessor);
 
         $data = $fieldNormalizer->normalizeField(
             'relation',
             $object,
-            $this->getNormalizerContext(),
-            $this->getNormalizer()
+            $context
         );
 
-        self::assertSame('id1', $data);
+        self::assertSame(null, $data);
     }
 
-    /**
-     * @return AccessorInterface
-     */
-    private function getAccessor(): AccessorInterface
+    public function testNormalizeFieldWithObject()
     {
-        /** @var AccessorInterface|MockObject $accessor */
-        $accessor = $this->getMockBuilder(AccessorInterface::class)->getMockForAbstractClass();
+        $relation = new \stdClass;
 
-        $accessor->expects(self::any())->method('getValue')->willReturnCallback(function ($object) {
-            return $object->getRelation();
-        });
+        $object = new \stdClass;
 
-        return $accessor;
-    }
+        /** @var AccessorInterface|MockObject $identifierAccessor */
+        $identifierAccessor = $this->getMockByCalls(AccessorInterface::class, [
+            Call::create('getValue')->with($relation)->willReturn('id1'),
+        ]);
 
-    /**
-     * @return AccessorInterface
-     */
-    private function getIdentifierAccessor(): AccessorInterface
-    {
         /** @var AccessorInterface|MockObject $accessor */
-        $accessor = $this->getMockBuilder(AccessorInterface::class)->getMockForAbstractClass();
-
-        $accessor->expects(self::any())->method('getValue')->willReturnCallback(function ($object) {
-            return $object->getId();
-        });
+        $accessor = $this->getMockByCalls(AccessorInterface::class, [
+            Call::create('getValue')->with($object)->willReturn($relation),
+        ]);
 
-        return $accessor;
-    }
-
-    /**
-     * @return NormalizerInterface
-     */
-    private function getNormalizer(): NormalizerInterface
-    {
-        /** @var NormalizerInterface|MockObject $normalizer */
-        $normalizer = $this->getMockBuilder(NormalizerInterface::class)->getMockForAbstractClass();
-
-        $normalizer->expects(self::any())->method('normalize')->willReturnCallback(
-            function ($object, NormalizerContextInterface $context = null, string $path = '') {
-                return ['name' => $object->getName()];
-            }
-        );
-
-        return $normalizer;
-    }
-
-    /**
-     * @return NormalizerContextInterface
-     */
-    private function getNormalizerContext(): NormalizerContextInterface
-    {
         /** @var NormalizerContextInterface|MockObject $context */
-        $context = $this->getMockBuilder(NormalizerContextInterface::class)->getMockForAbstractClass();
+        $context = $this->getMockByCalls(NormalizerContextInterface::class);
 
-        return $context;
-    }
+        $fieldNormalizer = new ReferenceOneFieldNormalizer($identifierAccessor, $accessor);
 
-    /**
-     * @return object
-     */
-    private function getObject()
-    {
-        return new class() {
-            /**
-             * @var object
-             */
-            private $relation;
-
-            /**
-             * @return object
-             */
-            public function getRelation()
-            {
-                return $this->relation;
-            }
-
-            /**
-             * @param object $relation
-             *
-             * @return self
-             */
-            public function setRelation($relation): self
-            {
-                $this->relation = $relation;
-
-                return $this;
-            }
-        };
-    }
+        $data = $fieldNormalizer->normalizeField(
+            'relation',
+            $object,
+            $context
+        );
 
-    /**
-     * @param string|null $id
-     *
-     * @return object
-     */
-    private function getRelation(string $id)
-    {
-        return new class($id ?? uniqid()) {
-            /**
-             * @var string
-             */
-            private $id;
-
-            /**
-             * @param string $id
-             */
-            public function __construct(string $id)
-            {
-                $this->id = $id;
-            }
-
-            /**
-             * @return string
-             */
-            public function getId(): string
-            {
-                return $this->id;
-            }
-        };
+        self::assertSame('id1', $data);
     }
 }