summaryrefslogtreecommitdiff
path: root/test/model
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2017-09-19 19:33:24 +0200
committerIgor Scheller <igor.scheller@igorshp.de>2017-09-19 19:45:02 +0200
commite6ed8a30171b86b452cec21a283373fc14dd5330 (patch)
treeac50aa8118686421cce0e5970657095d3a2fde73 /test/model
parentb3b65743cdc534f7632c8e04e80d3489eec9677c (diff)
Changed LogEntries table: Use log level instead of nick name
Diffstat (limited to 'test/model')
-rw-r--r--test/model/LogEntriesModelTest.php29
-rw-r--r--test/model/RoomModelTest.php17
2 files changed, 19 insertions, 27 deletions
diff --git a/test/model/LogEntriesModelTest.php b/test/model/LogEntriesModelTest.php
index 25d46fc4..761725c4 100644
--- a/test/model/LogEntriesModelTest.php
+++ b/test/model/LogEntriesModelTest.php
@@ -1,37 +1,32 @@
<?php
+
namespace Engelsystem\Test;
-use \PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LogLevel;
class LogEntriesModelTest extends TestCase
{
-
- public function create_LogEntry()
- {
- LogEntry_create('test', 'test');
- }
-
- public function test_LogEntry_create()
+ public function testCreateLogEntry()
{
+ LogEntries_clear_all();
$count = count(LogEntries());
- $this->assertNotFalse(LogEntry_create('test', 'test_LogEntry_create'));
-
+ $this->assertNotFalse(LogEntry_create(LogLevel::WARNING, 'test_LogEntry_create'));
+
// There should be one more log entry now
$this->assertEquals(count(LogEntries()), $count + 1);
}
- public function test_LogEntries_clear_all()
+ public function testClearAllLogEntries()
{
- $this->create_LogEntry();
+ LogEntry_create(LogLevel::WARNING, 'test');
$this->assertTrue(count(LogEntries()) > 0);
+
$this->assertNotFalse(LogEntries_clear_all());
- $this->assertEquals(count(LogEntries()), 0);
+ $this->assertCount(0, LogEntries());
}
- /**
- * @after
- */
- public function teardown()
+ public function tearDown()
{
LogEntries_clear_all();
}
diff --git a/test/model/RoomModelTest.php b/test/model/RoomModelTest.php
index 135a6108..4205845b 100644
--- a/test/model/RoomModelTest.php
+++ b/test/model/RoomModelTest.php
@@ -1,11 +1,11 @@
<?php
+
namespace Engelsystem\Test;
-use \PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestCase;
class RoomModelTest extends TestCase
{
-
private $room_id = null;
public function create_Room()
@@ -16,20 +16,17 @@ class RoomModelTest extends TestCase
public function test_Room()
{
$this->create_Room();
-
+
$room = Room($this->room_id);
-
+
$this->assertNotFalse($room);
$this->assertNotNull($room);
$this->assertEquals($room['Name'], 'test');
-
- $this->assertNull(Room(- 1));
+
+ $this->assertNull(Room(-1));
}
- /**
- * @after
- */
- public function teardown()
+ public function tearDown()
{
if ($this->room_id != null) {
Room_delete($this->room_id);