diff --git a/platform/android/Makefile b/platform/android/Makefile index b7386d757..ba1499be9 100644 --- a/platform/android/Makefile +++ b/platform/android/Makefile @@ -265,11 +265,6 @@ android-lint-sdk: android-lint-test-app: $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroidTestApp:lint -# Generates javadoc from the Android SDK -.PHONY: android-javadoc -android-javadoc: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:javadocrelease - # Generates LICENSE.md file based on all Android project dependencies .PHONY: android-license android-license: diff --git a/platform/android/MapLibreAndroid/build.gradle b/platform/android/MapLibreAndroid/build.gradle index 2dab4e279..2e234c769 100644 --- a/platform/android/MapLibreAndroid/build.gradle +++ b/platform/android/MapLibreAndroid/build.gradle @@ -158,7 +158,6 @@ configurations { all*.exclude group: 'commons-collections', module: 'commons-collections' } -apply from: "${rootDir}/gradle/gradle-javadoc.gradle" apply from: "${rootDir}/gradle/gradle-checkstyle.gradle" apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle" apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle" diff --git a/platform/android/TESTS.md b/platform/android/TESTS.md index a2b95ed5c..0bb35a08b 100644 --- a/platform/android/TESTS.md +++ b/platform/android/TESTS.md @@ -22,58 +22,6 @@ To create a new run configuration: You can now run this configuration from the main toolbar dropdown menu. -### Running Espresso tests on Firebase within AS - -Tests are under the `app/src/androidTest` folder. - -1) _Sign In_ with your Google account. - -![Firebase Tests AS 1][1] - -2) Or _Add Account_ if you want to sign in with a different account. - -![Firebase Tests AS 2][2] - -3) Select the test configuration you want to run and click _Play_ button. - -4) Click on _Cloud Testing_ tab. You need to create a project in Firebase and define a _Matrix configuration_ previously (see -[Firebase Test Lab for Android guide](https://firebase.google.com/docs/test-lab/overview)). Select your template (e.g. _Nexus 5 (3)_). - -5) Select your _Cloud project_ (e.g. _android-gl-native (android-gl-native)_). - -![Firebase Tests AS 3-5][3] - -6) Click on _OK_ button to run the tests. - -![Firebase Tests AS 6][4] - -7) When tests finish the results will appear within AS. - -![Firebase Tests AS 7][5] - -### Running Espresso tests on AWS Device Farm - -On a terminal, within `mapbox-gl-native/android/java`, -run the tests (`cC` stands for `connectedCheck`): - -``` -$ ./gradlew -Pmapbox.abis=all cC -p MapLibreAndroidTestApp -``` - -Then: -* Go to your AWS Console and choose Device Farm. -* Create a new project, e.g. `MapLibreAndroidTestApp` -* On step 1, upload the APK in `mapbox-gl-native/android/java/MapLibreAndroidTestApp/build/outputs/apk/MapLibreAndroidTestApp-debug-unaligned.apk` -* On step 2, choose Instrumentation, test filter is `org.maplibre.android.testapp.MainActivityTest` and upload the APK in `mapbox-gl-native/android/java/MapLibreAndroidTestApp/build/outputs/apk/MapLibreAndroidTestApp-debug-androidTest-unaligned.apk` -* On step 3, choose a device pool. E.g. Top Devices -* On step 4, customize your device state (if needed) -* Finally, confirm the configuration and run the tests. - -On Step 2, you can also separate by commas different classes: `org.maplibre.android.testapp.MainActivityTest,org.maplibre.android.testapp.MainActivityScreenTest` - -If you have no tests for your app, or want to test some random user behavior, -you can just choose "Built-in: Fuzz" in step 2. - ### Running pure JUnit tests These tests run on a local JVM on your development machine and they are extremely fast to run @@ -108,10 +56,3 @@ and then: ``` $ adb shell monkey -p org.maplibre.testapp -v 500 ``` - - -[1]: ./art/tests/FirebaseTestsAS_1.png -[2]: ./art/tests/FirebaseTestsAS_2.png -[3]: ./art/tests/FirebaseTestsAS_3-5.png -[4]: ./art/tests/FirebaseTestsAS_6.png -[5]: ./art/tests/FirebaseTestsAS_7.png diff --git a/platform/android/gradle/gradle-javadoc.gradle b/platform/android/gradle/gradle-javadoc.gradle deleted file mode 100644 index 5d2b2ddbe..000000000 --- a/platform/android/gradle/gradle-javadoc.gradle +++ /dev/null @@ -1,19 +0,0 @@ -android.libraryVariants.all { variant -> - def name = variant.name - task "javadoc$name"(type: Javadoc) { - description = "Generates javadoc for build $name" - destinationDir = new File(destinationDir, variant.baseName) - source = variant.sourceSets.collect { it.java.sourceFiles }.inject { m, i -> m + i } - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - options.windowTitle("Mapbox Maps SDK for Android $VERSION_NAME Reference") - options.docTitle("Mapbox Maps SDK for Android $VERSION_NAME") - options.header("Mapbox Maps SDK for Android $VERSION_NAME Reference") - options.bottom("© 2015–2019 Mapbox. All rights reserved.") - options.links("http://docs.oracle.com/javase/7/docs/api/") - options.linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference" - options.overview("src/main/java/overview.html") - options.group("Mapbox Android SDK", "com.mapbox.*") - exclude '**/R.java', '**/BuildConfig.java', '**/**.java.ejs', '**/**.html' - failOnError false - } -} \ No newline at end of file