Skip to content

Commit dae47a2

Browse files
committed
✅ Update ReportIndicatorDaoImplTest
Fix unnecessary stubbing
1 parent 2d54853 commit dae47a2

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

opensrp-reporting/src/test/java/org/smartregister/reporting/dao/ReportIndicatorDaoImplTest.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class ReportIndicatorDaoImplTest {
5959
private IndicatorQueryRepository indicatorQueryRepository;
6060
@Mock
6161
private CoreLibrary coreLibrary;
62-
@Mock
62+
6363
private AppProperties appProperties;
6464
@Mock
6565
private Context context;
@@ -68,6 +68,12 @@ public class ReportIndicatorDaoImplTest {
6868
public void setUp() {
6969
MockitoAnnotations.initMocks(this);
7070
reportIndicatorDao = new ReportIndicatorDaoImpl(indicatorQueryRepository, dailyIndicatorCountRepository, indicatorRepository);
71+
ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
72+
73+
Mockito.when(coreLibrary.context()).thenReturn(context);
74+
appProperties = new AppProperties();
75+
appProperties.setProperty(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES, "true");
76+
Mockito.when(context.getAppProperties()).thenReturn(appProperties);
7177
}
7278

7379
@Test
@@ -112,13 +118,6 @@ public void testGenerateDailyIndicatorTalliesCallsSaveTalliesEqualToNumberOfRepo
112118
Repository repository = Mockito.mock(Repository.class);
113119
Mockito.doReturn(database).when(repository).getWritableDatabase();
114120

115-
ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
116-
117-
Mockito.when(coreLibrary.context()).thenReturn(context);
118-
Mockito.when(context.getAppProperties()).thenReturn(appProperties);
119-
Mockito.when(appProperties.hasProperty(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES)).thenReturn(true);
120-
Mockito.when(appProperties.getPropertyBoolean(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES)).thenReturn(true);
121-
122121
ReportingLibrary reportingLibrarySpy = Mockito.mock(ReportingLibrary.class);
123122
ReflectionHelpers.setStaticField(ReportingLibrary.class, "instance", reportingLibrarySpy);
124123

@@ -157,12 +156,6 @@ public void testGenerateDailyIndicatorTalliesCallsSaveTalliesEqualToNumberOfRepo
157156

158157
@Test
159158
public void saveTalliesGeneratesTallyObject() {
160-
ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
161-
162-
Mockito.when(coreLibrary.context()).thenReturn(context);
163-
Mockito.when(context.getAppProperties()).thenReturn(appProperties);
164-
Mockito.when(appProperties.hasProperty(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES)).thenReturn(true);
165-
Mockito.when(appProperties.getPropertyBoolean(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES)).thenReturn(true);
166159

167160
SQLiteDatabase database = Mockito.mock(SQLiteDatabase.class);
168161
Map<String, IndicatorQuery> indicatorQueries = new HashMap<>();

0 commit comments

Comments
 (0)