Cleaned up Verify tests

Author: dragonmantank

test/Verify/ClientTest.php

@@ -175,54 +175,6 @@ public function testCanStartVerification(): void
         $this->assertSame($success, @$verification->getResponse());
     }
 
-    public function invalidDataDataProvider(): array
-    {
-        return [
-            [
-                'Country must be in two character format',
-                'Test Invalid Country',
-                'setCountry',
-                'GER'
-            ],
-            [
-                sprintf('Pin length must be either %d or %d digits', Request::PIN_LENGTH_4, Request::PIN_LENGTH_6),
-                'Test Invalid Code Length',
-                'setCodeLength',
-                123
-            ],
-            [
-                'Pin expiration must be between 60 and 3600 seconds',
-                'Test Invalid Pin Expiry',
-                'setPinExpiry',
-                30
-            ],
-            [
-                'Next Event time must be between 60 and 900 seconds',
-                'Test Invalid Next Event Wait',
-                'setNextEventWait',
-                30
-            ],
-            [
-                'Workflow ID must be from 1 to 7',
-                'Test Invalid Invalid Workflow Id',
-                'setWorkflowId',
-                123
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider invalidDataDataProvider
-     */
-    public function testInvalidData(string $expectedMessage, string $brand, string $method, $data): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage($expectedMessage);
-
-        (new Request('14845551212', $brand))
-            ->$method($data);
-    }
-
     /**
      * @throws ClientExceptionInterface
      * @throws Client\Exception\Exception

test/Verify/RequestTest.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace VonageTest\Verify;
+
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+use Vonage\Verify\Request;
+
+class RequestTest extends TestCase
+{
+    public function invalidDataDataProvider(): array
+    {
+        return [
+            [
+                'Country must be in two character format',
+                'Test Invalid Country',
+                'setCountry',
+                'GER'
+            ],
+            [
+                sprintf('Pin length must be either %d or %d digits', Request::PIN_LENGTH_4, Request::PIN_LENGTH_6),
+                'Test Invalid Code Length',
+                'setCodeLength',
+                123
+            ],
+            [
+                'Pin expiration must be between 60 and 3600 seconds',
+                'Test Invalid Pin Expiry',
+                'setPinExpiry',
+                30
+            ],
+            [
+                'Next Event time must be between 60 and 900 seconds',
+                'Test Invalid Next Event Wait',
+                'setNextEventWait',
+                30
+            ],
+            [
+                'Workflow ID must be from 1 to 7',
+                'Test Invalid Invalid Workflow Id',
+                'setWorkflowId',
+                123
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidDataDataProvider
+     */
+    public function testInvalidData(string $expectedMessage, string $brand, string $method, $data): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage($expectedMessage);
+
+        (new Request('14845551212', $brand))
+            ->$method($data);
+    }
+
+    public function testCanSetCodeLength()
+    {
+        $request = new Request(14845551212, 'Vonage');
+
+        $request->setCodeLength(4);
+        $this->assertSame(4, $request->getCodeLength());
+
+        $request->setCodeLength(6);
+        $this->assertSame(6, $request->getCodeLength());
+    }
+}

test/Verify/VerificationTest.php

@@ -226,8 +226,6 @@ public function testResponseDataAsArray($type): void
         foreach ($json as $key => $value) {
             $this->assertEquals($value, @$this->existing[$key], "Could not access `$key` as a property.");
         }
-
-        self::markTestIncomplete('Remove deprecated tests');
     }
 
     /**
@@ -273,8 +271,6 @@ public function testMethodsProxyClient($method, $proxy, $code = null, $ip = null
         } else {
             @$this->existing->$method();
         }
-
-        self::markTestIncomplete('Remove deprecated tests');
     }
 
     /**
@@ -294,8 +290,6 @@ public function testCheckReturnsBoolForInvalidCode(): void
 
         @$this->assertFalse($this->existing->check('4321'));
         @$this->assertTrue($this->existing->check('1234'));
-
-        self::markTestIncomplete('Remove deprecated tests');
     }
 
     /**
@@ -315,8 +309,6 @@ public function testCheckReturnsBoolForTooManyAttempts(): void
 
         @$this->assertFalse($this->existing->check('4321'));
         @$this->assertTrue($this->existing->check('1234'));
-
-        self::markTestIncomplete('Remove deprecated tests');
     }
 
     /**
@@ -336,8 +328,6 @@ public function testExceptionForCheckFail(): void
 
         $this->expectException(RequestException::class);
         @$this->existing->check('4321');
-
-        self::markTestIncomplete('Remove deprecated tests');
     }
 
     /**
@@ -360,8 +350,6 @@ public function testSerialize($response): void
         $this->assertEquals(@$this->existing->getAccountId(), @$unserialized->getAccountId());
         $this->assertEquals(@$this->existing->getStatus(), @$unserialized->getStatus());
         $this->assertEquals(@$this->existing->getResponseData(), @$unserialized->getResponseData());
-
-        self::markTestIncomplete('Remove deprecated tests');
     }
 
     /**