From 38dbb6deaa617145ffee9cf122a310e383638fc0 Mon Sep 17 00:00:00 2001
From: Daniel Thee Roperto <danielroperto@catalyst-au.net>
Date: Wed, 19 Oct 2016 10:30:26 +1100
Subject: [PATCH] Issue #64 - Fixed problems detected by Behat test.

---
 classes/calendar/calendar.php            | 6 +++---
 db/uninstall.php                         | 5 +++++
 tests/phpunit/calendar/calendar_test.php | 4 ++--
 tests/phpunit/event/events_test.php      | 6 +++---
 tests/phpunit/installation_test.php      | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/classes/calendar/calendar.php b/classes/calendar/calendar.php
index 9fb8f3e..b2db70c 100644
--- a/classes/calendar/calendar.php
+++ b/classes/calendar/calendar.php
@@ -96,9 +96,9 @@ class calendar {
             'courseid' => 1,
             'groupid' => 0,
             'userid' => 0,
-            'modulename' => 'auth_outage',
+            'modulename' => '',
             'instance' => $outage->id,
-            'eventtype' => 'outage',
+            'eventtype' => 'auth_outage',
             'timestart' => $outage->starttime,
             'visible' => true,
             'timeduration' => $outage->get_duration_planned(),
@@ -115,7 +115,7 @@ class calendar {
 
         $event = $DB->get_record_select(
             'event',
-            "(modulename='auth_outage' AND eventtype='outage' AND instance = :outageid)",
+            "(eventtype = 'auth_outage' AND instance = :outageid)",
             ['outageid' => $outageid],
             'id',
             IGNORE_MISSING
diff --git a/db/uninstall.php b/db/uninstall.php
index bce5250..643fad8 100644
--- a/db/uninstall.php
+++ b/db/uninstall.php
@@ -31,6 +31,11 @@ defined('MOODLE_INTERNAL') || die();
  */
 
 function xmldb_auth_outage_uninstall() {
+    global $DB;
+
+    // Delete all outage events.
+    $DB->delete_records('event', ['eventtype' => 'auth_outage']);
+
     // Delete template file.
     $template = auth_outage\local\controllers\infopage::get_defaulttemplatefile();
     if (file_exists($template)) {
diff --git a/tests/phpunit/calendar/calendar_test.php b/tests/phpunit/calendar/calendar_test.php
index bb687a3..8c7e798 100644
--- a/tests/phpunit/calendar/calendar_test.php
+++ b/tests/phpunit/calendar/calendar_test.php
@@ -130,8 +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('outage', $calendar->eventtype);
-        self::assertSame('auth_outage', $calendar->modulename);
+        self::assertSame('auth_outage', $calendar->eventtype);
+        self::assertSame('', $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 444f7d0..3e55064 100644
--- a/tests/phpunit/event/events_test.php
+++ b/tests/phpunit/event/events_test.php
@@ -75,7 +75,7 @@ class events_test extends advanced_testcase {
         // Check existance.
         self::$event = $DB->get_record_select(
             'event',
-            "(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage)",
+            "(eventtype = 'auth_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',
-            "(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage)",
+            "(eventtype = 'auth_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',
-            "(modulename='auth_outage' AND eventtype='outage' AND instance=:idoutage) OR (id = :idevent)",
+            "(eventtype = 'auth_outage' AND instance = :idoutage) OR (id = :idevent)",
             ['idoutage' => self::$outage->id, 'idevent' => self::$event->id],
             'id',
             IGNORE_MISSING
diff --git a/tests/phpunit/installation_test.php b/tests/phpunit/installation_test.php
index 4fa05a9..9b3708d 100644
--- a/tests/phpunit/installation_test.php
+++ b/tests/phpunit/installation_test.php
@@ -64,7 +64,7 @@ class installation_test extends auth_outage_base_testcase {
             'description' => 'Description',
         ]);
         \auth_outage\dml\outagedb::save($outage);
-        self::assertSame(1, $DB->count_records_select('event', "modulename='auth_outage'", null));
+        self::assertSame(1, $DB->count_records_select('event', "eventtype = 'auth_outage'", null));
 
         // Uninstall plugin.
         require_once($CFG->libdir.'/adminlib.php');