From 153f5eb3c7e9281c92a7ef64f334075bfb037df2 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 15 Nov 2012 15:19:28 +0800 Subject: [PATCH 1/1] MDL-36061 - remove master-only unit tests --- lib/grade/tests/grade_item_test.php | 5 ----- lib/tests/gradelib_test.php | 16 ++++------------ 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/lib/grade/tests/grade_item_test.php b/lib/grade/tests/grade_item_test.php index 35d527b4fcc..78bfa20e0a6 100644 --- a/lib/grade/tests/grade_item_test.php +++ b/lib/grade/tests/grade_item_test.php @@ -489,11 +489,6 @@ class grade_item_testcase extends grade_base_testcase { $grade_item = new grade_item($this->grade_items[0], false); $this->assertTrue(method_exists($grade_item, 'refresh_grades')); $this->assertTrue($grade_item->refresh_grades()); - - // Break the grade item and check error handling. - $grade_item->iteminstance = 123456789; - $this->assertFalse($grade_item->refresh_grades()); - $this->assertDebuggingCalled(); } protected function sub_test_grade_item_is_calculated() { diff --git a/lib/tests/gradelib_test.php b/lib/tests/gradelib_test.php index 14173cfeeff..659efc7247a 100644 --- a/lib/tests/gradelib_test.php +++ b/lib/tests/gradelib_test.php @@ -34,25 +34,17 @@ class gradelib_testcase extends advanced_testcase { $this->resetAfterTest(true); - // Create a broken module instance. - $modinstance = new stdClass(); - $modinstance->modname = 'doesntexist'; - - $this->assertFalse(grade_update_mod_grades($modinstance)); - // A debug message should have been generated. - $this->assertDebuggingCalled(); - - // Create a course and instance of mod_assign. + // Create a course and instance of mod_assignment. $course = $this->getDataGenerator()->create_course(); $assigndata['course'] = $course->id; $assigndata['name'] = 'lightwork assignment'; - $modinstance = self::getDataGenerator()->create_module('assign', $assigndata); + $modinstance = self::getDataGenerator()->create_module('assignment', $assigndata); // grade_update_mod_grades() requires 2 additional properties, cmidnumber and modname. - $cm = get_coursemodule_from_instance('assign', $modinstance->id, 0, false, MUST_EXIST); + $cm = get_coursemodule_from_instance('assignment', $modinstance->id, 0, false, MUST_EXIST); $modinstance->cmidnumber = $cm->id; - $modinstance->modname = 'assign'; + $modinstance->modname = 'assignment'; $this->assertTrue(grade_update_mod_grades($modinstance)); } -- 2.17.1