Refactor Legacy\PositiveNotationTest to Feature\test

t-regx · Jun 30, 2023 · d617344 · d617344
1 parent 867dfa6
commit d617344
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 262 deletions.
diff --git a/test/Feature/CleanRegex/match/_integer/isInt/DetailTest.php b/test/Feature/CleanRegex/match/_integer/isInt/DetailTest.php
@@ -25,6 +25,18 @@ public function shouldBeIntegerBase10(string $string, int $expected)
         $this->assertTrue($detail->isInt());
     }
 
+    /**
+     * @test
+     * @dataProvider integers
+     */
+    public function shouldBeIntegerGivenBase(string $input, int $expected, int $base)
+    {
+        // given
+        $detail = $this->detail($input);
+        // when, then
+        $this->assertTrue($detail->isInt($base));
+    }
+
     /**
      * @test
      */
@@ -124,12 +136,24 @@ public function shouldNotBeIntegerMalformed(int $base, string $text)
      * @test
      * @dataProvider cornerDigits
      */
-    public function shouldNotBeIntegerCornerDigit(int $base, string $text)
+    public function shouldBeIntegerCornerDigit(string $cornerDigit, int $value, int $base)
     {
         // given
-        $detail = $this->detail($text);
+        $detail = $this->detail($cornerDigit);
         // when, then
-        $this->assertFalse($detail->isInt($base));
+        $this->assertTrue($detail->isInt($base));
+    }
+
+    /**
+     * @test
+     * @dataProvider cornerDigits
+     */
+    public function shouldNotBeIntegerAboveCornerDigit(string $cornerDigit, int $value, int $base)
+    {
+        // given
+        $detail = $this->detail($cornerDigit);
+        // when, then
+        $this->assertFalse($detail->isInt($base - 1));
     }
 
     /**

diff --git a/test/Feature/CleanRegex/match/_integer/toInt/DetailTest.php b/test/Feature/CleanRegex/match/_integer/toInt/DetailTest.php
@@ -27,6 +27,18 @@ public function shouldParseIntegerBase10(string $string, int $expected)
         $this->assertSame($expected, $detail->toInt());
     }
 
+    /**
+     * @test
+     * @dataProvider integers
+     */
+    public function shouldBeIntegerGivenBase(string $input, int $expected, int $base)
+    {
+        // given
+        $detail = $this->detail($input);
+        // when, then
+        $this->assertSame($expected, $detail->toInt($base));
+    }
+
     /**
      * @test
      */
@@ -141,15 +153,27 @@ public function shouldThrowForIntegerMalformed(int $base, string $text)
      * @test
      * @dataProvider cornerDigits
      */
-    public function shouldThrowForCornerDigit(int $base, string $text)
+    public function shouldParseIntegerCornerDigit(string $cornerDigit, int $value, int $base)
     {
         // given
-        $detail = $this->detail($text);
+        $detail = $this->detail($cornerDigit);
+        // when, then
+        $this->assertEquals($value, $detail->toInt($base));
+    }
+
+    /**
+     * @test
+     * @dataProvider cornerDigits
+     */
+    public function shouldThrowForAboveCornerDigit(string $cornerDigit, int $value, int $base)
+    {
+        // given
+        $detail = $this->detail($cornerDigit);
         // then
         $this->expectException(IntegerFormatException::class);
-        $this->expectExceptionMessage("Expected to parse '$text', but it is not a valid integer in base $base");
+        $this->expectExceptionMessage("Expected to parse '$cornerDigit', but it is not a valid integer in base " . ($base - 1));
         // when
-        $detail->toInt($base);
+        $detail->toInt($base - 1);
     }
 
     /**

diff --git a/test/Legacy/CleanRegex/Internal/Numeral/PositiveNotationTest.php b/test/Legacy/CleanRegex/Internal/Numeral/PositiveNotationTest.php