Sfoglia il codice sorgente

Fix tests

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 anno fa
parent
commit
0639983b6b

+ 22 - 19
app/src/androidTest/java/com/nextcloud/client/assistant/AssistantRepositoryTests.kt

@@ -24,7 +24,6 @@ package com.nextcloud.client.assistant
 import com.nextcloud.client.assistant.repository.AssistantRepository
 import com.owncloud.android.AbstractOnServerIT
 import org.junit.Assert.assertTrue
-import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Test
 
@@ -39,42 +38,46 @@ class AssistantRepositoryTests : AbstractOnServerIT() {
 
     @Test
     fun testGetTaskTypes() {
-        assertTrue(sut?.getTaskTypes()?.resultData?.types?.isNotEmpty() == true)
+        val result = sut?.getTaskTypes()
+        assertTrue(result?.isSuccess == true)
+
+        val taskTypes = result?.resultData?.types
+        assertTrue(taskTypes?.isNotEmpty() == true)
     }
 
     @Test
     fun testGetTaskList() {
-        val result = sut?.getTaskList("assistant")?.resultData?.tasks
-
-        if (result == null) {
-            fail("Expected to get task list but found null")
-        }
+        val result = sut?.getTaskList("assistant")
+        assertTrue(result?.isSuccess == true)
 
-        assertTrue(result?.isEmpty() == true || (result?.size ?: 0) > 0)
+        val taskList = result?.resultData?.tasks
+        assertTrue(taskList?.isEmpty() == true || (taskList?.size ?: 0) > 0)
     }
 
     @Test
     fun testCreateTask() {
-        val input = "How many files I have?"
-        val type = "OCP\\TextProcessing\\HeadlineTaskType"
+        val input = "Give me some random output for test purpose"
+        val type = "OCP\\TextProcessing\\FreePromptTaskType"
         val result = sut?.createTask(input, type)
-        assertTrue(result != null)
+        assertTrue(result?.isSuccess == true)
     }
 
     @Test
     fun testDeleteTask() {
         testCreateTask()
 
-        shortSleep()
+        sleep(120)
+
+        val resultOfTaskList = sut?.getTaskList("assistant")
+        assertTrue(resultOfTaskList?.isSuccess == true)
+
+        sleep(120)
 
-        val taskList = sut?.getTaskList("assistant")?.resultData?.tasks
-        val taskListCountBeforeDelete = taskList?.size
+        val taskList = resultOfTaskList?.resultData?.tasks
 
-        if (taskList.isNullOrEmpty()) {
-            fail("Expected to get task list but found null or empty list")
-        }
+        assert((taskList?.size ?: 0) > 0)
 
-        sut?.deleteTask(taskList!!.first().id)
-        assertTrue(taskListCountBeforeDelete == taskListCountBeforeDelete?.minus(1))
+        val result = sut?.deleteTask(taskList!!.first().id)
+        assertTrue(result?.isSuccess == true)
     }
 }

+ 8 - 0
app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -334,6 +334,14 @@ public abstract class AbstractIT {
         }
     }
 
+    protected void sleep(int second) {
+        try {
+            Thread.sleep(1000L * second);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
     public OCFile createFolder(String remotePath) {
         RemoteOperationResult check = new ExistenceCheckRemoteOperation(remotePath, false).execute(client);