Fix tests (#8)

* Fix tests * Fix style
inverse · Jul 24, 2019 · 62636bf · 62636bf
1 parent e77028a
commit 62636bf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/src/Region.php b/src/Region.php
@@ -6,11 +6,11 @@
 
 class Region
 {
-    const CN = 'cn';
-    const EU = 'eu';
-    const US = 'us';
+    private const CN = 'cn';
+    private const EU = 'eu';
+    private const US = 'us';
 
-    const VALID_REGIONS = [
+    private const VALID_REGIONS = [
         self::CN,
         self::EU,
         self::US,
@@ -52,4 +52,19 @@ public static function createDefault(): self
     {
         return new self(self::US);
     }
+
+    public static function createUS(): self
+    {
+        return new self(self::US);
+    }
+
+    public static function createCN(): self
+    {
+        return new self(self::CN);
+    }
+
+    public static function createEU(): self
+    {
+        return new self(self::EU);
+    }
 }
diff --git a/tests/Unit/RegionTest.php b/tests/Unit/RegionTest.php
@@ -2,53 +2,40 @@
 
 namespace Tests\Unit\Inverse\TuyaClient;
 
-use InvalidArgumentException;
 use Inverse\TuyaClient\Region;
 use Inverse\TuyaClient\Token;
 use PHPUnit\Framework\TestCase;
 
 class RegionTest extends TestCase
 {
     /**
-     * @param Token $token
+     * @param Token  $token
+     * @param Region $expected
      * @dataProvider fromAccessTokenProvider
      */
-    public function testFromAccessToken(Token $token): void
+    public function testFromAccessToken(Token $token, Region $expected): void
     {
-        $this->doesNotPerformAssertions();
-        Region::fromAccessToken($token);
+        $this->assertEquals($expected, Region::fromAccessToken($token));
     }
 
     public function fromAccessTokenProvider(): array
     {
         return [
             'EU' => [
                 new Token('EU123456', '', 0),
+                Region::createEU(),
             ],
             'China' => [
                 new Token('AY123456', '', 0),
+                Region::createCN(),
             ],
-        ];
-    }
-
-    /**
-     * @param Token $token
-     * @dataProvider fromAccessTokenProviderInvalid
-     */
-    public function testFromAccessTokenInvalid(Token $token): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        Region::fromAccessToken($token);
-    }
-
-    public function fromAccessTokenProviderInvalid(): array
-    {
-        return [
             'Empty' => [
                 new Token('', '', 0),
+                Region::createUS(),
             ],
             'Unmapped' => [
                 new Token('DJHFHD3847', '', 0),
+                Region::createUS(),
             ],
         ];
     }