From e06bb5f800fbd9653fbbe0203c29706d5a224cce Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Thu, 30 Jan 2014 18:03:00 +0000 Subject: [PATCH] MDL-43926 Unit tests shouldn't assume only one category on install --- lib/tests/coursecatlib_test.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/tests/coursecatlib_test.php b/lib/tests/coursecatlib_test.php index 61b3b655206..b4b81809213 100644 --- a/lib/tests/coursecatlib_test.php +++ b/lib/tests/coursecatlib_test.php @@ -370,16 +370,18 @@ class core_coursecatlib_testcase extends advanced_testcase { * Test the countall function */ public function test_count_all() { - // There should be just the default category. - $this->assertEquals(1, coursecat::count_all()); + global $DB; + // Dont assume there is just one. An add-on might create a category as part of the install. + $numcategories = $DB->count_records('course_categories'); + $this->assertEquals($numcategories, coursecat::count_all()); $category1 = coursecat::create(array('name' => 'Cat1')); $category2 = coursecat::create(array('name' => 'Cat2', 'parent' => $category1->id)); $category3 = coursecat::create(array('name' => 'Cat3', 'parent' => $category2->id, 'visible' => 0)); - // Now we've got four. - $this->assertEquals(4, coursecat::count_all()); + // Now we've got three more. + $this->assertEquals($numcategories + 3, coursecat::count_all()); cache_helper::purge_by_event('changesincoursecat'); // We should still have 4. - $this->assertEquals(4, coursecat::count_all()); + $this->assertEquals($numcategories + 3, coursecat::count_all()); } /**