From 4ee56ad11d7f7fccd762af77b10e826ecb342da9 Mon Sep 17 00:00:00 2001
From: Pablo <pablo@dhis2.org>
Date: Fri, 10 May 2024 11:01:52 +0200
Subject: [PATCH] [ANDROAPP-6028] move test to correct module

Signed-off-by: Pablo <pablo@dhis2.org>
---
 .../RulesRepositoryTest.kt                    | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)
 rename {app/src/test/java/org/dhis2/data/forms => dhis2-mobile-program-rules/src/test/java/org/dhis2/mobileProgramRules}/RulesRepositoryTest.kt (66%)

diff --git a/app/src/test/java/org/dhis2/data/forms/RulesRepositoryTest.kt b/dhis2-mobile-program-rules/src/test/java/org/dhis2/mobileProgramRules/RulesRepositoryTest.kt
similarity index 66%
rename from app/src/test/java/org/dhis2/data/forms/RulesRepositoryTest.kt
rename to dhis2-mobile-program-rules/src/test/java/org/dhis2/mobileProgramRules/RulesRepositoryTest.kt
index 2036da7924..991514e804 100644
--- a/app/src/test/java/org/dhis2/data/forms/RulesRepositoryTest.kt
+++ b/dhis2-mobile-program-rules/src/test/java/org/dhis2/mobileProgramRules/RulesRepositoryTest.kt
@@ -1,9 +1,11 @@
-package org.dhis2.data.forms
+package org.dhis2.mobileProgramRules
 
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
 import org.hisp.dhis.android.core.user.UserRole
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito
@@ -30,24 +32,23 @@ class RulesRepositoryTest {
                 .blockingGet(),
         ) doReturn getTestOrgUnit()
         whenever(d2.userModule().userRoles().blockingGet()) doReturn getTestUserRoles()
-        val testObserver = repository.supplementaryData("org_unit_test")
-            .test()
-
-        testObserver.assertValueCount(1)
-        testObserver.assertValue { supplData ->
-
-            supplData.containsKey("USER")
-            supplData.containsKey("org_unit_group_test_code")
-            supplData.containsKey("org_unit_group_test")
-            supplData.getOrElse("USER") { arrayListOf() }
-                .contains("role1")
-            supplData.getOrElse("USER") { arrayListOf() }
-                .contains("role2")
+        val supplData = runBlocking {
+            repository.supplementaryData("org_unit_test")
+        }
+        assertTrue(supplData.isNotEmpty())
+        assertTrue(supplData.containsKey("USER"))
+        assertTrue(supplData.containsKey("org_unit_group_test_code"))
+        assertTrue(supplData.containsKey("org_unit_group_test"))
+        assertTrue(supplData.getOrElse("USER") { arrayListOf() }.contains("role1"))
+        assertTrue(supplData.getOrElse("USER") { arrayListOf() }.contains("role2"))
+        assertTrue(
             supplData.getOrElse("org_unit_group_test") { arrayListOf() }
-                .contains("org_unit_test")
+                .contains("org_unit_test"),
+        )
+        assertTrue(
             supplData.getOrElse("org_unit_group_test_code") { arrayListOf() }
-                .contains("org_unit_test")
-        }
+                .contains("org_unit_test"),
+        )
     }
 
     @Test
@@ -59,24 +60,22 @@ class RulesRepositoryTest {
                 .blockingGet(),
         ) doReturn getTestOrgUnitWithNullCodeGroup()
         whenever(d2.userModule().userRoles().blockingGet()) doReturn getTestUserRoles()
-        val testObserver = repository.supplementaryData("org_unit_test")
-            .test()
+        val supplData = runBlocking {
+            repository.supplementaryData("org_unit_test")
+        }
 
-        testObserver.assertValueCount(1)
-        testObserver.assertValue { supplData ->
+        assertTrue(supplData.isNotEmpty())
 
-            supplData.containsKey("USER")
-            !supplData.containsKey("org_unit_group_test_code")
-            supplData.containsKey("org_unit_group_test")
-            supplData.getOrElse("USER") { arrayListOf() }
-                .contains("role1")
-            supplData.getOrElse("USER") { arrayListOf() }
-                .contains("role2")
+        assertTrue(supplData.containsKey("USER"))
+        assertTrue(!supplData.containsKey("org_unit_group_test_code"))
+        assertTrue(supplData.containsKey("org_unit_group_test"))
+        assertTrue(supplData.getOrElse("USER") { arrayListOf() }.contains("role1"))
+        assertTrue(supplData.getOrElse("USER") { arrayListOf() }.contains("role2"))
+        assertTrue(
             supplData.getOrElse("org_unit_group_test") { arrayListOf() }
-                .contains("org_unit_test")
-            supplData.getOrElse("org_unit_group_test_code") { arrayListOf() }
-                .isEmpty()
-        }
+                .contains("org_unit_test"),
+        )
+        assertTrue(supplData.getOrElse("org_unit_group_test_code") { arrayListOf() }.isEmpty())
     }
 
     private fun getTestUserRoles(): List<UserRole> {