[in_app_purchase_storekit] Remove OCMock #6862

LouiseHsu · 2024-06-04T00:00:36Z

Also fixes the broken symlinking between test files.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

…move-ocmock

hellohuanlin · 2024-06-18T23:23:39Z

..._app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/InAppPurchasePluginTests.m

+  PaymentQueueHandlerStub *handlerStub = [[PaymentQueueHandlerStub alloc] init];
+  self.plugin.paymentQueueHandler = handlerStub;
+
+  __block NSInteger presentCodeRedemptionSheetCount = 0;


hellohuanlin · 2024-06-18T23:25:52Z

..._app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/InAppPurchasePluginTests.m

-  plugin.transactionObserverCallbackChannel = mockChannel;
-  OCMStub([mockChannel invokeMethod:[OCMArg any] arguments:[OCMArg any]]);
+  MethodChannelStub *channelStub = [[MethodChannelStub alloc] init];
+  __block NSInteger invokeMethodCount = 0;


hellohuanlin · 2024-06-18T23:29:38Z

packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Mocks.h

+
+NS_ASSUME_NONNULL_BEGIN
+
+// An interface representing a stubbed DefaultPaymentQueue


hellohuanlin · 2024-06-18T23:36:58Z

packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Mocks.h

+@end
+
+#if TARGET_OS_IOS
+@interface FlutterPluginRegistrarStub : NSObject <FlutterPluginRegistrar>


it's worth checking if it's possible to just use the real registrar in other tests.

hellohuanlin · 2024-06-18T23:37:47Z

...ages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/PaymentQueueTests.m

@@ -239,18 +239,39 @@ - (void)testStartObservingPaymentQueueShouldNotProcessTransactionsWhenCacheIsEmp
          }
          transactionCache:mockCache];

+  __block NSInteger TransactionCacheKeyUpdatedTransactionsInvoked = 0;
+  __block NSInteger TransactionCacheKeyUpdatedDownloadsInvoked = 0;
+  __block NSInteger TransactionCacheKeyRemovedTransactionsInvoked = 0;


naming convention

hellohuanlin · 2024-06-18T23:38:33Z

...ages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/PaymentQueueTests.m

-  FIATransactionCache *mockCache = OCMClassMock(FIATransactionCache.class);
+  SKPaymentTransaction *mockTransaction = [[SKPaymentTransactionStub alloc] init];
+  SKDownload *mockDownload = [[SKDownload alloc] init];
+  TransactionCacheStub *mockCache = [[TransactionCacheStub alloc] init];


hellohuanlin · 2024-06-18T23:39:17Z

...ages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/PaymentQueueTests.m

+
+  __block NSInteger clearInvoked = 0;
+  mockCache.clearStub = ^{
+    clearInvoked++;


hellohuanlin · 2024-06-18T23:40:02Z

...ages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/PaymentQueueTests.m

-  [handler paymentQueue:queue updatedDownloads:@[ mockDownload ]];
+  [handler paymentQueue:[[SKPaymentQueueStub alloc] init] updatedTransactions:@[ mockTransaction ]];
+  [handler paymentQueue:[[SKPaymentQueueStub alloc] init] removedTransactions:@[ mockTransaction ]];
+  [handler paymentQueue:[[SKPaymentQueueStub alloc] init] updatedDownloads:@[ mockDownload ]];


nit: use the same instance as before

auto-submit · 2024-06-21T23:15:23Z

auto label is removed for flutter/packages/6862, due to - The status or check suite Mac_arm64 ios_platform_tests_shard_1 master has failed. Please fix the issues identified (or deflake) before re-applying this label.

flutter/packages@711b4ac...03f5f6d 2024-06-24 [email protected] [interactive_media_ads] Fix README badge image URL (flutter/packages#6979) 2024-06-24 [email protected] [multicast_dns] Optimized Socket Binding: Always bind to 0.0.0.0 for simplicity and efficiency - #79772 (flutter/packages#6700) 2024-06-24 [email protected] [flutter_adaptive_scaffold] Allows for the animation duration to be adjusted using SlotLayout.from() (flutter/packages#6510) 2024-06-22 [email protected] [in_app_purchase_storekit] Remove OCMock (flutter/packages#6862) 2024-06-22 [email protected] [google_maps_flutter] Add iOS SDK 9.x support (flutter/packages#6902) 2024-06-21 [email protected] [google_maps_flutter] Partial Android host API Pigeon conversion (flutter/packages#6967) 2024-06-21 [email protected] Revert "Migrate `camera/android` from `SurfaceTexture`->`SurfaceProducer`." (flutter/packages#6964) 2024-06-21 [email protected] [quick_actions] Update to Pigeon 20 (flutter/packages#6961) 2024-06-20 [email protected] [google_maps_flutter] Move Android inspector to Pigeon (flutter/packages#6958) 2024-06-20 [email protected] Manual roll Flutter from ccf3abe to 6c06abb (21 revisions) (flutter/packages#6954) 2024-06-20 [email protected] [many] More v1 embedding deletion that was missed in flutter/packages#6494 (flutter/packages#6923) 2024-06-20 [email protected] [google_maps_flutter] deprecate old BitmapDescriptor methods (flutter/packages#6905) 2024-06-18 [email protected] [pigeon] Fully-qualify types in Equatable extension test (flutter/packages#6946) 2024-06-18 [email protected] [flutter_markdown] fixes null check operator used on null value if onSelectionChanged isâ�¦ (flutter/packages#6883) 2024-06-17 [email protected] Roll Flutter from 5187cab to ccf3abe (6 revisions) (flutter/packages#6940) 2024-06-17 [email protected] [google_sign_in_web] README.md typo (flutter/packages#6642) 2024-06-17 49699333+dependabot[bot]@users.noreply.github.com [camera]: Bump com.google.guava:guava from 32.0.1-android to 33.2.1-android and CameraX version to 1.3.4 in /packages/camera/camera_android_camerax/android (flutter/packages#6847) 2024-06-17 49699333+dependabot[bot]@users.noreply.github.com [sign_in]: Bump com.google.guava:guava from 32.0.1-android to 33.2.1-android in /packages/google_sign_in/google_sign_in_android/android (flutter/packages#6846) 2024-06-17 49699333+dependabot[bot]@users.noreply.github.com [quick_actions]: Bump com.android.tools.build:gradle from 7.2.1 to 8.4.1 in /packages/quick_actions/quick_actions_android/android (flutter/packages#6799) 2024-06-17 49699333+dependabot[bot]@users.noreply.github.com [path_provider]: Bump androidx.annotation:annotation from 1.7.1 to 1.8.0 in /packages/path_provider/path_provider_android/android (flutter/packages#6773) 2024-06-17 49699333+dependabot[bot]@users.noreply.github.com [camera]: Bump androidx.annotation:annotation from 1.7.1 to 1.8.0 in /packages/camera/camera_android/android (flutter/packages#6766) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

LouiseHsu added 4 commits May 13, 2024 11:15

init

3f22950

Merge remote-tracking branch 'upstream/main'

b3ae498

wip

750d5d6

tests are passing

60a1cfe

github-actions bot added p: in_app_purchase p: local_auth platform-ios platform-macos labels Jun 4, 2024

LouiseHsu added 8 commits June 4, 2024 12:05

NOW tests are passing

07d1fa9

PaymentQueue tests

e055868

remove some incidental files

27bc9dc

remove files 2

86fe875

.

f0440fa

.

77821d0

.

c4ba598

.

4337a30

github-actions bot removed the p: local_auth label Jun 5, 2024

LouiseHsu added 4 commits June 5, 2024 09:28

Merge branch 'main' into remove-ocmock

3331f6b

remove testing files

710f892

Merge branch 'remove-ocmock' of github.com:LouiseHsu/packages into re…

dd54781

…move-ocmock

formatting

a6f5c6b

LouiseHsu changed the title ~~Remove ocmock~~ [in_app_purchase_storekit] Remove OCMock Jun 5, 2024

LouiseHsu added 8 commits June 5, 2024 12:54

missing import for mac

e8425f3

warnings

135e328

macos warnings

3d43bb0

.

eb6d45e

.

04c733f

remove ocmock from pods

0cb8821

clean up

801d47f

.

1fcbabd

hellohuanlin reviewed Jun 18, 2024

View reviewed changes

hellohuanlin approved these changes Jun 18, 2024

View reviewed changes

LouiseHsu added 6 commits June 21, 2024 14:28

.

7a54cf9

oopsies mac version

dc5499e

remove extra symlnked files

ebd6bf1

.

bb41e93

.

d3f2479

.

aed5b28

LouiseHsu added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 21, 2024

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jun 21, 2024

LouiseHsu merged commit 02e71b0 into flutter:main Jun 22, 2024
74 checks passed

engine-flutter-autoroll mentioned this pull request Jun 24, 2024

Roll Packages from 711b4ac2794e to 02e71b087e76 (18 revisions) flutter/flutter#150700

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 24, 2024

02e71b0 [in_app_purchase_storekit] Remove OCMock (flutter/packages#6862)

3a8bcdf

engine-flutter-autoroll mentioned this pull request Jun 24, 2024

Roll Packages from 711b4ac2794e to 02e71b087e76 (18 revisions) flutter/flutter#150705

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 24, 2024

02e71b0 [in_app_purchase_storekit] Remove OCMock (flutter/packages#6862)

4e109a5

engine-flutter-autoroll mentioned this pull request Jun 24, 2024

Roll Packages from 711b4ac2794e to fdb78fcbd55d (19 revisions) flutter/flutter#150711

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 24, 2024

02e71b0 [in_app_purchase_storekit] Remove OCMock (flutter/packages#6862)

06173dc

jmagman mentioned this pull request Jun 24, 2024

[in_app_purchase] Use StoreKit 2 APIs flutter/flutter#116383

Open

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Packages from 711b4ac2794e to 03f5f6d5660c (21 revisions) flutter/flutter#150779

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 25, 2024

02e71b0 [in_app_purchase_storekit] Remove OCMock (flutter/packages#6862)

62ac39a

reidbaker mentioned this pull request Jul 2, 2024

i151188 update espresso dependencies v2 reidbaker/packages#6

Closed

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[in_app_purchase_storekit] Remove OCMock #6862

[in_app_purchase_storekit] Remove OCMock #6862

LouiseHsu commented Jun 4, 2024 •

edited

Loading

hellohuanlin Jun 18, 2024

hellohuanlin Jun 18, 2024

hellohuanlin Jun 18, 2024

hellohuanlin Jun 18, 2024

hellohuanlin Jun 18, 2024

hellohuanlin Jun 18, 2024

hellohuanlin Jun 18, 2024

hellohuanlin Jun 18, 2024

auto-submit bot commented Jun 21, 2024


		NS_ASSUME_NONNULL_BEGIN

		// An interface representing a stubbed DefaultPaymentQueue

[in_app_purchase_storekit] Remove OCMock #6862

[in_app_purchase_storekit] Remove OCMock #6862

Conversation

LouiseHsu commented Jun 4, 2024 • edited Loading

Pre-launch Checklist

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

auto-submit bot commented Jun 21, 2024

LouiseHsu commented Jun 4, 2024 •

edited

Loading