Merge branch 'pr/316' into feature-igel-rewrite

2 files changed, 57 insertions, 54 deletions

diff --git a/test/model/LogEntriesModelTest.php b/test/model/LogEntriesModelTest.php
index 552650b2..4da6fd4b 100644
--- a/test/model/LogEntriesModelTest.php
+++ b/test/model/LogEntriesModelTest.php
@@ -2,33 +2,35 @@
 
 namespace Engelsystem\Test;
 
-class LogEntriesModelTest extends \PHPUnit_Framework_TestCase {
+class LogEntriesModelTest extends \PHPUnit_Framework_TestCase
+{
+    public function create_LogEntry()
+    {
+        LogEntry_create('test', 'test');
+    }
 
-  public function create_LogEntry() {
-    LogEntry_create('test', 'test');
-  }
+    public function test_LogEntry_create()
+    {
+        $count = count(LogEntries());
+        $this->assertNotFalse(LogEntry_create('test', 'test_LogEntry_create'));
 
-  public function test_LogEntry_create() {
-    $count = count(LogEntries());
-    $this->assertNotFalse(LogEntry_create('test', 'test_LogEntry_create'));
-    
-    // There should be one more log entry now
-    $this->assertEquals(count(LogEntries()), $count + 1);
-  }
+        // There should be one more log entry now
+        $this->assertEquals(count(LogEntries()), $count + 1);
+    }
 
-  public function test_LogEntries_clear_all() {
-    $this->create_LogEntry();
-    $this->assertTrue(count(LogEntries()) > 0);
-    $this->assertNotFalse(LogEntries_clear_all());
-    $this->assertEquals(count(LogEntries()), 0);
-  }
+    public function test_LogEntries_clear_all()
+    {
+        $this->create_LogEntry();
+        $this->assertTrue(count(LogEntries()) > 0);
+        $this->assertNotFalse(LogEntries_clear_all());
+        $this->assertEquals(count(LogEntries()), 0);
+    }
 
-  /**
-   * @after
-   */
-  public function teardown() {
-    LogEntries_clear_all();
-  }
+    /**
+     * @after
+     */
+    public function teardown()
+    {
+        LogEntries_clear_all();
+    }
 }
-
-?>
diff --git a/test/model/RoomModelTest.php b/test/model/RoomModelTest.php
index 52daf6c8..9c91939d 100644
--- a/test/model/RoomModelTest.php
+++ b/test/model/RoomModelTest.php
@@ -2,34 +2,35 @@
 
 namespace Engelsystem\Test;
 
-class RoomModelTest extends \PHPUnit_Framework_TestCase {
-
-  private $room_id = null;
-
-  public function create_Room() {
-    $this->room_id = Room_create('test', false, true, '');
-  }
-
-  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));
-  }
-
-  /**
-   * @after
-   */
-  public function teardown() {
-    if ($this->room_id != null) {
-      Room_delete($this->room_id);
+class RoomModelTest extends \PHPUnit_Framework_TestCase
+{
+    private $room_id = null;
+
+    public function create_Room()
+    {
+        $this->room_id = Room_create('test', false, true, '');
     }
-  }
-}
 
-?>
+    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));
+    }
+
+    /**
+     * @after
+     */
+    public function teardown()
+    {
+        if ($this->room_id != null) {
+            Room_delete($this->room_id);
+        }
+    }
+}