Skip to content

Commit

Permalink
fix: Remove ServerURLWrapper from BaseTest.kt (#2545)
Browse files Browse the repository at this point in the history
  • Loading branch information
andresmr authored Mar 3, 2022
1 parent 259eccc commit 0b8f5ba
Showing 2 changed files with 6 additions and 17 deletions.
13 changes: 1 addition & 12 deletions app/src/androidTest/java/org/dhis2/usescases/BaseTest.kt
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ import android.os.Build
import androidx.test.espresso.IdlingRegistry
import androidx.test.espresso.intent.Intents
import androidx.test.platform.app.InstrumentationRegistry
import com.jakewharton.espresso.OkHttp3IdlingResource
import org.dhis2.AppTest
import org.dhis2.AppTest.Companion.DB_TO_IMPORT
import org.dhis2.common.di.TestingInjector
@@ -17,10 +16,8 @@ import org.dhis2.common.keystore.KeyStoreRobot.Companion.USERNAME
import org.dhis2.common.mockwebserver.MockWebServerRobot
import org.dhis2.common.preferences.PreferencesRobot
import org.dhis2.common.rules.DisableAnimations
import org.dhis2.commons.prefs.Preference
import org.dhis2.commons.idlingresource.CountingIdlingResourceSingleton
import org.hisp.dhis.android.core.D2Manager
import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
import org.dhis2.commons.prefs.Preference
import org.junit.After
import org.junit.Before
import org.junit.ClassRule
@@ -103,14 +100,6 @@ open class BaseTest {
preferencesRobot.saveValue(Preference.DATE_PICKER, true)
}

fun turnOnConnectivityAfterLogin(){
ServerURLWrapper.setServerUrl("$MOCK_SERVER_URL/$API/")
}

fun turnOffConnectivityAfterLogin(){
ServerURLWrapper.setServerUrl("none")
}

private fun disableIntents() {
if (isIntentsEnable) {
Intents.release()
10 changes: 5 additions & 5 deletions whatsnew/whatsnew-en-US
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
This is a patch version that fixes:
- ANDROAPP-4544 Sync re-start if it takes more than 10 minutes
- ANDROAPP-4260 App is selecting the wrong image for the profile picture
- ANDROAPP-4383 App does not mark TEI with error when failing to upload image
- ANDROAPP-4430 Display correct error message for wrong configured server in login
- Fixed several crashes related to navigation and maps
- [ANDROAPP-4620] Option set DE is hidden when selecting an option in another option set
- [ANDROAPP-4570] Dropdown selections in TEI search end up in wrong attributes
- [ANDROAPP-4568] Crash when opening Event-Program relationship in a map
- [ANDROAPP-4567] Bidirectional relationships are created in reverse order
- This patch release updates the Android SDK to version 1.5.3.
....
You can find all the details on Jira and Github.

0 comments on commit 0b8f5ba

Please sign in to comment.