From bd33eebb6e79afd8bdcfef3e2304f4fd4eaa352f Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Tue, 21 Jun 2022 09:53:35 +0300 Subject: [PATCH] Migrate deprecated API --- .../immunization/BaseUnitTest.java | 3 +- .../adapter/ImmunizationRowAdapterTest.java | 6 +- .../adapter/ServiceCardAdapterTest.java | 8 +- .../adapter/ServiceRowAdapterTest.java | 8 +- .../adapter/VaccineCardAdapterTest.java | 6 +- ...ActivateChildStatusDialogFragmentTest.java | 4 +- .../fragment/ServiceDialogFragmentTest.java | 4 +- .../ServiceEditDialogFragmentTest.java | 4 +- .../UndoServiceDialogFragmentTest.java | 4 +- .../UndoVaccinationDialogFragmentTest.java | 4 +- .../VaccinationDialogFragmentTest.java | 4 +- .../mock/VaccinationDialogFragmentMock.java | 8 +- .../RecurringServiceRecordRepositoryTest.java | 91 ++++++------ .../RecurringServiceTypeRepositoryTest.java | 137 ++++++++--------- .../repository/VaccineNameRepositoryTest.java | 19 +-- .../repository/VaccineRepositoryTest.java | 138 +++++++++--------- .../repository/VaccineTypeRepositoryTest.java | 67 ++++----- .../intent/RecurringIntentServiceTest.java | 4 +- .../intent/VaccineIntentServiceTest.java | 12 +- .../utils/IMDatabaseUtilsTest.java | 5 +- .../immunization/utils/ImageUtilsTest.java | 5 +- .../utils/RecurringServiceUtilsTest.java | 8 +- .../immunization/utils/UtilsTest.java | 6 +- .../utils/VaccinateActionUtilsTest.java | 19 ++- .../utils/VaccinatorUtilsRobolectricTest.java | 6 +- .../utils/VaccinatorUtilsTest.java | 16 +- .../utils/VaccinatorUtilsTestMock.java | 5 +- .../view/ImmunizationRowCardTest.java | 19 +-- .../view/ImmunizationRowGroupTest.java | 71 ++++----- .../immunization/view/ServiceCardTest.java | 4 +- .../immunization/view/ServiceGroupTest.java | 43 +++--- .../immunization/view/ServiceRowCardTest.java | 11 +- .../view/ServiceRowGroupTest.java | 57 ++++---- .../immunization/view/VaccineCardTest.java | 12 +- .../immunization/view/VaccineGroupTest.java | 68 ++++----- 35 files changed, 451 insertions(+), 435 deletions(-) diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/BaseUnitTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/BaseUnitTest.java index f6ac676c..a88d6375 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/BaseUnitTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/BaseUnitTest.java @@ -3,6 +3,7 @@ import androidx.annotation.NonNull; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatchers; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.modules.junit4.PowerMockRunner; @@ -49,7 +50,7 @@ public void mockImmunizationLibrary(@NonNull ImmunizationLibrary immunizationLib PowerMockito.when(ImmunizationLibrary.getInstance().getVaccines(IMConstants.VACCINE_TYPE.CHILD)).thenReturn(VaccineRepo.Vaccine.values()); PowerMockito.when(ImmunizationLibrary.getInstance().getVaccines(IMConstants.VACCINE_TYPE.WOMAN)).thenReturn(VaccineRepo.Vaccine.values()); - PowerMockito.when(ImmunizationLibrary.getInstance().vaccineRepository().findByEntityId(org.mockito.ArgumentMatchers.anyString())).thenReturn(null); + PowerMockito.when(ImmunizationLibrary.getInstance().vaccineRepository().findByEntityId(ArgumentMatchers.anyString())).thenReturn(null); PowerMockito.when(ImmunizationLibrary.getInstance().context().alertService()).thenReturn(alertService); PowerMockito.when(ImmunizationLibrary.getInstance().getProperties()).thenReturn(appProperties); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ImmunizationRowAdapterTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ImmunizationRowAdapterTest.java index 0934cd5d..9ed3cd62 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ImmunizationRowAdapterTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ImmunizationRowAdapterTest.java @@ -14,7 +14,7 @@ import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import org.smartregister.commonregistry.CommonPersonObjectClient; @@ -65,7 +65,7 @@ public class ImmunizationRowAdapterTest extends BaseUnitTest { @Before public void setUp() { org.mockito.MockitoAnnotations.initMocks(this); - view = new ImmunizationRowGroup(RuntimeEnvironment.application, false); + view = new ImmunizationRowGroup(ApplicationProvider.getApplicationContext(), false); setDataForTest(magicDate); } @@ -148,7 +148,7 @@ public void assertGetCountTestReturnsCount() throws Exception { @Test public void assertGetViewReturnsVaccineGroup() { - ImmunizationRowAdapter immunizationRowAdapter = new ImmunizationRowAdapter(RuntimeEnvironment.application, view, + ImmunizationRowAdapter immunizationRowAdapter = new ImmunizationRowAdapter(ApplicationProvider.getApplicationContext(), view, true, vaccinelist, alertlist); Assert.assertNotNull(immunizationRowAdapter.getView(0, null, null)); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ServiceCardAdapterTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ServiceCardAdapterTest.java index 12929591..6058a214 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ServiceCardAdapterTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ServiceCardAdapterTest.java @@ -4,14 +4,14 @@ import android.view.View; import android.view.ViewGroup; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; import org.powermock.reflect.Whitebox; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.annotation.Config; import org.smartregister.commonregistry.CommonPersonObjectClient; import org.smartregister.domain.Alert; @@ -71,9 +71,9 @@ public static List getServiceTypeKeys(HashMap> @Before public void setUp() { - view = new ServiceGroup(RuntimeEnvironment.application); + view = new ServiceGroup(ApplicationProvider.getApplicationContext()); setDataForTest(magicDate); - serviceCardAdapter = new ServiceCardAdapter(RuntimeEnvironment.application, view, serviceTypeList, serviceRecordList, + serviceCardAdapter = new ServiceCardAdapter(ApplicationProvider.getApplicationContext(), view, serviceTypeList, serviceRecordList, alertList); org.mockito.MockitoAnnotations.initMocks(this); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ServiceRowAdapterTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ServiceRowAdapterTest.java index 5c42acc1..56fcda96 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ServiceRowAdapterTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/ServiceRowAdapterTest.java @@ -4,12 +4,12 @@ import android.view.View; import android.view.ViewGroup; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.annotation.Config; import org.smartregister.commonregistry.CommonPersonObjectClient; import org.smartregister.domain.Alert; @@ -56,9 +56,9 @@ public class ServiceRowAdapterTest extends BaseUnitTest { @Before public void setUp() throws Exception { - view = new ServiceRowGroup(RuntimeEnvironment.application, true); + view = new ServiceRowGroup(ApplicationProvider.getApplicationContext(), true); setDataForTest(magicDate); - serviceRowAdapter = new ServiceRowAdapter(RuntimeEnvironment.application, view, true, serviceTypeList, + serviceRowAdapter = new ServiceRowAdapter(ApplicationProvider.getApplicationContext(), view, true, serviceTypeList, serviceRecordList, alertList); org.mockito.MockitoAnnotations.initMocks(this); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/VaccineCardAdapterTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/VaccineCardAdapterTest.java index 4b3e26f4..dbce8f2a 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/VaccineCardAdapterTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/adapter/VaccineCardAdapterTest.java @@ -12,7 +12,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.powermock.reflect.Whitebox; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.annotation.Config; import org.smartregister.commonregistry.CommonPersonObjectClient; import org.smartregister.domain.Alert; @@ -70,9 +70,9 @@ public class VaccineCardAdapterTest extends BaseUnitTest { @Before public void setUp() { - view = new VaccineGroup(RuntimeEnvironment.application); + view = new VaccineGroup(ApplicationProvider.getApplicationContext()); setDataForTest(magicDate); - vaccineCardAdapter = new VaccineCardAdapter(RuntimeEnvironment.application, view, "child", vaccineList, alertList); + vaccineCardAdapter = new VaccineCardAdapter(ApplicationProvider.getApplicationContext(), view, "child", vaccineList, alertList); org.mockito.MockitoAnnotations.initMocks(this); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ActivateChildStatusDialogFragmentTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ActivateChildStatusDialogFragmentTest.java index ae7d5871..fde323dc 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ActivateChildStatusDialogFragmentTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ActivateChildStatusDialogFragmentTest.java @@ -14,7 +14,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.smartregister.immunization.BaseUnitTest; import org.smartregister.immunization.R; @@ -65,7 +65,7 @@ public void testSetFilterTouchesWhenObscuredSetsFlagToTrue() { Mockito.doReturn(activity).when(activateChildStatusDialogFragment).getActivity(); - Mockito.doReturn(RuntimeEnvironment.application.getResources().getString(R.string.activate_child_status_dialog_title)).when(activity).getString(R.string.activate_child_status_dialog_title); + Mockito.doReturn(ApplicationProvider.getApplicationContext().getResources().getString(R.string.activate_child_status_dialog_title)).when(activity).getString(R.string.activate_child_status_dialog_title); Mockito.doReturn(layoutInflater).when(activity).getLayoutInflater(); Mockito.doReturn(view).when(layoutInflater).inflate(R.layout.dialog_fragment_activate_child_status, viewGroup, false); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ServiceDialogFragmentTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ServiceDialogFragmentTest.java index 4ef9faad..d0ae4881 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ServiceDialogFragmentTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ServiceDialogFragmentTest.java @@ -13,7 +13,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.smartregister.CoreLibrary; @@ -98,7 +98,7 @@ public void assertThatCallToNewInstanceCreatesAFragment() { @Test public void assertOnCreateViewTestSetsUpTheActivity() { destroyController(); - Intent intent = new Intent(RuntimeEnvironment.application, ServiceDialogFragmentTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), ServiceDialogFragmentTestActivity.class); controller = Robolectric.buildActivity(ServiceDialogFragmentTestActivity.class, intent); activity = controller.get(); controller.setup(); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ServiceEditDialogFragmentTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ServiceEditDialogFragmentTest.java index 93d81421..b3963b17 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ServiceEditDialogFragmentTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/ServiceEditDialogFragmentTest.java @@ -15,7 +15,7 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.smartregister.CoreLibrary; @@ -106,7 +106,7 @@ public void assertThatCallToNewInstanceCreatesAFragment() { @Test public void assertOnCreateViewTestSetsUpTheActivity() throws Exception { destroyController(); - Intent intent = new Intent(RuntimeEnvironment.application, FragmentUtilActivityUsingServiceActionListener.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), FragmentUtilActivityUsingServiceActionListener.class); controller = Robolectric.buildActivity(FragmentUtilActivityUsingServiceActionListener.class, intent); activity = controller.get(); controller.setup(); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/UndoServiceDialogFragmentTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/UndoServiceDialogFragmentTest.java index 1832535b..6b447110 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/UndoServiceDialogFragmentTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/UndoServiceDialogFragmentTest.java @@ -12,7 +12,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.smartregister.immunization.BaseUnitTest; @@ -80,7 +80,7 @@ public void assertThatCallToNewInstanceCreatesAFragment() { @Test public void assertOnCreateViewTestSetsUpTheActivity() throws Exception { destroyController(); - Intent intent = new Intent(RuntimeEnvironment.application, UndoServiceDialogFragmentTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), UndoServiceDialogFragmentTestActivity.class); controller = Robolectric.buildActivity(UndoServiceDialogFragmentTestActivity.class, intent); activity = controller.get(); controller.setup(); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/UndoVaccinationDialogFragmentTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/UndoVaccinationDialogFragmentTest.java index 1b084eda..0c6a0b49 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/UndoVaccinationDialogFragmentTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/UndoVaccinationDialogFragmentTest.java @@ -13,7 +13,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.smartregister.CoreLibrary; import org.smartregister.immunization.BaseUnitTest; @@ -87,7 +87,7 @@ private void destroyController() { @Test public void assertOnCreateViewTestSetsUpTheActivity() { destroyController(); - Intent intent = new Intent(RuntimeEnvironment.application, UndoVaccinationDialogFragmentTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), UndoVaccinationDialogFragmentTestActivity.class); controller = Robolectric.buildActivity(UndoVaccinationDialogFragmentTestActivity.class, intent); activity = controller.get(); controller.setup(); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/VaccinationDialogFragmentTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/VaccinationDialogFragmentTest.java index 7740d66a..69408600 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/VaccinationDialogFragmentTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/VaccinationDialogFragmentTest.java @@ -11,7 +11,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -101,7 +101,7 @@ private void destroyController() { @Test public void assertOnCreateViewTestSetsUpTheActivity() { destroyController(); - Intent intent = new Intent(RuntimeEnvironment.application, VaccinationDialogFragmentTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), VaccinationDialogFragmentTestActivity.class); controller = Robolectric.buildActivity(VaccinationDialogFragmentTestActivity.class, intent); activity = controller.get(); controller.setup(); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/mock/VaccinationDialogFragmentMock.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/mock/VaccinationDialogFragmentMock.java index 1a2463ab..245f5396 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/mock/VaccinationDialogFragmentMock.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/fragment/mock/VaccinationDialogFragmentMock.java @@ -12,7 +12,7 @@ import com.google.gson.reflect.TypeToken; import org.mockito.Mockito; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.smartregister.immunization.R; import org.smartregister.immunization.domain.Vaccine; import org.smartregister.immunization.domain.VaccineData; @@ -97,11 +97,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa .spy((LinearLayout) dialogView.findViewById(R.id.vaccination_name_layout)); Mockito.doReturn(vaccinationNameLayout).when(dialogView).findViewById(R.id.vaccination_name_layout); - LinearLayout vaccineName = Mockito.spy(new LinearLayout(RuntimeEnvironment.application)); + LinearLayout vaccineName = Mockito.spy(new LinearLayout(ApplicationProvider.getApplicationContext())); CheckBoxMock checkBox = Mockito.mock(CheckBoxMock.class); RadioButtonMock radioButton = Mockito - .mock(RadioButtonMock.class);//new RadioButtonMock(RuntimeEnvironment.application); - TextView textView = new TextView(RuntimeEnvironment.application); + .mock(RadioButtonMock.class);//new RadioButtonMock(ApplicationProvider.getApplicationContext()); + TextView textView = new TextView(ApplicationProvider.getApplicationContext()); Mockito.doReturn(vaccineName).when(this.inflater).inflate(R.layout.vaccination_name, null); Mockito.doReturn(radioButton).when(vaccineName).findViewById(R.id.radio); Mockito.doReturn(textView).when(vaccineName).findViewById(R.id.vaccine); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/RecurringServiceRecordRepositoryTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/RecurringServiceRecordRepositoryTest.java index 32b567ce..e794db1a 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/RecurringServiceRecordRepositoryTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/RecurringServiceRecordRepositoryTest.java @@ -2,13 +2,14 @@ import android.content.ContentValues; -import junit.framework.Assert; +import org.junit.Assert; import net.sqlcipher.MatrixCursor; import net.sqlcipher.database.SQLiteDatabase; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; @@ -70,7 +71,7 @@ public void assertInstantiatesSuccessfullyOnConstructorCall() { @Test public void verifyCreateTableCallsExecuteSQLMethod() { RecurringServiceRecordRepository.createTable(sqliteDatabase); - Mockito.verify(sqliteDatabase, Mockito.times(8)).execSQL(org.mockito.ArgumentMatchers.anyString()); + Mockito.verify(sqliteDatabase, Mockito.times(8)).execSQL(ArgumentMatchers.anyString()); } @Test @@ -78,8 +79,8 @@ public void verifyAddCallsDatabaseDatabaseMethod1TimesInCaseOfNonNullVaccineNull Mockito.when(recurringServiceRecordRepository.getWritableDatabase()).thenReturn(sqliteDatabase); recurringServiceRecordRepository.add(new ServiceRecord()); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .insert(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); } @Test @@ -89,19 +90,19 @@ public void verifyAddCallsDatabaseDatabaseMethod1TimesInCaseOfNonNullVaccineNotN serviceRecord.setId(0l); recurringServiceRecordRepository.add(serviceRecord); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test public void verifyAddCallsDatabaseDatabaseMethod0TimesInCaseOfNullVaccine() { recurringServiceRecordRepository.add(null); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .insert(org.mockito.ArgumentMatchers.anyString(), (String) org.mockito.ArgumentMatchers.isNull(), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), (String) ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test @@ -114,12 +115,12 @@ public void verifyFindbyEntityIDcallsDatabaseQueryMethod1Times() { cursor.addRow(new Object[]{1l, "", "", 1l, "", magicNumber, "", "", "", "", "", 1l, "", ""}); Mockito.when(sqliteDatabase - .rawQuery(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class))) + .rawQuery(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class))) .thenReturn(cursor); Mockito.when(recurringServiceRecordRepositoryspy.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceRecordRepositoryspy.findByEntityId("entityID"); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .rawQuery(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .rawQuery(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test @@ -138,26 +139,26 @@ public void verifyFindbyUniqueIDcallsDatabaseQueryMethod1Times() { RecurringServiceRecordRepository.UPDATED_AT_COLUMN, RecurringServiceTypeRepository.TYPE, RecurringServiceTypeRepository.NAME, RecurringServiceRecordRepository.TEAM, RecurringServiceRecordRepository.TEAM_ID, RecurringServiceRecordRepository.CHILD_LOCATION_ID}; MatrixCursor cursor = new MatrixCursor(columns); - cursor.addRow(new Object[]{"2020-01-01",1l, "", "", 1l, "", magicNumber, "", "", "", "", "", 1l, magicType, magicNAME,"","",""}); + cursor.addRow(new Object[]{"2020-01-01", 1l, "", "", 1l, "", magicNumber, "", "", "", "", "", 1l, magicType, magicNAME, "", "", ""}); ServiceRecord serviceRecord = new ServiceRecord(); serviceRecord.setFormSubmissionId(FORMSUBMISSIONID); serviceRecord.setEventId(EVENTID); recurringServiceRecordRepository.findUnique(null, serviceRecord); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class))) + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.anyString(), ArgumentMatchers.isNull())) .thenReturn(cursor); Mockito.when(recurringServiceRecordRepository.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceRecordRepository.findUnique(sqliteDatabase, serviceRecord); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.anyString(), ArgumentMatchers.isNull()); recurringServiceRecordRepository.findUnique(sqliteDatabase, null); } @@ -169,19 +170,19 @@ public void assertAndVerifyFindbyCaseIDcallsDatabaseQueryMethod1Times() { cursor.addRow(new Object[]{1l, "", "", 1l, "", magicNumber, "", "", "", "", "", 1l, magicType, magicNAME}); Assert.assertNull(recurringServiceRecordRepository.find(0l)); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(recurringServiceRecordRepository.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceRecordRepository.find(0l); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); } @Test @@ -194,8 +195,8 @@ public void verifyUpdateCallsDatabaseUpdateMethod1Times() { recurringServiceRecordRepository.update(null, serviceRecord); recurringServiceRecordRepository.update(sqliteDatabase, serviceRecord); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test @@ -212,8 +213,8 @@ public void verifyDeletecallsDatabaseDeleteMethod1Times() { Mockito.when(recurringServiceRecordRepositoryspy.getWritableDatabase()).thenReturn(sqliteDatabase); recurringServiceRecordRepositoryspy.deleteServiceRecord(0l); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .delete(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.anyString(), - org.mockito.ArgumentMatchers.any(String[].class)); + .delete(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), + ArgumentMatchers.any(String[].class)); } @Test @@ -221,9 +222,9 @@ public void verifycloseMethodCallsInternalMethodsWithCorrectParams() { Mockito.when(recurringServiceRecordRepository.getWritableDatabase()).thenReturn(sqliteDatabase); recurringServiceRecordRepository.close(5l); Mockito.verify(recurringServiceRecordRepository.getWritableDatabase(), Mockito.times(1)) - .update(org.mockito.ArgumentMatchers.eq(RecurringServiceRecordRepository.TABLE_NAME), - (ContentValues) org.mockito.ArgumentMatchers.any(), org.mockito.ArgumentMatchers.anyString(), - org.mockito.ArgumentMatchers.eq(new String[]{"5"})); + .update(ArgumentMatchers.eq(RecurringServiceRecordRepository.TABLE_NAME), + (ContentValues) ArgumentMatchers.any(), ArgumentMatchers.anyString(), + ArgumentMatchers.eq(new String[]{"5"})); } @Test @@ -231,8 +232,8 @@ public void verifyCloseMethodFailsSilentlyWithNullParams() { Mockito.when(recurringServiceRecordRepository.getWritableDatabase()).thenReturn(sqliteDatabase); recurringServiceRecordRepository.close(null); Mockito.verify(recurringServiceRecordRepository.getWritableDatabase(), Mockito.times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), (ContentValues) org.mockito.ArgumentMatchers.any(), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.eq(new String[]{"5"})); + .update(ArgumentMatchers.anyString(), (ContentValues) ArgumentMatchers.any(), + ArgumentMatchers.anyString(), ArgumentMatchers.eq(new String[]{"5"})); } @Test @@ -249,11 +250,11 @@ public void assertFindUnSyncedBeforeTimeTest() { cursor.addRow(new Object[]{1l, "", "", 1l, "", magicNumber, "", "", "", "", "", 1l, magicType, magicNAME}); Mockito.when(recurringServiceRecordRepository.getReadableDatabase()).thenReturn(sqliteDatabase); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Assert.assertNotNull(recurringServiceRecordRepository.findUnSyncedBeforeTime(magicNumber10)); } } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/RecurringServiceTypeRepositoryTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/RecurringServiceTypeRepositoryTest.java index 977ef96f..f3fa9af0 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/RecurringServiceTypeRepositoryTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/RecurringServiceTypeRepositoryTest.java @@ -1,14 +1,17 @@ package org.smartregister.immunization.repository; +import static org.mockito.Mockito.times; + import android.content.ContentValues; -import junit.framework.Assert; +import org.junit.Assert; import net.sqlcipher.MatrixCursor; import net.sqlcipher.database.SQLiteDatabase; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; @@ -18,8 +21,6 @@ import org.smartregister.repository.Repository; import org.smartregister.view.activity.DrishtiApplication; -import static org.mockito.Mockito.times; - /** * Created by onaio on 29/08/2017. */ @@ -57,7 +58,7 @@ public void assertInstantiatesSuccessfullyOnConstructorCall() { @Test public void verifyCreateTableCallsExecuteSQLMethod() { RecurringServiceTypeRepository.createTable(sqliteDatabase); - Mockito.verify(sqliteDatabase, times(4)).execSQL(org.mockito.ArgumentMatchers.anyString()); + Mockito.verify(sqliteDatabase, times(4)).execSQL(ArgumentMatchers.anyString()); } @Test @@ -66,8 +67,8 @@ public void verifyAddCallsDatabaseDatabaseMethod1TimesInCaseOfNonNullVaccineNull ServiceType serviceType = Mockito.spy(new ServiceType()); recurringServiceTypeRepository.add(serviceType, sqliteDatabase); Mockito.verify(sqliteDatabase, times(1)) - .insert(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); } @Test @@ -76,19 +77,19 @@ public void assertAndVerifySearchByNamecallsDatabaseQueryMethod1Times() { MatrixCursor cursor = new MatrixCursor(columns); cursor.addRow(new Object[]{1l, "", "", "", "", "", "", "", "", "", "", "", "", 1l}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(recurringServiceTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceTypeRepository.searchByName("Name"); Mockito.verify(sqliteDatabase, times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); Assert.assertNotNull(recurringServiceTypeRepository.searchByName("")); } @@ -98,20 +99,20 @@ public void assertAndVerifyGetByNameCallsDatabaseQueryMethod1Times() { MatrixCursor cursor = new MatrixCursor(columns); cursor.addRow(new Object[]{1l, "", "Name", "", "", "", "", "", "", "", "", "", "", 1l}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(recurringServiceTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceTypeRepository.getByName("Vitamin A1"); Mockito.verify(sqliteDatabase, times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); } @Test @@ -120,19 +121,19 @@ public void assertAndVerifySearchByTypecallsDatabaseQueryMethod1Times() { MatrixCursor cursor = new MatrixCursor(columns); cursor.addRow(new Object[]{1l, "", "", "", "", "", "", "", "", "", "", "", "", 1l}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(recurringServiceTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceTypeRepository.findByType("Type"); Mockito.verify(sqliteDatabase, times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); Assert.assertNotNull(recurringServiceTypeRepository.findByType("")); } @@ -143,40 +144,40 @@ public void verifyFindcallsDatabaseQueryMethod1Times() { cursor.addRow(new Object[]{1l, "", "", "", "", "", "", "", "", "", "", "", "", 1l}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(recurringServiceTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceTypeRepository.find(1l, sqliteDatabase); Mockito.verify(sqliteDatabase, times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); } @Test public void assertAndVerifyAddCallsDatabaseDatabaseMethod0TimesInCaseOfNullVaccine() { recurringServiceTypeRepository.add(null, sqliteDatabase); Mockito.verify(sqliteDatabase, times(0)) - .insert(org.mockito.ArgumentMatchers.anyString(), (String) org.mockito.ArgumentMatchers.isNull(), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), (String) ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); Mockito.verify(sqliteDatabase, times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); ServiceType serviceType = new ServiceType(); serviceType.setId(1l); RecurringServiceTypeRepository spy = Mockito.spy(recurringServiceTypeRepository); Mockito.doReturn(serviceType).when(spy) - .find(org.mockito.ArgumentMatchers.anyLong(), org.mockito.ArgumentMatchers.any(SQLiteDatabase.class)); + .find(ArgumentMatchers.anyLong(), ArgumentMatchers.any(SQLiteDatabase.class)); spy.add(serviceType); Mockito.verify(sqliteDatabase, times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); Assert.assertNull(recurringServiceTypeRepository.find(0l)); } @@ -189,19 +190,19 @@ public void verifyFetchAllTypecallsDatabaseQueryMethod1Times() { cursor.addRow(new Object[]{1l, "", "a_b", "", "", "", "", "", "", "", "", "", "", 1l}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.anyString())).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.anyString())).thenReturn(cursor); Mockito.when(recurringServiceTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceTypeRepository.fetchAll(); Mockito.verify(sqliteDatabase, times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.anyString()); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.anyString()); } @Test @@ -211,12 +212,12 @@ public void verifyFetchTypescallsDatabaseQueryMethod1Times() { cursor.addRow(new Object[]{1l, "", "", "", "", "", "", "", "", "", "", "", "", 1l}); Mockito.when(sqliteDatabase - .rawQuery(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String[].class))) + .rawQuery(ArgumentMatchers.anyString(), ArgumentMatchers.isNull())) .thenReturn(cursor); Mockito.when(recurringServiceTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); recurringServiceTypeRepository.fetchTypes(); Mockito.verify(sqliteDatabase, times(1)) - .rawQuery(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String[].class)); + .rawQuery(ArgumentMatchers.anyString(), ArgumentMatchers.isNull()); } @Test @@ -227,8 +228,8 @@ public void verifyDeletecallsDatabaseDeleteMethod1Times() { Mockito.when(recurringServiceTypeRepositoryspy.getWritableDatabase()).thenReturn(sqliteDatabase); recurringServiceTypeRepositoryspy.deleteServiceType(0l); Mockito.verify(sqliteDatabase, times(1)) - .delete(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.anyString(), - org.mockito.ArgumentMatchers.any(String[].class)); + .delete(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), + ArgumentMatchers.any(String[].class)); } @Test @@ -255,7 +256,7 @@ public void verifyFetchTypesOverrideCallTheSameMethod() throws Exception { cursor.addRow(new Object[]{1l, "", "", "", "", "", "", "", "", "", "", "", "", 1l}); Mockito.when(sqliteDatabase - .rawQuery(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String[].class))) + .rawQuery(ArgumentMatchers.anyString(), ArgumentMatchers.isNull())) .thenReturn(cursor); recurringServiceTypeRepositoryspy.fetchTypes(); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineNameRepositoryTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineNameRepositoryTest.java index 892ad092..352a383a 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineNameRepositoryTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineNameRepositoryTest.java @@ -6,6 +6,7 @@ import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; @@ -60,7 +61,7 @@ public void assertInstantiatesSuccessfullyOnConstructorCall() { @Test public void verifyCreateTableCallsExecuteSQLMethod() { VaccineNameRepository.createTable(sqliteDatabase); - Mockito.verify(sqliteDatabase, Mockito.times(1)).execSQL(org.mockito.ArgumentMatchers.anyString()); + Mockito.verify(sqliteDatabase, Mockito.times(1)).execSQL(ArgumentMatchers.anyString()); } @Test @@ -69,8 +70,8 @@ public void verifyAddCallsDatabaseDatabaseMethod1TimesInCaseOfNonNullVaccineNull VaccineName vaccineName = new VaccineName(0l, "", "", "", "", "", ""); vaccineNameRepository.add(vaccineName); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .insert(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); } @Test @@ -79,19 +80,19 @@ public void verifyAddCallsDatabaseDatabaseMethod1TimesInCaseOfNonNullVaccineNotN VaccineName vaccineName = new VaccineName(1l, "", "", "", "", "", ""); vaccineNameRepository.add(vaccineName); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test public void verifyAddCallsDatabaseDatabaseMethod0TimesInCaseOfNullVaccine() { vaccineNameRepository.add(null); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .insert(org.mockito.ArgumentMatchers.anyString(), (String) org.mockito.ArgumentMatchers.isNull(), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), (String) ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineRepositoryTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineRepositoryTest.java index 82b2efe6..53046cbd 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineRepositoryTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineRepositoryTest.java @@ -95,11 +95,11 @@ public void assertFindUnSyncedBeforeTimeTest() { org.junit.Assert.assertNotNull(vaccineRepository.findUnSyncedBeforeTime(magic10)); Mockito.when(vaccineRepository.getReadableDatabase()).thenReturn(sqliteDatabase); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); org.junit.Assert.assertNotNull(vaccineRepository.findUnSyncedBeforeTime(magic10)); } @@ -122,7 +122,7 @@ public void verifyUpdateHia2StatusTest() { @Test public void verifyCreateTableTest() { VaccineRepository.createTable(sqliteDatabase); - Mockito.verify(sqliteDatabase, Mockito.times(3)).execSQL(org.mockito.ArgumentMatchers.anyString()); + Mockito.verify(sqliteDatabase, Mockito.times(3)).execSQL(ArgumentMatchers.anyString()); } @Test @@ -135,26 +135,26 @@ public void verifyaddTestShouldCallInsertAndUpdate1Time() { //null vaccine vaccineRepository.add(null); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .insert(org.mockito.ArgumentMatchers.anyString(), (String) org.mockito.ArgumentMatchers.isNull(), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), (String) ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); //notnull vaccine Mockito.when(vaccineRepository.getWritableDatabase()).thenReturn(sqliteDatabase); Vaccine vaccine = new Vaccine(); vaccine.setId(0l); vaccineRepository.add(vaccine); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); //null id vaccineRepository.add(new Vaccine()); Mockito.when(vaccineRepository.getWritableDatabase()).thenReturn(sqliteDatabase); vaccineRepository.add(new Vaccine()); Mockito.verify(sqliteDatabase, Mockito.times(2)) - .insert(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); Vaccine newVaccine = new Vaccine(0l, VaccineTest.BASEENTITYID, VaccineTest.PROGRAMCLIENTID, VaccineTest.NAME, 0, new Date(), VaccineTest.ANMID, VaccineTest.LOCATIONID, VaccineTest.SYNCSTATUS, VaccineTest.HIA2STATUS, 0l, @@ -162,12 +162,12 @@ public void verifyaddTestShouldCallInsertAndUpdate1Time() { VaccineRepository vaccineRepositoryspy = Mockito.spy(vaccineRepository); Vaccine vaccineToReturn = Mockito.mock(Vaccine.class); - Mockito.when(vaccineRepositoryspy.findUnique(org.mockito.ArgumentMatchers.any(SQLiteDatabase.class), - org.mockito.ArgumentMatchers.any(Vaccine.class))).thenReturn(vaccineToReturn); + Mockito.when(vaccineRepositoryspy.findUnique(ArgumentMatchers.any(SQLiteDatabase.class), + ArgumentMatchers.any(Vaccine.class))).thenReturn(vaccineToReturn); vaccineRepositoryspy.add(newVaccine); Mockito.verify(sqliteDatabase, Mockito.times(2)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test @@ -209,15 +209,15 @@ public void verifyUpdateTestCallsDatabaseUpdate1Time() { //exception test database null vaccineRepository.update(null, vaccine); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); //vaccine null test vaccineRepository.update(sqliteDatabase, null); //vaccine and database not null vaccineRepository.update(sqliteDatabase, vaccine); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test @@ -227,19 +227,19 @@ public void verifyFindbyEntityIdTestCallsDatabaseQuery1Time() { cursor.addRow(new Object[]{1l, "", "", magicName, magic10, magicTime, "", "", "", "", 1l, "", "", 1}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(vaccineRepository.getReadableDatabase()).thenReturn(sqliteDatabase); vaccineRepository.findByEntityId(ENTITYID); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); } @Test @@ -249,19 +249,19 @@ public void verifyFindTwentyFourTestCallsDatabaseQuery1Time() { cursor.addRow(new Object[]{1l, "", "", magicName, magic10, magicTime, "", "", "", "", 1l, "", "", 1}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(vaccineRepository.getReadableDatabase()).thenReturn(sqliteDatabase); vaccineRepository.findLatestTwentyFourHoursByEntityId(ENTITYID); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); } @Test @@ -272,19 +272,19 @@ public void verifyFindTestCallsDatabaseQuery1Time() { cursor.addRow(new Object[]{1l, "", "", magicName, magic10, magicTime, "", "", "", "", 1l, "", "", 1}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(vaccineRepository.getReadableDatabase()).thenReturn(sqliteDatabase); vaccineRepository.find(1l); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); } @@ -299,20 +299,20 @@ public void findbyUniqueTest() { vaccine.setFormSubmissionId(FORMSUBMISSIONID); vaccine.setEventId(EVENTID); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class))) + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.anyString(), ArgumentMatchers.isNull())) .thenReturn(cursor); Mockito.when(vaccineRepository.getReadableDatabase()).thenReturn(sqliteDatabase); vaccineRepository.findUnique(null, vaccine); vaccineRepository.findUnique(sqliteDatabase, null); vaccineRepository.findUnique(sqliteDatabase, vaccine); Mockito.verify(sqliteDatabase, Mockito.times(2)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.anyString(), ArgumentMatchers.isNull()); } @Test @@ -327,8 +327,8 @@ public void deleteVaccineTest() { Mockito.when(vaccineRepositoryspy.getWritableDatabase()).thenReturn(sqliteDatabase); vaccineRepositoryspy.deleteVaccine(0l); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .delete(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.anyString(), - org.mockito.ArgumentMatchers.any(String[].class)); + .delete(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), + ArgumentMatchers.any(String[].class)); } @Test @@ -337,8 +337,8 @@ public void deleteVaccineByBaseEntityIdAndName() { Mockito.when(vaccineRepositoryspy.getWritableDatabase()).thenReturn(sqliteDatabase); vaccineRepositoryspy.deleteVaccine("baseEntityID", "opv_1"); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .delete(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.anyString(), - org.mockito.ArgumentMatchers.any(String[].class)); + .delete(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), + ArgumentMatchers.any(String[].class)); } @Test @@ -355,15 +355,15 @@ public void closeTest() { Mockito.when(vaccineRepository.getWritableDatabase()).thenReturn(sqliteDatabase); vaccineRepository.close(null); Mockito.verify(vaccineRepository.getWritableDatabase(), Mockito.times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), (ContentValues) org.mockito.ArgumentMatchers.any(), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.eq(new String[]{"5"})); + .update(ArgumentMatchers.anyString(), (ContentValues) ArgumentMatchers.any(), + ArgumentMatchers.anyString(), ArgumentMatchers.eq(new String[]{"5"})); Mockito.when(vaccineRepository.getWritableDatabase()).thenReturn(sqliteDatabase); vaccineRepository.close(5l); Mockito.verify(vaccineRepository.getWritableDatabase(), Mockito.times(1)) - .update(org.mockito.ArgumentMatchers.eq(VaccineRepository.VACCINE_TABLE_NAME), - (ContentValues) org.mockito.ArgumentMatchers.any(), org.mockito.ArgumentMatchers.anyString(), - org.mockito.ArgumentMatchers.eq(new String[]{"5"})); + .update(ArgumentMatchers.eq(VaccineRepository.VACCINE_TABLE_NAME), + (ContentValues) ArgumentMatchers.any(), ArgumentMatchers.anyString(), + ArgumentMatchers.eq(new String[]{"5"})); } @Test diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineTypeRepositoryTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineTypeRepositoryTest.java index f14b78ed..40ebcf42 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineTypeRepositoryTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/repository/VaccineTypeRepositoryTest.java @@ -2,7 +2,7 @@ import android.content.ContentValues; -import junit.framework.Assert; +import org.junit.Assert; import net.sqlcipher.Cursor; import net.sqlcipher.MatrixCursor; @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; @@ -65,7 +66,7 @@ public void assertGetDosesPerVialTest() { VaccineTypeRepository vaccineTypeRepository = new VaccineTypeRepository(commonFtsObject, alertService); // Mockito.when(vaccineTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); VaccineTypeRepository spy = Mockito.spy(vaccineTypeRepository); - PowerMockito.doReturn(list).when(spy).findIDByName(org.mockito.ArgumentMatchers.anyString()); + PowerMockito.doReturn(list).when(spy).findIDByName(ArgumentMatchers.anyString()); Assert.assertEquals(spy.getDosesPerVial(""), magic10); } @@ -78,7 +79,7 @@ public void assertInstantiatesSuccessfullyOnConstructorCall() { @Test public void verifyCreateTableCallsExecuteSQLMethod() { VaccineTypeRepository.createTable(sqliteDatabase); - Mockito.verify(sqliteDatabase, Mockito.times(1)).execSQL(org.mockito.ArgumentMatchers.anyString()); + Mockito.verify(sqliteDatabase, Mockito.times(1)).execSQL(ArgumentMatchers.anyString()); } @Test @@ -87,8 +88,8 @@ public void verifyAddCallsDatabaseDatabaseMethod1TimesInCaseOfNonNullVaccineNull VaccineType vaccineType = new VaccineType(null, 0, "", "", "", ""); vaccineTypeRepository.add(vaccineType, sqliteDatabase); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .insert(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); } @Test @@ -97,38 +98,38 @@ public void verifyAddCallsDatabaseDatabaseMethod1TimesInCaseOfNonNullVaccineNotN VaccineType vaccineType = new VaccineType(0l, 0, "", "", "", ""); vaccineTypeRepository.add(vaccineType, sqliteDatabase); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test public void verifyAddCallsDatabaseDatabaseMethod0TimesInCaseOfNullVaccine() { vaccineTypeRepository.add(null, sqliteDatabase); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .insert(org.mockito.ArgumentMatchers.anyString(), (String) org.mockito.ArgumentMatchers.isNull(), - org.mockito.ArgumentMatchers.any(ContentValues.class)); + .insert(ArgumentMatchers.anyString(), (String) ArgumentMatchers.isNull(), + ArgumentMatchers.any(ContentValues.class)); Mockito.verify(sqliteDatabase, Mockito.times(0)) - .update(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(ContentValues.class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class)); + .update(ArgumentMatchers.anyString(), ArgumentMatchers.any(ContentValues.class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class)); } @Test public void verifyFindbyEntityIDcallsDatabaseQueryMethod1Times() { Cursor cursor = PowerMockito.mock(Cursor.class); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(vaccineTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); vaccineTypeRepository.findIDByName("Name"); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); } @Test @@ -139,21 +140,21 @@ public void verifyFindallVaccineTypcallsDatabaseQueryMethod1Times() { cursor.addRow(new Object[]{1l, 1, "", "", "", ""}); Mockito.when(sqliteDatabase - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class))).thenReturn(cursor); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull())).thenReturn(cursor); Mockito.when(vaccineTypeRepository.getReadableDatabase()).thenReturn(sqliteDatabase); vaccineTypeRepository.getAllVaccineTypes(sqliteDatabase); Mockito.verify(sqliteDatabase, Mockito.times(1)) - .query(org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.any(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String[].class), - org.mockito.ArgumentMatchers.isNull(String.class), org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class), - org.mockito.ArgumentMatchers.isNull(String.class)); + .query(ArgumentMatchers.anyString(), ArgumentMatchers.any(String[].class), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), ArgumentMatchers.isNull(), + ArgumentMatchers.isNull(), + ArgumentMatchers.isNull()); } } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/service/intent/RecurringIntentServiceTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/service/intent/RecurringIntentServiceTest.java index bbf01c82..1a4aafa8 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/service/intent/RecurringIntentServiceTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/service/intent/RecurringIntentServiceTest.java @@ -16,7 +16,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.rule.PowerMockRule; import org.powermock.reflect.Whitebox; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.smartregister.immunization.BaseUnitTest; import org.smartregister.immunization.ImmunizationLibrary; import org.smartregister.immunization.domain.ServiceRecord; @@ -64,7 +64,7 @@ public void setUp() { @Test public void onHandleIntentTest() { - Application application = RuntimeEnvironment.application; + Application application = ApplicationProvider.getApplicationContext(); Intent intent = new Intent(application, RecurringIntentService.class); //List spyServiceRecordList = Mockito.spy(serviceRecordList); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/service/intent/VaccineIntentServiceTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/service/intent/VaccineIntentServiceTest.java index 6d32ba06..81148bb6 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/service/intent/VaccineIntentServiceTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/service/intent/VaccineIntentServiceTest.java @@ -4,11 +4,14 @@ import android.content.Context; import android.content.Intent; +import androidx.test.core.app.ApplicationProvider; + import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @@ -17,7 +20,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.rule.PowerMockRule; import org.powermock.reflect.Whitebox; -import org.robolectric.RuntimeEnvironment; import org.smartregister.immunization.BaseUnitTest; import org.smartregister.immunization.ImmunizationLibrary; import org.smartregister.immunization.domain.Vaccine; @@ -39,8 +41,6 @@ import java.util.List; import java.util.Map; -import static org.mockito.ArgumentMatchers.any; - /** * Created by onaio on 30/08/2017. */ @@ -76,7 +76,7 @@ public void assertDefaultConstructorsCreateNonNullObjectOnInstantiation() { @Test public void onHandleIntentTest() { - Application application = RuntimeEnvironment.application; + Application application = ApplicationProvider.getApplicationContext(); Intent intent = new Intent(application, VaccineIntentService.class); VaccineIntentService vaccineIntentService = Mockito.spy(new VaccineIntentService()); @@ -91,8 +91,8 @@ public void onHandleIntentTest() { PowerMockito.when(ImmunizationLibrary.getInstance().vaccineRepository()).thenReturn(vaccineRepository); Assert.assertNotNull(vaccineRepository); - PowerMockito.when(VaccinatorUtils.getSupportedVaccines(any(Context.class))).thenReturn(availableVaccines); - PowerMockito.when(VaccinatorUtils.getSpecialVaccines(any(Context.class))).thenReturn(specialJsonMappingVaccines); + PowerMockito.when(VaccinatorUtils.getSupportedVaccines(ArgumentMatchers.any(Context.class))).thenReturn(availableVaccines); + PowerMockito.when(VaccinatorUtils.getSpecialVaccines(ArgumentMatchers.any(Context.class))).thenReturn(specialJsonMappingVaccines); Assert.assertNotNull(availableVaccines); Assert.assertNotNull(specialJsonMappingVaccines); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/IMDatabaseUtilsTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/IMDatabaseUtilsTest.java index c1280ccd..fedd5817 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/IMDatabaseUtilsTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/IMDatabaseUtilsTest.java @@ -5,6 +5,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -65,8 +66,8 @@ public void accessAssetsAndFillDataBaseForVaccineTypesTest() throws Exception { PowerMockito.when(ImmunizationLibrary.getInstance()).thenReturn(immunizationLibrary); PowerMockito.when(immunizationLibrary.vaccineTypeRepository()).thenReturn(vaccineTypeRepository); PowerMockito.when(vaccineTypeRepository.getAllVaccineTypes(null)).thenReturn(new ArrayList()); - PowerMockito.when(Utils.readAssetContents(org.mockito.ArgumentMatchers.any(Context.class), - org.mockito.ArgumentMatchers.any(String.class))).thenReturn(VaccineData.vaccine_type); + PowerMockito.when(Utils.readAssetContents(ArgumentMatchers.any(Context.class), + ArgumentMatchers.any(String.class))).thenReturn(VaccineData.vaccine_type); IMDatabaseUtils.accessAssetsAndFillDataBaseForVaccineTypes(context, null); org.junit.Assert.assertNotNull(imDatabaseUtils); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/ImageUtilsTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/ImageUtilsTest.java index 4445363a..60cd7d75 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/ImageUtilsTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/ImageUtilsTest.java @@ -5,6 +5,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; @@ -101,7 +102,7 @@ public void assertProfilePhotoByClientReturnsDefaultInfantBoyPhoto() { PowerMockito.when(ImmunizationLibrary.getInstance()).thenReturn(immunizationLibrary); PowerMockito.when(ImmunizationLibrary.getInstance().context()).thenReturn(context); PowerMockito.when(ImmunizationLibrary.getInstance().context().imageRepository()).thenReturn(imageRepository); - PowerMockito.when(ImmunizationLibrary.getInstance().context().imageRepository().findByEntityId(org.mockito.ArgumentMatchers.anyString())).thenReturn(null); + PowerMockito.when(ImmunizationLibrary.getInstance().context().imageRepository().findByEntityId(ArgumentMatchers.anyString())).thenReturn(null); Mockito.doReturn("test-base-entity-id").when(commonPersonObjectClient).entityId(); Photo photo = ImageUtils.profilePhotoByClient(commonPersonObjectClient); org.junit.Assert.assertNotNull(photo); @@ -135,7 +136,7 @@ public void assertProfilePhotoByClientReturnsGirlPhotoForFemaleGender() { PowerMockito.when(ImmunizationLibrary.getInstance()).thenReturn(immunizationLibrary); PowerMockito.when(ImmunizationLibrary.getInstance().context()).thenReturn(context); PowerMockito.when(ImmunizationLibrary.getInstance().context().imageRepository()).thenReturn(imageRepository); - PowerMockito.when(ImmunizationLibrary.getInstance().context().imageRepository().findByEntityId(org.mockito.ArgumentMatchers.anyString())).thenReturn(null); + PowerMockito.when(ImmunizationLibrary.getInstance().context().imageRepository().findByEntityId(ArgumentMatchers.anyString())).thenReturn(null); Map childDetails = ImmutableMap.of(IMConstants.KEY.GENDER, "female"); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/RecurringServiceUtilsTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/RecurringServiceUtilsTest.java index d3fdf524..6686466e 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/RecurringServiceUtilsTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/RecurringServiceUtilsTest.java @@ -11,7 +11,7 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.rule.PowerMockRule; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.smartregister.immunization.BaseUnitTest; import org.smartregister.immunization.ImmunizationLibrary; import org.smartregister.immunization.R; @@ -50,17 +50,17 @@ public void setUp() { public void testGetLastOpenedServiceViewReturnsCorrectView() { List serviceGroups = new ArrayList<>(); - ServiceGroup serviceGroup = new ServiceGroup(RuntimeEnvironment.application); + ServiceGroup serviceGroup = new ServiceGroup(ApplicationProvider.getApplicationContext()); serviceGroup.setModalOpen(false); serviceGroup.setTag(R.id.key, "SG Alpha"); serviceGroups.add(serviceGroup); - serviceGroup = new ServiceGroup(RuntimeEnvironment.application); + serviceGroup = new ServiceGroup(ApplicationProvider.getApplicationContext()); serviceGroup.setModalOpen(true); serviceGroup.setTag(R.id.key, SG_BETA); serviceGroups.add(serviceGroup); - serviceGroup = new ServiceGroup(RuntimeEnvironment.application); + serviceGroup = new ServiceGroup(ApplicationProvider.getApplicationContext()); serviceGroup.setModalOpen(false); serviceGroup.setTag(R.id.key, "SG Gamma"); serviceGroups.add(serviceGroup); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/UtilsTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/UtilsTest.java index ce2e1bfa..f0462b1a 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/UtilsTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/UtilsTest.java @@ -12,7 +12,7 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.rule.PowerMockRule; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.smartregister.Context; import org.smartregister.immunization.BaseUnitTest; import org.smartregister.immunization.ImmunizationLibrary; @@ -149,12 +149,12 @@ public void testProcessVaccineCacheFunctionsCorrectly() { PowerMockito.when(VaccinatorUtils.getSpecialVaccines(androidContext)).thenReturn(specialVaccines); PowerMockito.spy(VaccinatorUtils.class); - PowerMockito.when(VaccinatorUtils.getSupportedVaccinesByCategory(RuntimeEnvironment.application, "child")).thenReturn(vaccines); + PowerMockito.when(VaccinatorUtils.getSupportedVaccinesByCategory(ApplicationProvider.getApplicationContext(), "child")).thenReturn(vaccines); Map vaccineCacheMap = new HashMap<>(); PowerMockito.when( ImmunizationLibrary.getVaccineCacheMap()).thenReturn(vaccineCacheMap); - Utils.processVaccineCache(RuntimeEnvironment.application, "child"); + Utils.processVaccineCache(ApplicationProvider.getApplicationContext(), "child"); VaccineCache childVaccineCache = vaccineCacheMap.get("child"); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinateActionUtilsTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinateActionUtilsTest.java index dc9e2f2b..09867a3a 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinateActionUtilsTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinateActionUtilsTest.java @@ -3,6 +3,8 @@ import android.widget.TableLayout; import android.widget.TableRow; +import androidx.test.core.app.ApplicationProvider; + import com.google.gson.reflect.TypeToken; import org.joda.time.DateTime; @@ -11,13 +13,14 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.rule.PowerMockRule; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.smartregister.Context; import org.smartregister.domain.Alert; import org.smartregister.domain.AlertStatus; @@ -97,10 +100,10 @@ public void assertFormDataTestWithTestData() throws Exception { android.content.Context context = Mockito.mock(android.content.Context.class); PowerMockito.mockStatic(FormUtils.class); Assert.assertNull(VaccinateActionUtils.formData(context, "", "", "")); - PowerMockito.when(FormUtils.getInstance(org.mockito.ArgumentMatchers.any(android.content.Context.class))) + PowerMockito.when(FormUtils.getInstance(ArgumentMatchers.any(android.content.Context.class))) .thenReturn(formUtils); - PowerMockito.when(formUtils.generateXMLInputForFormWithEntityId(org.mockito.ArgumentMatchers.anyString(), - org.mockito.ArgumentMatchers.anyString(), org.mockito.ArgumentMatchers.anyString())).thenReturn(magicData); + PowerMockito.when(formUtils.generateXMLInputForFormWithEntityId(ArgumentMatchers.anyString(), + ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(magicData); Assert.assertEquals(VaccinateActionUtils.formData(context, "", "", ""), magicData); } @@ -144,8 +147,8 @@ public void assertFindRowTestReturnsTableRow() { String tag = "TAG"; String wrong_tag = "WRONG TAG"; Set tables = new HashSet<>(); - TableLayout tableLayout = new TableLayout(RuntimeEnvironment.application); - TableRow row = new TableRow(RuntimeEnvironment.application); + TableLayout tableLayout = new TableLayout(ApplicationProvider.getApplicationContext()); + TableRow row = new TableRow(ApplicationProvider.getApplicationContext()); row.setTag(tag); tableLayout.addView(row); tables.add(tableLayout); @@ -239,12 +242,12 @@ public void assertAddBcg2SpecialVaccineTestReturnsSpecialVaccinesOnHasVaccineAnd .fromJson(VaccineData.special_vacines, listType); PowerMockito - .when(VaccinatorUtils.getSpecialVaccines(org.mockito.ArgumentMatchers.any(android.content.Context.class))) + .when(VaccinatorUtils.getSpecialVaccines(ArgumentMatchers.any(android.content.Context.class))) .thenReturn(specialVaccines); VaccinateActionUtils.addBcg2SpecialVaccine(Mockito.mock(android.content.Context.class), vaccines.get(0), list); PowerMockito - .when(VaccinatorUtils.getSpecialVaccines(org.mockito.ArgumentMatchers.any(android.content.Context.class))) + .when(VaccinatorUtils.getSpecialVaccines(ArgumentMatchers.any(android.content.Context.class))) .thenReturn(null); VaccinateActionUtils.addBcg2SpecialVaccine(Mockito.mock(android.content.Context.class), vaccines.get(0), list); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsRobolectricTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsRobolectricTest.java index f1dcfd9b..1088434d 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsRobolectricTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsRobolectricTest.java @@ -10,7 +10,7 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import org.smartregister.immunization.ImmunizationLibrary; @@ -44,7 +44,7 @@ public void getVaccineFromVaccineConfigFileShouldReturnSpecialVaccinesAndAddThem Mockito.doReturn(jsonMap).when(immunizationLibrary).getVaccinesConfigJsonMap(); // Mock calls to AssetHandler.readFileFromAssetsFolder(String filename, Context context) - List specialVaccines = VaccinatorUtils.getVaccineFromVaccineConfigFile(RuntimeEnvironment.application, "special_vaccines.json"); + List specialVaccines = VaccinatorUtils.getVaccineFromVaccineConfigFile(ApplicationProvider.getApplicationContext(), "special_vaccines.json"); Assert.assertEquals(1, specialVaccines.size()); @@ -60,7 +60,7 @@ public void testThatSpecialVaccinesFileIsAvailableAndCanBeRead() { }.getType(); Map jsonMap = new HashMap<>(); - List specialVaccinesList = AssetHandler.assetJsonToJava(jsonMap, RuntimeEnvironment.application, "special_vaccines.json", classType, listType); + List specialVaccinesList = AssetHandler.assetJsonToJava(jsonMap, ApplicationProvider.getApplicationContext(), "special_vaccines.json", classType, listType); Assert.assertEquals(1, specialVaccinesList.size()); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTest.java index 5f44c6d3..5e05a284 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTest.java @@ -63,8 +63,6 @@ import java.util.Locale; import java.util.Map; -import static org.mockito.ArgumentMatchers.eq; - /** * Created by onaio on 29/08/2017. */ @@ -107,7 +105,7 @@ public void verifygetwastedcallssqlmethodonce() { VaccinatorUtils.getWasted("", "", ""); VaccinatorUtils.getWasted("", "", "", ""); Mockito.verify(commonRepository, Mockito.times(1)) - .rawQuery(org.mockito.ArgumentMatchers.anyString(), eq(new String[]{})); + .rawQuery(ArgumentMatchers.anyString(), ArgumentMatchers.eq(new String[]{})); } @Test @@ -116,11 +114,11 @@ public void verifyGetUsedcallssqlmethodonce() { PowerMockito.when(ImmunizationLibrary.getInstance()).thenReturn(immunizationLibrary); PowerMockito.when(ImmunizationLibrary.getInstance().context()).thenReturn(context); PowerMockito - .when(ImmunizationLibrary.getInstance().context().commonrepository(org.mockito.ArgumentMatchers.anyString())) + .when(ImmunizationLibrary.getInstance().context().commonrepository(ArgumentMatchers.anyString())) .thenReturn(commonRepository); VaccinatorUtils.getUsed("", "", "", "", ""); Mockito.verify(commonRepository, Mockito.times(1)) - .rawQuery(org.mockito.ArgumentMatchers.anyString(), eq(new String[]{})); + .rawQuery(ArgumentMatchers.anyString(), ArgumentMatchers.eq(new String[]{})); } @Test @@ -131,13 +129,13 @@ public void assertVaccinatorUtilsTest() { PowerMockito.when(ImmunizationLibrary.getInstance()).thenReturn(immunizationLibrary); PowerMockito.when(ImmunizationLibrary.getInstance().context()).thenReturn(context); PowerMockito - .when(ImmunizationLibrary.getInstance().context().commonrepository(org.mockito.ArgumentMatchers.anyString())) + .when(ImmunizationLibrary.getInstance().context().commonrepository(ArgumentMatchers.anyString())) .thenReturn(commonRepository); android.content.Context ctx = Mockito.mock(android.content.Context.class); Resources resources = Mockito.mock(Resources.class); PowerMockito.when(ctx.getResources()).thenReturn(resources); - PowerMockito.when(resources.getColor(org.mockito.ArgumentMatchers.anyInt())).thenReturn(magicColor); + PowerMockito.when(resources.getColor(ArgumentMatchers.anyInt())).thenReturn(magicColor); //get file name with prefix Assert.assertEquals(VaccinatorUtils.getFileName("vaccines.json", "tz"), "tz_vaccines.json"); @@ -243,8 +241,8 @@ public void assertGetVaccineCalculationTestReturnsCalculation() throws Exception JsonFormUtils.gson.toJson(VaccinatorUtils.getSpecialVaccines(context), listType2), JSONCompareMode.NON_EXTENSIBLE); //readrecurringservices - PowerMockito.when(Utils.readAssetContents(org.mockito.ArgumentMatchers.any(android.content.Context.class), - org.mockito.ArgumentMatchers.anyString())).thenReturn(ServiceData.recurringservice); + PowerMockito.when(Utils.readAssetContents(ArgumentMatchers.any(android.content.Context.class), + ArgumentMatchers.anyString())).thenReturn(ServiceData.recurringservice); Assert.assertEquals(VaccinatorUtils.getSupportedRecurringServices(context), ServiceData.recurringservice); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTestMock.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTestMock.java index 13ab3c68..f097bb1d 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTestMock.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/utils/VaccinatorUtilsTestMock.java @@ -3,13 +3,14 @@ import android.content.Intent; import android.util.Log; +import androidx.test.core.app.ApplicationProvider; + import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; import org.smartregister.immunization.BaseUnitTest; @@ -25,7 +26,7 @@ public class VaccinatorUtilsTestMock extends BaseUnitTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - Intent intent = new Intent(RuntimeEnvironment.application, VaccinatorUtilsTestMockActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), VaccinatorUtilsTestMockActivity.class); controller = Robolectric.buildActivity(VaccinatorUtilsTestMockActivity.class, intent); activity = controller.get(); controller.setup(); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ImmunizationRowCardTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ImmunizationRowCardTest.java index 85261191..1bf83067 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ImmunizationRowCardTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ImmunizationRowCardTest.java @@ -8,6 +8,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; @@ -15,7 +16,7 @@ import org.powermock.modules.junit4.rule.PowerMockRule; import org.powermock.reflect.Whitebox; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.annotation.Config; import org.smartregister.commonregistry.CommonFtsObject; import org.smartregister.domain.Alert; @@ -57,7 +58,7 @@ public class ImmunizationRowCardTest extends BaseUnitTest { @Before public void setUp() throws Exception { org.mockito.MockitoAnnotations.initMocks(this); - view = new ImmunizationRowCard(RuntimeEnvironment.application); + view = new ImmunizationRowCard(ApplicationProvider.getApplicationContext()); EventClientRepository eventClientRepository = Mockito.mock(EventClientRepository.class); Vaccine vaccine = new Vaccine(0l, VaccineTest.BASEENTITYID, VaccineTest.PROGRAMCLIENTID, VaccineTest.NAME, 0, @@ -75,21 +76,21 @@ public void setUp() throws Exception { Mockito.mock(CommonFtsObject.class), 0, 0); PowerMockito.when(ImmunizationLibrary.getInstance()).thenReturn(immunizationLibrary); PowerMockito.when(immunizationLibrary.vaccineRepository()).thenReturn(vaccineRepository); - PowerMockito.when(vaccineRepository.find(org.mockito.ArgumentMatchers.anyLong())).thenReturn(vaccine); + PowerMockito.when(vaccineRepository.find(ArgumentMatchers.anyLong())).thenReturn(vaccine); PowerMockito.when(immunizationLibrary.eventClientRepository()).thenReturn(eventClientRepository); PowerMockito.when(eventClientRepository - .convert(org.mockito.ArgumentMatchers.any(JSONObject.class), org.mockito.ArgumentMatchers.any(Class.class))) + .convert(ArgumentMatchers.any(JSONObject.class), ArgumentMatchers.any(Class.class))) .thenReturn(event); } @Test public void testConstructors() { - Assert.assertNotNull(new ImmunizationRowCard(RuntimeEnvironment.application)); - Assert.assertNotNull(new ImmunizationRowCard(RuntimeEnvironment.application, true)); - Assert.assertNotNull(new ImmunizationRowCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build())); - Assert.assertNotNull(new ImmunizationRowCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build(), 0)); - Assert.assertNotNull(new ImmunizationRowCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build(), 0, 0)); + Assert.assertNotNull(new ImmunizationRowCard(ApplicationProvider.getApplicationContext())); + Assert.assertNotNull(new ImmunizationRowCard(ApplicationProvider.getApplicationContext(), true)); + Assert.assertNotNull(new ImmunizationRowCard(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build())); + Assert.assertNotNull(new ImmunizationRowCard(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build(), 0)); + Assert.assertNotNull(new ImmunizationRowCard(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build(), 0, 0)); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ImmunizationRowGroupTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ImmunizationRowGroupTest.java index d78ebc9e..a775c9d0 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ImmunizationRowGroupTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ImmunizationRowGroupTest.java @@ -12,12 +12,13 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -88,7 +89,7 @@ public class ImmunizationRowGroupTest extends BaseUnitTest { @Before public void setUp() { org.mockito.MockitoAnnotations.initMocks(this); - Intent intent = new Intent(RuntimeEnvironment.application, ImmunizationRowGroupTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), ImmunizationRowGroupTestActivity.class); controller = Robolectric.buildActivity(ImmunizationRowGroupTestActivity.class, intent); activity = controller.start().resume().get(); ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary); @@ -213,8 +214,8 @@ public void assertOnClickCallsOnRecordAllClickListenerAndOnVaccineClickedListene view.setOnRecordAllClickListener(onRecordAllClickListener); view.onClick(view.findViewById(R.id.record_all_tv)); - Mockito.verify(onRecordAllClickListener).onClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(ArrayList.class)); + Mockito.verify(onRecordAllClickListener).onClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(ArrayList.class)); // Vaccine Clicked ImmunizationRowGroup.OnVaccineClickedListener onVaccineClickListener = Mockito @@ -224,7 +225,7 @@ public void assertOnClickCallsOnRecordAllClickListenerAndOnVaccineClickedListene ExpandableHeightGridView expandableHeightGridView = view.getVaccinesGV(); ImmunizationRowAdapter adapter = view.getVaccineCardAdapter(); - ImmunizationRowCard immunizationRowCard = new ImmunizationRowCard(RuntimeEnvironment.application); + ImmunizationRowCard immunizationRowCard = new ImmunizationRowCard(ApplicationProvider.getApplicationContext()); wrapper = new VaccineWrapper(); wrapper.setVaccine(VaccineRepo.Vaccine.bcg); wrapper.setVaccineDate(DateTime.now()); @@ -233,26 +234,26 @@ public void assertOnClickCallsOnRecordAllClickListenerAndOnVaccineClickedListene immunizationRowCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineClickListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineClickListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.DONE_CAN_NOT_BE_UNDONE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineClickListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineClickListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.DUE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); @@ -270,26 +271,26 @@ public void assertOnClickCallsOnRecordAllClickListenerAndOnVaccineClickedListene immunizationRowCard.setState(State.DUE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.OVERDUE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); @@ -315,8 +316,8 @@ public void assertOnClickCallsUndoClickedListener() throws Exception { view.setOnRecordAllClickListener(onRecordAllClickListener); view.onClick(view.findViewById(R.id.record_all_tv)); - Mockito.verify(onRecordAllClickListener).onClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(ArrayList.class)); + Mockito.verify(onRecordAllClickListener).onClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(ArrayList.class)); // Vaccine Clicked ImmunizationRowGroup.OnVaccineClickedListener onVaccineClickListener = Mockito @@ -326,7 +327,7 @@ public void assertOnClickCallsUndoClickedListener() throws Exception { ExpandableHeightGridView expandableHeightGridView = view.getVaccinesGV(); ImmunizationRowAdapter adapter = view.getVaccineCardAdapter(); - ImmunizationRowCard immunizationRowCard = new ImmunizationRowCard(RuntimeEnvironment.application, true); + ImmunizationRowCard immunizationRowCard = new ImmunizationRowCard(ApplicationProvider.getApplicationContext(), true); wrapper = new VaccineWrapper(); wrapper.setVaccine(VaccineRepo.Vaccine.bcg); wrapper.setVaccineDate(DateTime.now()); @@ -339,26 +340,26 @@ public void assertOnClickCallsUndoClickedListener() throws Exception { immunizationRowCard.setState(State.DUE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.OVERDUE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ImmunizationRowGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ImmunizationRowGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); immunizationRowCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(immunizationRowCard, 0, adapter.getItemId(0)); @@ -411,13 +412,13 @@ public void asertConstructorsNotNull() { Assert.assertNotNull(activity.getInstance()); - ImmunizationRowGroup instance1 = new ImmunizationRowGroup(RuntimeEnvironment.application, attrs); + ImmunizationRowGroup instance1 = new ImmunizationRowGroup(ApplicationProvider.getApplicationContext(), attrs); Assert.assertNotNull(instance1); - ImmunizationRowGroup instance2 = new ImmunizationRowGroup(RuntimeEnvironment.application, attrs, 0); + ImmunizationRowGroup instance2 = new ImmunizationRowGroup(ApplicationProvider.getApplicationContext(), attrs, 0); Assert.assertNotNull(instance2); - ImmunizationRowGroup instance3 = new ImmunizationRowGroup(RuntimeEnvironment.application, attrs, 0, 0); + ImmunizationRowGroup instance3 = new ImmunizationRowGroup(ApplicationProvider.getApplicationContext(), attrs, 0, 0); Assert.assertNotNull(instance3); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceCardTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceCardTest.java index 4ad07624..82e1ac14 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceCardTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceCardTest.java @@ -13,7 +13,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.util.ReflectionHelpers; import org.smartregister.CoreLibrary; @@ -57,7 +57,7 @@ public class ServiceCardTest extends BaseUnitTest { @Before public void setUp() { org.mockito.MockitoAnnotations.initMocks(this); - Intent intent = new Intent(RuntimeEnvironment.application, ServiceCardTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), ServiceCardTestActivity.class); controller = Robolectric.buildActivity(ServiceCardTestActivity.class, intent); activity = controller.start().resume().get(); ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceGroupTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceGroupTest.java index d648df33..42c5379a 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceGroupTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceGroupTest.java @@ -7,12 +7,13 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.powermock.reflect.Whitebox; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.util.ReflectionHelpers; import org.smartregister.CoreLibrary; @@ -71,7 +72,7 @@ public class ServiceGroupTest extends BaseUnitTest { @Before public void setUp() { org.mockito.MockitoAnnotations.initMocks(this); - Intent intent = new Intent(RuntimeEnvironment.application, ServiceGroupTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), ServiceGroupTestActivity.class); controller = Robolectric.buildActivity(ServiceGroupTestActivity.class, intent); activity = controller.start().resume().get(); ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary); @@ -116,7 +117,7 @@ public void verifyOnClickCallsOnUndoServiceAllClickListenerAndOnServiceClickedLi ExpandableHeightGridView expandableHeightGridView = view.getServicesGV(); ServiceCardAdapter adapter = view.getServiceCardAdapter(); - ServiceCard serviceCard = new ServiceCard(RuntimeEnvironment.application); + ServiceCard serviceCard = new ServiceCard(ApplicationProvider.getApplicationContext()); wrapper = new ServiceWrapper(); wrapper.setDefaultName(ServiceWrapperTest.DEFAULTNAME); serviceCard.setServiceWrapper(wrapper); @@ -124,26 +125,26 @@ public void verifyOnClickCallsOnUndoServiceAllClickListenerAndOnServiceClickedLi serviceCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceClickedListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceClickedListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.DONE_CAN_NOT_BE_UNDONE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceClickedListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceClickedListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.DUE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); @@ -161,32 +162,32 @@ public void verifyOnClickCallsOnUndoServiceAllClickListenerAndOnServiceClickedLi serviceCard.setState(State.DONE_CAN_NOT_BE_UNDONE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.DUE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.OVERDUE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(serviceCard, 0, adapter.getItemId(0)); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceRowCardTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceRowCardTest.java index 6917fb47..c9d5a771 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceRowCardTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceRowCardTest.java @@ -11,6 +11,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; @@ -20,7 +21,7 @@ import org.powermock.modules.junit4.rule.PowerMockRule; import org.powermock.reflect.Whitebox; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -92,7 +93,7 @@ public void setUp() { Mockito.doReturn(5).when(allSharedPreferences).getDBEncryptionVersion(); Mockito.doReturn(allSharedPreferences).when(openSRPContext).allSharedPreferences(); - Intent intent = new Intent(RuntimeEnvironment.application, ServiceRowCardTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), ServiceRowCardTestActivity.class); controller = Robolectric.buildActivity(ServiceRowCardTestActivity.class, intent); activity = controller.start().resume().get(); ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary); @@ -121,14 +122,14 @@ public void setUp() { PowerMockito.when(ImmunizationLibrary.getInstance()).thenReturn(immunizationLibrary); PowerMockito.when(immunizationLibrary.recurringServiceRecordRepository()) .thenReturn(recurringServiceRecordRepository); - PowerMockito.when(recurringServiceRecordRepository.find(org.mockito.ArgumentMatchers.anyLong())) + PowerMockito.when(recurringServiceRecordRepository.find(ArgumentMatchers.anyLong())) .thenReturn(serviceRecord); PowerMockito.when(immunizationLibrary.eventClientRepository()).thenReturn(eventClientRepository); PowerMockito.when(eventClientRepository - .convert(org.mockito.ArgumentMatchers.any(JSONObject.class), org.mockito.ArgumentMatchers.any(Class.class))) + .convert(ArgumentMatchers.any(JSONObject.class), ArgumentMatchers.any(Class.class))) .thenReturn(event); // controller.setup(); - view = new ServiceRowCard(RuntimeEnvironment.application); + view = new ServiceRowCard(ApplicationProvider.getApplicationContext()); // view = activity.getInstance(); } diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceRowGroupTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceRowGroupTest.java index 39c6f4df..92bd1574 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceRowGroupTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/ServiceRowGroupTest.java @@ -7,11 +7,12 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.util.ReflectionHelpers; import org.smartregister.CoreLibrary; @@ -69,7 +70,7 @@ public class ServiceRowGroupTest extends BaseUnitTest { @Before public void setUp() { org.mockito.MockitoAnnotations.initMocks(this); - Intent intent = new Intent(RuntimeEnvironment.application, ServiceRowGroupTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), ServiceRowGroupTestActivity.class); controller = Robolectric.buildActivity(ServiceRowGroupTestActivity.class, intent); activity = controller.start().resume().get(); ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary); @@ -117,7 +118,7 @@ public void assertOnClickCallsOnUndoServiceAllClickListenerAndOnServiceClickedLi ExpandableHeightGridView expandableHeightGridView = view.getServicesGV(); ServiceRowAdapter adapter = view.getServiceRowAdapter(); - ServiceRowCard serviceRowCard = new ServiceRowCard(RuntimeEnvironment.application); + ServiceRowCard serviceRowCard = new ServiceRowCard(ApplicationProvider.getApplicationContext()); wrapper = new ServiceWrapper(); wrapper.setDefaultName(ServiceWrapperTest.DEFAULTNAME); serviceRowCard.setServiceWrapper(wrapper); @@ -125,26 +126,26 @@ public void assertOnClickCallsOnUndoServiceAllClickListenerAndOnServiceClickedLi serviceRowCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceClickedListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceClickedListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.DONE_CAN_NOT_BE_UNDONE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceClickedListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceClickedListener, Mockito.never()) - .onClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.DUE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); @@ -162,26 +163,26 @@ public void assertOnClickCallsOnUndoServiceAllClickListenerAndOnServiceClickedLi serviceRowCard.setState(State.DUE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.OVERDUE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); @@ -261,7 +262,7 @@ public void assertOnClickCallsOnUndoServiceAllClickListener() throws Exception { ExpandableHeightGridView expandableHeightGridView = view.getServicesGV(); ServiceRowAdapter adapter = view.getServiceRowAdapter(); - ServiceRowCard serviceRowCard = new ServiceRowCard(RuntimeEnvironment.application, true); + ServiceRowCard serviceRowCard = new ServiceRowCard(ApplicationProvider.getApplicationContext(), true); wrapper = new ServiceWrapper(); wrapper.setDefaultName(ServiceWrapperTest.DEFAULTNAME); serviceRowCard.setServiceWrapper(wrapper); @@ -274,26 +275,26 @@ public void assertOnClickCallsOnUndoServiceAllClickListener() throws Exception { serviceRowCard.setState(State.DUE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.OVERDUE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); Mockito.verify(onServiceUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(ServiceRowGroup.class), - org.mockito.ArgumentMatchers.any(ServiceWrapper.class)); + .onUndoClick(ArgumentMatchers.any(ServiceRowGroup.class), + ArgumentMatchers.any(ServiceWrapper.class)); serviceRowCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(serviceRowCard, 0, adapter.getItemId(0)); diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/VaccineCardTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/VaccineCardTest.java index cbaab7d7..027b796a 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/VaccineCardTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/VaccineCardTest.java @@ -13,7 +13,7 @@ import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; +import androidx.test.core.app.ApplicationProvider; import org.robolectric.android.controller.ActivityController; import org.robolectric.util.ReflectionHelpers; import org.smartregister.CoreLibrary; @@ -64,7 +64,7 @@ public void setUp() { Mockito.doReturn(5).when(allSharedPreferences).getDBEncryptionVersion(); Mockito.doReturn(allSharedPreferences).when(context_).allSharedPreferences(); - Intent intent = new Intent(RuntimeEnvironment.application, VaccineCardTestActivity.class); + Intent intent = new Intent(ApplicationProvider.getApplicationContext(), VaccineCardTestActivity.class); controller = Robolectric.buildActivity(VaccineCardTestActivity.class, intent); activity = controller.start().resume().get(); CoreLibrary.init(context_); @@ -79,10 +79,10 @@ public void assertGetUndoBNotNull() { @Test public void testConstructors() { - Assert.assertNotNull(new VaccineCard(RuntimeEnvironment.application)); - Assert.assertNotNull(new VaccineCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build())); - Assert.assertNotNull(new VaccineCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build(), 0)); - Assert.assertNotNull(new VaccineCard(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build(), 0, 0)); + Assert.assertNotNull(new VaccineCard(ApplicationProvider.getApplicationContext())); + Assert.assertNotNull(new VaccineCard(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build())); + Assert.assertNotNull(new VaccineCard(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build(), 0)); + Assert.assertNotNull(new VaccineCard(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build(), 0, 0)); } @Test diff --git a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/VaccineGroupTest.java b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/VaccineGroupTest.java index b57c9c24..d26f5001 100644 --- a/opensrp-immunization/src/test/java/org/smartregister/immunization/view/VaccineGroupTest.java +++ b/opensrp-immunization/src/test/java/org/smartregister/immunization/view/VaccineGroupTest.java @@ -2,16 +2,18 @@ import android.util.AttributeSet; +import androidx.test.core.app.ApplicationProvider; + import com.google.gson.reflect.TypeToken; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import org.smartregister.commonregistry.CommonPersonObjectClient; import org.smartregister.domain.Alert; @@ -61,7 +63,7 @@ public class VaccineGroupTest extends BaseUnitTest { @Before public void setUp() { org.mockito.MockitoAnnotations.initMocks(this); - view = new VaccineGroup(RuntimeEnvironment.application); + view = new VaccineGroup(ApplicationProvider.getApplicationContext()); Mockito.doReturn(properties).when(immunizationLibrary).getProperties(); view.setImmunizationLibraryInstance(immunizationLibrary); @@ -69,10 +71,10 @@ public void setUp() { @Test public void testConstructors() { - Assert.assertNotNull(new VaccineGroup(RuntimeEnvironment.application)); - Assert.assertNotNull(new VaccineGroup(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build())); - Assert.assertNotNull(new VaccineGroup(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build(), 0)); - Assert.assertNotNull(new VaccineGroup(RuntimeEnvironment.application, Robolectric.buildAttributeSet().build(), 0, 0)); + Assert.assertNotNull(new VaccineGroup(ApplicationProvider.getApplicationContext())); + Assert.assertNotNull(new VaccineGroup(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build())); + Assert.assertNotNull(new VaccineGroup(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build(), 0)); + Assert.assertNotNull(new VaccineGroup(ApplicationProvider.getApplicationContext(), Robolectric.buildAttributeSet().build(), 0, 0)); } @Test @@ -188,8 +190,8 @@ public void verifyOnClickCallsOnRecordAllClickListenerAndOnVaccineClickedListene view.setOnRecordAllClickListener(onRecordAllClickListener); view.onClick(view.findViewById(R.id.record_all_tv)); - Mockito.verify(onRecordAllClickListener).onClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(ArrayList.class)); + Mockito.verify(onRecordAllClickListener).onClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(ArrayList.class)); // Vaccine Clicked VaccineGroup.OnVaccineClickedListener onVaccineClickListener = Mockito @@ -199,38 +201,38 @@ public void verifyOnClickCallsOnRecordAllClickListenerAndOnVaccineClickedListene ExpandableHeightGridView expandableHeightGridView = view.getVaccinesGV(); VaccineCardAdapter adapter = view.getVaccineCardAdapter(); - VaccineCard vaccineCard = new VaccineCard(RuntimeEnvironment.application); + VaccineCard vaccineCard = new VaccineCard(ApplicationProvider.getApplicationContext()); wrapper = new VaccineWrapper(); wrapper.setVaccine(VaccineRepo.Vaccine.bcg); vaccineCard.setVaccineWrapper(wrapper); vaccineCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); - Mockito.verify(onVaccineClickListener, Mockito.never()).onClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + Mockito.verify(onVaccineClickListener, Mockito.never()).onClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); vaccineCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); - Mockito.verify(onVaccineClickListener, Mockito.never()).onClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + Mockito.verify(onVaccineClickListener, Mockito.never()).onClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); vaccineCard.setState(State.DONE_CAN_NOT_BE_UNDONE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); - Mockito.verify(onVaccineClickListener, Mockito.never()).onClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + Mockito.verify(onVaccineClickListener, Mockito.never()).onClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); //If expiry retroactive data entry Not Allowed vaccineCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); - Mockito.verify(onVaccineClickListener, Mockito.times(0)).onClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + Mockito.verify(onVaccineClickListener, Mockito.times(0)).onClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); //If expiry retroactive data entry Allowed Mockito.doReturn(true).when(immunizationLibrary).isAllowExpiredVaccineEntry(); vaccineCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); - Mockito.verify(onVaccineClickListener, Mockito.times(1)).onClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + Mockito.verify(onVaccineClickListener, Mockito.times(1)).onClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); vaccineCard.setState(State.DUE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); @@ -248,32 +250,32 @@ public void verifyOnClickCallsOnRecordAllClickListenerAndOnVaccineClickedListene vaccineCard.setState(State.DONE_CAN_NOT_BE_UNDONE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); vaccineCard.setState(State.DUE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); vaccineCard.setState(State.OVERDUE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); vaccineCard.setState(State.EXPIRED); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); vaccineCard.setState(State.NOT_DUE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); Mockito.verify(onVaccineUndoClickListener, Mockito.never()) - .onUndoClick(org.mockito.ArgumentMatchers.any(VaccineGroup.class), - org.mockito.ArgumentMatchers.any(VaccineWrapper.class)); + .onUndoClick(ArgumentMatchers.any(VaccineGroup.class), + ArgumentMatchers.any(VaccineWrapper.class)); vaccineCard.setState(State.DONE_CAN_BE_UNDONE); expandableHeightGridView.performItemClick(vaccineCard, 0, adapter.getItemId(0)); @@ -309,10 +311,10 @@ public void assertIsModalOpenReturnsBoolean() { @Test public void assertConstructorsNotNull() { AttributeSet attrs = Robolectric.buildAttributeSet().build(); - Assert.assertNotNull(new VaccineGroup(RuntimeEnvironment.application)); - //Assert.assertNotNull(new VaccineGroup(RuntimeEnvironment.application, ViewAttributes.attrs)); - //Assert.assertNotNull(new VaccineGroup(RuntimeEnvironment.application, ViewAttributes.attrs, 0)); - //Assert.assertNotNull(new VaccineGroup(RuntimeEnvironment.application, ViewAttributes.attrs, 0, 0)); + Assert.assertNotNull(new VaccineGroup(ApplicationProvider.getApplicationContext())); + //Assert.assertNotNull(new VaccineGroup(ApplicationProvider.getApplicationContext(), ViewAttributes.attrs)); + //Assert.assertNotNull(new VaccineGroup(ApplicationProvider.getApplicationContext(), ViewAttributes.attrs, 0)); + //Assert.assertNotNull(new VaccineGroup(ApplicationProvider.getApplicationContext(), ViewAttributes.attrs, 0, 0)); } @After