Rearranged code. (#67)

bunq · Nov 14, 2017 · 905e80c · 905e80c
1 parent 9eb7f4c
commit 905e80c
Showing 1 changed file with 23 additions and 40 deletions.
diff --git a/tests/Model/Generated/Object/NotificationUrlTest.php b/tests/Model/Generated/Object/NotificationUrlTest.php
@@ -72,27 +72,6 @@ class NotificationUrlTest extends BunqSdkTestBase
      */
     const KEY_NOTIFICATION_URL_MODEL = 'NotificationUrl';
 
-    /**
-     * @param string $expectedJsonFileName
-     * @param string $classNameExpected
-     * @param string $referencedObjectGetterName
-     */
-    private function executeNotificationUrlTest(
-        string $expectedJsonFileName,
-        string $classNameExpected,
-        string $referencedObjectGetterName
-    ) {
-        $jsonExpectedString = FileUtil::getFileContents($expectedJsonFileName);
-        $notificationUrl = $this->getNotificationUrlFromJson($jsonExpectedString);
-
-        $model = $notificationUrl->getObject()->$referencedObjectGetterName();
-        $referencedModel = $notificationUrl->getObject()->getReferencedObject();
-
-        static::assertNotNull($model);
-        static::assertNotNull($referencedModel);
-        static::assertInstanceOf($classNameExpected, $referencedModel);
-    }
-
     /**
      */
     public function testMutationModel()
@@ -125,7 +104,7 @@ public function testGetMonetaryAccountModel()
             self::GETTER_MONETARY_ACCOUNT_BANK
         );
     }
-
+    
     /**
      */
     public function testPaymentBatchModel()
@@ -169,7 +148,7 @@ public function testSchedulePaymentModel()
             self::GETTER_SCHEDULE_PAYMENT
         );
     }
-    
+
     /**
      */
     public function testShareInviteBankResponse()
@@ -236,6 +215,27 @@ public function testDraftPaymentModel()
         );
     }
 
+    /**
+     * @param string $expectedJsonFileName
+     * @param string $classNameExpected
+     * @param string $referencedObjectGetterName
+     */
+    private function executeNotificationUrlTest(
+        string $expectedJsonFileName,
+        string $classNameExpected,
+        string $referencedObjectGetterName
+    ) {
+        $jsonExpectedString = FileUtil::getFileContents($expectedJsonFileName);
+        $notificationUrl = $this->getNotificationUrlFromJson($jsonExpectedString);
+
+        $model = $notificationUrl->getObject()->$referencedObjectGetterName();
+        $referencedModel = $notificationUrl->getObject()->getReferencedObject();
+
+        static::assertNotNull($model);
+        static::assertNotNull($referencedModel);
+        static::assertInstanceOf($classNameExpected, $referencedModel);
+    }
+
     /**
      * @param string $jsonString
      *
@@ -256,23 +256,6 @@ private function getNotificationUrlFromJson(string $jsonString): NotificationUrl
         return $notificationUrl;
     }
 
-    /**
-     * @param BunqModel $model
-     *
-     * @return NotificationUrl
-     * @throws BunqException
-     */
-    private function assertInstanceOfNotificationUrl(BunqModel $model): NotificationUrl
-    {
-        static::assertInstanceOf(NotificationUrl::class, $model);
-
-        if ($model instanceof NotificationUrl) {
-            return $model;
-        }
-
-        throw new BunqException(self::ASSERT_SHOULD_NOT_REACH_THIS_CODE_ERROR);
-    }
-
     /**
      * @param string[] $json
      *