Skip to content

Commit 503c9c7

Browse files
BalcanBalcan
committed
fix test
Signed-off-by: Pablo <[email protected]>
1 parent 88e5d18 commit 503c9c7

File tree

1 file changed

+58
-51
lines changed

1 file changed

+58
-51
lines changed

‎app/src/androidTest/java/org/dhis2/usescases/teidashboard/TeiDashboardMobileActivityTest.kt‎

Lines changed: 58 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,31 @@ package org.dhis2.usescases.teidashboard
33
import android.view.View
44
import androidx.compose.ui.test.junit4.createAndroidComposeRule
55
import androidx.test.core.app.ActivityScenario
6-
import androidx.test.espresso.Espresso.onView
7-
import androidx.test.espresso.assertion.ViewAssertions.matches
8-
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
9-
import androidx.test.espresso.matcher.ViewMatchers.withId
106
import androidx.test.ext.junit.rules.activityScenarioRule
117
import dhis2.org.analytics.charts.Charts
128
import io.reactivex.Observable
9+
import java.util.Calendar
1310
import org.dhis2.R
1411
import org.dhis2.android.rtsm.utils.NetworkUtils
15-
import org.dhis2.commons.date.DateUtils
1612
import org.dhis2.commons.filters.FilterManager
13+
import org.dhis2.commons.prefs.PreferenceProvider
1714
import org.dhis2.commons.resources.ResourceManager
1815
import org.dhis2.ui.ThemeManager
19-
import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.EventInitialTest
20-
import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.data.EventDetailsRepository
21-
import org.dhis2.usescases.main.program.ProgramPresenter
2216
import org.dhis2.usescases.teiDashboard.DashboardRepositoryImpl
2317
import org.dhis2.usescases.teiDashboard.DashboardViewModel
2418
import org.dhis2.usescases.teiDashboard.TeiAttributesProvider
2519
import org.dhis2.usescases.teiDashboard.TeiDashboardContracts
2620
import org.dhis2.usescases.teiDashboard.TeiDashboardMobileActivity
2721
import org.dhis2.utils.analytics.AnalyticsHelper
2822
import org.hisp.dhis.android.core.D2
29-
import org.hisp.dhis.android.core.event.EventEditableStatus
3023
import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
3124
import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
32-
import org.junit.Before
3325
import org.junit.Rule
3426
import org.junit.Test
35-
import org.mockito.ArgumentMatchers
3627
import org.mockito.Mockito
3728
import org.mockito.kotlin.doReturn
38-
import org.mockito.kotlin.doReturnConsecutively
3929
import org.mockito.kotlin.mock
4030
import org.mockito.kotlin.whenever
41-
import java.util.Calendar
4231

4332
class TeiDashboardMobileActivityTest {
4433

@@ -55,18 +44,21 @@ class TeiDashboardMobileActivityTest {
5544
private val resources: ResourceManager = mock()
5645
private val charts: Charts = mock()
5746
private val teiAttributesProvider: TeiAttributesProvider = mock()
47+
private val preferences: PreferenceProvider = mock()
5848

5949

6050
private var repository: DashboardRepositoryImpl = mock {
6151

6252
}
63-
var tei = Observable.just(TrackedEntityInstance.builder()
64-
.uid(TEI_Uid)
65-
.created(Calendar.getInstance().time)
66-
.lastUpdated(Calendar.getInstance().time)
67-
.organisationUnit(ORG_UNIT_UID)
68-
.trackedEntityType(TETYPE_NAME)
69-
.build())
53+
var tei = Observable.just(
54+
TrackedEntityInstance.builder()
55+
.uid(TEI_Uid)
56+
.created(Calendar.getInstance().time)
57+
.lastUpdated(Calendar.getInstance().time)
58+
.organisationUnit(ORG_UNIT_UID)
59+
.trackedEntityType(TETYPE_NAME)
60+
.build()
61+
)
7062

7163
private val teType: TrackedEntityType = mock()
7264

@@ -93,8 +85,8 @@ class TeiDashboardMobileActivityTest {
9385
}
9486

9587
private fun initViewModel() {
96-
viewModel = DashboardViewModel(
97-
repository ,
88+
viewModel = DashboardViewModel(
89+
repository,
9890
analyticsHelper
9991
)
10092

@@ -112,8 +104,8 @@ class TeiDashboardMobileActivityTest {
112104
TEI_Uid,
113105
PROGRAM_UID,
114106
ENROLLMENT_UID,
115-
resources,
116107
teiAttributesProvider,
108+
preferences,
117109
)
118110

119111

@@ -123,58 +115,73 @@ class TeiDashboardMobileActivityTest {
123115
@Test
124116
fun shouldSuccessfullyInitializeTeiDashBoardMobileActivity() {
125117
setUp()
126-
whenever (repository.getTETypeName()) doReturn TETYPE_NAME
127-
whenever ( repository.getTrackedEntityInstance("") ) doReturn mock()
128-
whenever {repository.getTrackedEntityInstance("").flatMap { tei: TrackedEntityInstance ->
129-
d2.trackedEntityModule().trackedEntityTypes()
130-
.uid(tei.trackedEntityType())
131-
.get()
132-
.toObservable()
133-
} } doReturn mock()
134-
whenever {repository.getTrackedEntityInstance("").flatMap { tei: TrackedEntityInstance ->
135-
d2.trackedEntityModule().trackedEntityTypes()
136-
.uid(tei.trackedEntityType())
137-
.get()
138-
.toObservable()
139-
}.blockingFirst() } doReturn { teType }
118+
whenever(repository.getTETypeName()) doReturn TETYPE_NAME
119+
whenever(repository.getTrackedEntityInstance("")) doReturn mock()
120+
whenever {
121+
repository.getTrackedEntityInstance("").flatMap { tei: TrackedEntityInstance ->
122+
d2.trackedEntityModule().trackedEntityTypes()
123+
.uid(tei.trackedEntityType())
124+
.get()
125+
.toObservable()
126+
}
127+
} doReturn mock()
128+
whenever {
129+
repository.getTrackedEntityInstance("").flatMap { tei: TrackedEntityInstance ->
130+
d2.trackedEntityModule().trackedEntityTypes()
131+
.uid(tei.trackedEntityType())
132+
.get()
133+
.toObservable()
134+
}.blockingFirst()
135+
} doReturn { teType }
140136
whenever(
141137
presenter.teType
142-
) doReturn TETYPE_NAME
138+
) doReturn TETYPE_NAME
143139

144140
whenever(
145141
repository.getTETypeName()
146-
) doReturn TETYPE_NAME
142+
) doReturn TETYPE_NAME
147143
whenever(
148-
d2.trackedEntityModule() ) doReturn mock()
144+
d2.trackedEntityModule()
145+
) doReturn mock()
149146
whenever(
150-
d2.trackedEntityModule().trackedEntityInstances() ) doReturn mock()
147+
d2.trackedEntityModule().trackedEntityInstances()
148+
) doReturn mock()
151149
whenever(
152-
d2.trackedEntityModule().trackedEntityInstances().byUid() ) doReturn mock()
150+
d2.trackedEntityModule().trackedEntityInstances().byUid()
151+
) doReturn mock()
153152
whenever(
154-
d2.trackedEntityModule().trackedEntityInstances().byUid().eq("") ) doReturn mock()
153+
d2.trackedEntityModule().trackedEntityInstances().byUid().eq("")
154+
) doReturn mock()
155155
whenever(
156-
d2.trackedEntityModule().trackedEntityInstances().byUid().eq("").one() ) doReturn mock()
156+
d2.trackedEntityModule().trackedEntityInstances().byUid().eq("").one()
157+
) doReturn mock()
157158
whenever(
158159
d2.trackedEntityModule().trackedEntityInstances().byUid().eq("").one()
159-
.blockingGet() ) doReturn mock()
160+
.blockingGet()
161+
) doReturn mock()
160162

161163
whenever(
162-
d2.trackedEntityModule().trackedEntityTypes() ) doReturn mock()
164+
d2.trackedEntityModule().trackedEntityTypes()
165+
) doReturn mock()
163166
whenever(
164-
d2.trackedEntityModule().trackedEntityTypes().uid("") ) doReturn mock()
167+
d2.trackedEntityModule().trackedEntityTypes().uid("")
168+
) doReturn mock()
165169
whenever(
166-
d2.trackedEntityModule().trackedEntityTypes().uid("").get() ) doReturn mock()
170+
d2.trackedEntityModule().trackedEntityTypes().uid("").get()
171+
) doReturn mock()
167172
whenever(
168-
d2.trackedEntityModule().trackedEntityTypes().uid("").get().toObservable() ) doReturn mock()
173+
d2.trackedEntityModule().trackedEntityTypes().uid("").get().toObservable()
174+
) doReturn mock()
169175
whenever(
170-
d2.trackedEntityModule().trackedEntityTypes().uid("").get().toObservable() ) doReturn mock()
176+
d2.trackedEntityModule().trackedEntityTypes().uid("").get().toObservable()
177+
) doReturn mock()
171178

172179

173180

174181

175182
ActivityScenario.launch(TeiDashboardMobileActivity::class.java).onActivity { activity ->
176183

177-
val showMoreOptions = activity.findViewById<View>(R.id.moreOptions)
184+
val showMoreOptions = activity.findViewById<View>(R.id.moreOptions)
178185
showMoreOptions.performClick()
179186
}
180187

0 commit comments

Comments
 (0)