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

ikawhero · Oct 24, 2014 · 4ea3258 · 4ea3258
2 parents 996de18 + 4809376
commit 4ea3258
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/admin/tool/monitor/tests/rule_manager_test.php b/admin/tool/monitor/tests/rule_manager_test.php
@@ -126,7 +126,7 @@ public function test_get_rules_by_courseid() {
             $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 @@ public function test_get_rules_by_plugin() {
         }
 
         $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);
     }