Issue #57 - Calendar entry not removed on uninstall -- Fixed failing unit tests.

This commit is contained in:
Daniel Thee Roperto
2016-10-18 14:49:59 +11:00
parent f652c9ecf0
commit 6985d33dc6
2 changed files with 6 additions and 5 deletions

View File

@@ -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);
}

View File

@@ -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