-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
47 changed files
with
1,803 additions
and
720 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
src/androidTest/java/de/blau/android/layer/mapillary/package-info.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
src/androidTest/java/de/blau/android/layer/streetlevel/mapillary/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /** | ||
| * Mapillary related testing | ||
| */ | ||
| package de.blau.android.layer.streetlevel.mapillary; |
182 changes: 182 additions & 0 deletions
182
src/androidTest/java/de/blau/android/layer/streetlevel/panoramax/PanoramaxTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| package de.blau.android.layer.streetlevel.panoramax; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.junit.Assert.fail; | ||
|
|
||
| import java.io.IOException; | ||
| import java.text.SimpleDateFormat; | ||
| import java.util.Date; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import com.orhanobut.mockwebserverplus.MockWebServerPlus; | ||
|
|
||
| import android.app.Instrumentation; | ||
| import android.app.Instrumentation.ActivityMonitor; | ||
| import android.database.sqlite.SQLiteDatabase; | ||
| import android.os.Build; | ||
| import androidx.annotation.NonNull; | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| import androidx.test.filters.LargeTest; | ||
| import androidx.test.platform.app.InstrumentationRegistry; | ||
| import androidx.test.rule.ActivityTestRule; | ||
| import androidx.test.uiautomator.UiDevice; | ||
| import androidx.test.uiautomator.UiObject2; | ||
| import de.blau.android.App; | ||
| import de.blau.android.LayerUtils; | ||
| import de.blau.android.Logic; | ||
| import de.blau.android.Main; | ||
| import de.blau.android.Map; | ||
| import de.blau.android.MockTileServer; | ||
| import de.blau.android.R; | ||
| import de.blau.android.TestUtils; | ||
| import de.blau.android.dialogs.DateRangeDialog; | ||
| import de.blau.android.layer.LayerDialogTest; | ||
| import de.blau.android.layer.LayerType; | ||
| import de.blau.android.layer.streetlevel.ImageViewerActivity; | ||
| import de.blau.android.layer.streetlevel.mapillary.MapillaryOverlay; | ||
| import de.blau.android.prefs.AdvancedPrefDatabase; | ||
| import de.blau.android.prefs.Preferences; | ||
| import de.blau.android.resources.TileLayerDatabase; | ||
| import de.blau.android.resources.TileLayerSource.TileType; | ||
| import okhttp3.HttpUrl; | ||
| import okhttp3.mockwebserver.MockResponse; | ||
| import okhttp3.mockwebserver.MockWebServer; | ||
| import okhttp3.mockwebserver.RecordedRequest; | ||
|
|
||
| @RunWith(AndroidJUnit4.class) | ||
| @LargeTest | ||
| public class PanoramaxTest { | ||
|
|
||
| AdvancedPrefDatabase prefDB = null; | ||
| Main main = null; | ||
| UiDevice device = null; | ||
| Map map = null; | ||
| Logic logic = null; | ||
| Instrumentation instrumentation = null; | ||
| MockWebServerPlus mockApiServer = null; | ||
| MockWebServer tileServer = null; | ||
| HttpUrl mockImagesBaseUrl = null; | ||
|
|
||
| @Rule | ||
| public ActivityTestRule<Main> mActivityRule = new ActivityTestRule<>(Main.class); | ||
|
|
||
| /** | ||
| * Pre-test setup | ||
| */ | ||
| @Before | ||
| public void setup() { | ||
| instrumentation = InstrumentationRegistry.getInstrumentation(); | ||
| device = UiDevice.getInstance(instrumentation); | ||
| main = mActivityRule.getActivity(); | ||
|
|
||
| assertNotNull(main); | ||
| TestUtils.grantPermissons(device); | ||
| LayerUtils.removeLayer(main, LayerType.PANORAMAX); | ||
| tileServer = MockTileServer.setupTileServer(main, "panoramax.mbtiles", true, LayerType.PANORAMAX, TileType.MVT, | ||
| de.blau.android.layer.streetlevel.panoramax.PanoramaxOverlay.PANORAMAX_TILES_ID); | ||
|
|
||
| mockApiServer = new MockWebServerPlus(); | ||
| HttpUrl mockApiBaseUrl = mockApiServer.server().url("/"); | ||
| Preferences prefs = new Preferences(main); | ||
| prefs.setPanoramaxApiUrl(mockApiBaseUrl.toString()); | ||
|
|
||
| App.getLogic().setPrefs(prefs); | ||
| map = main.getMap(); | ||
| map.setPrefs(main, prefs); | ||
|
|
||
| TestUtils.dismissStartUpDialogs(device, main); | ||
| TestUtils.loadTestData(main, "test2.osm"); | ||
| map.getDataLayer().setVisible(true); | ||
| TestUtils.stopEasyEdit(main); | ||
| } | ||
|
|
||
| /** | ||
| * Post-test teardown | ||
| */ | ||
| @After | ||
| public void teardown() { | ||
| try { | ||
| mockApiServer.server().shutdown(); | ||
| } catch (IOException e) { | ||
| // Ignore | ||
| } | ||
| try { | ||
| tileServer.close(); | ||
| } catch (IOException | NullPointerException e) { | ||
| // ignore | ||
| } | ||
| LayerUtils.removeLayer(main, LayerType.MAPILLARY); | ||
| try (TileLayerDatabase tlDb = new TileLayerDatabase(main); SQLiteDatabase db = tlDb.getWritableDatabase()) { | ||
| TileLayerDatabase.deleteLayerWithId(db, de.blau.android.layer.streetlevel.mapillary.MapillaryOverlay.MAPILLARY_TILES_ID); | ||
| } | ||
| instrumentation.waitForIdleSync(); | ||
| } | ||
|
|
||
| /** | ||
| * Add Panoramax layer and click on one image | ||
| */ | ||
| @Test | ||
| public void panoramaxLayer() { | ||
| mockApiServer.enqueue("panoramax_sequences"); | ||
| de.blau.android.layer.streetlevel.panoramax.PanoramaxOverlay layer = (PanoramaxOverlay) map.getLayer(LayerType.PANORAMAX); | ||
| assertNotNull(layer); | ||
| layer.flushCaches(main); // forces the layer to retrieve everything | ||
|
|
||
| MockResponse image = TestUtils.createBinaryReponse("image/jpeg", "fixtures/mapillary_image_v4.jpg"); | ||
| mockApiServer.server().enqueue(image); | ||
| mockApiServer.server().enqueue(image); | ||
| mockApiServer.server().enqueue(image); | ||
| mockApiServer.server().enqueue(image); | ||
| mockApiServer.server().enqueue(image); | ||
|
|
||
| TestUtils.unlock(device); | ||
| TestUtils.sleep(); | ||
|
|
||
| ActivityMonitor monitor = instrumentation.addMonitor(ImageViewerActivity.class.getName(), null, false); | ||
| // hack around slow rendering on some emulators | ||
| map.getViewBox().moveTo(map, (int) (2.3281776 * 1E7), (int) (48.8698124 * 1E7)); | ||
| map.invalidate(); | ||
| TestUtils.zoomToLevel(device, main, 22); | ||
| TestUtils.clickAtCoordinates(device, map, 2.3281776, 48.8698124, true); | ||
| if (TestUtils.clickText(device, false, "OK", true)) { | ||
| TestUtils.clickAtCoordinates(device, map, 2.3281776, 48.8698124, true); | ||
| } | ||
| ImageViewerActivity viewer = null; | ||
| try { | ||
| viewer = (ImageViewerActivity) instrumentation.waitForMonitorWithTimeout(monitor, 30000); | ||
| assertNotNull(viewer); | ||
| try { | ||
| RecordedRequest recorded = mockApiServer.server().takeRequest(10, TimeUnit.SECONDS); | ||
| assertNotNull(recorded); | ||
| System.out.println(recorded.getPath()); | ||
| mockApiServer.server().takeRequest(10, TimeUnit.SECONDS); | ||
| mockApiServer.server().takeRequest(10, TimeUnit.SECONDS); | ||
| mockApiServer.server().takeRequest(10, TimeUnit.SECONDS); | ||
| mockApiServer.server().takeRequest(10, TimeUnit.SECONDS); | ||
| } catch (InterruptedException e) { | ||
| fail(e.getMessage()); | ||
| } | ||
| assertTrue(TestUtils.clickMenuButton(device, main.getString(R.string.share), false, true)); | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { | ||
| assertTrue(TestUtils.findText(device, false, "178993950747668")); | ||
| } else { // currently can't test this properly on Android before 10 | ||
| assertTrue(TestUtils.findText(device, false, "Share with")); | ||
| } | ||
| device.pressBack(); | ||
| } finally { | ||
| instrumentation.removeMonitor(monitor); | ||
| if (viewer != null) { | ||
| viewer.finish(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
1 change: 1 addition & 0 deletions
1
src/androidTest/java/de/blau/android/layer/streetlevel/panoramax/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| package de.blau.android.layer.streetlevel.panoramax; |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.