updated test to accommodate MMDB data change

ecmchow · Sep 2, 2022 · ab924b2 · ab924b2
1 parent fd28fe7
commit ab924b2
Show file tree

Hide file tree

Showing 9 changed files with 431 additions and 197 deletions.
diff --git a/test/e2e/RedisAuthTest.php b/test/e2e/RedisAuthTest.php
@@ -29,6 +29,53 @@ private static function getTestData() {
         return json_decode(file_get_contents(__DIR__ . '/../ip-test-data.json'), true);
     }
 
+    private function assertIpDetails($data) {
+        $this->assertArrayHasKey('country', $data);
+        $this->assertArrayHasKey('isEU', $data);
+        $this->assertArrayHasKey('city', $data);
+        $this->assertArrayHasKey('postal', $data);
+        $this->assertArrayHasKey('div', $data);
+        $this->assertArrayHasKey('divIso', $data);
+        $this->assertArrayHasKey('accuracy', $data);
+        $this->assertArrayHasKey('lat', $data);
+        $this->assertArrayHasKey('long', $data);
+        $this->assertArrayHasKey('timezone', $data);
+
+        $this->assertStringMatchesFormat('%s', $data['country']);
+        $this->assertIsBool($data['isEU']);
+        $this->assertStringMatchesFormat('%s', $data['city']);
+        $this->assertStringMatchesFormat('%S', $data['postal']);
+        $this->assertStringMatchesFormat('%s', $data['div']);
+        $this->assertStringMatchesFormat('%s', $data['divIso']);
+        $this->assertIsNumeric($data['accuracy']);
+        $this->assertIsFloat($data['lat']);
+        $this->assertIsFloat($data['long']);
+        $this->assertMatchesRegularExpression('/[a-zA-Z]+\/[a-zA-Z]+/', $data['timezone']);
+    }
+
+    private function assertIpData($input, $expected) {
+        if (array_key_exists('status', $expected)) {
+            $this->assertArrayHasKey('status', $input);
+            $this->assertArrayHasKey('data', $input);
+            $this->assertArrayHasKey('message', $input);
+
+            $this->assertEquals($expected['status'], $input['status']);
+            $this->assertIsArray($input['data']);
+            $this->assertEquals($expected['message'], $input['message']);
+
+            if (array_key_exists('country', $expected['data'])) {
+                $data = $input['data'];
+                $this->assertIpDetails($data);
+            } else {
+                foreach ($input['data'] as $ip => $data) {
+                    $this->assertIpDetails($data);
+                }
+            }
+        } else {
+            $this->assertIpDetails($input);
+        }
+    }
+
     public static function setUpBeforeClass(): void {
         static::$redis = new \Redis();
         static::$redis->connect('tcp://127.0.0.1', 6379, 0, null, 100, 10);
@@ -181,10 +228,7 @@ public function testPingResponseIsValid(): void {
      * @dataProvider ipDataProvider
      */
     public function testCanConnectAndAnalyzeIp($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            self::connect($input)
-        );
+        $this->assertIpData(self::connect($input), $expected);
     }
 
     public function ipDataProvider(): array {
@@ -205,10 +249,7 @@ public function ipDataProvider(): array {
      * @dataProvider cacheDataProvider
      */
     public function testCanCacheAndExpireResult($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            static::$redis->get("result:{$input}")
-        );
+        $this->assertIpData(static::$redis->get("result:{$input}"), $expected);
 
         $this->assertLessThanOrEqual(
             3600,
@@ -234,10 +275,7 @@ public function cacheDataProvider(): array {
      * @dataProvider ipListDataProvider
      */
     public function testCanConnectAndAnalyzeIpList($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            self::connect($input)
-        );
+        $this->assertIpData(self::connect($input), $expected);
     }
 
     public function ipListDataProvider(): array {

diff --git a/test/e2e/RedisBasicTest.php b/test/e2e/RedisBasicTest.php
@@ -29,6 +29,53 @@ private static function getTestData() {
         return json_decode(file_get_contents(__DIR__ . '/../ip-test-data.json'), true);
     }
 
+    private function assertIpDetails($data) {
+        $this->assertArrayHasKey('country', $data);
+        $this->assertArrayHasKey('isEU', $data);
+        $this->assertArrayHasKey('city', $data);
+        $this->assertArrayHasKey('postal', $data);
+        $this->assertArrayHasKey('div', $data);
+        $this->assertArrayHasKey('divIso', $data);
+        $this->assertArrayHasKey('accuracy', $data);
+        $this->assertArrayHasKey('lat', $data);
+        $this->assertArrayHasKey('long', $data);
+        $this->assertArrayHasKey('timezone', $data);
+
+        $this->assertStringMatchesFormat('%s', $data['country']);
+        $this->assertIsBool($data['isEU']);
+        $this->assertStringMatchesFormat('%s', $data['city']);
+        $this->assertStringMatchesFormat('%S', $data['postal']);
+        $this->assertStringMatchesFormat('%s', $data['div']);
+        $this->assertStringMatchesFormat('%s', $data['divIso']);
+        $this->assertIsNumeric($data['accuracy']);
+        $this->assertIsFloat($data['lat']);
+        $this->assertIsFloat($data['long']);
+        $this->assertMatchesRegularExpression('/[a-zA-Z]+\/[a-zA-Z]+/', $data['timezone']);
+    }
+
+    private function assertIpData($input, $expected) {
+        if (array_key_exists('status', $expected)) {
+            $this->assertArrayHasKey('status', $input);
+            $this->assertArrayHasKey('data', $input);
+            $this->assertArrayHasKey('message', $input);
+
+            $this->assertEquals($expected['status'], $input['status']);
+            $this->assertIsArray($input['data']);
+            $this->assertEquals($expected['message'], $input['message']);
+
+            if (array_key_exists('country', $expected['data'])) {
+                $data = $input['data'];
+                $this->assertIpDetails($data);
+            } else {
+                foreach ($input['data'] as $ip => $data) {
+                    $this->assertIpDetails($data);
+                }
+            }
+        } else {
+            $this->assertIpDetails($input);
+        }
+    }
+
     public static function setUpBeforeClass(): void {
         static::$redis = new \Redis();
         static::$redis->connect('tcp://127.0.0.1', 6379, 0, null, 100, 10);
@@ -132,10 +179,7 @@ public function testPingResponseIsValid(): void {
      * @dataProvider ipDataProvider
      */
     public function testCanConnectAndAnalyzeIp($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            self::connect($input)
-        );
+        $this->assertIpData(self::connect($input), $expected);
     }
 
     public function ipDataProvider(): array {
@@ -156,10 +200,7 @@ public function ipDataProvider(): array {
      * @dataProvider cacheDataProvider
      */
     public function testCanCacheAndExpireResult($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            static::$redis->get("result:{$input}")
-        );
+        $this->assertIpData(static::$redis->get("result:{$input}"), $expected);
 
         $this->assertLessThanOrEqual(
             3600,
@@ -185,10 +226,7 @@ public function cacheDataProvider(): array {
      * @dataProvider ipListDataProvider
      */
     public function testCanConnectAndAnalyzeIpList($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            self::connect($input)
-        );
+        $this->assertIpData(self::connect($input), $expected);
     }
 
     public function ipListDataProvider(): array {

diff --git a/test/e2e/RedisListTest.php b/test/e2e/RedisListTest.php
@@ -41,6 +41,53 @@ private static function getTestData() {
         return json_decode(file_get_contents(__DIR__ . '/../ip-test-data.json'), true);
     }
 
+    private function assertIpDetails($data) {
+        $this->assertArrayHasKey('country', $data);
+        $this->assertArrayHasKey('isEU', $data);
+        $this->assertArrayHasKey('city', $data);
+        $this->assertArrayHasKey('postal', $data);
+        $this->assertArrayHasKey('div', $data);
+        $this->assertArrayHasKey('divIso', $data);
+        $this->assertArrayHasKey('accuracy', $data);
+        $this->assertArrayHasKey('lat', $data);
+        $this->assertArrayHasKey('long', $data);
+        $this->assertArrayHasKey('timezone', $data);
+
+        $this->assertStringMatchesFormat('%s', $data['country']);
+        $this->assertIsBool($data['isEU']);
+        $this->assertStringMatchesFormat('%s', $data['city']);
+        $this->assertStringMatchesFormat('%S', $data['postal']);
+        $this->assertStringMatchesFormat('%s', $data['div']);
+        $this->assertStringMatchesFormat('%s', $data['divIso']);
+        $this->assertIsNumeric($data['accuracy']);
+        $this->assertIsFloat($data['lat']);
+        $this->assertIsFloat($data['long']);
+        $this->assertMatchesRegularExpression('/[a-zA-Z]+\/[a-zA-Z]+/', $data['timezone']);
+    }
+
+    private function assertIpData($input, $expected) {
+        if (array_key_exists('status', $expected)) {
+            $this->assertArrayHasKey('status', $input);
+            $this->assertArrayHasKey('data', $input);
+            $this->assertArrayHasKey('message', $input);
+
+            $this->assertEquals($expected['status'], $input['status']);
+            $this->assertIsArray($input['data']);
+            $this->assertEquals($expected['message'], $input['message']);
+
+            if (array_key_exists('country', $expected['data'])) {
+                $data = $input['data'];
+                $this->assertIpDetails($data);
+            } else {
+                foreach ($input['data'] as $ip => $data) {
+                    $this->assertIpDetails($data);
+                }
+            }
+        } else {
+            $this->assertIpDetails($input);
+        }
+    }
+
     public static function setUpBeforeClass(): void {
         static::$redis = new \Redis();
         static::$redis->connect('tcp://127.0.0.1', 6379, 0, null, 100, 10);
@@ -144,10 +191,7 @@ public function testPingResponseIsValid(): void {
      * @dataProvider ipDataProvider
      */
     public function testCanConnectAndAnalyzeIp($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            self::connect($input)
-        );
+        $this->assertIpData(self::connect($input), $expected);
     }
 
     public function ipDataProvider(): array {
@@ -168,10 +212,7 @@ public function ipDataProvider(): array {
      * @dataProvider cacheDataProvider
      */
     public function testCanCacheResult($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            static::$redis->get("result:{$input}")
-        );
+        $this->assertIpData(static::$redis->get("result:{$input}"), $expected);
     }
 
     public function cacheDataProvider(): array {
@@ -192,10 +233,7 @@ public function cacheDataProvider(): array {
      * @dataProvider ipListDataProvider
      */
     public function testCanConnectAndAnalyzeIpList($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            self::connect($input)
-        );
+        $this->assertIpData(self::connect($input), $expected);
     }
 
     public function ipListDataProvider(): array {

diff --git a/test/e2e/ServiceAuthSslTest.php b/test/e2e/ServiceAuthSslTest.php
@@ -18,6 +18,49 @@ private static function getTestData() {
         return json_decode(file_get_contents(__DIR__ . '/../ip-test-data.json'), true);
     }
 
+    private function assertIpDetails($data) {
+        $this->assertArrayHasKey('country', $data);
+        $this->assertArrayHasKey('isEU', $data);
+        $this->assertArrayHasKey('city', $data);
+        $this->assertArrayHasKey('postal', $data);
+        $this->assertArrayHasKey('div', $data);
+        $this->assertArrayHasKey('divIso', $data);
+        $this->assertArrayHasKey('accuracy', $data);
+        $this->assertArrayHasKey('lat', $data);
+        $this->assertArrayHasKey('long', $data);
+        $this->assertArrayHasKey('timezone', $data);
+
+        $this->assertStringMatchesFormat('%s', $data['country']);
+        $this->assertIsBool($data['isEU']);
+        $this->assertStringMatchesFormat('%s', $data['city']);
+        $this->assertStringMatchesFormat('%S', $data['postal']);
+        $this->assertStringMatchesFormat('%s', $data['div']);
+        $this->assertStringMatchesFormat('%s', $data['divIso']);
+        $this->assertIsNumeric($data['accuracy']);
+        $this->assertIsFloat($data['lat']);
+        $this->assertIsFloat($data['long']);
+        $this->assertMatchesRegularExpression('/[a-zA-Z]+\/[a-zA-Z]+/', $data['timezone']);
+    }
+
+    private function assertIpData($input, $expected) {
+        $this->assertArrayHasKey('status', $input);
+        $this->assertArrayHasKey('data', $input);
+        $this->assertArrayHasKey('message', $input);
+
+        $this->assertEquals($expected['status'], $input['status']);
+        $this->assertIsArray($input['data']);
+        $this->assertEquals($expected['message'], $input['message']);
+
+        if (array_key_exists('country', $expected['data'])) {
+            $data = $input['data'];
+            $this->assertIpDetails($data);
+        } else {
+            foreach ($input['data'] as $ip => $data) {
+                $this->assertIpDetails($data);
+            }
+        }
+    }
+
     public static function setUpBeforeClass(): void {
         // TODO
     }
@@ -170,10 +213,7 @@ public function testPingResponseIsValid(): void {
      * @dataProvider ipDataProvider
      */
     public function testCanConnectAndAnalyzeIp($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            self::connect($input)
-        );
+        $this->assertIpData(self::connect($input), $expected);
     }
 
     public function ipDataProvider(): array {
@@ -194,10 +234,7 @@ public function ipDataProvider(): array {
      * @dataProvider ipListDataProvider
      */
     public function testCanConnectAndAnalyzeIpList($input, array $expected): void {
-        $this->assertSame(
-            $expected,
-            self::connect($input)
-        );
+        $this->assertIpData(self::connect($input), $expected);
     }
 
     public function ipListDataProvider(): array {