fix: Updating test mock set method definitions (#3089)

apollographql · Jun 23, 2023 · 03baa31 · 03baa31
1 parent 0531744
commit 03baa31
Show file tree

Hide file tree

Showing 16 changed files with 217 additions and 163 deletions.
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Bird+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Bird+Mock.graphql.swift
@@ -39,16 +39,16 @@ public extension Mock where O == Bird {
     wingspan: Double? = nil
   ) {
     self.init()
-    _set(bodyTemperature, for: \.bodyTemperature)
-    _set(favoriteToy, for: \.favoriteToy)
-    _set(height, for: \.height)
-    _set(humanName, for: \.humanName)
-    _set(id, for: \.id)
-    _set(laysEggs, for: \.laysEggs)
-    _set(owner, for: \.owner)
-    _set(predators, for: \.predators)
-    _set(skinCovering, for: \.skinCovering)
-    _set(species, for: \.species)
-    _set(wingspan, for: \.wingspan)
+    _setScalar(bodyTemperature, for: \.bodyTemperature)
+    _setScalar(favoriteToy, for: \.favoriteToy)
+    _setEntity(height, for: \.height)
+    _setScalar(humanName, for: \.humanName)
+    _setScalar(id, for: \.id)
+    _setScalar(laysEggs, for: \.laysEggs)
+    _setEntity(owner, for: \.owner)
+    _setList(predators, for: \.predators)
+    _setScalar(skinCovering, for: \.skinCovering)
+    _setScalar(species, for: \.species)
+    _setScalar(wingspan, for: \.wingspan)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Cat+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Cat+Mock.graphql.swift
@@ -39,16 +39,16 @@ public extension Mock where O == Cat {
     species: String? = nil
   ) {
     self.init()
-    _set(bodyTemperature, for: \.bodyTemperature)
-    _set(favoriteToy, for: \.favoriteToy)
-    _set(height, for: \.height)
-    _set(humanName, for: \.humanName)
-    _set(id, for: \.id)
-    _set(isJellicle, for: \.isJellicle)
-    _set(laysEggs, for: \.laysEggs)
-    _set(owner, for: \.owner)
-    _set(predators, for: \.predators)
-    _set(skinCovering, for: \.skinCovering)
-    _set(species, for: \.species)
+    _setScalar(bodyTemperature, for: \.bodyTemperature)
+    _setScalar(favoriteToy, for: \.favoriteToy)
+    _setEntity(height, for: \.height)
+    _setScalar(humanName, for: \.humanName)
+    _setScalar(id, for: \.id)
+    _setScalar(isJellicle, for: \.isJellicle)
+    _setScalar(laysEggs, for: \.laysEggs)
+    _setEntity(owner, for: \.owner)
+    _setList(predators, for: \.predators)
+    _setScalar(skinCovering, for: \.skinCovering)
+    _setScalar(species, for: \.species)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Crocodile+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Crocodile+Mock.graphql.swift
@@ -27,10 +27,10 @@ public extension Mock where O == Crocodile {
     species: String? = nil
   ) {
     self.init()
-    _set(height, for: \.height)
-    _set(id, for: \.id)
-    _set(predators, for: \.predators)
-    _set(skinCovering, for: \.skinCovering)
-    _set(species, for: \.species)
+    _setEntity(height, for: \.height)
+    _setScalar(id, for: \.id)
+    _setList(predators, for: \.predators)
+    _setScalar(skinCovering, for: \.skinCovering)
+    _setScalar(species, for: \.species)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Dog+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Dog+Mock.graphql.swift
@@ -39,16 +39,16 @@ public extension Mock where O == Dog {
     species: String? = nil
   ) {
     self.init()
-    _set(birthdate, for: \.birthdate)
-    _set(bodyTemperature, for: \.bodyTemperature)
-    _set(favoriteToy, for: \.favoriteToy)
-    _set(height, for: \.height)
-    _set(humanName, for: \.humanName)
-    _set(id, for: \.id)
-    _set(laysEggs, for: \.laysEggs)
-    _set(owner, for: \.owner)
-    _set(predators, for: \.predators)
-    _set(skinCovering, for: \.skinCovering)
-    _set(species, for: \.species)
+    _setScalar(birthdate, for: \.birthdate)
+    _setScalar(bodyTemperature, for: \.bodyTemperature)
+    _setScalar(favoriteToy, for: \.favoriteToy)
+    _setEntity(height, for: \.height)
+    _setScalar(humanName, for: \.humanName)
+    _setScalar(id, for: \.id)
+    _setScalar(laysEggs, for: \.laysEggs)
+    _setEntity(owner, for: \.owner)
+    _setList(predators, for: \.predators)
+    _setScalar(skinCovering, for: \.skinCovering)
+    _setScalar(species, for: \.species)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Fish+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Fish+Mock.graphql.swift
@@ -33,13 +33,13 @@ public extension Mock where O == Fish {
     species: String? = nil
   ) {
     self.init()
-    _set(favoriteToy, for: \.favoriteToy)
-    _set(height, for: \.height)
-    _set(humanName, for: \.humanName)
-    _set(id, for: \.id)
-    _set(owner, for: \.owner)
-    _set(predators, for: \.predators)
-    _set(skinCovering, for: \.skinCovering)
-    _set(species, for: \.species)
+    _setScalar(favoriteToy, for: \.favoriteToy)
+    _setEntity(height, for: \.height)
+    _setScalar(humanName, for: \.humanName)
+    _setScalar(id, for: \.id)
+    _setEntity(owner, for: \.owner)
+    _setList(predators, for: \.predators)
+    _setScalar(skinCovering, for: \.skinCovering)
+    _setScalar(species, for: \.species)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Height+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Height+Mock.graphql.swift
@@ -27,10 +27,10 @@ public extension Mock where O == Height {
     relativeSize: GraphQLEnum<AnimalKingdomAPI.RelativeSize>? = nil
   ) {
     self.init()
-    _set(centimeters, for: \.centimeters)
-    _set(feet, for: \.feet)
-    _set(inches, for: \.inches)
-    _set(meters, for: \.meters)
-    _set(relativeSize, for: \.relativeSize)
+    _setScalar(centimeters, for: \.centimeters)
+    _setScalar(feet, for: \.feet)
+    _setScalar(inches, for: \.inches)
+    _setScalar(meters, for: \.meters)
+    _setScalar(relativeSize, for: \.relativeSize)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Human+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Human+Mock.graphql.swift
@@ -33,13 +33,13 @@ public extension Mock where O == Human {
     species: String? = nil
   ) {
     self.init()
-    _set(bodyTemperature, for: \.bodyTemperature)
-    _set(firstName, for: \.firstName)
-    _set(height, for: \.height)
-    _set(id, for: \.id)
-    _set(laysEggs, for: \.laysEggs)
-    _set(predators, for: \.predators)
-    _set(skinCovering, for: \.skinCovering)
-    _set(species, for: \.species)
+    _setScalar(bodyTemperature, for: \.bodyTemperature)
+    _setScalar(firstName, for: \.firstName)
+    _setEntity(height, for: \.height)
+    _setScalar(id, for: \.id)
+    _setScalar(laysEggs, for: \.laysEggs)
+    _setList(predators, for: \.predators)
+    _setScalar(skinCovering, for: \.skinCovering)
+    _setScalar(species, for: \.species)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Mutation+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Mutation+Mock.graphql.swift
@@ -19,6 +19,6 @@ public extension Mock where O == Mutation {
     adoptPet: AnyMock? = nil
   ) {
     self.init()
-    _set(adoptPet, for: \.adoptPet)
+    _setEntity(adoptPet, for: \.adoptPet)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/PetRock+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/PetRock+Mock.graphql.swift
@@ -25,9 +25,9 @@ public extension Mock where O == PetRock {
     owner: Mock<Human>? = nil
   ) {
     self.init()
-    _set(favoriteToy, for: \.favoriteToy)
-    _set(humanName, for: \.humanName)
-    _set(id, for: \.id)
-    _set(owner, for: \.owner)
+    _setScalar(favoriteToy, for: \.favoriteToy)
+    _setScalar(humanName, for: \.humanName)
+    _setScalar(id, for: \.id)
+    _setEntity(owner, for: \.owner)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Query+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Query+Mock.graphql.swift
@@ -23,8 +23,8 @@ public extension Mock where O == Query {
     pets: [AnyMock]? = nil
   ) {
     self.init()
-    _set(allAnimals, for: \.allAnimals)
-    _set(classroomPets, for: \.classroomPets)
-    _set(pets, for: \.pets)
+    _setList(allAnimals, for: \.allAnimals)
+    _setList(classroomPets, for: \.classroomPets)
+    _setList(pets, for: \.pets)
   }
 }
diff --git a/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Rat+Mock.graphql.swift b/Sources/AnimalKingdomAPI/AnimalKingdomAPI/TestMocks/Rat+Mock.graphql.swift
@@ -33,13 +33,13 @@ public extension Mock where O == Rat {
     species: String? = nil
   ) {
     self.init()
-    _set(favoriteToy, for: \.favoriteToy)
-    _set(height, for: \.height)
-    _set(humanName, for: \.humanName)
-    _set(id, for: \.id)
-    _set(owner, for: \.owner)
-    _set(predators, for: \.predators)
-    _set(skinCovering, for: \.skinCovering)
-    _set(species, for: \.species)
+    _setScalar(favoriteToy, for: \.favoriteToy)
+    _setEntity(height, for: \.height)
+    _setScalar(humanName, for: \.humanName)
+    _setScalar(id, for: \.id)
+    _setEntity(owner, for: \.owner)
+    _setList(predators, for: \.predators)
+    _setScalar(skinCovering, for: \.skinCovering)
+    _setScalar(species, for: \.species)
   }
 }
diff --git a/Sources/ApolloCodegenLib/Templates/MockObjectTemplate.swift b/Sources/ApolloCodegenLib/Templates/MockObjectTemplate.swift
@@ -14,7 +14,7 @@ struct MockObjectTemplate: TemplateRenderer {
     responseKey: String,
     propertyName: String,
     initializerParameterName: String?,
-    type: String,
+    type: GraphQLType,
     mockType: String,
     deprecationReason: String?
   )
@@ -24,14 +24,14 @@ struct MockObjectTemplate: TemplateRenderer {
     let fields: [TemplateField] = ir.fieldCollector
       .collectedFields(for: graphqlObject)
       .map {
-        (
+         (
           responseKey: $0.0,
           propertyName: $0.0.asTestMockFieldPropertyName,
           initializerParameterName: $0.0.asTestMockInitializerParameterName,
-          type: $0.1.rendered(as: .testMockField(forceNonNull: true), config: config.config),
+          type: $0.1,
           mockType: mockTypeName(for: $0.1),
           deprecationReason: $0.deprecationReason
-        )
+         )
       }
 
     let memberAccessControl = accessControlModifier(for: .member)
@@ -46,7 +46,7 @@ struct MockObjectTemplate: TemplateRenderer {
         \(fields.map {
           TemplateString("""
           \(deprecationReason: $0.deprecationReason, config: config)
-          @Field<\($0.type)>("\($0.responseKey)") public var \($0.propertyName)
+          @Field<\($0.type.rendered(as: .testMockField(forceNonNull: true), config: config.config))>("\($0.responseKey)") public var \($0.propertyName)
           """)
         }, separator: "\n")
       }
@@ -63,14 +63,31 @@ struct MockObjectTemplate: TemplateRenderer {
             """ }, separator: ",\n")
         ) {
           self.init()
-          \(fields.map { "_set(\($0.initializerParameterName ?? $0.propertyName), for: \\.\($0.propertyName))" }, separator: "\n")
+          \(fields.map {
+            return "_set\(mockFunctionDescriptor($0.type))(\($0.initializerParameterName ?? $0.propertyName), for: \\.\($0.propertyName))"
+          }, separator: "\n")
         }
       }
       """) : TemplateString(stringLiteral: "")
     )
     
     """
   }
+
+  private func mockFunctionDescriptor(_ graphQLType: GraphQLType) -> String {
+    switch graphQLType {
+      case .list(_):
+        return "List"
+      case .scalar(_), .enum(_):
+        return "Scalar"
+      case .entity(_):
+        return "Entity"
+      case .inputObject(_):
+        preconditionFailure("Input object found when determing mock set function descriptor.")
+      case .nonNull(let type):
+        return mockFunctionDescriptor(type)
+    }
+  }
 
   private func conflictingFieldNameProperties(_ fields: [TemplateField]) -> TemplateString {
     """

diff --git a/Sources/ApolloTestSupport/TestMock.swift b/Sources/ApolloTestSupport/TestMock.swift
@@ -23,11 +23,11 @@ public class Mock<O: MockObject>: AnyMock, Hashable {
       return _data[field.key.description] as? T
     }
     set {
-      _set(newValue, for: keyPath)
+      _setScalar(newValue, for: keyPath)
     }
   }
 
-  public func _set<T: AnyScalarType & Hashable>(
+  public func _setScalar<T: AnyScalarType & Hashable>(
     _ value: T?,
     for keyPath: KeyPath<O.MockFields, Field<T>>
   ) {
@@ -43,11 +43,11 @@ public class Mock<O: MockObject>: AnyMock, Hashable {
       return _data[field.key.description] as? T.MockValueCollectionType.Element
     }
     set {
-      _set(newValue, for: keyPath)
+      _setEntity(newValue, for: keyPath)
     }
   }
 
-  public func _set<T: MockFieldValue>(
+  public func _setEntity<T: MockFieldValue>(
     _ value: T.MockValueCollectionType.Element?,
     for keyPath: KeyPath<O.MockFields, Field<T>>
   ) {
@@ -63,12 +63,11 @@ public class Mock<O: MockObject>: AnyMock, Hashable {
       return _data[field.key.description] as? [T.MockValueCollectionType.Element]
     }
     set {
-      _set(newValue, for: keyPath)
+      _setList(newValue, for: keyPath)
     }
   }
 
-  @_disfavoredOverload
-  public func _set<T: MockFieldValue>(
+  public func _setList<T: MockFieldValue>(
     _ value: [T.MockValueCollectionType.Element]?,
     for keyPath: KeyPath<O.MockFields, Field<Array<T>>>
   ) {