Update unit tests to expect the arrays being returned by the jsonSeri…

…alize method.
halfpastfouram · Jan 9, 2020 · b73938e · b73938e
1 parent a9694fb
commit b73938e
Show file tree

Hide file tree

Showing 26 changed files with 246 additions and 175 deletions.
diff --git a/test/unit/Collection/DataTest.php b/test/unit/Collection/DataTest.php
@@ -3,12 +3,14 @@
 namespace Collection;
 
 use Halfpastfour\PHPChartJS\Collection\Data;
+use PHPUnit_Framework_TestCase;
 
 /**
  * Class DataTest
+ *
  * @package Collection
  */
-class DataTest extends \PHPUnit_Framework_TestCase
+class DataTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var  Data
@@ -28,7 +30,7 @@ public function setUp()
      */
     public function testJsonSerializeEmpty()
     {
-        $expected = "[]";
+        $expected = [];
         $result   = $this->data->jsonSerialize();
         self::assertSame($expected, $result);
     }

diff --git a/test/unit/DataSetCollectionTest.php b/test/unit/DataSetCollectionTest.php
@@ -2,23 +2,39 @@
 
 namespace Halfpastfour\PHPChartJS;
 
-class DataSetCollectionTest extends \PHPUnit_Framework_TestCase
+use PHPUnit_Framework_TestCase;
+
+/**
+ * Class DataSetCollectionTest
+ *
+ * @package Halfpastfour\PHPChartJS
+ */
+class DataSetCollectionTest extends PHPUnit_Framework_TestCase
 {
     /** @var  DataSetCollection */
     private $dataSetCollection;
 
+    /**
+     *
+     */
     public function setUp()
     {
         $this->dataSetCollection = new DataSetCollection();
     }
 
+    /**
+     *
+     */
     public function testGetArrayCopyEmpty()
     {
         $expected = [];
-        $result = $this->dataSetCollection->getArrayCopy();
+        $result   = $this->dataSetCollection->getArrayCopy();
         self::assertSame($expected, $result);
     }
 
+    /**
+     *
+     */
     public function testGetArrayCopyNonEmpty()
     {
         $expected = [[]];
@@ -27,16 +43,22 @@ public function testGetArrayCopyNonEmpty()
         self::assertSame($expected, $result);
     }
 
+    /**
+     *
+     */
     public function testJsonSerializeEmpty()
     {
-        $expected = '[]';
-        $result = $this->dataSetCollection->jsonSerialize();
+        $expected = [];
+        $result   = $this->dataSetCollection->jsonSerialize();
         self::assertSame($expected, $result);
     }
 
+    /**
+     *
+     */
     public function testJsonSerializeNonEmpty()
     {
-        $expected = '[[]]';
+        $expected = [[]];
         $this->dataSetCollection->append(new DataSet());
         $result = $this->dataSetCollection->jsonSerialize();
         self::assertSame($expected, $result);

diff --git a/test/unit/DataSetTest.php b/test/unit/DataSetTest.php
@@ -9,12 +9,15 @@
 use Halfpastfour\PHPChartJS\ChartOwnedInterface;
 use Halfpastfour\PHPChartJS\Collection\Data;
 use Halfpastfour\PHPChartJS\DataSet;
+use JsonSerializable;
+use PHPUnit_Framework_TestCase;
 
 /**
  * Class DataSetTest
+ *
  * @package Test
  */
-class DataSetTest extends \PHPUnit_Framework_TestCase
+class DataSetTest extends PHPUnit_Framework_TestCase
 {
     /**
      *
@@ -28,7 +31,7 @@ public function testImplementation()
             $dataSet,
             'Class implements ArraySerializableInterface'
         );
-        $this->assertInstanceOf(\JsonSerializable::class, $dataSet, 'Class implements JsonSerializable');
+        $this->assertInstanceOf(JsonSerializable::class, $dataSet, 'Class implements JsonSerializable');
     }
 
     /**
@@ -75,7 +78,7 @@ public function testData()
         $this->assertInstanceOf(Data::class, $dataCollection, 'The data collection is the right class');
         $this->assertInstanceOf(ArrayAccess::class, $dataCollection, 'The data collection extends Collection');
         $this->assertInstanceOf(
-            \JsonSerializable::class,
+            JsonSerializable::class,
             $dataCollection,
             'The data collection implements JsonSerializable'
         );
@@ -106,7 +109,7 @@ public function testBackgroundColor()
         $dataSet->setBackgroundColor('#fff');
         $this->assertEquals('#fff', $dataSet->getBackgroundColor());
 
-        $backgroundColorArray = [ '#fff', 'rgb( 255, 255, 255 )', 'rgba( 255, 255, 255, .5 )', 'white' ];
+        $backgroundColorArray = ['#fff', 'rgb( 255, 255, 255 )', 'rgba( 255, 255, 255, .5 )', 'white'];
         $dataSet->setBackgroundColor($backgroundColorArray);
         $this->assertEquals(
             $backgroundColorArray,
@@ -127,7 +130,7 @@ public function testBorderColor()
         $dataSet->setBorderColor('#fff');
         $this->assertEquals('#fff', $dataSet->getBorderColor(), 'The border color is set and returned correctly');
 
-        $borderColorArray = [ '#fff', 'rgb( 255, 255, 255 )', 'rgba( 255, 255, 255, .5 )', 'white' ];
+        $borderColorArray = ['#fff', 'rgb( 255, 255, 255 )', 'rgba( 255, 255, 255, .5 )', 'white'];
         $dataSet->setBorderColor($borderColorArray);
         $this->assertEquals(
             $borderColorArray,
@@ -168,9 +171,9 @@ public function testBorderWidth()
         $this->assertTrue(is_int($dataSet->getBorderWidth()), 'Return type should be int');
         $this->assertEquals(0, $dataSet->getBorderWidth(), 'The border width should equal int 0');
 
-        $dataSet->setBorderWidth([ 10, '20', '30abc', 40.00, 'abc50' ]);
+        $dataSet->setBorderWidth([10, '20', '30abc', 40.00, 'abc50']);
         $this->assertTrue(is_array($dataSet->getBorderWidth()), 'Return type should be array');
-        $this->assertEquals([ 10, 20, 30, 40, 0 ], $dataSet->getBorderWidth(), 'Return value should be array of int');
+        $this->assertEquals([10, 20, 30, 40, 0], $dataSet->getBorderWidth(), 'Return value should be array of int');
     }
 
     /**
@@ -201,10 +204,10 @@ public function testAxes()
 
         $this->assertInstanceOf(DataSet::class, $dataSet->setXAxisID('myXAxis'));
         $this->assertEquals('myXAxis', $dataSet->getXAxisID(), 'The correct value is returned');
-        $this->assertArraySubset([ 'xAxisID' => 'myXAxis' ], $dataSet->getArrayCopy());
+        $this->assertArraySubset(['xAxisID' => 'myXAxis'], $dataSet->getArrayCopy());
         $this->assertArraySubset(
-            [ 'xAxisID' => 'myXAxis' ],
-            json_decode($dataSet->jsonSerialize(), true),
+            ['xAxisID' => 'myXAxis'],
+            $dataSet->jsonSerialize(),
             'Serialized data is not correct'
         );
 
@@ -217,7 +220,7 @@ public function testAxes()
                 'xAxisID' => 'myXAxis',
                 'yAxisID' => 'myYAxis',
             ],
-            json_decode($dataSet->jsonSerialize(), true),
+            $dataSet->jsonSerialize(),
             'The serialized data is not correct'
         );
     }
@@ -234,7 +237,7 @@ public function testHoverBackgroundColor()
         $this->assertInstanceOf(DataSet::class, $dataSet->setHoverBackgroundColor('#fff'));
         $this->assertEquals('#fff', $dataSet->getHoverBackgroundColor(), 'The correct value is returned');
 
-        $newColors = [ 'silver', '#fff', 'rgb( 0, 0, 0 )', 'rgba( 255, 255, 255, .5 )' ];
+        $newColors = ['silver', '#fff', 'rgb( 0, 0, 0 )', 'rgba( 255, 255, 255, .5 )'];
         $dataSet->setHoverBackgroundColor($newColors);
         $this->assertEquals($newColors, $dataSet->getHoverBackgroundColor(), 'The correct value is returned');
     }
@@ -251,9 +254,9 @@ public function testHoverBorderColor()
         $this->assertInstanceOf(DataSet::class, $dataSet->setHoverBorderColor('#fff'));
         $this->assertEquals('#fff', $dataSet->getHoverBorderColor(), 'The correct value is returned');
 
-        $dataSet->setHoverBorderColor([ 'silver', '#fff', 'rgb( 0, 0, 0 )', 'rgba( 255, 255, 255, .5 )', 0 ]);
+        $dataSet->setHoverBorderColor(['silver', '#fff', 'rgb( 0, 0, 0 )', 'rgba( 255, 255, 255, .5 )', 0]);
         $this->assertEquals(
-            [ 'silver', '#fff', 'rgb( 0, 0, 0 )', 'rgba( 255, 255, 255, .5 )', '0' ],
+            ['silver', '#fff', 'rgb( 0, 0, 0 )', 'rgba( 255, 255, 255, .5 )', '0'],
             $dataSet->getHoverBorderColor(),
             'The correct value is returned'
         );
@@ -271,7 +274,7 @@ public function testHoverBorderWidth()
         $this->assertInstanceOf(DataSet::class, $dataSet->setHoverBorderWidth(1));
         $this->assertEquals(1, $dataSet->getHoverBorderWidth(), 'The correct value is returned');
 
-        $dataSet->setHoverBorderWidth([ 1, 10, '5a', 0 ]);
-        $this->assertEquals([ 1, 10, 5, 0 ], $dataSet->getHoverBorderWidth(), 'The correct value is returned');
+        $dataSet->setHoverBorderWidth([1, 10, '5a', 0]);
+        $this->assertEquals([1, 10, 5, 0], $dataSet->getHoverBorderWidth(), 'The correct value is returned');
     }
 }
diff --git a/test/unit/LabelsCollectionTest.php b/test/unit/LabelsCollectionTest.php
@@ -3,12 +3,14 @@
 namespace Test;
 
 use Halfpastfour\PHPChartJS\LabelsCollection;
+use PHPUnit_Framework_TestCase;
 
 /**
  * Class LabelsCollectionTest
+ *
  * @package Test
  */
-class LabelsCollectionTest extends \PHPUnit_Framework_TestCase
+class LabelsCollectionTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var  LabelsCollection
@@ -23,7 +25,7 @@ class LabelsCollectionTest extends \PHPUnit_Framework_TestCase
     /**
      * @var array
      */
-    private $labelsArray = [ 'startingLabel', 'label1', 'label2', 'endLabel' ];
+    private $labelsArray = ['startingLabel', 'label1', 'label2', 'endLabel'];
 
     /**
      *
@@ -39,7 +41,7 @@ public function setUp()
      */
     public function testJsonSerializeEmpty()
     {
-        $expected = '[]';
+        $expected = [];
         $result   = $this->labelsCollectionEmpty->jsonSerialize();
         self::assertSame($expected, $result);
     }
@@ -49,7 +51,7 @@ public function testJsonSerializeEmpty()
      */
     public function testJsonSerialize()
     {
-        $expected = "[\"" . implode("\",\"", $this->labelsArray) . "\"]";
+        $expected = $this->labelsArray;
         $result   = $this->labelsCollection->jsonSerialize();
         self::assertSame($expected, $result);
     }

diff --git a/test/unit/Options/ClickTest.php b/test/unit/Options/ClickTest.php
@@ -3,14 +3,16 @@
 namespace Test\Options;
 
 use Halfpastfour\PHPChartJS\Options;
+use PHPUnit_Framework_TestCase;
 use Test\TestUtils;
 use Zend\Json\Expr;
 
 /**
  * Class ClickTest
+ *
  * @package Test\Options
  */
-class ClickTest extends \PHPUnit_Framework_TestCase
+class ClickTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var Options
@@ -21,15 +23,15 @@ class ClickTest extends \PHPUnit_Framework_TestCase
         'onClick' => null,
     ];
 
-    private $input_data_no_expressions = ['onClick' => null];
+    private $input_data_no_expressions   = ['onClick' => null];
     private $input_data_with_expressions = null;
 
     /**
      *
      */
     public function setUp()
     {
-        $this->options = new Options();
+        $this->options                     = new Options();
         $this->input_data_with_expressions = ['onClick' => new Expr('function(event, array) { echo "onClick"; }')];
     }
 
@@ -62,7 +64,7 @@ public function testJsonSerializeWithoutExpressions()
     {
         $expected = TestUtils::removeNullsFromArray($this->input_data_no_expressions);
         TestUtils::setAttributes($this->options, $this->input_data_no_expressions);
-        $result = json_decode($this->options->jsonSerialize(), true);
+        $result = $this->options->jsonSerialize();
         self::assertSame($expected, $result);
     }
 }
diff --git a/test/unit/Options/Elements/ArcTest.php b/test/unit/Options/Elements/ArcTest.php
@@ -3,13 +3,15 @@
 namespace Test\Options\Elements;
 
 use Halfpastfour\PHPChartJS\Options\Elements\Arc;
+use PHPUnit_Framework_TestCase;
 use Test\TestUtils;
 
 /**
  * Class ArcTest
+ *
  * @package Test\Options\Elements
  */
-class ArcTest extends \PHPUnit_Framework_TestCase
+class ArcTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var Arc
@@ -79,7 +81,7 @@ public function testJsonSerialize()
     {
         $expected = TestUtils::removeNullsFromArray($this->input_data);
         TestUtils::setAttributes($this->arc, $this->input_data);
-        $result = json_decode($this->arc->jsonSerialize(), true);
+        $result = $this->arc->jsonSerialize();
         self::assertSame($expected, $result);
     }
 }