From 3f8a56f2b2bab93edc3781b0ad01a0c505057b45 Mon Sep 17 00:00:00 2001 From: Simon Njoroge Date: Tue, 2 Feb 2021 14:33:07 +0300 Subject: [PATCH] Fix unit tests --- .../java/org/smartregister/util/Utils.java | 7 ++--- .../java/org/smartregister/ContextTest.java | 29 ++----------------- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/opensrp-app/src/main/java/org/smartregister/util/Utils.java b/opensrp-app/src/main/java/org/smartregister/util/Utils.java index 3145d555c5..8e2820a130 100644 --- a/opensrp-app/src/main/java/org/smartregister/util/Utils.java +++ b/opensrp-app/src/main/java/org/smartregister/util/Utils.java @@ -32,8 +32,6 @@ import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Environment; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.Html; import android.text.Spanned; import android.text.TextUtils; @@ -45,6 +43,9 @@ import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonDeserializationContext; @@ -99,7 +100,6 @@ import timber.log.Timber; import static android.content.Context.INPUT_METHOD_SERVICE; -import static org.smartregister.util.Log.logError; /** @@ -515,7 +515,6 @@ public static CommonPersonObjectClient convert(CommonPersonObject commonPersonOb } public static boolean getBooleanProperty(String key) { - return CoreLibrary.getInstance().context().getAppProperties().isTrue(key); } diff --git a/opensrp-app/src/test/java/org/smartregister/ContextTest.java b/opensrp-app/src/test/java/org/smartregister/ContextTest.java index 2eac20fffe..d77b6d0692 100644 --- a/opensrp-app/src/test/java/org/smartregister/ContextTest.java +++ b/opensrp-app/src/test/java/org/smartregister/ContextTest.java @@ -1,13 +1,9 @@ package org.smartregister; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.robolectric.util.ReflectionHelpers; import org.smartregister.repository.AllAlerts; import org.smartregister.repository.AllReports; import org.smartregister.repository.AllServicesProvided; @@ -54,12 +50,6 @@ public class ContextTest extends BaseUnitTest { private Context context; - @Mock - private CoreLibrary coreLibrary; - - @Mock - private SyncConfiguration syncConfiguration; - @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -317,23 +307,8 @@ public void testGetClientFormRepository() { } @Test - public void testAllSharedPreferencesCreatesUnencryptedSharedPreferencesWhenEncryptSharedPreferencesSyncConfigurationFlagIsFalse() { - AllSharedPreferences allSharedPreferences = context.allSharedPreferences(); - Assert.assertNotNull(allSharedPreferences); - } - - @Test - public void testAllSharedPreferencesCreatesEncryptedSharedPreferencesWhenEncryptSharedPreferencesSyncConfigurationFlagIsTrue() { - ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary); - Mockito.when(coreLibrary.getSyncConfiguration()).thenReturn(syncConfiguration); - Mockito.when(syncConfiguration.encryptSharedPreferences()).thenReturn(true); - + public void testAllSharedPreferences() { AllSharedPreferences allSharedPreferences = context.allSharedPreferences(); Assert.assertNotNull(allSharedPreferences); } - - @After - public void tearDown() { - ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null); - } -} +} \ No newline at end of file