Skip to content

Commit 0cc45ab

Browse files
authored
[in_app_purchase_storekit] convert TranslatorTests to swift (flutter#7232)
Part of flutter#151624
1 parent b0b4469 commit 0cc45ab

File tree

12 files changed

+573
-538
lines changed

12 files changed

+573
-538
lines changed

packages/in_app_purchase/in_app_purchase_storekit/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.3.17+3
2+
3+
* Converts TranslatorTests to swift.
4+
15
## 0.3.17+2
26

37
* Converts FIAPPaymentQueueDeleteTests to swift.

packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAObjectTranslator.m

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,9 @@ + (NSDictionary *)getMapFromNSLocale:(NSLocale *)locale {
118118
return nil;
119119
}
120120
NSMutableDictionary *map = [[NSMutableDictionary alloc] init];
121-
[map setObject:[locale objectForKey:NSLocaleCurrencySymbol] ?: [NSNull null]
122-
forKey:@"currencySymbol"];
123-
[map setObject:[locale objectForKey:NSLocaleCurrencyCode] ?: [NSNull null]
124-
forKey:@"currencyCode"];
125-
[map setObject:[locale objectForKey:NSLocaleCountryCode] ?: [NSNull null] forKey:@"countryCode"];
121+
[map setObject:locale.currencySymbol ?: [NSNull null] forKey:@"currencySymbol"];
122+
[map setObject:locale.currencyCode ?: [NSNull null] forKey:@"currencyCode"];
123+
[map setObject:locale.countryCode ?: [NSNull null] forKey:@"countryCode"];
126124
return map;
127125
}
128126

@@ -509,9 +507,9 @@ + (nullable SKProductsResponseMessage *)convertProductsResponseToPigeon:
509507
[pigeonProducts addObject:[self convertProductToPigeon:product]];
510508
};
511509

512-
SKProductsResponseMessage *msg =
513-
[SKProductsResponseMessage makeWithProducts:pigeonProducts
514-
invalidProductIdentifiers:productsResponse.invalidProductIdentifiers];
510+
SKProductsResponseMessage *msg = [SKProductsResponseMessage
511+
makeWithProducts:pigeonProducts
512+
invalidProductIdentifiers:productsResponse.invalidProductIdentifiers ?: @[]];
515513
return msg;
516514
}
517515

packages/in_app_purchase/in_app_purchase_storekit/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
F27694112C49BF6F00277144 /* FIAPPaymentQueueDeleteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F27694102C49BF6F00277144 /* FIAPPaymentQueueDeleteTests.swift */; };
2424
F27694172C49DBCA00277144 /* FIATransactionCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F27694162C49DBCA00277144 /* FIATransactionCacheTests.swift */; };
2525
F295AD3A2C1256DD0067C78A /* Stubs.m in Sources */ = {isa = PBXBuildFile; fileRef = F295AD392C1256DD0067C78A /* Stubs.m */; };
26-
F295AD462C1256F50067C78A /* TranslatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F295AD402C1256F50067C78A /* TranslatorTests.m */; };
26+
F2D5272A2C583C4A00C137C7 /* TranslatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D527292C583C4A00C137C7 /* TranslatorTests.swift */; };
2727
F2D5271A2C50627500C137C7 /* PaymentQueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D527192C50627500C137C7 /* PaymentQueueTests.swift */; };
2828
/* End PBXBuildFile section */
2929

@@ -81,7 +81,7 @@
8181
F27694162C49DBCA00277144 /* FIATransactionCacheTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FIATransactionCacheTests.swift; path = ../../shared/RunnerTests/FIATransactionCacheTests.swift; sourceTree = "<group>"; };
8282
F295AD362C1251300067C78A /* Stubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Stubs.h; path = ../../shared/RunnerTests/Stubs.h; sourceTree = "<group>"; };
8383
F295AD392C1256DD0067C78A /* Stubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Stubs.m; path = ../../shared/RunnerTests/Stubs.m; sourceTree = "<group>"; };
84-
F295AD402C1256F50067C78A /* TranslatorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TranslatorTests.m; path = ../../shared/RunnerTests/TranslatorTests.m; sourceTree = "<group>"; };
84+
F2D527292C583C4A00C137C7 /* TranslatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TranslatorTests.swift; path = ../../shared/RunnerTests/TranslatorTests.swift; sourceTree = "<group>"; };
8585
F2D527192C50627500C137C7 /* PaymentQueueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaymentQueueTests.swift; path = ../../shared/RunnerTests/PaymentQueueTests.swift; sourceTree = "<group>"; };
8686
F6E5D5F926131C4800C68BED /* Configuration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = Configuration.storekit; sourceTree = "<group>"; };
8787
/* End PBXFileReference section */
@@ -186,12 +186,12 @@
186186
A59001A521E69658004A3E5E /* RunnerTests */ = {
187187
isa = PBXGroup;
188188
children = (
189+
F2D527292C583C4A00C137C7 /* TranslatorTests.swift */,
189190
F2D527192C50627500C137C7 /* PaymentQueueTests.swift */,
190191
F27694162C49DBCA00277144 /* FIATransactionCacheTests.swift */,
191192
F27694102C49BF6F00277144 /* FIAPPaymentQueueDeleteTests.swift */,
192193
F24C45E12C409D41000C6C72 /* InAppPurchasePluginTests.swift */,
193194
F276940A2C47268700277144 /* ProductRequestHandlerTests.swift */,
194-
F295AD402C1256F50067C78A /* TranslatorTests.m */,
195195
F295AD392C1256DD0067C78A /* Stubs.m */,
196196
F295AD362C1251300067C78A /* Stubs.h */,
197197
F22BF91B2BC9B40B00713878 /* SwiftStubs.swift */,
@@ -437,8 +437,8 @@
437437
F24C45E22C409D42000C6C72 /* InAppPurchasePluginTests.swift in Sources */,
438438
F22BF91C2BC9B40B00713878 /* SwiftStubs.swift in Sources */,
439439
F276940B2C47268700277144 /* ProductRequestHandlerTests.swift in Sources */,
440-
F295AD462C1256F50067C78A /* TranslatorTests.m in Sources */,
441440
F295AD3A2C1256DD0067C78A /* Stubs.m in Sources */,
441+
F2D5272A2C583C4A00C137C7 /* TranslatorTests.swift in Sources */,
442442
F27694172C49DBCA00277144 /* FIATransactionCacheTests.swift in Sources */,
443443
F27694112C49BF6F00277144 /* FIAPPaymentQueueDeleteTests.swift in Sources */,
444444
);

packages/in_app_purchase/in_app_purchase_storekit/example/ios/RunnerTests/TranslatorTests.m

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../shared/RunnerTests/TranslatorTests.swift

packages/in_app_purchase/in_app_purchase_storekit/example/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
F27694132C49BF7B00277144 /* FIAPPaymentQueueDeleteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F27694122C49BF7B00277144 /* FIAPPaymentQueueDeleteTests.swift */; };
3333
F27694192C49DBE800277144 /* FIATransactionCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F27694182C49DBE800277144 /* FIATransactionCacheTests.swift */; };
3434
F2C3A7412BD9D33D000D35F2 /* Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2C3A7402BD9D33D000D35F2 /* Stubs.swift */; };
35+
F2D527262C583C1C00C137C7 /* TranslatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D527252C583C1C00C137C7 /* TranslatorTests.swift */; };
3536
F2D5271E2C50645600C137C7 /* PaymentQueueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2D5271D2C50645600C137C7 /* PaymentQueueTests.swift */; };
3637
F79BDC1C2905FC3200E3999D /* Stubs.m in Sources */ = {isa = PBXBuildFile; fileRef = F79BDC1B2905FC3200E3999D /* Stubs.m */; };
37-
F79BDC1E2905FC3900E3999D /* TranslatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F79BDC1D2905FC3900E3999D /* TranslatorTests.m */; };
3838
F8270DE1AEF80A8CF2C45688 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 045C0F7D19875EDA98DF0B7F /* Pods_RunnerTests.framework */; };
3939
/* End PBXBuildFile section */
4040

@@ -97,11 +97,11 @@
9797
F27694182C49DBE800277144 /* FIATransactionCacheTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FIATransactionCacheTests.swift; path = ../../shared/RunnerTests/FIATransactionCacheTests.swift; sourceTree = "<group>"; };
9898
F2C3A73F2BD9D33D000D35F2 /* RunnerTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RunnerTests-Bridging-Header.h"; sourceTree = "<group>"; };
9999
F2C3A7402BD9D33D000D35F2 /* Stubs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stubs.swift; sourceTree = "<group>"; };
100+
F2D527252C583C1C00C137C7 /* TranslatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TranslatorTests.swift; path = ../../shared/RunnerTests/TranslatorTests.swift; sourceTree = "<group>"; };
100101
F2D5271D2C50645600C137C7 /* PaymentQueueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaymentQueueTests.swift; path = ../../shared/RunnerTests/PaymentQueueTests.swift; sourceTree = "<group>"; };
101102
F700DD0228E652A10004836B /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
102103
F79BDC152905FC0500E3999D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../../shared/RunnerTests/Info.plist; sourceTree = "<group>"; };
103104
F79BDC1B2905FC3200E3999D /* Stubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Stubs.m; path = ../../shared/RunnerTests/Stubs.m; sourceTree = "<group>"; };
104-
F79BDC1D2905FC3900E3999D /* TranslatorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TranslatorTests.m; path = ../../shared/RunnerTests/TranslatorTests.m; sourceTree = "<group>"; };
105105
F79BDC1F2906023C00E3999D /* Stubs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Stubs.h; path = ../../shared/RunnerTests/Stubs.h; sourceTree = "<group>"; };
106106
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>"; };
107107
/* End PBXFileReference section */
@@ -217,6 +217,7 @@
217217
F700DD0328E652A10004836B /* RunnerTests */ = {
218218
isa = PBXGroup;
219219
children = (
220+
F2D527252C583C1C00C137C7 /* TranslatorTests.swift */,
220221
F2D5271D2C50645600C137C7 /* PaymentQueueTests.swift */,
221222
F27694182C49DBE800277144 /* FIATransactionCacheTests.swift */,
222223
F27694122C49BF7B00277144 /* FIAPPaymentQueueDeleteTests.swift */,
@@ -225,7 +226,6 @@
225226
F79BDC1F2906023C00E3999D /* Stubs.h */,
226227
F79BDC152905FC0500E3999D /* Info.plist */,
227228
F79BDC1B2905FC3200E3999D /* Stubs.m */,
228-
F79BDC1D2905FC3900E3999D /* TranslatorTests.m */,
229229
F2C3A7402BD9D33D000D35F2 /* Stubs.swift */,
230230
F2C3A73F2BD9D33D000D35F2 /* RunnerTests-Bridging-Header.h */,
231231
);
@@ -465,10 +465,10 @@
465465
files = (
466466
F2D5271E2C50645600C137C7 /* PaymentQueueTests.swift in Sources */,
467467
F24C45E42C409D87000C6C72 /* InAppPurchasePluginTests.swift in Sources */,
468-
F79BDC1E2905FC3900E3999D /* TranslatorTests.m in Sources */,
469468
F79BDC1C2905FC3200E3999D /* Stubs.m in Sources */,
470469
F27694092C4724B200277144 /* ProductRequestHandlerTests.swift in Sources */,
471470
F2C3A7412BD9D33D000D35F2 /* Stubs.swift in Sources */,
471+
F2D527262C583C1C00C137C7 /* TranslatorTests.swift in Sources */,
472472
F27694192C49DBE800277144 /* FIATransactionCacheTests.swift in Sources */,
473473
F27694132C49BF7B00277144 /* FIAPPaymentQueueDeleteTests.swift in Sources */,
474474
);

packages/in_app_purchase/in_app_purchase_storekit/example/macos/RunnerTests/TranslatorTests.m

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../shared/RunnerTests/TranslatorTests.swift

packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/InAppPurchasePluginTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ final class InAppPurchasePluginTests: XCTestCase {
8282
}
8383

8484
XCTAssertEqual(unwrappedProducts.count, 1)
85-
XCTAssertEqual(response.invalidProductIdentifiers, nil)
85+
XCTAssertEqual(response.invalidProductIdentifiers, [])
8686
XCTAssertEqual(unwrappedProducts[0].productIdentifier, "123")
8787
expectation.fulfill()
8888
}

0 commit comments

Comments
 (0)