Skip to content

[in_app_purchase_storekit] convert TranslatorTests to swift #7232

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Jul 31, 2024
Merged

[in_app_purchase_storekit] convert TranslatorTests to swift #7232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e2d1d04
switch branches lol
LouiseHsu Jul 24, 2024
94926bb
tests passing
LouiseHsu Jul 26, 2024
665d17c
clean up
LouiseHsu Jul 28, 2024
476e313
.
LouiseHsu Jul 28, 2024
7a00574
.
LouiseHsu Jul 29, 2024
d8b6470
Merge branch 'main' into iap-tests-obecttranslator
LouiseHsu Jul 29, 2024
b6bb804
.
LouiseHsu Jul 29, 2024
2975698
conflict
LouiseHsu Jul 29, 2024
052fecf
.
LouiseHsu Jul 30, 2024
17b8469
.
LouiseHsu Jul 30, 2024
2e9ffb7
.
LouiseHsu Jul 30, 2024
8c0b795
added private modifiers
LouiseHsu Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.17+3

* Converts TranslatorTests to swift.

## 0.3.17+2

* Converts FIAPPaymentQueueDeleteTests to swift.
Expand Down
14 changes: 6 additions & 8 deletions packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAObjectTranslator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,9 @@ + (NSDictionary *)getMapFromNSLocale:(NSLocale *)locale {
return nil;
}
NSMutableDictionary *map = [[NSMutableDictionary alloc] init];
[map setObject:[locale objectForKey:NSLocaleCurrencySymbol] ?: [NSNull null]
forKey:@"currencySymbol"];
[map setObject:[locale objectForKey:NSLocaleCurrencyCode] ?: [NSNull null]
forKey:@"currencyCode"];
[map setObject:[locale objectForKey:NSLocaleCountryCode] ?: [NSNull null] forKey:@"countryCode"];
[map setObject:locale.currencySymbol ?: [NSNull null] forKey:@"currencySymbol"];
[map setObject:locale.currencyCode ?: [NSNull null] forKey:@"currencyCode"];
[map setObject:locale.countryCode ?: [NSNull null] forKey:@"countryCode"];
return map;
}

Expand Down Expand Up @@ -509,9 +507,9 @@ + (nullable SKProductsResponseMessage *)convertProductsResponseToPigeon:
[pigeonProducts addObject:[self convertProductToPigeon:product]];
};

SKProductsResponseMessage *msg =
[SKProductsResponseMessage makeWithProducts:pigeonProducts
invalidProductIdentifiers:productsResponse.invalidProductIdentifiers];
SKProductsResponseMessage *msg = [SKProductsResponseMessage
makeWithProducts:pigeonProducts
invalidProductIdentifiers:productsResponse.invalidProductIdentifiers ?: @[]];
return msg;
}

Expand Down
8 changes: 4 additions & 4 deletions ...ges/in_app_purchase/in_app_purchase_storekit/example/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
F27694112C49BF6F00277144 /* FIAPPaymentQueueDeleteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F27694102C49BF6F00277144 /* FIAPPaymentQueueDeleteTests.swift */; };
F27694172C49DBCA00277144 /* FIATransactionCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F27694162C49DBCA00277144 /* FIATransactionCacheTests.swift */; };
F295AD3A2C1256DD0067C78A /* Stubs.m in Sources */ = {isa = PBXBuildFile; fileRef = F295AD392C1256DD0067C78A /* Stubs.m */; };
F295AD462C1256F50067C78A /* TranslatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F295AD402C1256F50067C78A /* TranslatorTests.m */; };
F2D5272A2C583C4A00C137C7 /* TranslatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D527292C583C4A00C137C7 /* TranslatorTests.swift */; };
F2D5271A2C50627500C137C7 /* PaymentQueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D527192C50627500C137C7 /* PaymentQueueTests.swift */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -81,7 +81,7 @@
F27694162C49DBCA00277144 /* FIATransactionCacheTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FIATransactionCacheTests.swift; path = ../../shared/RunnerTests/FIATransactionCacheTests.swift; sourceTree = "<group>"; };
F295AD362C1251300067C78A /* Stubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Stubs.h; path = ../../shared/RunnerTests/Stubs.h; sourceTree = "<group>"; };
F295AD392C1256DD0067C78A /* Stubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Stubs.m; path = ../../shared/RunnerTests/Stubs.m; sourceTree = "<group>"; };
F295AD402C1256F50067C78A /* TranslatorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TranslatorTests.m; path = ../../shared/RunnerTests/TranslatorTests.m; sourceTree = "<group>"; };
F2D527292C583C4A00C137C7 /* TranslatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TranslatorTests.swift; path = ../../shared/RunnerTests/TranslatorTests.swift; sourceTree = "<group>"; };
F2D527192C50627500C137C7 /* PaymentQueueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaymentQueueTests.swift; path = ../../shared/RunnerTests/PaymentQueueTests.swift; sourceTree = "<group>"; };
F6E5D5F926131C4800C68BED /* Configuration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = Configuration.storekit; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -186,12 +186,12 @@
A59001A521E69658004A3E5E /* RunnerTests */ = {
isa = PBXGroup;
children = (
F2D527292C583C4A00C137C7 /* TranslatorTests.swift */,
F2D527192C50627500C137C7 /* PaymentQueueTests.swift */,
F27694162C49DBCA00277144 /* FIATransactionCacheTests.swift */,
F27694102C49BF6F00277144 /* FIAPPaymentQueueDeleteTests.swift */,
F24C45E12C409D41000C6C72 /* InAppPurchasePluginTests.swift */,
F276940A2C47268700277144 /* ProductRequestHandlerTests.swift */,
F295AD402C1256F50067C78A /* TranslatorTests.m */,
F295AD392C1256DD0067C78A /* Stubs.m */,
F295AD362C1251300067C78A /* Stubs.h */,
F22BF91B2BC9B40B00713878 /* SwiftStubs.swift */,
Expand Down Expand Up @@ -437,8 +437,8 @@
F24C45E22C409D42000C6C72 /* InAppPurchasePluginTests.swift in Sources */,
F22BF91C2BC9B40B00713878 /* SwiftStubs.swift in Sources */,
F276940B2C47268700277144 /* ProductRequestHandlerTests.swift in Sources */,
F295AD462C1256F50067C78A /* TranslatorTests.m in Sources */,
F295AD3A2C1256DD0067C78A /* Stubs.m in Sources */,
F2D5272A2C583C4A00C137C7 /* TranslatorTests.swift in Sources */,
F27694172C49DBCA00277144 /* FIATransactionCacheTests.swift in Sources */,
F27694112C49BF6F00277144 /* FIAPPaymentQueueDeleteTests.swift in Sources */,
);
Expand Down
1 change: 0 additions & 1 deletion packages/in_app_purchase/in_app_purchase_storekit/example/ios/RunnerTests/TranslatorTests.m
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...es/in_app_purchase/in_app_purchase_storekit/example/ios/RunnerTests/TranslatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../shared/RunnerTests/TranslatorTests.swift
8 changes: 4 additions & 4 deletions ...s/in_app_purchase/in_app_purchase_storekit/example/macos/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
F27694132C49BF7B00277144 /* FIAPPaymentQueueDeleteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F27694122C49BF7B00277144 /* FIAPPaymentQueueDeleteTests.swift */; };
F27694192C49DBE800277144 /* FIATransactionCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F27694182C49DBE800277144 /* FIATransactionCacheTests.swift */; };
F2C3A7412BD9D33D000D35F2 /* Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2C3A7402BD9D33D000D35F2 /* Stubs.swift */; };
F2D527262C583C1C00C137C7 /* TranslatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D527252C583C1C00C137C7 /* TranslatorTests.swift */; };
F2D5271E2C50645600C137C7 /* PaymentQueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D5271D2C50645600C137C7 /* PaymentQueueTests.swift */; };
F79BDC1C2905FC3200E3999D /* Stubs.m in Sources */ = {isa = PBXBuildFile; fileRef = F79BDC1B2905FC3200E3999D /* Stubs.m */; };
F79BDC1E2905FC3900E3999D /* TranslatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F79BDC1D2905FC3900E3999D /* TranslatorTests.m */; };
F8270DE1AEF80A8CF2C45688 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 045C0F7D19875EDA98DF0B7F /* Pods_RunnerTests.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -97,11 +97,11 @@
F27694182C49DBE800277144 /* FIATransactionCacheTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FIATransactionCacheTests.swift; path = ../../shared/RunnerTests/FIATransactionCacheTests.swift; sourceTree = "<group>"; };
F2C3A73F2BD9D33D000D35F2 /* RunnerTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RunnerTests-Bridging-Header.h"; sourceTree = "<group>"; };
F2C3A7402BD9D33D000D35F2 /* Stubs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stubs.swift; sourceTree = "<group>"; };
F2D527252C583C1C00C137C7 /* TranslatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TranslatorTests.swift; path = ../../shared/RunnerTests/TranslatorTests.swift; sourceTree = "<group>"; };
F2D5271D2C50645600C137C7 /* PaymentQueueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaymentQueueTests.swift; path = ../../shared/RunnerTests/PaymentQueueTests.swift; sourceTree = "<group>"; };
F700DD0228E652A10004836B /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F79BDC152905FC0500E3999D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../../shared/RunnerTests/Info.plist; sourceTree = "<group>"; };
F79BDC1B2905FC3200E3999D /* Stubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Stubs.m; path = ../../shared/RunnerTests/Stubs.m; sourceTree = "<group>"; };
F79BDC1D2905FC3900E3999D /* TranslatorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TranslatorTests.m; path = ../../shared/RunnerTests/TranslatorTests.m; sourceTree = "<group>"; };
F79BDC1F2906023C00E3999D /* Stubs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Stubs.h; path = ../../shared/RunnerTests/Stubs.h; sourceTree = "<group>"; };
F8E47120B1A50B8A1C480FDB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -217,6 +217,7 @@
F700DD0328E652A10004836B /* RunnerTests */ = {
isa = PBXGroup;
children = (
F2D527252C583C1C00C137C7 /* TranslatorTests.swift */,
F2D5271D2C50645600C137C7 /* PaymentQueueTests.swift */,
F27694182C49DBE800277144 /* FIATransactionCacheTests.swift */,
F27694122C49BF7B00277144 /* FIAPPaymentQueueDeleteTests.swift */,
Expand All @@ -225,7 +226,6 @@
F79BDC1F2906023C00E3999D /* Stubs.h */,
F79BDC152905FC0500E3999D /* Info.plist */,
F79BDC1B2905FC3200E3999D /* Stubs.m */,
F79BDC1D2905FC3900E3999D /* TranslatorTests.m */,
F2C3A7402BD9D33D000D35F2 /* Stubs.swift */,
F2C3A73F2BD9D33D000D35F2 /* RunnerTests-Bridging-Header.h */,
);
Expand Down Expand Up @@ -465,10 +465,10 @@
files = (
F2D5271E2C50645600C137C7 /* PaymentQueueTests.swift in Sources */,
F24C45E42C409D87000C6C72 /* InAppPurchasePluginTests.swift in Sources */,
F79BDC1E2905FC3900E3999D /* TranslatorTests.m in Sources */,
F79BDC1C2905FC3200E3999D /* Stubs.m in Sources */,
F27694092C4724B200277144 /* ProductRequestHandlerTests.swift in Sources */,
F2C3A7412BD9D33D000D35F2 /* Stubs.swift in Sources */,
F2D527262C583C1C00C137C7 /* TranslatorTests.swift in Sources */,
F27694192C49DBE800277144 /* FIATransactionCacheTests.swift in Sources */,
F27694132C49BF7B00277144 /* FIAPPaymentQueueDeleteTests.swift in Sources */,
);
Expand Down
1 change: 0 additions & 1 deletion ...ages/in_app_purchase/in_app_purchase_storekit/example/macos/RunnerTests/TranslatorTests.m
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .../in_app_purchase/in_app_purchase_storekit/example/macos/RunnerTests/TranslatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../shared/RunnerTests/TranslatorTests.swift
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what are these files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the actual test file gets put in shared/RunnerTests and the ios/macos workspaces just symlink to it. i guess this is what the symlinks look like

2 changes: 1 addition & 1 deletion ...rchase/in_app_purchase_storekit/example/shared/RunnerTests/InAppPurchasePluginTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ final class InAppPurchasePluginTests: XCTestCase {
}

XCTAssertEqual(unwrappedProducts.count, 1)
XCTAssertEqual(response.invalidProductIdentifiers, nil)
XCTAssertEqual(response.invalidProductIdentifiers, [])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this behavior change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

obj-c let me pass in a nil with no objections, but invalidProductIdentifiers is not an optional field in swift version of the api https://developer.apple.com/documentation/storekit/skproductsresponse/1505985-invalidproductidentifiers

XCTAssertEqual(unwrappedProducts[0].productIdentifier, "123")
expectation.fulfill()
}
Expand Down
Loading