From 64c6968053a9c0f7d248ddb149076a6c42211fde Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Fri, 1 Mar 2019 10:10:13 +1300 Subject: [PATCH 1/5] Use `assertEqualsCanonicalizing` for `allergies_test` --- exercises/allergies/allergies_test.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/exercises/allergies/allergies_test.php b/exercises/allergies/allergies_test.php index 321d9a09..8b4736de 100644 --- a/exercises/allergies/allergies_test.php +++ b/exercises/allergies/allergies_test.php @@ -58,40 +58,40 @@ public function testIsAllergicToLotsOfStuffs() { $allergies = new Allergies(248); - $this->assertEquals([ + $this->assertEqualsCanonicalizing([ new Allergen(Allergen::CATS), new Allergen(Allergen::CHOCOLATE), new Allergen(Allergen::POLLEN), new Allergen(Allergen::STRAWBERRIES), new Allergen(Allergen::TOMATOES), - ], $allergies->getList(), "\$canonicalize = true", $delta = 0.0, $maxDepth = 10, $canonicalize = true); + ], $allergies->getList()); } public function testIsAllergicToEggsAndPeanuts() { $allergies = new Allergies(3); - $this->assertEquals([ + $this->assertEqualsCanonicalizing([ new Allergen(Allergen::EGGS), new Allergen(Allergen::PEANUTS), - ], $allergies->getList(), "\$canonicalize = true", $delta = 0.0, $maxDepth = 10, $canonicalize = true); + ], $allergies->getList()); } public function testIsAllergicToEgssAndShellfish() { $allergies = new Allergies(5); - $this->assertEquals([ + $this->assertEqualsCanonicalizing([ new Allergen(Allergen::EGGS), new Allergen(Allergen::SHELLFISH), - ], $allergies->getList(), "\$canonicalize = true", $delta = 0.0, $maxDepth = 10, $canonicalize = true); + ], $allergies->getList()); } public function testIgnoreNonAllergenScorePart() { $allergies = new Allergies(509); - $this->assertEquals([ + $this->assertEqualsCanonicalizing([ new Allergen(Allergen::CATS), new Allergen(Allergen::CHOCOLATE), new Allergen(Allergen::EGGS), @@ -99,7 +99,7 @@ public function testIgnoreNonAllergenScorePart() new Allergen(Allergen::SHELLFISH), new Allergen(Allergen::STRAWBERRIES), new Allergen(Allergen::TOMATOES), - ], $allergies->getList(), "\$canonicalize = true", $delta = 0.0, $maxDepth = 10, $canonicalize = true); + ], $allergies->getList()); } /** From 9f530d2bf42028c307b9ae829b2a3cd75c82ce58 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Fri, 1 Mar 2019 10:10:42 +1300 Subject: [PATCH 2/5] Add phpdoc parameters & fix typo --- exercises/allergies/allergies_test.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/exercises/allergies/allergies_test.php b/exercises/allergies/allergies_test.php index 8b4736de..2f6f4ada 100644 --- a/exercises/allergies/allergies_test.php +++ b/exercises/allergies/allergies_test.php @@ -7,6 +7,8 @@ class AllergiesTest extends PHPUnit\Framework\TestCase /** * @dataProvider provideListOfAllergen + * + * @param Allergen $allergen */ public function testNoAllergiesMeansNotAllergicToAnything($allergen) { @@ -17,6 +19,8 @@ public function testNoAllergiesMeansNotAllergicToAnything($allergen) /** * @dataProvider provideListOfAllergen + * + * @param Allergen $allergicTo */ public function testAllergiesToOneAllergen($allergicTo) { @@ -26,7 +30,7 @@ public function testAllergiesToOneAllergen($allergicTo) $otherAllergen = array_filter(Allergen::allergenList(), function ($allergen) use ($allergicTo) { return $allergen != $allergicTo; }); - $self = $this; + $self = $this; array_map(function ($allergen) use ($allergies, $self) { $self->assertFalse($allergies->isAllergicTo($allergen)); }, $otherAllergen); @@ -77,7 +81,7 @@ public function testIsAllergicToEggsAndPeanuts() ], $allergies->getList()); } - public function testIsAllergicToEgssAndShellfish() + public function testIsAllergicToEggsAndShellfish() { $allergies = new Allergies(5); From aa180fcc6f04ae4aac578af05863237d5c08f00d Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Fri, 1 Mar 2019 10:11:25 +1300 Subject: [PATCH 3/5] Use `assertEqualsCanonicalizing` for `grade-school_test` --- exercises/grade-school/grade-school_test.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/exercises/grade-school/grade-school_test.php b/exercises/grade-school/grade-school_test.php index d6672380..c6ef9659 100644 --- a/exercises/grade-school/grade-school_test.php +++ b/exercises/grade-school/grade-school_test.php @@ -31,13 +31,9 @@ public function testAddStudentsinSameGrade() $students = $this->school->grade(2) ; $this->assertCount(3, $students); - $this->assertEquals( + $this->assertEqualsCanonicalizing( ['Claire', 'Marc', 'Virginie'], - $students, - $message = '', - $delta = 0.0, - $maxDepth = 10, - $canonicalize = true + $students ); } From 395edd8c284c06d91ae9b49ae6629c7b613fbc14 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Fri, 1 Mar 2019 10:12:28 +1300 Subject: [PATCH 4/5] Correct typo in `grade-school_test` --- exercises/grade-school/grade-school_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/grade-school/grade-school_test.php b/exercises/grade-school/grade-school_test.php index c6ef9659..d269613b 100644 --- a/exercises/grade-school/grade-school_test.php +++ b/exercises/grade-school/grade-school_test.php @@ -23,7 +23,7 @@ public function testAddStudent() $this->assertContains('Claire', $this->school->grade(2)); } - public function testAddStudentsinSameGrade() + public function testAddStudentsInSameGrade() { $this->school->add("Marc", 2); $this->school->add("Virginie", 2); From c6717b8aed8e8ece6536aa0d2ba285d99989a954 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Fri, 28 Jun 2019 07:54:58 +1200 Subject: [PATCH 5/5] Remove unneeded `$self` variable --- exercises/allergies/allergies_test.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/allergies/allergies_test.php b/exercises/allergies/allergies_test.php index 2f6f4ada..8d0ed4b4 100644 --- a/exercises/allergies/allergies_test.php +++ b/exercises/allergies/allergies_test.php @@ -30,9 +30,9 @@ public function testAllergiesToOneAllergen($allergicTo) $otherAllergen = array_filter(Allergen::allergenList(), function ($allergen) use ($allergicTo) { return $allergen != $allergicTo; }); - $self = $this; - array_map(function ($allergen) use ($allergies, $self) { - $self->assertFalse($allergies->isAllergicTo($allergen)); + + array_map(function ($allergen) use ($allergies) { + $this->assertFalse($allergies->isAllergicTo($allergen)); }, $otherAllergen); }