From 8e731140516a5f9dea417c59bc2dd34251853f53 Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Tue, 31 Jul 2018 09:26:49 +1200 Subject: [PATCH 1/2] FIX Updating test to not assert order of results --- tests/php/ContentReviewReportTest.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/php/ContentReviewReportTest.php b/tests/php/ContentReviewReportTest.php index 97d8185..6d4a6b4 100644 --- a/tests/php/ContentReviewReportTest.php +++ b/tests/php/ContentReviewReportTest.php @@ -52,13 +52,17 @@ class ContentReviewReportTest extends FunctionalTest "ReviewDateBefore" => "2010-12-12", ]); - $this->assertEquals([ - "Contact Us Child", - "Home", - "About Us", - "Staff", - "Contact Us", - ], $results->column("Title")); + $this->assertListContains([ + ['Title' => 'Contact Us Child'], + ['Title' => 'Home'], + ['Title' => 'About Us'], + ['Title' => 'Staff'], + ['Title' => 'Contact Us'], + ], $results); + $this->assertListNotContains([ + ['Title' => 'Page without review date'], + ['Title' => 'Page owned by group'], + ], $results); DBDatetime::set_mock_now("2010-02-13 00:00:00"); From 6b5bc12f31161839b5fc9b6d90154241cc0a4d0e Mon Sep 17 00:00:00 2001 From: Dan Hensby Date: Tue, 31 Jul 2018 00:55:50 +0100 Subject: [PATCH 2/2] FIX Use assertListEquals --- tests/php/ContentReviewReportTest.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/php/ContentReviewReportTest.php b/tests/php/ContentReviewReportTest.php index 6d4a6b4..5179657 100644 --- a/tests/php/ContentReviewReportTest.php +++ b/tests/php/ContentReviewReportTest.php @@ -52,17 +52,13 @@ class ContentReviewReportTest extends FunctionalTest "ReviewDateBefore" => "2010-12-12", ]); - $this->assertListContains([ + $this->assertListEquals([ ['Title' => 'Contact Us Child'], ['Title' => 'Home'], ['Title' => 'About Us'], ['Title' => 'Staff'], ['Title' => 'Contact Us'], ], $results); - $this->assertListNotContains([ - ['Title' => 'Page without review date'], - ['Title' => 'Page owned by group'], - ], $results); DBDatetime::set_mock_now("2010-02-13 00:00:00");