Remove integration test flavor #1143

tonidero · 2023-07-19T11:07:46Z

Description

After we joined all modules into one, we can remove the integration test flavor. This will simplify things

purchases/build.gradle

tonidero · 2023-07-19T11:09:30Z

purchases/src/androidTest/AndroidManifest.xml

+<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"/>


Need this since mockk-android is only android api 21+. If we try to run integration test in less than that it would fail at runtime. Before, it wouldn't even run (since the integration test flavor was 21+). But I think this is ok?

tonidero · 2023-07-19T11:10:19Z

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


-class MainActivity : AppCompatActivity() {
+class MainActivity : FragmentActivity() {


I was running into a weird issue of a missing function when using AppCompatActivity... I tried to research a bit and didn't find anything. Going to the superclass fixed things, but we probably want to take another look when we have more time.

Is it maybe due to the differences in the AndroidManifest?

Shouldn't be, the activity that is defined is MainActivity, not the superclass... As in, why would it matter what's the superclass of the MainActivity in the AndroidManifest? It seemed to be as if a dependency was missing, but it didn't make much sense... We probably want to revisit this at some other time, but this works for now.

tonidero · 2023-07-19T11:10:58Z

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

+                    var delayToApply = (delay.minDelay.inWholeMilliseconds..delay.maxDelay.inWholeMilliseconds).random()
+                    if (runningIntegrationTests) {
+                        delayToApply = (delayToApply * INTEGRATION_TEST_DELAY_PERCENTAGE).toLong()
+                    }


This is not ideal... Honestly it was cleaner before, but I think it's worth this for the tradeoff of removing the extra flavor... Lmk what you think!

I honestly think the other way was a bit "magic" in the sense that it was hard to know the override was happening, I think this way it's more explicit

This reverts commit 1f440b2.

codecov · 2023-07-19T12:07:35Z

Codecov Report

Merging #1143 (9fef071) into main (32ee171) will increase coverage by 0.06%.
The diff coverage is 88.88%.

@@            Coverage Diff             @@
##             main    #1143      +/-   ##
==========================================
+ Coverage   85.37%   85.43%   +0.06%     
==========================================
  Files         175      176       +1     
  Lines        6194     6200       +6     
  Branches      916      917       +1     
==========================================
+ Hits         5288     5297       +9     
+ Misses        560      558       -2     
+ Partials      346      345       -1

Impacted Files	Coverage Δ
...revenuecat/purchases/common/DispatcherConstants.kt	`100.00% <ø> (ø)`
...otlin/com/revenuecat/purchases/PurchasesFactory.kt	`86.58% <75.00%> (ø)`
...tlin/com/revenuecat/purchases/common/Dispatcher.kt	`86.04% <100.00%> (+9.12%)`	⬆️

purchases/build.gradle

vegaro · 2023-07-19T12:45:27Z

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

+                    var delayToApply = (delay.minDelay.inWholeMilliseconds..delay.maxDelay.inWholeMilliseconds).random()
+                    if (runningIntegrationTests) {
+                        delayToApply = (delayToApply * INTEGRATION_TEST_DELAY_PERCENTAGE).toLong()
+                    }


I honestly think the other way was a bit "magic" in the sense that it was hard to know the override was happening, I think this way it's more explicit

vegaro · 2023-07-19T12:47:16Z

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

@@ -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) {


Is this the only place where we use runningIntegrationTests? If so maybe it's cleaner to have the delay as parameter of the Dispatcher constructor?

Hmm how do you mean? There can be 3 different types of delay: NONE, DEFAULT or LONG, with different durations so the delay needs to be a parameter of the enqueue method. Not sure if you meant something else?

nevermind, this looks good

vegaro · 2023-07-19T12:52:23Z

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


-class MainActivity : AppCompatActivity() {
+class MainActivity : FragmentActivity() {


Is it maybe due to the differences in the AndroidManifest?

### Description After we joined all modules into one, we can remove the integration test flavor. This will simplify things

@aboedo

**This is an automatic release.** ### New Features Introduced Custom Entitlements Computation mode. This is new library intended for apps that will do their own entitlement computation separate from RevenueCat. It's distributed as a separate artifact in Maven. Apps using this mode rely on webhooks to signal their backends to refresh entitlements with RevenueCat. See the [demo app for an example and usage instructions](https://github.com/RevenueCat/purchases-android/tree/main/examples/CustomEntitlementComputationSample). * Custom entitlements: add README and other improvements (#1167) via Andy Boedo (@aboedo) * Update Custom Entitlements Sample app (#1166) via Andy Boedo (@aboedo) * purchase coroutine (#1142) via Andy Boedo (@aboedo) * Add switchUser (#1156) via Cesar de la Vega (@vegaro) * CustomEntitlementsComputation: disable first listener callback when set (#1152) via Andy Boedo (@aboedo) * CustomEntitlementsComputation: Prevent posting subscriber attributes in post receipt (#1151) via Andy Boedo (@aboedo) * Fix `customEntitlementComputation` library deployment (#1169) via Toni Rico (@tonidero) * CustomEntitlementComputation: Configure method for customEntitlementComputation mode (#1168) via Toni Rico (@tonidero) * Add publish system for customEntitlementComputation package (#1149) via Cesar de la Vega (@vegaro) * Use purchase coroutine in CustomEntitlementComputationSample (#1162) via Cesar de la Vega (@vegaro) * Adds CustomEntitlementComputationSample (#1160) via Cesar de la Vega (@vegaro) * Fix tests in customEntitlementComputation after merges (#1161) via Toni Rico (@tonidero) * CustomEntitlementComputation: Remove custom entitlement computation flavor for amazon module (#1158) via Toni Rico (@tonidero) * CustomEntitlementComputation: Generate dokka docs only for defaults flavor (#1159) via Toni Rico (@tonidero) * CustomEntitlementComputation: Create different PurchasesConfiguration that requires an appUserId parameter (#1154) via Toni Rico (@tonidero) * CustomEntitlementComputation: New Purchases class (#1153) via Toni Rico (@tonidero) * CustomEntitlementComputation: Disable automatic cache refresh (#1157) via Toni Rico (@tonidero) * Add `customEntitlementComputation` flavor (#1147) via Toni Rico (@tonidero) * Make `customEntitlementComputation` singular (#1148) via Toni Rico (@tonidero) * Disable offline entitlements in custom entitlements computation mode (#1146) via Toni Rico (@tonidero) * Remove integration test flavor (#1143) via Toni Rico (@tonidero) * Add header to requests when in custom entitlement computation mode (#1145) via Toni Rico (@tonidero) * Add internal customEntitlementsComputation mode to app config (#1141) via Toni Rico (@tonidero) ### New Coroutines * `awaitPurchase` is available as a coroutine-friendly alternative to `purchase()`. (#1142) via Andy Boedo (@aboedo) ### Dependency Updates * Bump fastlane from 2.213.0 to 2.214.0 (#1140) via dependabot[bot] (@dependabot[bot]) ### Other changes * CI: make all Codecov jobs informational (#1155) via Cesar de la Vega (@vegaro) * Creates PurchasesOrchestrator (#1144) via Cesar de la Vega (@vegaro) --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: Andy Boedo <andresboedo@gmail.com>

@aboedo

### New Features Introduced Custom Entitlements Computation mode. This is new library intended for apps that will do their own entitlement computation separate from RevenueCat. It's distributed as a separate artifact in Maven. Apps using this mode rely on webhooks to signal their backends to refresh entitlements with RevenueCat. See the [demo app for an example and usage instructions](https://github.com/RevenueCat/purchases-android/tree/main/examples/CustomEntitlementComputationSample). * Custom entitlements: add README and other improvements (#1167) via Andy Boedo (@aboedo) * Update Custom Entitlements Sample app (#1166) via Andy Boedo (@aboedo) * purchase coroutine (#1142) via Andy Boedo (@aboedo) * Add switchUser (#1156) via Cesar de la Vega (@vegaro) * CustomEntitlementsComputation: disable first listener callback when set (#1152) via Andy Boedo (@aboedo) * CustomEntitlementsComputation: Prevent posting subscriber attributes in post receipt (#1151) via Andy Boedo (@aboedo) * Fix `customEntitlementComputation` library deployment (#1169) via Toni Rico (@tonidero) * CustomEntitlementComputation: Configure method for customEntitlementComputation mode (#1168) via Toni Rico (@tonidero) * Add publish system for customEntitlementComputation package (#1149) via Cesar de la Vega (@vegaro) * Use purchase coroutine in CustomEntitlementComputationSample (#1162) via Cesar de la Vega (@vegaro) * Adds CustomEntitlementComputationSample (#1160) via Cesar de la Vega (@vegaro) * Fix tests in customEntitlementComputation after merges (#1161) via Toni Rico (@tonidero) * CustomEntitlementComputation: Remove custom entitlement computation flavor for amazon module (#1158) via Toni Rico (@tonidero) * CustomEntitlementComputation: Generate dokka docs only for defaults flavor (#1159) via Toni Rico (@tonidero) * CustomEntitlementComputation: Create different PurchasesConfiguration that requires an appUserId parameter (#1154) via Toni Rico (@tonidero) * CustomEntitlementComputation: New Purchases class (#1153) via Toni Rico (@tonidero) * CustomEntitlementComputation: Disable automatic cache refresh (#1157) via Toni Rico (@tonidero) * Add `customEntitlementComputation` flavor (#1147) via Toni Rico (@tonidero) * Make `customEntitlementComputation` singular (#1148) via Toni Rico (@tonidero) * Disable offline entitlements in custom entitlements computation mode (#1146) via Toni Rico (@tonidero) * Remove integration test flavor (#1143) via Toni Rico (@tonidero) * Add header to requests when in custom entitlement computation mode (#1145) via Toni Rico (@tonidero) * Add internal customEntitlementsComputation mode to app config (#1141) via Toni Rico (@tonidero) ### New Coroutines * `awaitPurchase` is available as a coroutine-friendly alternative to `purchase()`. (#1142) via Andy Boedo (@aboedo) ### Dependency Updates * Bump fastlane from 2.213.0 to 2.214.0 (#1140) via dependabot[bot] (@dependabot[bot]) ### Other changes * CI: make all Codecov jobs informational (#1155) via Cesar de la Vega (@vegaro) * Creates PurchasesOrchestrator (#1144) via Cesar de la Vega (@vegaro) --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: Andy Boedo <andresboedo@gmail.com>

tonidero added 3 commits July 19, 2023 12:56

Remove integrationTest flavor

1ad7f42

Fix backend integration tests

b8d2d13

To revert: Testing all jobs in CircleCI

1f440b2

tonidero added the refactor label Jul 19, 2023

tonidero commented Jul 19, 2023

View reviewed changes

tonidero added 5 commits July 19, 2023 13:17

Fix run configurations

2bd38ca

Fix multidex issue

d09067c

Change minsdkversion during tests to 21

0969177

Fix tests job

3f07e56

Revert "To revert: Testing all jobs in CircleCI"

fe907e0

This reverts commit 1f440b2.

tonidero added 2 commits July 19, 2023 14:09

Rename run configuration to run integration tests

bf68f8d

Add tests for dispatcher logic

6d96a29

tonidero marked this pull request as ready for review July 19, 2023 12:25

tonidero requested a review from a team July 19, 2023 12:25

vegaro reviewed Jul 19, 2023

View reviewed changes

Remove unnecessary dependencies for integration tests

9fef071

tonidero requested a review from vegaro July 19, 2023 13:46

vegaro approved these changes Jul 19, 2023

View reviewed changes

tonidero merged commit 492e97c into main Jul 19, 2023
2 checks passed

tonidero deleted the toniricodiez/sdk-3234-remove-integrationtest-flavor branch July 19, 2023 14:52

RCGitBot mentioned this pull request Jul 19, 2023

[AUTOMATIC] Release/6.7.1 #1150

Closed

tonidero added a commit that referenced this pull request Jul 20, 2023

Remove integration test flavor (#1143)

67d1147

### Description After we joined all modules into one, we can remove the integration test flavor. This will simplify things

This was referenced Jul 21, 2023

[AUTOMATIC] Release/6.8.0 #1165

Closed

[AUTOMATIC] Release/6.8.0 #1170

Merged

RCGitBot mentioned this pull request Jul 24, 2023

[AUTOMATIC] Release/6.8.0 #1173

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove integration test flavor #1143

Remove integration test flavor #1143

tonidero commented Jul 19, 2023

tonidero Jul 19, 2023

tonidero Jul 19, 2023

vegaro Jul 19, 2023

tonidero Jul 19, 2023 •

edited

Loading

tonidero Jul 19, 2023

vegaro Jul 19, 2023

codecov bot commented Jul 19, 2023 •

edited

Loading

vegaro Jul 19, 2023

vegaro Jul 19, 2023

tonidero Jul 19, 2023

vegaro Jul 19, 2023

vegaro Jul 19, 2023


		class MainActivity : AppCompatActivity() {
		class MainActivity : FragmentActivity() {

Remove integration test flavor #1143

Remove integration test flavor #1143

Conversation

tonidero commented Jul 19, 2023

Description

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tonidero Jul 19, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Jul 19, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tonidero Jul 19, 2023 •

edited

Loading

codecov bot commented Jul 19, 2023 •

edited

Loading