Merge pull request #1171 from MariusVolkhart/unitTests

[TESTS] Restore unit tests

.circleci/config.yml

@@ -57,7 +57,7 @@ jobs:
           command: ./gradlew lint
       - run:
           name: Run Unit test
-          command: echo ./gradlew test # TODO: Fix unit test errors soon...
+          command: ./gradlew test
       - store_artifacts:
           path: app/build/reports/
           destination: reports

app/src/test/java/chat/rocket/android/MemoryMessagesRepositoryTest.kt

@@ -3,6 +3,7 @@ package chat.rocket.android
 import chat.rocket.android.server.infraestructure.MemoryMessagesRepository
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.MessageType
+import kotlinx.coroutines.experimental.runBlocking
 import org.hamcrest.CoreMatchers.notNullValue
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Before
@@ -30,7 +31,9 @@ class MemoryMessagesRepositoryTest {
             senderAlias = null,
             type = MessageType.MessageRemoved(),
             updatedAt = 1511443964815,
-            urls = null
+            urls = null,
+            pinned = false,
+            reactions = null
     )
 
     val msg2 = Message(
@@ -50,16 +53,21 @@ class MemoryMessagesRepositoryTest {
             senderAlias = null,
             type = MessageType.MessageRemoved(),
             updatedAt = 1511443964818,
-            urls = null
+            urls = null,
+            pinned = false,
+            reactions = null
     )
 
     @Before
     fun setup() {
+        runBlocking {
             repository.clear()
         }
+    }
 
     @Test
     fun `save() should save a single message`() {
+        runBlocking {
             assertThat(repository.getAll().size, isEqualTo(0))
             repository.save(msg)
             val allMessages = repository.getAll()
@@ -70,9 +78,11 @@ class MemoryMessagesRepositoryTest {
                 assertThat(roomId, isEqualTo("GENERAL"))
             }
         }
+    }
 
     @Test
     fun `saveAll() should all saved messages`() {
+        runBlocking {
             assertThat(repository.getAll().size, isEqualTo(0))
             repository.saveAll(listOf(msg, msg2))
             val allMessages = repository.getAll()
@@ -89,9 +99,11 @@ class MemoryMessagesRepositoryTest {
                 assertThat(roomId, isEqualTo("sandbox"))
             }
         }
+    }
 
     @Test
     fun `getById() should return a single message`() {
+        runBlocking {
             repository.saveAll(listOf(msg, msg2))
             var singleMsg = repository.getById("messageId")
             assertThat(singleMsg, notNullValue())
@@ -109,9 +121,11 @@ class MemoryMessagesRepositoryTest {
                 assertThat(roomId, isEqualTo("sandbox"))
             }
         }
+    }
 
     @Test
     fun `getByRoomId() should return all messages for room id or an empty list`() {
+        runBlocking {
             repository.saveAll(listOf(msg, msg2))
             var roomMessages = repository.getByRoomId("faAad32fkasods2")
             assertThat(roomMessages.isEmpty(), isEqualTo(true))
@@ -132,4 +146,5 @@ class MemoryMessagesRepositoryTest {
                 assertThat(roomId, isEqualTo("GENERAL"))
             }
         }
+    }
 }
\ No newline at end of file