From a78ebc159a1595c68d07bbfe1ea1e56b4f667e21 Mon Sep 17 00:00:00 2001 From: Arkadiusz Kondas Date: Mon, 12 Dec 2016 19:31:30 +0100 Subject: [PATCH] Use assertCount in tests --- tests/Phpml/Clustering/KMeansTest.php | 8 ++++---- tests/Phpml/CrossValidation/RandomSplitTest.php | 8 ++++---- tests/Phpml/Dataset/CsvDatasetTest.php | 8 ++++---- tests/Phpml/Dataset/Demo/GlassDatasetTest.php | 6 +++--- tests/Phpml/Dataset/Demo/IrisDatasetTest.php | 6 +++--- tests/Phpml/Dataset/Demo/WineDatasetTest.php | 6 +++--- tests/Phpml/Dataset/FilesDatasetTest.php | 4 ++-- tests/Phpml/Math/SetTest.php | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/Phpml/Clustering/KMeansTest.php b/tests/Phpml/Clustering/KMeansTest.php index aa4d9c3..bd954be 100644 --- a/tests/Phpml/Clustering/KMeansTest.php +++ b/tests/Phpml/Clustering/KMeansTest.php @@ -15,14 +15,14 @@ class KMeansTest extends \PHPUnit_Framework_TestCase $kmeans = new KMeans(2); $clusters = $kmeans->cluster($samples); - $this->assertEquals(2, count($clusters)); + $this->assertCount(2, $clusters); foreach ($samples as $index => $sample) { if (in_array($sample, $clusters[0]) || in_array($sample, $clusters[1])) { unset($samples[$index]); } } - $this->assertEquals(0, count($samples)); + $this->assertCount(0, $samples); } public function testKMeansInitializationMethods() @@ -42,11 +42,11 @@ class KMeansTest extends \PHPUnit_Framework_TestCase $kmeans = new KMeans(4, KMeans::INIT_KMEANS_PLUS_PLUS); $clusters = $kmeans->cluster($samples); - $this->assertEquals(4, count($clusters)); + $this->assertCount(4, $clusters); $kmeans = new KMeans(4, KMeans::INIT_RANDOM); $clusters = $kmeans->cluster($samples); - $this->assertEquals(4, count($clusters)); + $this->assertCount(4, $clusters); } /** diff --git a/tests/Phpml/CrossValidation/RandomSplitTest.php b/tests/Phpml/CrossValidation/RandomSplitTest.php index 74bfcd7..d6f4681 100644 --- a/tests/Phpml/CrossValidation/RandomSplitTest.php +++ b/tests/Phpml/CrossValidation/RandomSplitTest.php @@ -34,13 +34,13 @@ class RandomSplitTest extends \PHPUnit_Framework_TestCase $randomSplit = new RandomSplit($dataset, 0.5); - $this->assertEquals(2, count($randomSplit->getTestSamples())); - $this->assertEquals(2, count($randomSplit->getTrainSamples())); + $this->assertCount(2, $randomSplit->getTestSamples()); + $this->assertCount(2, $randomSplit->getTrainSamples()); $randomSplit2 = new RandomSplit($dataset, 0.25); - $this->assertEquals(1, count($randomSplit2->getTestSamples())); - $this->assertEquals(3, count($randomSplit2->getTrainSamples())); + $this->assertCount(1, $randomSplit2->getTestSamples()); + $this->assertCount(3, $randomSplit2->getTrainSamples()); } public function testDatasetRandomSplitWithSameSeed() diff --git a/tests/Phpml/Dataset/CsvDatasetTest.php b/tests/Phpml/Dataset/CsvDatasetTest.php index 5a3546c..44e745a 100644 --- a/tests/Phpml/Dataset/CsvDatasetTest.php +++ b/tests/Phpml/Dataset/CsvDatasetTest.php @@ -22,8 +22,8 @@ class CsvDatasetTest extends \PHPUnit_Framework_TestCase $dataset = new CsvDataset($filePath, 2, true); - $this->assertEquals(10, count($dataset->getSamples())); - $this->assertEquals(10, count($dataset->getTargets())); + $this->assertCount(10, $dataset->getSamples()); + $this->assertCount(10, $dataset->getTargets()); } public function testSampleCsvDatasetWithoutHeaderRow() @@ -32,7 +32,7 @@ class CsvDatasetTest extends \PHPUnit_Framework_TestCase $dataset = new CsvDataset($filePath, 2, false); - $this->assertEquals(11, count($dataset->getSamples())); - $this->assertEquals(11, count($dataset->getTargets())); + $this->assertCount(11, $dataset->getSamples()); + $this->assertCount(11, $dataset->getTargets()); } } diff --git a/tests/Phpml/Dataset/Demo/GlassDatasetTest.php b/tests/Phpml/Dataset/Demo/GlassDatasetTest.php index b646c72..9755b5d 100644 --- a/tests/Phpml/Dataset/Demo/GlassDatasetTest.php +++ b/tests/Phpml/Dataset/Demo/GlassDatasetTest.php @@ -13,10 +13,10 @@ class GlassDatasetTest extends \PHPUnit_Framework_TestCase $glass = new GlassDataset(); // whole dataset - $this->assertEquals(214, count($glass->getSamples())); - $this->assertEquals(214, count($glass->getTargets())); + $this->assertCount(214, $glass->getSamples()); + $this->assertCount(214, $glass->getTargets()); // one sample features count - $this->assertEquals(9, count($glass->getSamples()[0])); + $this->assertCount(9, $glass->getSamples()[0]); } } diff --git a/tests/Phpml/Dataset/Demo/IrisDatasetTest.php b/tests/Phpml/Dataset/Demo/IrisDatasetTest.php index 5bc4559..3ee67d0 100644 --- a/tests/Phpml/Dataset/Demo/IrisDatasetTest.php +++ b/tests/Phpml/Dataset/Demo/IrisDatasetTest.php @@ -13,10 +13,10 @@ class IrisDatasetTest extends \PHPUnit_Framework_TestCase $iris = new IrisDataset(); // whole dataset - $this->assertEquals(150, count($iris->getSamples())); - $this->assertEquals(150, count($iris->getTargets())); + $this->assertCount(150, $iris->getSamples()); + $this->assertCount(150, $iris->getTargets()); // one sample features count - $this->assertEquals(4, count($iris->getSamples()[0])); + $this->assertCount(4, $iris->getSamples()[0]); } } diff --git a/tests/Phpml/Dataset/Demo/WineDatasetTest.php b/tests/Phpml/Dataset/Demo/WineDatasetTest.php index ee79d5b..dbac4e0 100644 --- a/tests/Phpml/Dataset/Demo/WineDatasetTest.php +++ b/tests/Phpml/Dataset/Demo/WineDatasetTest.php @@ -13,10 +13,10 @@ class WineDatasetTest extends \PHPUnit_Framework_TestCase $wine = new WineDataset(); // whole dataset - $this->assertEquals(178, count($wine->getSamples())); - $this->assertEquals(178, count($wine->getTargets())); + $this->assertCount(178, $wine->getSamples()); + $this->assertCount(178, $wine->getTargets()); // one sample features count - $this->assertEquals(13, count($wine->getSamples()[0])); + $this->assertCount(13, $wine->getSamples()[0]); } } diff --git a/tests/Phpml/Dataset/FilesDatasetTest.php b/tests/Phpml/Dataset/FilesDatasetTest.php index f6e9555..49f0e20 100644 --- a/tests/Phpml/Dataset/FilesDatasetTest.php +++ b/tests/Phpml/Dataset/FilesDatasetTest.php @@ -22,8 +22,8 @@ class FilesDatasetTest extends \PHPUnit_Framework_TestCase $dataset = new FilesDataset($rootPath); - $this->assertEquals(50, count($dataset->getSamples())); - $this->assertEquals(50, count($dataset->getTargets())); + $this->assertCount(50, $dataset->getSamples()); + $this->assertCount(50, $dataset->getTargets()); $targets = ['business', 'entertainment', 'politics', 'sport', 'tech']; $this->assertEquals($targets, array_values(array_unique($dataset->getTargets()))); diff --git a/tests/Phpml/Math/SetTest.php b/tests/Phpml/Math/SetTest.php index cdf4460..5426764 100644 --- a/tests/Phpml/Math/SetTest.php +++ b/tests/Phpml/Math/SetTest.php @@ -39,7 +39,7 @@ class SetTest extends \PHPUnit_Framework_TestCase $this->assertInternalType('array', $power); $this->assertEquals([new Set(), new Set(['A']), new Set(['B']), new Set(['A', 'B'])], $power); - $this->assertEquals(4, count($power)); + $this->assertCount(4, $power); } public function testCartesian() @@ -48,7 +48,7 @@ class SetTest extends \PHPUnit_Framework_TestCase $this->assertInternalType('array', $cartesian); $this->assertEquals([new Set(['A', 1]), new Set(['A', 2])], $cartesian); - $this->assertEquals(2, count($cartesian)); + $this->assertCount(2, $cartesian); } public function testContains()