summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Zugaldia <antonio@mapbox.com>2019-01-10 11:22:48 -0500
committerGitHub <noreply@github.com>2019-01-10 11:22:48 -0500
commit0a398bd6fd9254dcc16e5b9d46814bf439fa7955 (patch)
treeb7828572d69bce62d69552773974faec626dcce7
parentcc602aa935e91f377f8599f1b82025f63637f35a (diff)
downloadqtlocation-mapboxgl-0a398bd6fd9254dcc16e5b9d46814bf439fa7955.tar.gz
[android] Rename offline database in Test App to follow .gitignore rule (#13708)
* [android] rename offline.db to offline_test.db to avoid working around the .gitignore rule * [android] update code references to database file
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt2
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db (renamed from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline.db)bin73728 -> 73728 bytes
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt2
3 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
index 78be095005..144d67feee 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
@@ -21,7 +21,7 @@ import java.io.IOException
class OfflineManagerTest : EspressoTest() {
companion object {
- private const val TEST_DB_FILE_NAME = "offline.db"
+ private const val TEST_DB_FILE_NAME = "offline_test.db"
}
private val context: Context by lazy { rule.activity }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline.db b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db
index 6146e30872..6146e30872 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline.db
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db
Binary files differ
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
index 7370b64963..45ff67d688 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/offline/MergeOfflineRegionsActivity.kt
@@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.activity_merge_offline_regions.*
class MergeOfflineRegionsActivity : AppCompatActivity() {
companion object {
private const val LOG_TAG = "Mbgl-MergeOfflineRegionsActivity"
- private const val TEST_DB_FILE_NAME = "offline.db"
+ private const val TEST_DB_FILE_NAME = "offline_test.db"
private const val TEST_STYLE = Style.SATELLITE
}