From 0a398bd6fd9254dcc16e5b9d46814bf439fa7955 Mon Sep 17 00:00:00 2001 From: Antonio Zugaldia Date: Thu, 10 Jan 2019 11:22:48 -0500 Subject: [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 --- .../mapboxsdk/testapp/offline/OfflineManagerTest.kt | 2 +- .../src/main/assets/offline.db | Bin 73728 -> 0 bytes .../src/main/assets/offline_test.db | Bin 0 -> 73728 bytes .../activity/offline/MergeOfflineRegionsActivity.kt | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline.db create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db (limited to 'platform') 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.db deleted file mode 100644 index 6146e30872..0000000000 Binary files a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline.db and /dev/null differ diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db new file mode 100644 index 0000000000..6146e30872 Binary files /dev/null and b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db 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 } -- cgit v1.2.1