Remove integration test flavor

.circleci/config.yml

@@ -151,22 +151,20 @@ jobs:
       - android/restore-build-cache
       - run:
           name: Run Tests
-          # We are running tests in the "defaults" flavor only. If we ever add/remove flavors, we will need to update
-          # this command.
-          command: ./gradlew lint testDefaultsDebugUnitTest testDefaultsReleaseUnitTest
+          command: ./gradlew lint test
       - run:
           name: Consolidate artifacts
           command: |
               mkdir -p build/test-results/
               find . -type f -regex ".*/build/test-results/.*xml" -exec cp --parents {} build/test-results/ \;
       - run:
           name: Kover HTML
-          command: ./gradlew purchases:koverHtmlReportDefaultsRelease
+          command: ./gradlew purchases:koverHtmlReportRelease
       - run:
           name: Kover XML
-          command: ./gradlew purchases:koverXmlReportDefaultsRelease
+          command: ./gradlew purchases:koverXmlReportRelease
       - codecov/upload:
-          file: purchases/build/reports/kover/reportDefaultsRelease.xml
+          file: purchases/build/reports/kover/reportRelease.xml
       - android/save-build-cache
       - store_artifacts:
           path: build/reports

.run/Debug tests.run.xml

@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="testDefaultsDebugUnitTest" />
+          <option value="testDebugUnitTest" />
         </list>
       </option>
       <option name="vmOptions" />

.run/Purchases Integration Tests (set purchases module variant before executing).run.xml → .run/Purchases Integration Tests.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Purchases Integration Tests (set purchases module variant before executing)" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests" singleton="true">
+  <configuration default="false" name="Purchases Integration Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests" singleton="true">
     <module name="purchases-android.purchases.androidTest" />
     <option name="TESTING_TYPE" value="0" />
     <option name="METHOD_NAME" value="" />

.run/Release tests.run.xml

@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="testDefaultsReleaseUnitTest" />
+          <option value="testReleaseUnitTest" />
         </list>
       </option>
       <option name="vmOptions" />

base-application.gradle

@@ -5,10 +5,6 @@ android {
     defaultConfig {
         minSdkVersion minVersion
         targetSdkVersion compileVersion
-        // Library modules have a new dimension used to add extra APIs for integration tests
-        // Our applications however don't need the extra flavor. This makes sure that we use the
-        // flavor without the extra APIs in our applications.
-        missingDimensionStrategy 'extraAPIs', 'defaults'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

fastlane/Fastfile

@@ -175,12 +175,11 @@ platform :android do
       new_text: ENV['LOAD_SHEDDER_REVENUECAT_API_KEY'],
       paths_of_files_to_update: [constants_path]
     )
-    # Running integration test flavor in order to make backend tests run faster, since the jittering is too
-    # long in the `defaults` flavor.
     gradle(
-      task: ':purchases:testIntegrationTestDebugUnitTest',
+      task: ':purchases:testDebugUnitTest',
       properties: {
-        "RUN_INTEGRATION_TESTS" => true
+        "RUN_INTEGRATION_TESTS" => true,
+        "minSdkVersion" => 21,
       }
     )
   end
@@ -221,7 +220,7 @@ platform :android do
   def build_purchases_integration_tests(app_name:, api_key:, google_purchase_token:, product_id_to_purchase:,
                                         base_plan_id_to_purchase:, active_entitlements_to_verify: '',
                                         proxy_url: nil, build_type: 'release')
-    constants_path = './purchases/src/androidTestIntegrationTest/kotlin/com/revenuecat/purchases/Constants.kt'
+    constants_path = './purchases/src/androidTest/kotlin/com/revenuecat/purchases/Constants.kt'
     replace_text_in_files(
       previous_text: "REVENUECAT_API_KEY",
       new_text: api_key,
@@ -472,11 +471,12 @@ def build_purchases_android_test_apk(package_name, apk_name, build_type)
     task: ':purchases:assembleAndroidTest',
     properties: {
       "testApplicationId" => package_name,
-      "testBuildType" => build_type
+      "testBuildType" => build_type,
+      "minSdkVersion" => 21
     }
   )
-  apk_path = "../purchases/build/outputs/apk/androidTest/integrationTest/#{build_type}/purchases-integrationTest-#{build_type}-androidTest.apk"
-  new_apk_path = "../purchases/build/outputs/apk/androidTest/integrationTest/#{build_type}/#{apk_name}.apk"
+  apk_path = "../purchases/build/outputs/apk/androidTest/#{build_type}/purchases-#{build_type}-androidTest.apk"
+  new_apk_path = "../purchases/build/outputs/apk/androidTest/#{build_type}/#{apk_name}.apk"
   sh "mv #{apk_path} #{new_apk_path}"
   copy_artifacts(
     target_path: 'purchases/test_artifacts',

gradle.properties

@@ -42,7 +42,7 @@ purchaseTesterMinSdkVersion=21
 
 #Do not sign releases. When calling uploadArchives pass -PRELEASE_SIGNING_ENABLED=true
 RELEASE_SIGNING_ENABLED=false
-ANDROID_VARIANT_TO_PUBLISH=defaultsRelease
+ANDROID_VARIANT_TO_PUBLISH=release
 SONATYPE_HOST=DEFAULT
 SONATYPE_AUTOMATIC_RELEASE=true
 

library.gradle

@@ -2,19 +2,8 @@ android {
     compileSdkVersion compileVersion
     buildToolsVersion buildToolsVersion
 
-    flavorDimensions "extraAPIs"
-    productFlavors {
-        defaults {
-            dimension "extraAPIs"
-        }
-        integrationTest {
-            dimension "extraAPIs"
-            minSdkVersion 21 // Needed because mockk-android requires API 21
-        }
-    }
-
     defaultConfig {
-        minSdkVersion minVersion
+        minSdkVersion obtainMinSdkVersion()
         targetSdkVersion compileVersion
         versionCode 1
         versionName "6.8.0-SNAPSHOT"
@@ -42,3 +31,13 @@ project.afterEvaluate {
     // after https://github.com/Kotlin/kotlinx-kover/issues/362 is fixed
     project.pluginManager.apply("org.jetbrains.kotlinx.kover")
 }
+
+def obtainMinSdkVersion() {
+    def result = minVersion
+
+    if (project.hasProperty("minSdkVersion")) {
+        result = project.getProperties().get("minSdkVersion").toInteger()
+    }
+
+    result
+}

purchases/build.gradle

@@ -15,14 +15,12 @@ android {
         buildConfig true
     }
 
-    productFlavors {
-        integrationTest {
-            testApplicationId obtainTestApplicationId()
-            testBuildType obtainTestBuildType()
-            packagingOptions {
-                resources.excludes.add("META-INF/LICENSE.md")
-                resources.excludes.add("META-INF/LICENSE-notice.md")
-            }
+    defaultConfig {
+        testApplicationId obtainTestApplicationId()
+        testBuildType obtainTestBuildType()
+        packagingOptions {
+            resources.excludes.add("META-INF/LICENSE.md")
+            resources.excludes.add("META-INF/LICENSE-notice.md")
         }
     }
 
@@ -81,18 +79,18 @@ dependencies {
     testImplementation libs.okhttp.mockwebserver
     testImplementation libs.playServices.ads.identifier
 
-    integrationTestImplementation libs.androidx.appcompat
-    integrationTestImplementation libs.material
-    integrationTestImplementation libs.androidx.constraintlayout
-
-    androidTestIntegrationTestImplementation libs.androidx.lifecycle.runtime.ktx
-    androidTestIntegrationTestImplementation libs.androidx.test.espresso.core
-    androidTestIntegrationTestImplementation libs.androidx.test.runner
-    androidTestIntegrationTestImplementation libs.androidx.test.rules
-    androidTestIntegrationTestImplementation libs.androidx.test.junit
-    androidTestIntegrationTestImplementation libs.assertJ
-    androidTestIntegrationTestImplementation libs.mockk.android
-    androidTestIntegrationTestImplementation libs.mockk.agent
+    androidTestImplementation libs.androidx.appcompat
+    androidTestImplementation libs.androidx.core
+    androidTestImplementation libs.androidx.lifecycle.common
+    androidTestImplementation libs.androidx.lifecycle.runtime.ktx
+    androidTestImplementation libs.androidx.lifecycle.process
+    androidTestImplementation libs.androidx.test.espresso.core
+    androidTestImplementation libs.androidx.test.runner
+    androidTestImplementation libs.androidx.test.rules
+    androidTestImplementation libs.androidx.test.junit
+    androidTestImplementation libs.assertJ
+    androidTestImplementation libs.mockk.android
+    androidTestImplementation libs.mockk.agent
 }
 
 tasks.dokkaHtmlPartial.configure {

purchases/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">
+    <!-- Ignoring errors in API <21 since mockk-android is only supported starting in API 21 -->
+    <uses-sdk tools:overrideLibrary="io.mockk,io.mockk.proxy.android"/>
+    <application
+            android:allowBackup="true"
+            android:label="RevenueCatIntegrationTests"
+            android:supportsRtl="true"
+            android:debuggable="true"
+            tools:ignore="HardcodedDebugMode">
+        <activity android:name="com.revenuecat.purchases.MainActivity" android:exported="true"/>
+    </application>
+</manifest>

purchases/src/integrationTest/kotlin/com/revenuecat/purchases/MainActivity.kt → purchases/src/androidTest/kotlin/com/revenuecat/purchases/MainActivity.kt

@@ -2,9 +2,9 @@ package com.revenuecat.purchases
 
 import android.os.Bundle
 import android.widget.LinearLayout
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(LinearLayout(this))

purchases/src/androidTestIntegrationTest/kotlin/com/revenuecat/purchases/purchasesExtensions.kt → purchases/src/androidTest/kotlin/com/revenuecat/purchases/purchasesExtensions.kt

@@ -16,6 +16,7 @@ internal fun Purchases.Companion.configure(
         overrideBillingAbstract,
         forceServerErrors,
         forceSigningErrors,
+        runningIntegrationTests = true,
     ).also {
         @SuppressLint("RestrictedApi")
         sharedInstance = it

purchases/src/main/kotlin/com/revenuecat/purchases/PurchasesFactory.kt

@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.preference.PreferenceManager
 import androidx.annotation.VisibleForTesting
-import com.revenuecat.purchases.api.BuildConfig
 import com.revenuecat.purchases.common.Anonymizer
 import com.revenuecat.purchases.common.AppConfig
 import com.revenuecat.purchases.common.Backend
@@ -45,7 +44,6 @@ import java.util.concurrent.ThreadFactory
 internal class PurchasesFactory(
     private val apiKeyValidator: APIKeyValidator = APIKeyValidator(),
 ) {
-    private val integrationTestFlavor = "integrationTest"
 
     @Suppress("LongMethod", "LongParameterList")
     fun createPurchases(
@@ -55,6 +53,7 @@ internal class PurchasesFactory(
         overrideBillingAbstract: BillingAbstract? = null,
         forceServerErrors: Boolean = false,
         forceSigningError: Boolean = false,
+        runningIntegrationTests: Boolean = false,
     ): Purchases {
         validateConfiguration(configuration)
 
@@ -67,7 +66,7 @@ internal class PurchasesFactory(
                 proxyURL,
                 store,
                 dangerousSettings,
-                BuildConfig.FLAVOR == integrationTestFlavor,
+                runningIntegrationTests,
                 forceServerErrors,
                 forceSigningError,
             )
@@ -77,8 +76,8 @@ internal class PurchasesFactory(
             val sharedPreferencesForETags = ETagManager.initializeSharedPreferences(context)
             val eTagManager = ETagManager(sharedPreferencesForETags)
 
-            val dispatcher = Dispatcher(service ?: createDefaultExecutor())
-            val diagnosticsDispatcher = Dispatcher(createDiagnosticsExecutor())
+            val dispatcher = Dispatcher(service ?: createDefaultExecutor(), runningIntegrationTests)
+            val diagnosticsDispatcher = Dispatcher(createDiagnosticsExecutor(), runningIntegrationTests)
 
             var diagnosticsFileHelper: DiagnosticsFileHelper? = null
             var diagnosticsTracker: DiagnosticsTracker? = null

purchases/src/main/kotlin/com/revenuecat/purchases/common/Dispatcher.kt

@@ -24,7 +24,11 @@ internal enum class Delay(val minDelay: Duration, val maxDelay: Duration) {
 
 internal open class Dispatcher(
     private val executorService: ExecutorService,
+    private val runningIntegrationTests: Boolean = false,
 ) {
+    private companion object {
+        const val INTEGRATION_TEST_DELAY_PERCENTAGE: Double = .01
+    }
 
     abstract class AsyncCall : Runnable {
         @Throws(JSONException::class, IOException::class)
@@ -56,7 +60,10 @@ internal open class Dispatcher(
         synchronized(this.executorService) {
             if (!executorService.isShutdown) {
                 val future = if (delay != Delay.NONE && executorService is ScheduledExecutorService) {
-                    val delayToApply = (delay.minDelay.inWholeMilliseconds..delay.maxDelay.inWholeMilliseconds).random()
+                    var delayToApply = (delay.minDelay.inWholeMilliseconds..delay.maxDelay.inWholeMilliseconds).random()
+                    if (runningIntegrationTests) {
+                        delayToApply = (delayToApply * INTEGRATION_TEST_DELAY_PERCENTAGE).toLong()
+                    }
                     executorService.schedule(command, delayToApply, TimeUnit.MILLISECONDS)
                 } else {
                     executorService.submit(command)

purchases/src/defaults/kotlin/com/revenuecat/purchases/common/DispatcherConstants.kt → purchases/src/main/kotlin/com/revenuecat/purchases/common/DispatcherConstants.kt

@@ -2,7 +2,6 @@ package com.revenuecat.purchases.common
 
 import kotlin.time.Duration.Companion.milliseconds
 
-// These values are modified in the `integrationTest` flavor to make the tests run faster.
 internal object DispatcherConstants {
     val jitterDelay = 5000L.milliseconds
     val jitterLongDelay = 10000L.milliseconds

purchases/src/test/java/com/revenuecat/purchases/backend_integration_tests/BaseBackendIntegrationTest.kt

@@ -81,8 +81,8 @@ internal abstract class BaseBackendIntegrationTest {
             every { forceServerErrors } returns false
             every { forceSigningErrors } returns false
         }
-        dispatcher = Dispatcher(Executors.newSingleThreadScheduledExecutor())
-        diagnosticsDispatcher = Dispatcher(Executors.newSingleThreadScheduledExecutor())
+        dispatcher = Dispatcher(Executors.newSingleThreadScheduledExecutor(), runningIntegrationTests = true)
+        diagnosticsDispatcher = Dispatcher(Executors.newSingleThreadScheduledExecutor(), runningIntegrationTests = true)
         sharedPreferencesEditor = mockk<SharedPreferences.Editor>().apply {
             every { putString(any(), any()) } returns this
             every { apply() } just Runs