From c7870a9b0a7e47516c98ae72042389580331f40a Mon Sep 17 00:00:00 2001
From: Birk Skyum <74932975+birkskyum@users.noreply.github.com>
Date: Wed, 11 Jan 2023 15:45:36 +0100
Subject: [PATCH] Port testapp activity unit tests to kotlin (#684)

---
 .../testapp/activity/EspressoTest.java        | 29 -------------------
 .../testapp/activity/EspressoTest.kt          | 25 ++++++++++++++++
 .../testapp/activity/activity.junit.ejs       | 27 +++++++----------
 .../android/scripts/generate-test-code.js     |  2 +-
 4 files changed, 36 insertions(+), 47 deletions(-)
 delete mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java
 create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.kt

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java
deleted file mode 100644
index eee01358e..000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity;
-
-import androidx.annotation.UiThread;
-
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
-
-
-/**
- * Base class for all tests using EspressoTestActivity as wrapper.
- * <p>
- * Loads "assets/streets.json" as style.
- * </p>
- */
-public class EspressoTest extends BaseTest {
-
-  @Override
-  protected final Class getActivityClass() {
-    return EspressoTestActivity.class;
-  }
-
-  @UiThread
-  @Override
-  protected void initMap(MapboxMap mapboxMap) {
-    mapboxMap.setStyle(new Style.Builder().fromUri("asset://streets.json"));
-    super.initMap(mapboxMap);
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.kt
new file mode 100644
index 000000000..1b614b0b9
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.kt
@@ -0,0 +1,25 @@
+package com.mapbox.mapboxsdk.testapp.activity
+
+import androidx.annotation.UiThread
+import com.mapbox.mapboxsdk.maps.MapboxMap
+import com.mapbox.mapboxsdk.maps.Style
+import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity
+
+/**
+ * Base class for all tests using EspressoTestActivity as wrapper.
+ *
+ *
+ * Loads "assets/streets.json" as style.
+ *
+ */
+open class EspressoTest : BaseTest() {
+    override fun getActivityClass(): Class<*> {
+        return EspressoTestActivity::class.java
+    }
+
+    @UiThread
+    override fun initMap(mapboxMap: MapboxMap) {
+        mapboxMap.setStyle(Style.Builder().fromUri("asset://streets.json"))
+        super.initMap(mapboxMap)
+    }
+}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs
index 9f55cb61c..e7da16cbf 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/activity.junit.ejs
@@ -5,29 +5,22 @@
 // This file is generated. Edit android/platform/scripts/generate-test-code.js, then run `make generate-test-android`.
 package com.mapbox.mapboxsdk.testapp.activity.gen.<%- subPackage %>;
 
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
-
-import com.mapbox.mapboxsdk.testapp.activity.BaseTest;
-import com.mapbox.mapboxsdk.testapp.activity.<%- subPackage %>.<%- activity %>;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import com.mapbox.mapboxsdk.testapp.activity.BaseTest
+import com.mapbox.mapboxsdk.testapp.activity.<%- subPackage %>.<%- activity %>
+import org.junit.Test
+import org.junit.runner.RunWith
 
 /**
  * Sanity test for <%- activity %>
  */
-@RunWith(AndroidJUnit4ClassRunner.class)
-public class <%- activity %>Test extends BaseTest {
-
+@RunWith(AndroidJUnit4ClassRunner::class)
+class <%- activity %>Test : BaseTest() {
     @Test
-    public void testSanity() {
-
+    fun testSanity() {
     }
 
-    @Override
-    protected Class getActivityClass() {
-        return <%- activity %>.class;
+    override fun getActivityClass(): Class<*> {
+        return <%- activity %>::class.java
     }
 }
diff --git a/platform/android/scripts/generate-test-code.js b/platform/android/scripts/generate-test-code.js
index 91cbc8897..17d79bf19 100644
--- a/platform/android/scripts/generate-test-code.js
+++ b/platform/android/scripts/generate-test-code.js
@@ -46,7 +46,7 @@ for(const subPackage of subPackages) {
       }
 
       // create path for test file
-      const filePath = `${testBasePath}/${subPackage}/${activityName}Test.java`;
+      const filePath = `${testBasePath}/${subPackage}/${activityName}Test.kt`;
 
       // try removing previous generated files
       try {