From 6985d33dc6f556f0c97e31103bbe139c3952ae05 Mon Sep 17 00:00:00 2001
From: Daniel Thee Roperto <danielroperto@catalyst-au.net>
Date: Tue, 18 Oct 2016 14:49:59 +1100
Subject: [PATCH] Issue #57 - Calendar entry not removed on uninstall -- Fixed
 failing unit tests.

---
 tests/phpunit/calendar/calendar_test.php | 3 ++-
 tests/phpunit/event/events_test.php      | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/calendar/calendar_test.php b/tests/phpunit/calendar/calendar_test.php
index 7cec327..bb687a3 100644
--- a/tests/phpunit/calendar/calendar_test.php
+++ b/tests/phpunit/calendar/calendar_test.php
@@ -130,7 +130,8 @@ class calendar_test extends advanced_testcase {
         $calendar = calendar::load(self::$outage->id);
         self::assertSame(self::$outage->title, $calendar->name);
         self::assertSame(self::$outage->description, $calendar->description);
-        self::assertSame('auth_outage', $calendar->eventtype);
+        self::assertSame('outage', $calendar->eventtype);
+        self::assertSame('auth_outage', $calendar->modulename);
         self::assertEquals(self::$outage->starttime, $calendar->timestart);
         self::assertEquals(self::$outage->get_duration_planned(), $calendar->timeduration);
     }
diff --git a/tests/phpunit/event/events_test.php b/tests/phpunit/event/events_test.php
index f416936..444f7d0 100644
--- a/tests/phpunit/event/events_test.php
+++ b/tests/phpunit/event/events_test.php
@@ -75,8 +75,8 @@ class events_test extends advanced_testcase {
         // Check existance.
         self::$event = $DB->get_record_select(
             'event',
-            "(eventtype = 'auth_outage' AND instance = :outageid)",
-            ['outageid' => self::$outage->id],
+            "(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage)",
+            ['idoutage' => self::$outage->id],
             'id',
             IGNORE_MISSING
         );
@@ -98,7 +98,7 @@ class events_test extends advanced_testcase {
         // Should still exist.
         $event = $DB->get_record_select(
             'event',
-            "(eventtype = 'auth_outage' AND instance = :idoutage)",
+            "(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage)",
             ['idoutage' => self::$outage->id],
             'id',
             IGNORE_MISSING
@@ -122,7 +122,7 @@ class events_test extends advanced_testcase {
         // Should not exist.
         $event = $DB->get_record_select(
             'event',
-            "(eventtype = 'auth_outage' AND instance = :idoutage) OR (id = :idevent)",
+            "(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage) OR (id = :idevent)",
             ['idoutage' => self::$outage->id, 'idevent' => self::$event->id],
             'id',
             IGNORE_MISSING