From d3286bf6bc96dd9f064caf8241f23d2204a36d98 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 22 Jun 2022 21:42:07 +0200
Subject: [PATCH] update test cases

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../talk/activities/MainActivityTest.kt       | 61 ++++++++++---------
 .../java/com/nextcloud/talk/ui/LoginIT.java   |  7 +--
 .../com/nextcloud/talk/users/UserManager.kt   |  4 ++
 3 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt b/app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt
index 0e3630571..c57acbabf 100644
--- a/app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt
@@ -2,7 +2,10 @@ package com.nextcloud.talk.activities
 
 import androidx.test.espresso.intent.rule.IntentsTestRule
 import com.nextcloud.talk.data.user.model.UserNgEntity
-import org.junit.Assert.assertTrue
+import com.nextcloud.talk.users.UserManager
+import io.reactivex.Observer
+import io.reactivex.disposables.Disposable
+import org.junit.Assert.fail
 import org.junit.Rule
 import org.junit.Test
 
@@ -15,39 +18,41 @@ class MainActivityTest {
     )
 
     @Test
-    suspend fun login() {
+    fun login() {
         val sut = activityRule.launchActivity(null)
 
-        sut.usersRepository.insertUser(
-            UserNgEntity(
-                0,
-                "test",
-                "test",
-                "http://server/nc",
-                "test",
-                null,
-                null,
-                null,
-                null,
-                null,
-                false,
-                scheduledForDeletion = false
+        sut.userManager.createOrUpdateUser(
+            "test",
+            UserManager.UserAttributes(
+                id = 0,
+                serverUrl = "http://server/nc",
+                currentUser = false,
+                userId = "test",
+                token = "test",
+                displayName = null,
+                pushConfigurationState = null,
+                capabilities = null,
+                certificateAlias = null,
+                externalSignalingServer = null
             )
-        )
+        ).subscribe(object : Observer<UserNgEntity?> {
+            override fun onSubscribe(d: Disposable) {
+                // unused atm
+            }
 
-        try {
-            Thread.sleep(2000)
-        } catch (e: InterruptedException) {
-            e.printStackTrace()
-        }
+            override fun onNext(user: UserNgEntity) {
+                sut.runOnUiThread { sut.resetConversationsList() }
 
-        sut.runOnUiThread { sut.resetConversationsList() }
+                println("User: " + user.id + " / " + user.userId + " / " + user.baseUrl)
+            }
 
-        assertTrue(sut.usersRepository.getUserWithUsernameAndServer("test", "http://server/nc") != null)
+            override fun onError(e: Throwable) {
+                fail("No user created")
+            }
 
-        try {
-        } catch (e: InterruptedException) {
-            e.printStackTrace()
-        }
+            override fun onComplete() {
+                // unused atm
+            }
+        })
     }
 }
diff --git a/app/src/androidTest/java/com/nextcloud/talk/ui/LoginIT.java b/app/src/androidTest/java/com/nextcloud/talk/ui/LoginIT.java
index 2eea9df52..69128942b 100644
--- a/app/src/androidTest/java/com/nextcloud/talk/ui/LoginIT.java
+++ b/app/src/androidTest/java/com/nextcloud/talk/ui/LoginIT.java
@@ -143,10 +143,7 @@ public class LoginIT {
         onView(withId(R.id.user_name)).check(matches(withText("User One")));
 
         activityScenario.onActivity(activity -> {
-            assertEquals(loginName, Objects.requireNonNull(activity.usersRepository.getActiveUser()).getUserId());
+            assertEquals(loginName, Objects.requireNonNull(activity.userManager.getCurrentUser()).getUserId());
         });
-
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
index 6874e7bdc..70d0b9e0a 100644
--- a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
+++ b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
@@ -303,6 +303,10 @@ class UserManager internal constructor(private val userRepository: UsersReposito
         return userRepository.getUserWithIdLiveData(user!!.id)
     }
 
+    fun getUserWithUsernameAndServer(username: String, server: String): Observable<UserNgEntity?> {
+        return userRepository.getUserWithUsernameAndServer(username, server)
+    }
+
     private fun updateUserData(user: UserNgEntity, userAttributes: UserAttributes) {
         updateUserIdIfNeeded(userAttributes, user)
         updateTokenIfNeeded(userAttributes, user)