Skip to content

Commit 24377d8

Browse files
lawmichalawmicha
authored
chore(Model): API and DataStore integration test for scalars, lists, enums (#1135)
* fix(Model): API and DataStore integration test for scalars, lists, enums * chore(Model): split asserts and add nil list test
1 parent e0a5dd4 commit 24377d8

26 files changed

+1610
-5
lines changed

‎Amplify.xcodeproj/project.pbxproj‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,20 @@
145145
21A4F8F325A77D9100E1047D /* ListPaginationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A4F8F225A77D9100E1047D /* ListPaginationTests.swift */; };
146146
21A7C8AA25ACB6C8004355D6 /* ArrayLiteralListProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A7C8A925ACB6C8004355D6 /* ArrayLiteralListProviderTests.swift */; };
147147
21A7C90225ACC4D1004355D6 /* MockDataStoreResponders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A7C90125ACC4D1004355D6 /* MockDataStoreResponders.swift */; };
148+
21A9052C2616446F00EC141D /* ListStringContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A9051F2616446F00EC141D /* ListStringContainer.swift */; };
149+
21A9052D2616446F00EC141D /* ScalarContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905202616446F00EC141D /* ScalarContainer.swift */; };
150+
21A9052E2616446F00EC141D /* NestedTypeTestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905212616446F00EC141D /* NestedTypeTestModel.swift */; };
151+
21A9052F2616446F00EC141D /* NestedTypeTestModel+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905222616446F00EC141D /* NestedTypeTestModel+Schema.swift */; };
152+
21A905302616446F00EC141D /* ListIntContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905232616446F00EC141D /* ListIntContainer.swift */; };
153+
21A905312616446F00EC141D /* ListIntContainer+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905242616446F00EC141D /* ListIntContainer+Schema.swift */; };
154+
21A905322616446F00EC141D /* ListStringContainer+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905252616446F00EC141D /* ListStringContainer+Schema.swift */; };
155+
21A905332616446F00EC141D /* ScalarContainer+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905262616446F00EC141D /* ScalarContainer+Schema.swift */; };
156+
21A905342616446F00EC141D /* Nested+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905272616446F00EC141D /* Nested+Schema.swift */; };
157+
21A905352616446F00EC141D /* EnumTestModel+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905282616446F00EC141D /* EnumTestModel+Schema.swift */; };
158+
21A905362616446F00EC141D /* Nested.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A905292616446F00EC141D /* Nested.swift */; };
159+
21A905372616446F00EC141D /* EnumTestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A9052A2616446F00EC141D /* EnumTestModel.swift */; };
160+
21A905382616446F00EC141D /* TestEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A9052B2616446F00EC141D /* TestEnum.swift */; };
161+
21A905602616484A00EC141D /* Scalar+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A9055F2616484A00EC141D /* Scalar+Equatable.swift */; };
148162
21AD424B249BF0DA0016FE95 /* AnyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FACBAD522386160100E29E56 /* AnyModel.swift */; };
149163
21AD424C249BF0DE0016FE95 /* AnyModel+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8EE776238626D60097E4F1 /* AnyModel+Codable.swift */; };
150164
21AD424D249BF0E50016FE95 /* AnyModel+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8EE78223862DDB0097E4F1 /* AnyModel+Schema.swift */; };
@@ -958,6 +972,20 @@
958972
21A4F8F225A77D9100E1047D /* ListPaginationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListPaginationTests.swift; sourceTree = "<group>"; };
959973
21A7C8A925ACB6C8004355D6 /* ArrayLiteralListProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayLiteralListProviderTests.swift; sourceTree = "<group>"; };
960974
21A7C90125ACC4D1004355D6 /* MockDataStoreResponders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockDataStoreResponders.swift; sourceTree = "<group>"; };
975+
21A9051F2616446F00EC141D /* ListStringContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListStringContainer.swift; sourceTree = "<group>"; };
976+
21A905202616446F00EC141D /* ScalarContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScalarContainer.swift; sourceTree = "<group>"; };
977+
21A905212616446F00EC141D /* NestedTypeTestModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NestedTypeTestModel.swift; sourceTree = "<group>"; };
978+
21A905222616446F00EC141D /* NestedTypeTestModel+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NestedTypeTestModel+Schema.swift"; sourceTree = "<group>"; };
979+
21A905232616446F00EC141D /* ListIntContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListIntContainer.swift; sourceTree = "<group>"; };
980+
21A905242616446F00EC141D /* ListIntContainer+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ListIntContainer+Schema.swift"; sourceTree = "<group>"; };
981+
21A905252616446F00EC141D /* ListStringContainer+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ListStringContainer+Schema.swift"; sourceTree = "<group>"; };
982+
21A905262616446F00EC141D /* ScalarContainer+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ScalarContainer+Schema.swift"; sourceTree = "<group>"; };
983+
21A905272616446F00EC141D /* Nested+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Nested+Schema.swift"; sourceTree = "<group>"; };
984+
21A905282616446F00EC141D /* EnumTestModel+Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EnumTestModel+Schema.swift"; sourceTree = "<group>"; };
985+
21A905292616446F00EC141D /* Nested.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Nested.swift; sourceTree = "<group>"; };
986+
21A9052A2616446F00EC141D /* EnumTestModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumTestModel.swift; sourceTree = "<group>"; };
987+
21A9052B2616446F00EC141D /* TestEnum.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEnum.swift; sourceTree = "<group>"; };
988+
21A9055F2616484A00EC141D /* Scalar+Equatable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Scalar+Equatable.swift"; sourceTree = "<group>"; };
961989
21AD4255249BFFDF0016FE95 /* DeprecatedTodo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DeprecatedTodo.swift; path = Deprecated/DeprecatedTodo.swift; sourceTree = "<group>"; };
962990
21C395B2245729EC00597EA2 /* AppSyncErrorType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSyncErrorType.swift; sourceTree = "<group>"; };
963991
21D79FD9237617C60057D00D /* SubscriptionEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionEvent.swift; sourceTree = "<group>"; };
@@ -2098,6 +2126,27 @@
20982126
path = Collection;
20992127
sourceTree = "<group>";
21002128
};
2129+
21A9051E2616442000EC141D /* Scalar */ = {
2130+
isa = PBXGroup;
2131+
children = (
2132+
21A9052A2616446F00EC141D /* EnumTestModel.swift */,
2133+
21A905282616446F00EC141D /* EnumTestModel+Schema.swift */,
2134+
21A905232616446F00EC141D /* ListIntContainer.swift */,
2135+
21A905242616446F00EC141D /* ListIntContainer+Schema.swift */,
2136+
21A9051F2616446F00EC141D /* ListStringContainer.swift */,
2137+
21A905252616446F00EC141D /* ListStringContainer+Schema.swift */,
2138+
21A905292616446F00EC141D /* Nested.swift */,
2139+
21A905272616446F00EC141D /* Nested+Schema.swift */,
2140+
21A905212616446F00EC141D /* NestedTypeTestModel.swift */,
2141+
21A905222616446F00EC141D /* NestedTypeTestModel+Schema.swift */,
2142+
21A9055F2616484A00EC141D /* Scalar+Equatable.swift */,
2143+
21A905202616446F00EC141D /* ScalarContainer.swift */,
2144+
21A905262616446F00EC141D /* ScalarContainer+Schema.swift */,
2145+
21A9052B2616446F00EC141D /* TestEnum.swift */,
2146+
);
2147+
path = Scalar;
2148+
sourceTree = "<group>";
2149+
};
21012150
21AD424A249BEC440016FE95 /* Internal */ = {
21022151
isa = PBXGroup;
21032152
children = (
@@ -2894,6 +2943,7 @@
28942943
6B597A092565D3E50038C3E2 /* QPredGen.swift */,
28952944
6B597A082565D3E40038C3E2 /* QPredGen+Schema.swift */,
28962945
6B7743D625906F7E001469F5 /* Restaurant */,
2946+
21A9051E2616442000EC141D /* Scalar */,
28972947
6B9F7C542526864800F1F71C /* ScenarioATest6Post.swift */,
28982948
6B9F7C532526864800F1F71C /* ScenarioATest6Post+Schema.swift */,
28992949
762167CB261542F70033FCD2 /* Record.swift */,
@@ -5265,6 +5315,7 @@
52655315
217D5EB02577F9DF009F0639 /* Post4.swift in Sources */,
52665316
217D5EB22577F9DF009F0639 /* PostEditor5+Schema.swift in Sources */,
52675317
21F40A3A23A294770074678E /* TestConfigHelper.swift in Sources */,
5318+
21A905312616446F00EC141D /* ListIntContainer+Schema.swift in Sources */,
52685319
B4BD6B3723708C6700A1F0A7 /* MockPredictionsCategoryPlugin.swift in Sources */,
52695320
B4F3542C25361BC80050FEE0 /* DynamicEmbedded.swift in Sources */,
52705321
6B7743E125906FD3001469F5 /* MenuType.swift in Sources */,
@@ -5293,19 +5344,26 @@
52935344
B9FAA11823879A57009414B4 /* Author+Schema.swift in Sources */,
52945345
B9521836237E21BA00F53237 /* Post+Schema.swift in Sources */,
52955346
6B7743DE25906FD3001469F5 /* Menu+Schema.swift in Sources */,
5347+
21A905352616446F00EC141D /* EnumTestModel+Schema.swift in Sources */,
52965348
217D5EB72577F9DF009F0639 /* Project1+Schema.swift in Sources */,
52975349
FA4A955F239ADEBD008E876E /* MockResponder.swift in Sources */,
5350+
21A9052F2616446F00EC141D /* NestedTypeTestModel+Schema.swift in Sources */,
52985351
214F497A2486D8A200DA616C /* User.swift in Sources */,
52995352
B9FAA11223878C96009414B4 /* UserAccount+Schema.swift in Sources */,
53005353
FACA36152327FC39000E74F6 /* MessageReporter.swift in Sources */,
53015354
FAF512AE23986791001ADF4E /* AmplifyModels.swift in Sources */,
53025355
217D5EC42577F9DF009F0639 /* Team1+Schema.swift in Sources */,
53035356
6BE9D73725A67F7400AB5C9A /* M2MPost.swift in Sources */,
5357+
21A905362616446F00EC141D /* Nested.swift in Sources */,
53045358
B9FAA11C23879B35009414B4 /* Book.swift in Sources */,
53055359
6B597A0B2565D3E50038C3E2 /* QPredGen.swift in Sources */,
5360+
21A9052E2616446F00EC141D /* NestedTypeTestModel.swift in Sources */,
53065361
975751B424D21DE000FA0A6E /* MockDevMenuContextProvider.swift in Sources */,
5362+
21A905342616446F00EC141D /* Nested+Schema.swift in Sources */,
53075363
6B597A0A2565D3E50038C3E2 /* QPredGen+Schema.swift in Sources */,
53085364
214F49772486D8A200DA616C /* UserFollowers+Schema.swift in Sources */,
5365+
21A905332616446F00EC141D /* ScalarContainer+Schema.swift in Sources */,
5366+
21A905382616446F00EC141D /* TestEnum.swift in Sources */,
53095367
B9FAA11423878CEA009414B4 /* UserProfile+Schema.swift in Sources */,
53105368
6BE9D6EF25A6622000AB5C9A /* Team+Schema.swift in Sources */,
53115369
762C978E26210FF100798FA3 /* RecordCover+Schema.swift in Sources */,
@@ -5314,13 +5372,17 @@
53145372
217D5EB82577F9DF009F0639 /* Project2+Schema.swift in Sources */,
53155373
214F49792486D8A200DA616C /* UserFollowing+Schema.swift in Sources */,
53165374
FACA361D2327FC84000E74F6 /* MockAPICategoryPlugin.swift in Sources */,
5375+
21A905602616484A00EC141D /* Scalar+Equatable.swift in Sources */,
53175376
B9FAA11023878C5E009414B4 /* UserProfile.swift in Sources */,
5377+
21A905322616446F00EC141D /* ListStringContainer+Schema.swift in Sources */,
53185378
6BE9D6EE25A6622000AB5C9A /* Team.swift in Sources */,
53195379
B9AA09F12473CA29000E6FBB /* PostStatus.swift in Sources */,
53205380
6BEE081C2533CCFA00133961 /* OGCScenarioBPost+Schema.swift in Sources */,
53215381
214F497B2486D8A200DA616C /* User+Schema.swift in Sources */,
53225382
6B9F7C562526864800F1F71C /* ScenarioATest6Post.swift in Sources */,
5383+
21A905372616446F00EC141D /* EnumTestModel.swift in Sources */,
53235384
B9FAA12023879BD0009414B4 /* BookAuthor+Schema.swift in Sources */,
5385+
21A9052D2616446F00EC141D /* ScalarContainer.swift in Sources */,
53245386
21F40A4023A295470074678E /* TestCommonConstants.swift in Sources */,
53255387
217D5EB32577F9DF009F0639 /* Comment3.swift in Sources */,
53265388
214F497C2486D8A200DA616C /* UserFollowers.swift in Sources */,
@@ -5344,6 +5406,7 @@
53445406
21FDBB642587D7A30086FCDC /* Post6+Schema.swift in Sources */,
53455407
217D5EB12577F9DF009F0639 /* Team2+Schema.swift in Sources */,
53465408
B4F3E9FA24314ECC00F23296 /* MockAuthCategoryPlugin.swift in Sources */,
5409+
21A9052C2616446F00EC141D /* ListStringContainer.swift in Sources */,
53475410
21FDBB652587D7A30086FCDC /* Comment6+Schema.swift in Sources */,
53485411
214F49CE24898E8500DA616C /* Article+Schema.swift in Sources */,
53495412
216E460A249183230035E3CE /* Section.swift in Sources */,
@@ -5358,6 +5421,7 @@
53585421
762C978526210F6400798FA3 /* RecordCover.swift in Sources */,
53595422
216E45ED248E914F0035E3CE /* Category.swift in Sources */,
53605423
6BE9D6ED25A6622000AB5C9A /* Project+Schema.swift in Sources */,
5424+
21A905302616446F00EC141D /* ListIntContainer.swift in Sources */,
53615425
6BE9D6EC25A6622000AB5C9A /* Project.swift in Sources */,
53625426
);
53635427
runOnlyForDeploymentPostprocessing = 0;

‎AmplifyPlugins/API/APICategoryPlugin.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
21A4F94C25A7ACE600E1047D /* GraphQLRequest+toListQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A4F94B25A7ACE500E1047D /* GraphQLRequest+toListQuery.swift */; };
7474
21A4F95725A7AEB300E1047D /* GraphQLRequestToListQueryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A4F95625A7AEB300E1047D /* GraphQLRequestToListQueryTests.swift */; };
7575
21A4F98F25A7BF9E00E1047D /* AppSyncListResponseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A4F98E25A7BF9E00E1047D /* AppSyncListResponseTests.swift */; };
76+
21A90541261644F700EC141D /* GraphQLScalarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A90540261644F700EC141D /* GraphQLScalarTests.swift */; };
77+
21A9054C2616453200EC141D /* GraphQLTestBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21A9054B2616453200EC141D /* GraphQLTestBase.swift */; };
7678
21D38B9B240C517C00EC2A8D /* AWSOIDCAuthProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21D38B9A240C517C00EC2A8D /* AWSOIDCAuthProvider.swift */; };
7779
21D5286724169E74005186BA /* IAMAuthInterceptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21D5286624169E74005186BA /* IAMAuthInterceptor.swift */; };
7880
21D7A0DF237B54D90057D00D /* AWSGraphQLOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21D7A08D237B54D90057D00D /* AWSGraphQLOperation.swift */; };
@@ -384,6 +386,8 @@
384386
21A4F94B25A7ACE500E1047D /* GraphQLRequest+toListQuery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GraphQLRequest+toListQuery.swift"; sourceTree = "<group>"; };
385387
21A4F95625A7AEB300E1047D /* GraphQLRequestToListQueryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLRequestToListQueryTests.swift; sourceTree = "<group>"; };
386388
21A4F98E25A7BF9E00E1047D /* AppSyncListResponseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSyncListResponseTests.swift; sourceTree = "<group>"; };
389+
21A90540261644F700EC141D /* GraphQLScalarTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLScalarTests.swift; sourceTree = "<group>"; };
390+
21A9054B2616453200EC141D /* GraphQLTestBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLTestBase.swift; sourceTree = "<group>"; };
387391
21D38B9A240C517C00EC2A8D /* AWSOIDCAuthProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AWSOIDCAuthProvider.swift; sourceTree = "<group>"; };
388392
21D5286624169E74005186BA /* IAMAuthInterceptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IAMAuthInterceptor.swift; sourceTree = "<group>"; };
389393
21D7A08D237B54D90057D00D /* AWSGraphQLOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AWSGraphQLOperation.swift; sourceTree = "<group>"; };
@@ -723,6 +727,8 @@
723727
21F40A2D23A0707E0074678E /* GraphQLModelBasedTests-amplifyconfiguration.json */,
724728
217856C12383339D00A30D19 /* GraphQLModelBasedTests.swift */,
725729
212B299E259251F100593ED5 /* GraphQLModelBasedTests+List.swift */,
730+
21A90540261644F700EC141D /* GraphQLScalarTests.swift */,
731+
21A9054B2616453200EC141D /* GraphQLTestBase.swift */,
726732
21598CEF23A00F8400529F29 /* README.md */,
727733
);
728734
path = GraphQLModelBased;
@@ -2283,9 +2289,11 @@
22832289
FA97F5532386CCF500EE9EFE /* AnyModelIntegrationTests.swift in Sources */,
22842290
217D60012578369F009F0639 /* GraphQLConnectionScenario5Tests.swift in Sources */,
22852291
217D5FE925783559009F0639 /* GraphQLConnectionScenario2Tests.swift in Sources */,
2292+
21A9054C2616453200EC141D /* GraphQLTestBase.swift in Sources */,
22862293
217856C22383339D00A30D19 /* GraphQLModelBasedTests.swift in Sources */,
22872294
212B298B2592519800593ED5 /* GraphQLConnectionScenario3Tests+List.swift in Sources */,
22882295
217D60022578369F009F0639 /* GraphQLConnectionScenario1Tests.swift in Sources */,
2296+
21A90541261644F700EC141D /* GraphQLScalarTests.swift in Sources */,
22892297
212B299F259251F100593ED5 /* GraphQLModelBasedTests+List.swift in Sources */,
22902298
);
22912299
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)