Remove Wiremock (#22305)

* Bump wiremock to 2.35.0

* Entirely remove wiremock for now

* Remove wiremock references

Author: jkmassel

.github/dependabot.yml

@@ -20,9 +20,6 @@ updates:
       # Gutenberg. As such, and as agreed, any update is paused. For more details, see
       # https://github.com/wordpress-mobile/WordPress-Android/pull/17936#issuecomment-1553227875
       - dependency-name: "com.google.android.exoplayer:exoplayer"
-      # Bumping 2.26.3 to 2.27.2 will break the mocks. For more details, see
-      # https://github.com/wiremock/wiremock/issues/1345#issuecomment-656060968
-      - dependency-name: "com.github.tomakehurst:wiremock"
       # List of React Native related dependencies that should be explicitly updated alongside a
       # React Native upgrade. For more details, see
       # https://github.com/wordpress-mobile/WordPress-Android/pull/18494#issuecomment-1566922244

WordPress/src/androidTest/java/org/wordpress/android/e2e/StatsTests.kt

@@ -13,11 +13,9 @@ import org.wordpress.android.e2e.pages.MySitesPage
 import org.wordpress.android.support.BaseTest
 import org.wordpress.android.support.ComposeEspressoLink
 import org.wordpress.android.support.WPSupportUtils
-import org.wordpress.android.wiremock.WireMockStub
-import org.wordpress.android.wiremock.WireMockUrlPath
 
 @HiltAndroidTest
-class StatsTests : BaseTest(listOf(WireMockStub(urlPath = WireMockUrlPath.FEATURE_RESPONSE, fileName = "new-stats-feature-response.json"))) {
+class StatsTests : BaseTest() {
     @Before
     fun setUp() {
         Assume.assumeTrue(BuildConfig.IS_JETPACK_APP)

WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java

@@ -1,26 +1,15 @@
 package org.wordpress.android.support;
 
-import android.app.Instrumentation;
-import android.util.Log;
 
-import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 import androidx.compose.ui.test.junit4.ComposeTestRule;
 import androidx.test.espresso.accessibility.AccessibilityChecks;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
-import com.github.jknack.handlebars.Helper;
-import com.github.jknack.handlebars.Options;
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.DateOffset;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.HandlebarsHelper;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResult;
 import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResult.AccessibilityCheckResultType;
+import com.google.gson.internal.bind.util.ISO8601Utils;
 
-import org.apache.commons.lang3.LocaleUtils;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.junit.Before;
@@ -31,25 +20,17 @@
 import org.wordpress.android.e2e.flows.LoginFlow;
 import org.wordpress.android.e2e.pages.MePage;
 import org.wordpress.android.e2e.pages.MySitesPage;
-import org.wordpress.android.editor.Utils;
-import org.wordpress.android.mocks.AndroidNotifier;
-import org.wordpress.android.mocks.AssetFileSource;
 import org.wordpress.android.rules.RetryTestRule;
 import org.wordpress.android.ui.WPLaunchActivity;
-import org.wordpress.android.wiremock.WireMockStub;
 
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
 import dagger.hilt.android.testing.HiltAndroidRule;
 
 import static androidx.compose.ui.test.junit4.AndroidComposeTestRule_androidKt.createComposeRule;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesTypes;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.is;
@@ -60,7 +41,6 @@
 
 public class BaseTest {
     static final String TAG = BaseTest.class.getSimpleName();
-    public static final int WIREMOCK_PORT = 8080;
 
     @Rule(order = 0)
     public HiltAndroidRule mHiltRule = new HiltAndroidRule(this);
@@ -76,52 +56,8 @@ public class BaseTest {
             = new ActivityScenarioRule<>(WPLaunchActivity.class);
 
     @Rule(order = 4)
-    public WireMockRule wireMockRule;
-
-    @Rule(order = 5)
     public RetryTestRule retryTestRule = new RetryTestRule();
 
-    public BaseTest() {
-        this(null);
-    }
-
-    /**
-     * Constructor
-     *
-     * @param wireMockStubs the wiremock stubs to use for this specific test.
-     */
-    public BaseTest(@Nullable final List<WireMockStub> wireMockStubs) {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        wireMockRule = new WireMockRule(
-                options().port(WIREMOCK_PORT)
-                         .fileSource(
-                             new AssetFileSource(instrumentation.getContext().getAssets())
-                         )
-
-                         .extensions(new ResponseTemplateTransformer(true, new HashMap<String, Helper>() {
-                             {
-                                 put("fnow", new UnlocalizedDateHelper());
-                             }
-                         }))
-                         .notifier(new AndroidNotifier()));
-        if (wireMockStubs != null && !wireMockStubs.isEmpty()) {
-            for (WireMockStub wireMockStub : wireMockStubs) {
-                try {
-                    final String result = Utils.getStringFromInputStream(
-                            instrumentation.getContext().getClassLoader().getResourceAsStream(
-                                    wireMockStub.getFileName()
-                            )
-                    );
-                    // This is where we can stub out
-                    wireMockRule.stubFor(WireMock.get(WireMock.urlPathMatching(wireMockStub.getUrlPath().getPath()))
-                                                 .willReturn(WireMock.aResponse().withBody(result)));
-                } catch (final Exception exception) {
-                    Log.e(TAG, "Problem stubbing endpoint", exception);
-                }
-            }
-        }
-    }
-
     @Before
     public void setup() {
         Matcher<? super AccessibilityCheckResult> nonErrorLevelMatcher =
@@ -172,27 +108,6 @@ private void wpLogout() {
     }
 }
 
-class UnlocalizedDateHelper extends HandlebarsHelper<Object> {
-    @Override public Object apply(Object context, Options options) throws IOException {
-        String format = options.hash("format", null);
-        String offset = options.hash("offset", null);
-        String timezone = options.hash("timezone", null);
-        String localeCode = options.hash("locale", "en_US_POSIX");
-
-        Date date = new Date();
-        if (offset != null) {
-            date = new DateOffset(offset).shift(date);
-        }
-
-        Locale locale = Locale.getDefault();
-        if (localeCode != null) {
-            locale = LocaleUtils.toLocale(localeCode);
-        }
-
-        return new LocaleAwareRenderableDate(date, format, timezone, locale);
-    }
-}
-
 class LocaleAwareRenderableDate {
     private static final long DIVIDE_MILLISECONDS_TO_SECONDS = 1000L;
 
@@ -208,7 +123,7 @@ class LocaleAwareRenderableDate {
         this.mLocale = locale;
     }
 
-    @Override
+    @NonNull @Override
     public String toString() {
         if (mFormat != null) {
             if (mFormat.equals("epoch")) {

WordPress/src/androidTest/java/org/wordpress/android/support/MockingInterceptor.kt

@@ -16,7 +16,6 @@ class MockingInterceptor : Interceptor {
             val newUrl = request.url.newBuilder()
                 .scheme("http")
                 .host("localhost")
-                .port(BaseTest.WIREMOCK_PORT)
                 .build()
             val newRequest = request.newBuilder()
                 .url(newUrl)

WordPress/src/androidTest/java/org/wordpress/android/util/StatsMocksReader.kt

@@ -8,8 +8,7 @@ class StatsMocksReader {
             MutableList<StatsKeyValueData> {
         val todayMarker = "{{now format='yyyy-MM-dd'}}"
         val readString = this.readAssetsFile("mocks/mappings/wpcom/stats/$fileName.json")
-        val wireMockJSON = JSONObject(readString)
-        val arrayRaw = wireMockJSON
+        val arrayRaw = JSONObject(readString)
             .getJSONObject("response")
             .getJSONObject("jsonBody")
             .getJSONObject("days")

WordPress/src/androidTest/java/org/wordpress/android/wiremock/WireMockStub.kt

@@ -98,7 +98,6 @@ squareup-kotlin-poet = '1.18.1'
 squareup-okhttp3 = '5.2.1'
 squareup-retrofit = '3.0.0'
 wellsql = '2.0.0'
-wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-lint = '2.2.0'
 wordpress-persistent-edittext = '1.0.2'
@@ -257,7 +256,6 @@ squareup-okhttp3-urlconnection = { module = "com.squareup.okhttp3:okhttp-urlconn
 squareup-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "squareup-retrofit" }
 wellsql = { module = "org.wordpress:wellsql", version.ref = "wellsql" }
 wellsql-processor = { module = "org.wordpress.wellsql:wellsql-processor", version.ref = "wellsql" }
-wiremock = { group = "com.github.tomakehurst", name = "wiremock", version.ref = "wiremock" }
 wordpress-lint = { group = "org.wordpress", name = "lint", version.ref = "wordpress-lint" }
 wordpress-persistent-edittext = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordpress-persistent-edittext" }
 wordpress-rs-android = { group = "rs.wordpress.api", name = "android", version.ref = "wordpress-rs" }

gradle/libs.versions.toml

@@ -12,34 +12,3 @@ android {
         compileSdk rootProject.compileSdkVersion
     }
 }
-
-dependencies {
-    api(libs.wiremock.get().module.toString()) {
-        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-        exclude group: 'org.apache.commons', module: 'commons-lang3'
-        exclude group: 'asm', module: 'asm'
-        exclude group: 'org.json', module: 'json'
-    }
-    runtimeOnly(libs.apache.http.client.android)
-
-    constraints {
-        implementation(libs.wiremock) {
-            because("newer versions of WireMock use Java APIs not available on Android")
-        }
-
-        def wireMockSecurity = "version shipped with WireMock 2.26.3 contains security vulnerabilities"
-
-        implementation(libs.jetty.webapp) {
-            because(wireMockSecurity)
-        }
-        implementation(libs.jackson.databind) {
-            because(wireMockSecurity)
-        }
-        implementation(libs.json.path) {
-            because(wireMockSecurity)
-        }
-        implementation(libs.commons.fileupload) {
-            because(wireMockSecurity)
-        }
-    }
-}