Tests: use PHPUnit (6.4) exception methods (#165)

* tests: update to PHPUnit 6.0 with rector * [cs] clean empty docs * composer: bump to PHPUnit 6.4 * tests: use class references over strings * cleanup
znsoftm · Nov 28, 2017 · 946fbbc · 946fbbc
1 parent 726cf4c
commit 946fbbc
Show file tree

Hide file tree

Showing 24 changed files with 64 additions and 117 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "php": "^7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^6.4",
         "friendsofphp/php-cs-fixer": "^2.4",
         "symplify/easy-coding-standard": "dev-master as 2.5",
         "symplify/coding-standard": "dev-master as 2.5",

diff --git a/src/Phpml/Preprocessing/Imputer.php b/src/Phpml/Preprocessing/Imputer.php
@@ -28,9 +28,9 @@ class Imputer implements Preprocessor
     private $axis;
 
     /**
-     * @var
+     * @var mixed[]
      */
-    private $samples;
+    private $samples = [];
 
     /**
      * @param mixed      $missingValue

diff --git a/tests/Phpml/Association/AprioriTest.php b/tests/Phpml/Association/AprioriTest.php
@@ -178,7 +178,7 @@ public function testEquals(): void
      *
      * @return mixed
      */
-    public function invoke(&$object, $method, array $params = [])
+    public function invoke(&$object, string $method, array $params = [])
     {
         $reflection = new ReflectionClass(get_class($object));
         $method = $reflection->getMethod($method);

diff --git a/tests/Phpml/Classification/MLPClassifierTest.php b/tests/Phpml/Classification/MLPClassifierTest.php
@@ -5,6 +5,7 @@
 namespace tests\Phpml\Classification;
 
 use Phpml\Classification\MLPClassifier;
+use Phpml\Exception\InvalidArgumentException;
 use Phpml\ModelManager;
 use Phpml\NeuralNetwork\Node\Neuron;
 use PHPUnit\Framework\TestCase;
@@ -160,19 +161,15 @@ public function testSaveAndRestore(): void
         $this->assertEquals($predicted, $restoredClassifier->predict($testSamples));
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidLayersNumber(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         new MLPClassifier(2, [], [0, 1]);
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidPartialTrainingClasses(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         $classifier = new MLPClassifier(2, [2], [0, 1]);
         $classifier->partialTrain(
             [[0, 1], [1, 0]],
@@ -181,11 +178,9 @@ public function testThrowExceptionOnInvalidPartialTrainingClasses(): void
         );
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidClassesNumber(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         new MLPClassifier(2, [2], [0]);
     }
 

diff --git a/tests/Phpml/Clustering/KMeansTest.php b/tests/Phpml/Clustering/KMeansTest.php
@@ -5,6 +5,7 @@
 namespace tests\Phpml\Clustering;
 
 use Phpml\Clustering\KMeans;
+use Phpml\Exception\InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
 class KMeansTest extends TestCase
@@ -51,11 +52,9 @@ public function testKMeansInitializationMethods(): void
         $this->assertCount(4, $clusters);
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidClusterNumber(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         new KMeans(0);
     }
 }
diff --git a/tests/Phpml/CrossValidation/RandomSplitTest.php b/tests/Phpml/CrossValidation/RandomSplitTest.php
@@ -6,23 +6,20 @@
 
 use Phpml\CrossValidation\RandomSplit;
 use Phpml\Dataset\ArrayDataset;
+use Phpml\Exception\InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
 class RandomSplitTest extends TestCase
 {
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnToSmallTestSize(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         new RandomSplit(new ArrayDataset([], []), 0);
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnToBigTestSize(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         new RandomSplit(new ArrayDataset([], []), 1);
     }
 

diff --git a/tests/Phpml/Dataset/ArrayDatasetTest.php b/tests/Phpml/Dataset/ArrayDatasetTest.php
@@ -5,15 +5,14 @@
 namespace tests\Phpml\Dataset;
 
 use Phpml\Dataset\ArrayDataset;
+use Phpml\Exception\InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
 class ArrayDatasetTest extends TestCase
 {
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidArgumentsSize(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         new ArrayDataset([0, 1], [0]);
     }
 

diff --git a/tests/Phpml/Dataset/CsvDatasetTest.php b/tests/Phpml/Dataset/CsvDatasetTest.php
@@ -5,15 +5,14 @@
 namespace tests\Phpml\Dataset;
 
 use Phpml\Dataset\CsvDataset;
+use Phpml\Exception\FileException;
 use PHPUnit\Framework\TestCase;
 
 class CsvDatasetTest extends TestCase
 {
-    /**
-     * @expectedException \Phpml\Exception\FileException
-     */
     public function testThrowExceptionOnMissingFile(): void
     {
+        $this->expectException(FileException::class);
         new CsvDataset('missingFile', 3);
     }
 

diff --git a/tests/Phpml/Dataset/FilesDatasetTest.php b/tests/Phpml/Dataset/FilesDatasetTest.php
@@ -5,15 +5,14 @@
 namespace tests\Phpml\Dataset;
 
 use Phpml\Dataset\FilesDataset;
+use Phpml\Exception\DatasetException;
 use PHPUnit\Framework\TestCase;
 
 class FilesDatasetTest extends TestCase
 {
-    /**
-     * @expectedException \Phpml\Exception\DatasetException
-     */
     public function testThrowExceptionOnMissingRootFolder(): void
     {
+        $this->expectException(DatasetException::class);
         new FilesDataset('some/not/existed/path');
     }
 

diff --git a/tests/Phpml/FeatureExtraction/StopWordsTest.php b/tests/Phpml/FeatureExtraction/StopWordsTest.php
@@ -4,6 +4,7 @@
 
 namespace tests\Phpml\FeatureExtraction;
 
+use Phpml\Exception\InvalidArgumentException;
 use Phpml\FeatureExtraction\StopWords;
 use PHPUnit\Framework\TestCase;
 
@@ -22,11 +23,9 @@ public function testCustomStopWords(): void
         $this->assertFalse($stopWords->isStopWord('amet'));
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidLanguage(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         StopWords::factory('Lorem');
     }
 

diff --git a/tests/Phpml/Math/ComparisonTest.php b/tests/Phpml/Math/ComparisonTest.php
@@ -4,6 +4,7 @@
 
 namespace tests\Phpml\Math;
 
+use Phpml\Exception\InvalidArgumentException;
 use Phpml\Math\Comparison;
 use PHPUnit\Framework\TestCase;
 
@@ -22,12 +23,10 @@ public function testResult($a, $b, string $operator, bool $expected): void
         $this->assertEquals($expected, $result);
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Invalid operator "~=" provided
-     */
     public function testThrowExceptionWhenOperatorIsInvalid(): void
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid operator "~=" provided');
         Comparison::compare(1, 1, '~=');
     }
 

diff --git a/tests/Phpml/Math/Distance/ChebyshevTest.php b/tests/Phpml/Math/Distance/ChebyshevTest.php
@@ -4,6 +4,7 @@
 
 namespace tests\Phpml\Metric;
 
+use Phpml\Exception\InvalidArgumentException;
 use Phpml\Math\Distance\Chebyshev;
 use PHPUnit\Framework\TestCase;
 
@@ -19,14 +20,11 @@ public function setUp(): void
         $this->distanceMetric = new Chebyshev();
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidArguments(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         $a = [0, 1, 2];
         $b = [0, 2];
-
         $this->distanceMetric->distance($a, $b);
     }
 

diff --git a/tests/Phpml/Math/Distance/EuclideanTest.php b/tests/Phpml/Math/Distance/EuclideanTest.php
@@ -4,6 +4,7 @@
 
 namespace tests\Phpml\Metric;
 
+use Phpml\Exception\InvalidArgumentException;
 use Phpml\Math\Distance\Euclidean;
 use PHPUnit\Framework\TestCase;
 
@@ -19,14 +20,11 @@ public function setUp(): void
         $this->distanceMetric = new Euclidean();
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidArguments(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         $a = [0, 1, 2];
         $b = [0, 2];
-
         $this->distanceMetric->distance($a, $b);
     }
 

diff --git a/tests/Phpml/Math/Distance/ManhattanTest.php b/tests/Phpml/Math/Distance/ManhattanTest.php
@@ -4,6 +4,7 @@
 
 namespace tests\Phpml\Metric;
 
+use Phpml\Exception\InvalidArgumentException;
 use Phpml\Math\Distance\Manhattan;
 use PHPUnit\Framework\TestCase;
 
@@ -19,14 +20,11 @@ public function setUp(): void
         $this->distanceMetric = new Manhattan();
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidArguments(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         $a = [0, 1, 2];
         $b = [0, 2];
-
         $this->distanceMetric->distance($a, $b);
     }
 

diff --git a/tests/Phpml/Math/Distance/MinkowskiTest.php b/tests/Phpml/Math/Distance/MinkowskiTest.php
@@ -4,6 +4,7 @@
 
 namespace tests\Phpml\Metric;
 
+use Phpml\Exception\InvalidArgumentException;
 use Phpml\Math\Distance\Minkowski;
 use PHPUnit\Framework\TestCase;
 
@@ -19,14 +20,11 @@ public function setUp(): void
         $this->distanceMetric = new Minkowski();
     }
 
-    /**
-     * @expectedException \Phpml\Exception\InvalidArgumentException
-     */
     public function testThrowExceptionOnInvalidArguments(): void
     {
+        $this->expectException(InvalidArgumentException::class);
         $a = [0, 1, 2];
         $b = [0, 2];
-
         $this->distanceMetric->distance($a, $b);
     }