-
-
Notifications
You must be signed in to change notification settings - Fork 348
1197 fix version code inactive bundles #1198
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
DennisHartrampf
wants to merge
2
commits into
Triple-T:master
Choose a base branch
from
DennisHartrampf:1197-fix-versionCode-inactive-bundles
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletions
139
...st/kotlin/com/github/triplet/gradle/androidpublisher/internal/DefaultPlayPublisherTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| package com.github.triplet.gradle.androidpublisher.internal | ||
|
|
||
| import com.google.api.services.androidpublisher.AndroidPublisher | ||
| import com.google.api.services.androidpublisher.model.Apk | ||
| import com.google.api.services.androidpublisher.model.ApksListResponse | ||
| import com.google.api.services.androidpublisher.model.Bundle | ||
| import com.google.api.services.androidpublisher.model.BundlesListResponse | ||
| import com.google.common.truth.Truth.assertThat | ||
| import org.junit.jupiter.api.BeforeEach | ||
| import org.junit.jupiter.api.Test | ||
| import org.mockito.Mockito.mock | ||
| import org.mockito.Mockito.`when` | ||
|
|
||
| class DefaultPlayPublisherTest { | ||
| private val mockAndroidPublisher = mock(AndroidPublisher::class.java) | ||
| private val appId = "appId" | ||
| private val editId = "editId" | ||
|
|
||
| private val mockEdits = mock(AndroidPublisher.Edits::class.java) | ||
|
|
||
| private val mockBundles = mock(AndroidPublisher.Edits.Bundles::class.java) | ||
| private val mockBundlesList = mock(AndroidPublisher.Edits.Bundles.List::class.java) | ||
| private val mockBundlesResponse = mock(BundlesListResponse::class.java) | ||
|
|
||
| private val mockApks = mock(AndroidPublisher.Edits.Apks::class.java) | ||
| private val mockApksList = mock(AndroidPublisher.Edits.Apks.List::class.java) | ||
| private val mockApksResponse = mock(ApksListResponse::class.java) | ||
|
|
||
| private val publisher = DefaultPlayPublisher(mockAndroidPublisher, appId) | ||
|
|
||
| @BeforeEach | ||
| fun setUp() { | ||
| `when`(mockAndroidPublisher.edits()).thenReturn(mockEdits) | ||
|
|
||
| `when`(mockEdits.bundles()).thenReturn(mockBundles) | ||
| `when`(mockBundles.list(appId, editId)).thenReturn(mockBundlesList) | ||
| `when`(mockBundlesList.execute()).thenReturn(mockBundlesResponse) | ||
|
|
||
| `when`(mockEdits.apks()).thenReturn(mockApks) | ||
| `when`(mockApks.list(appId, editId)).thenReturn(mockApksList) | ||
| `when`(mockApksList.execute()).thenReturn(mockApksResponse) | ||
| } | ||
|
|
||
| @Test | ||
| fun `findMaxAppVersionCode returns 1 on null bundles and null apks`() { | ||
| `when`(mockBundlesResponse.bundles).thenReturn(null) | ||
| `when`(mockApksResponse.apks).thenReturn(null) | ||
|
|
||
| val max = publisher.findMaxAppVersionCode(editId) | ||
|
|
||
| assertThat(max).isEqualTo(1) | ||
| } | ||
|
|
||
| @Test | ||
| fun `findMaxAppVersionCode returns 1 on empty bundles and empty apks`() { | ||
| `when`(mockBundlesResponse.bundles).thenReturn(emptyList()) | ||
| `when`(mockApksResponse.apks).thenReturn(emptyList()) | ||
|
|
||
| val max = publisher.findMaxAppVersionCode(editId) | ||
|
|
||
| assertThat(max).isEqualTo(1) | ||
| } | ||
|
|
||
| private fun bundle(versionCode: Int): Bundle { | ||
| val bundle = Bundle() | ||
| bundle.versionCode = versionCode | ||
| return bundle | ||
| } | ||
|
|
||
| private fun apk(versionCode: Int): Apk { | ||
| val apk = Apk() | ||
| apk.versionCode = versionCode | ||
| return apk | ||
| } | ||
|
|
||
| @Test | ||
| fun `findMaxAppVersionCode succeeds with single bundle, no apks`() { | ||
| `when`(mockBundlesResponse.bundles).thenReturn(listOf(bundle(5))) | ||
| `when`(mockApksResponse.apks).thenReturn(emptyList()) | ||
|
|
||
| val max = publisher.findMaxAppVersionCode(editId) | ||
|
|
||
| assertThat(max).isEqualTo(5) | ||
| } | ||
|
|
||
| @Test | ||
| fun `findMaxAppVersionCode succeeds with no bundles, single apk`() { | ||
| `when`(mockBundlesResponse.bundles).thenReturn(emptyList()) | ||
| `when`(mockApksResponse.apks).thenReturn(listOf(apk(6))) | ||
|
|
||
| val max = publisher.findMaxAppVersionCode(editId) | ||
|
|
||
| assertThat(max).isEqualTo(6) | ||
| } | ||
|
|
||
| @Test | ||
| fun `findMaxAppVersionCode succeeds with multiple bundles and apks, max in bundles`() { | ||
| `when`(mockBundlesResponse.bundles).thenReturn( | ||
| listOf( | ||
| bundle(5), | ||
| bundle(12), | ||
| bundle(8), | ||
| ) | ||
| ) | ||
| `when`(mockApksResponse.apks).thenReturn( | ||
| listOf( | ||
| apk(3), | ||
| apk(7), | ||
| apk(2), | ||
| ) | ||
| ) | ||
|
|
||
| val max = publisher.findMaxAppVersionCode(editId) | ||
|
|
||
| assertThat(max).isEqualTo(12) | ||
| } | ||
|
|
||
| @Test | ||
| fun `findMaxAppVersionCode succeeds with multiple bundles and apks, max in apks`() { | ||
| `when`(mockBundlesResponse.bundles).thenReturn( | ||
| listOf( | ||
| bundle(5), | ||
| bundle(2), | ||
| bundle(8), | ||
| ) | ||
| ) | ||
| `when`(mockApksResponse.apks).thenReturn( | ||
| listOf( | ||
| apk(3), | ||
| apk(15), | ||
| apk(12), | ||
| ) | ||
| ) | ||
|
|
||
| val max = publisher.findMaxAppVersionCode(editId) | ||
|
|
||
| assertThat(max).isEqualTo(15) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this pulled out into a new fn? This module isn't supposed to have logic so this code should go back in DefaultEditManager.kt
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, thanks for the feedback. I wasn't aware of this. The reason was simplicity: The new function's logic needs
BundlesandAPKsfrom the Android Publisher. Both of these aren't available inDefaultEditManager, yet, and I was reluctant to introduce two new dependencies there. But I totally get your point and would change it.But - the fix didn't work anyway. It looks like
Track.releases,Bundles.listandApks.listall only contain active versions. So for now I don't see a way of fixing the issue when using theResolutionStrategy.AUTO. Also since I manually set my versionCode yesterday to be able to release my app update, I can't reproduce the issue on my machine anymore.