Merge pull request #70 from afk11/improve-tests

Improve tests
Bit-Wasp · Dec 27, 2017 · 5c2c8c0 · 5c2c8c0
2 parents d81eb3f + 68b0adb
commit 5c2c8c0
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 25 deletions.
diff --git a/tests/BufferTest.php b/tests/BufferTest.php
@@ -96,19 +96,25 @@ public function testGetSize()
         $this->assertEquals(4, Buffer::hex('41', 4)->getSize());
     }
 
-    public function getIntVectors()
+    /**
+     * @return array
+     */
+    public function getIntVectors(): array
     {
-        return array(
-            array('1',  1,      '01'),
-            array('1',  null,   '01'),
-            array('20', 1,      '14')
-        );
+        return [
+            ['1',  '01', 1,   ],
+            ['1',  '01', null,],
+            ['20', '14', 1,   ]
+        ];
     }
 
     /**
      * @dataProvider getIntVectors
+     * @param int|string $int
+     * @param int|null $size
+     * @param string $expectedHex
      */
-    public function testIntConstruct($int, $size, string $expectedHex)
+    public function testIntConstruct($int, string $expectedHex, int $size = null)
     {
         $buffer = Buffer::int($int, $size);
         $this->assertEquals($expectedHex, $buffer->getHex());

diff --git a/tests/BuffertoolsTest.php b/tests/BuffertoolsTest.php
@@ -174,7 +174,6 @@ public function testFlipBytes()
         $this->assertSame($flip, chr(0x08) . chr(0x07) . chr(0x06) . chr(0x05) . chr(0x04) . chr(0x03) . chr(0x02) . chr(0x01));
     }
 
-
     public function testConcat()
     {
         $a = Buffer::hex("1100");

diff --git a/tests/TemplateFactoryTest.php b/tests/TemplateFactoryTest.php
@@ -7,13 +7,14 @@
 use BitWasp\Buffertools\TemplateFactory;
 use BitWasp\Buffertools\Types\VarInt;
 use BitWasp\Buffertools\Types\VarString;
+use BitWasp\Buffertools\Types\Vector;
 
 class TemplateFactoryTest extends BinaryTest
 {
     /**
      * @return array
      */
-    public function getTestVectors()
+    public function getTestVectors(): array
     {
         $vectors = [];
 
@@ -45,8 +46,10 @@ public function getTestVectors()
 
     /**
      * @dataProvider getTestVectors
+     * @param string $function
+     * @param string $eClass
      */
-    public function testTemplateUint($function, $eClass)
+    public function testTemplateUint(string $function, string $eClass)
     {
         $factory = new TemplateFactory(null);
         $factory->$function();
@@ -67,6 +70,6 @@ function () {
         $template = $factory->getTemplate();
         $this->assertEquals(1, count($template));
         $template = $factory->getTemplate()->getItems();
-        $this->assertInstanceOf('BitWasp\Buffertools\Types\Vector', $template[0]);
+        $this->assertInstanceOf(Vector::class, $template[0]);
     }
 }
diff --git a/tests/TypeFactoryTest.php b/tests/TypeFactoryTest.php
@@ -22,7 +22,10 @@
 
 class TypeFactoryTest extends BinaryTest
 {
-    public function getTypeVectors()
+    /**
+     * @return array
+     */
+    public function getTypeVectors(): array
     {
         $vectors = [];
         $addPlainAndLe = function ($fxnName, $class, array $params = []) use (& $vectors) {
@@ -46,7 +49,10 @@ public function getTypeVectors()
         return $vectors;
     }
 
-    public function getTypeFactoryVectors()
+    /**
+     * @return array
+     */
+    public function getTypeFactoryVectors(): array
     {
         $vectors = [];
         foreach ([new TypeFactory(), new CachingTypeFactory()] as $factory) {

diff --git a/tests/Types/IntSetTest.php b/tests/Types/IntSetTest.php
@@ -13,8 +13,10 @@
 
 class IntSetTest extends BinaryTest
 {
-
-    public function getIntSetVectors()
+    /**
+     * @return array
+     */
+    public function getIntSetVectors(): array
     {
         $int32_le = new Int32(ByteOrder::LE);
         $int32_be = new Int32(ByteOrder::BE);

diff --git a/tests/Types/VarStringTest.php b/tests/Types/VarStringTest.php
@@ -12,24 +12,36 @@
 
 class VarStringTest extends BinaryTest
 {
-
-    public function testGetVarString()
+    /**
+     * @return array
+     */
+    public function getSampleVarStrings(): array
     {
-        $strings = array(
+        return array_map(function (string $value) {
+            return [$value];
+        }, [
             '',
             '00',
             '00010203040506070809',
             '00010203040506070809000102030405060708090001020304050607080900010203040506070809000102030405060708090001020304050607080900010203040506070809000102030405060708090001020304050607080900010203040506070809000102030405060708090001020304050607080900010203040506070809000102030405060708090001020304050607080900010203040506070809000102030405060708090001020304050607080900010203040506070809000102030405060708090001020304050607080900010203040506070809000102030405060708090001020304050607080900010203040506070809000102',
-        );
+        ]);
+    }
 
+    /**
+     * @param string $input
+     * @throws \BitWasp\Buffertools\Exceptions\ParserOutOfRange
+     * @throws \Exception
+     * @dataProvider getSampleVarStrings
+     */
+    public function testGetVarString(string $input)
+    {
         $varstring = new VarString(new VarInt());
+        $binary = $varstring->write(Buffer::hex($input));
+
+        $parser = new Parser(new Buffer($binary));
+        $original = $varstring->read($parser);
 
-        foreach ($strings as $string) {
-            $binary = $varstring->write(Buffer::hex($string));
-            $parser = new Parser(new Buffer($binary));
-            $original = $varstring->read($parser);
-            $this->assertSame($string, $original->getHex());
-        }
+        $this->assertSame($input, $original->getHex());
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -174,7 +174,6 @@ public function testFlipBytes() @@
             $this->assertSame($flip, chr(0x08) . chr(0x07) . chr(0x06) . chr(0x05) . chr(0x04) . chr(0x03) . chr(0x02) . chr(0x01));
         }
         public function testConcat()
         {
             $a = Buffer::hex("1100");
@@ Expand Down @@