MDL-48012 tool_recyclebin: used new hooks in core

admin/tool/recyclebin/lib.php

@@ -131,4 +131,28 @@ function tool_recyclebin_extend_navigation_category_settings($navigation, $conte
     }
 
     $navigation->add_node($node);
-}
+}
+
+/**
+ * Hook called before we delete a course module.
+ *
+ * @param \stdClass $cm The course module record.
+ */
+function tool_recyclebin_pre_course_module_delete($cm) {
+    if (\tool_recyclebin\course::is_enabled()) {
+        $recyclebin = new \tool_recyclebin\course($cm->course);
+        $recyclebin->store_item($cm);
+    }
+}
+
+/**
+ * Hook called before we delete a course.
+ *
+ * @param \stdClass $course The course record.
+ */
+function tool_recyclebin_pre_course_delete($course) {
+    if (\tool_recyclebin\category::is_enabled()) {
+        $recyclebin = new \tool_recyclebin\category($course->category);
+        $recyclebin->store_item($course);
+    }
+}

admin/tool/recyclebin/tests/category_test.php

@@ -47,9 +47,9 @@ protected function setUp() {
     }
 
     /**
-     * Run a bunch of tests to make sure we capture courses.
+     * Check that our hook is called when a course is deleted.
      */
-    public function test_observer() {
+    public function test_hook() {
         global $DB;
 
         $this->assertEquals($this->before + 1, $DB->count_records('course'));

admin/tool/recyclebin/tests/course_test.php

@@ -51,9 +51,9 @@ protected function setUp() {
     }
 
     /**
-     * Run a bunch of tests to make sure we capture mods.
+     * Check that our hook is called when an activity is deleted.
      */
-    public function test_observer() {
+    public function test_hook() {
         global $DB;
 
         $this->assertEquals($this->before + 1, $DB->count_records('course_modules'));