Merge branch 'MDL-47813-master' of git://github.com/xow/moodle

This commit is contained in:
Marina Glancy 2014-10-24 16:22:12 +08:00 committed by Eloy Lafuente (stronk7)
commit 4ea3258af9

View File

@ -126,7 +126,7 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
$rule = $monitorgenerator->create_rule($record2); // Create rules in a different course.
}
$ruledata = \tool_monitor\rule_manager::get_rules_by_courseid($course1->id);
$this->assertEquals($ruleids, array_keys($ruledata));
$this->assertEmpty(array_merge(array_diff(array_keys($ruledata), $ruleids), array_diff($ruleids, array_keys($ruledata))));
$this->assertCount(20, $ruledata);
}
@ -153,7 +153,7 @@ class tool_monitor_rule_manager_testcase extends advanced_testcase {
}
$ruledata = \tool_monitor\rule_manager::get_rules_by_plugin('core');
$this->assertEquals($ruleids, array_keys($ruledata));
$this->assertEmpty(array_merge(array_diff(array_keys($ruledata), $ruleids), array_diff($ruleids, array_keys($ruledata))));
$this->assertCount(10, $ruledata);
}