Fixed typo, fixed access modifier for SwityMocky.

Author: g-amichnia

Mintfile

@@ -1 +1,2 @@
 MakeAWishFoundation/SwiftyMocky-CLI@4.0.0
+krzysztofzablocki/Sourcery@1.0.0

Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Sourcery (0.18.0)
+  - Sourcery (1.0.0)
   - SwiftyMocky (4.0.0):
     - Sourcery (>= 0.18)
 

README.md

@@ -61,7 +61,7 @@ Current version has several significant changes. It removes deprecated methods (
 
 **SwiftyPrototype** was also extracted to separate library. There are no more compilation flags, so if you were relying on **SwiftyMocky** with `-DMockyCustom`, you will have to switch to `SwiftyPrototype`.
 
-We consider current version as stable. We are moving toward using the new [Mockfile][link-guides-mockfile] but the previous configuration format would be still supported. Library works with Swift **4.1, 4.2, 5.0, 5.1.2**  and  Sourcery 0.17-0.18.
+We consider current version as stable. We are moving toward using the new [Mockfile][link-guides-mockfile] but the previous configuration format would be still supported. Library works with Swift **4.1, 4.2, 5.0, 5.1.2**  and  Sourcery 1.0.x.
 
 While it is technically possible to integrate SwiftyMocky on Linux targets, there is no Mock generation feature there yet. You can use SwiftyMokcy runtime via SwiftPM though, as long as your are fine with generating mocks on mac machine.
 

Sources/SwiftyMocky/Mock.swifttemplate

@@ -54,6 +54,7 @@ import XCTest
 <%_
 class Current {
     static var selfType: String = "Self"
+    static var accessModifier: String = "open"
 }
 // Collision management
 func areThereCollisions(between methods: [MethodWrapper]) -> Bool {
@@ -514,7 +515,7 @@ class MethodWrapper {
         guard !method.isStatic else { return "public static" }
         guard !returnsGenericConstrainedToSelf else { return "public" }
         guard !parametersContainsSelf else { return "public" }
-        return "open"
+        return Current.accessModifier
     }
 
     private var registrationName: String {
@@ -1405,7 +1406,8 @@ class VariableWrapper {
     var casesCount: Int { return readonly ? 1 : 2 }
 
     var accessModifier: String {
-        guard variable.type?.accessLevel != "internal" else { return "" }
+        // TODO: Fix access levels for SwiftyPrototype
+        // guard variable.type?.accessLevel != "internal" else { return "" }
         return "public "
     }
     var attributes: String {
@@ -1520,6 +1522,7 @@ _%>
     let inlineMockable = protocolToDecorate != nil
     guard let aProtocol = autoMockable ? type : protocolToDecorate else { continue }
     mockedCount += 1
+
     let associatedTypes: [String]? = Helpers.extractAssociatedTypes(from: aProtocol)
     let attributes: String = Helpers.extractAttributes(from: type.attributes)
     let typeAliases: [String] = Helpers.extractTypealiases(from: aProtocol)
@@ -1533,6 +1536,7 @@ _%>
     let allMethods = uniques(methods: aProtocol.allMethods.filter({ !$0.isStatic }))
     let selfConstrained = allMethods.map(wrapMethod).contains(where: { $0.returnsGenericConstrainedToSelf || $0.parametersContainsSelf })
     let accessModifier: String = selfConstrained ? "public final" : "open"
+    Current.accessModifier = accessModifier // TODO: Temporary workaround for access modifiers
     let inheritFromNSObject = type.annotations["ObjcProtocol"] != nil || attributes.contains("@objc")
     let allMethodsForMethodType = uniquesWithoutGenericConstraints(methods: aProtocol.allMethods.filter({ !$0.isStatic }))
     let allStaticMethods = uniques(methods: aProtocol.allMethods.filter({ $0.isStatic }))

Sources/SwiftyPrototype/Prototype.swifttemplate

@@ -53,6 +53,7 @@ import SwiftyPrototype
 <%_
 class Current {
     static var selfType: String = "Self"
+    static var accessModifier: String = "open"
 }
 // Collision management
 func areThereCollisions(between methods: [MethodWrapper]) -> Bool {
@@ -513,7 +514,7 @@ class MethodWrapper {
         guard !method.isStatic else { return "public static" }
         guard !returnsGenericConstrainedToSelf else { return "public" }
         guard !parametersContainsSelf else { return "public" }
-        return "open"
+        return Current.accessModifier
     }
 
     private var registrationName: String {
@@ -1404,7 +1405,8 @@ class VariableWrapper {
     var casesCount: Int { return readonly ? 1 : 2 }
 
     var accessModifier: String {
-        guard variable.type?.accessLevel != "internal" else { return "" }
+        // TODO: Fix access levels for SwiftyPrototype
+        // guard variable.type?.accessLevel != "internal" else { return "" }
         return "public "
     }
     var attributes: String {
@@ -1519,6 +1521,7 @@ _%>
     let inlineMockable = protocolToDecorate != nil
     guard let aProtocol = autoMockable ? type : protocolToDecorate else { continue }
     mockedCount += 1
+
     let associatedTypes: [String]? = Helpers.extractAssociatedTypes(from: aProtocol)
     let attributes: String = Helpers.extractAttributes(from: type.attributes)
     let typeAliases: [String] = Helpers.extractTypealiases(from: aProtocol)
@@ -1532,6 +1535,7 @@ _%>
     let allMethods = uniques(methods: aProtocol.allMethods.filter({ !$0.isStatic }))
     let selfConstrained = allMethods.map(wrapMethod).contains(where: { $0.returnsGenericConstrainedToSelf || $0.parametersContainsSelf })
     let accessModifier: String = selfConstrained ? "public final" : "open"
+    Current.accessModifier = accessModifier // TODO: Temporary workaround for access modifiers
     let inheritFromNSObject = type.annotations["ObjcProtocol"] != nil || attributes.contains("@objc")
     let allMethodsForMethodType = uniquesWithoutGenericConstraints(methods: aProtocol.allMethods.filter({ !$0.isStatic }))
     let allStaticMethods = uniques(methods: aProtocol.allMethods.filter({ $0.isStatic }))

SwiftyMocky-Example/Shared/Example 8/ProtocolWithProperties.swift

@@ -9,14 +9,18 @@
 import Foundation
 
 //sourcery: AutoMockable
-protocol ProtocolWithPropoerties {
+protocol ProtocolWithProperties {
     var name: String { get set }
     static var name: String { get set }
     var email: String? { get set }
     static var defaultEmail: String? { get set }
 
+    var internalProperty: InternalType { get set }
+
     // Methods cannot have labels called "set"
     func name(_ newValue: String)
     func email(_ newValue: String!)
     static func defaultEmail(_ newValue: String!)
 }
+
+internal struct InternalType { }

SwiftyMocky-Tests/Shared/Example 8/ProtocolWithPropertiesTests.swift

@@ -19,7 +19,7 @@ import SwiftyMocky
 class ProtocolsWithPropertiesTests: XCTestCase {
 
     func test_properties_getters() {
-        let mock = ProtocolWithPropoertiesMock()
+        let mock = ProtocolWithPropertiesMock()
 
         Verify(mock, .never, .name)
         Verify(mock, .never, .name(set: .any))
@@ -36,7 +36,7 @@ class ProtocolsWithPropertiesTests: XCTestCase {
     }
 
     func test_properties_setters() {
-        let mock = ProtocolWithPropoertiesMock()
+        let mock = ProtocolWithPropertiesMock()
 
         Verify(mock, .never, .name)
         Verify(mock, .never, .name(set: .any))
@@ -52,7 +52,7 @@ class ProtocolsWithPropertiesTests: XCTestCase {
     }
 
     func test_static_properties_getters() {
-        let mock = ProtocolWithPropoertiesMock.self
+        let mock = ProtocolWithPropertiesMock.self
         mock.resetMock()
 
         Verify(mock, .never, .name)
@@ -70,7 +70,7 @@ class ProtocolsWithPropertiesTests: XCTestCase {
     }
 
     func test_static_properties_setters() {
-        let mock = ProtocolWithPropoertiesMock.self
+        let mock = ProtocolWithPropertiesMock.self
         mock.resetMock()
 
         Verify(mock, .never, .name)

SwiftyMocky-Tests/Shared/Other/VerifyMessagesTests.swift

@@ -57,7 +57,7 @@ class VerifyMessagesTests: XCTestCase {
     }
 
     func testMessagesForProperties() {
-        let mock = ProtocolWithPropoertiesMock()
+        let mock = ProtocolWithPropertiesMock()
 
         Given(mock, .email(getter: "john@mail.com"))
         Given(mock, .name(getter: "john"))

SwiftyMocky-Tests/iOS/Mocks/Mock.generated.swift

@@ -3580,7 +3580,7 @@ public final class FailsWithReturnedTypeBeingGenericOfSelfMock: FailsWithReturne
 		return _wrapped()
     }
 
-    open func test(value: FailsWithReturnedTypeBeingGenericOfSelfMock) -> Bool {
+    public final func test(value: FailsWithReturnedTypeBeingGenericOfSelfMock) -> Bool {
         addInvocation(.m_test__value_value(Parameter<FailsWithReturnedTypeBeingGenericOfSelfMock>.value(`value`)))
 		let perform = methodPerformValue(.m_test__value_value(Parameter<FailsWithReturnedTypeBeingGenericOfSelfMock>.value(`value`))) as? (FailsWithReturnedTypeBeingGenericOfSelfMock) -> Void
 		perform?(`value`)
@@ -8524,9 +8524,9 @@ open class ProtocolWithMethodsWithGenericReturnTypeThatThrowsMock: ProtocolWithM
     }
 }
 
-// MARK: - ProtocolWithPropoerties
+// MARK: - ProtocolWithProperties
 
-open class ProtocolWithPropoertiesMock: ProtocolWithPropoerties, Mock, StaticMock {
+open class ProtocolWithPropertiesMock: ProtocolWithProperties, Mock, StaticMock {
     public init(sequencing sequencingPolicy: SequencingPolicy = .lastWrittenResolvedFirst, stubbing stubbingPolicy: StubbingPolicy = .wrap, file: StaticString = #file, line: UInt = #line) {
         SwiftyMockyTestObserver.setup()
         self.sequencingPolicy = sequencingPolicy
@@ -8579,27 +8579,33 @@ open class ProtocolWithPropoertiesMock: ProtocolWithPropoerties, Mock, StaticMoc
     }
 
     public var name: String {
-		get {	invocations.append(.p_name_get); return __p_name ?? givenGetterValue(.p_name_get, "ProtocolWithPropoertiesMock - stub value for name was not defined") }
+		get {	invocations.append(.p_name_get); return __p_name ?? givenGetterValue(.p_name_get, "ProtocolWithPropertiesMock - stub value for name was not defined") }
 		set {	invocations.append(.p_name_set(.value(newValue))); __p_name = newValue }
 	}
 	private var __p_name: (String)?
 
     public var email: String? {
-		get {	invocations.append(.p_email_get); return __p_email ?? optionalGivenGetterValue(.p_email_get, "ProtocolWithPropoertiesMock - stub value for email was not defined") }
+		get {	invocations.append(.p_email_get); return __p_email ?? optionalGivenGetterValue(.p_email_get, "ProtocolWithPropertiesMock - stub value for email was not defined") }
 		set {	invocations.append(.p_email_set(.value(newValue))); __p_email = newValue }
 	}
 	private var __p_email: (String)?
 
+    public var internalProperty: InternalType {
+		get {	invocations.append(.p_internalProperty_get); return __p_internalProperty ?? givenGetterValue(.p_internalProperty_get, "ProtocolWithPropertiesMock - stub value for internalProperty was not defined") }
+		set {	invocations.append(.p_internalProperty_set(.value(newValue))); __p_internalProperty = newValue }
+	}
+	private var __p_internalProperty: (InternalType)?
+
 
     public static var name: String {
-		get {	ProtocolWithPropoertiesMock.invocations.append(.p_name_get); return ProtocolWithPropoertiesMock.__p_name ?? givenGetterValue(.p_name_get, "ProtocolWithPropoertiesMock - stub value for name was not defined") }
-		set {	ProtocolWithPropoertiesMock.invocations.append(.p_name_set(.value(newValue))); ProtocolWithPropoertiesMock.__p_name = newValue }
+		get {	ProtocolWithPropertiesMock.invocations.append(.p_name_get); return ProtocolWithPropertiesMock.__p_name ?? givenGetterValue(.p_name_get, "ProtocolWithPropertiesMock - stub value for name was not defined") }
+		set {	ProtocolWithPropertiesMock.invocations.append(.p_name_set(.value(newValue))); ProtocolWithPropertiesMock.__p_name = newValue }
 	}
 	private static var __p_name: (String)?
 
     public static var defaultEmail: String? {
-		get {	ProtocolWithPropoertiesMock.invocations.append(.p_defaultEmail_get); return ProtocolWithPropoertiesMock.__p_defaultEmail ?? optionalGivenGetterValue(.p_defaultEmail_get, "ProtocolWithPropoertiesMock - stub value for defaultEmail was not defined") }
-		set {	ProtocolWithPropoertiesMock.invocations.append(.p_defaultEmail_set(.value(newValue))); ProtocolWithPropoertiesMock.__p_defaultEmail = newValue }
+		get {	ProtocolWithPropertiesMock.invocations.append(.p_defaultEmail_get); return ProtocolWithPropertiesMock.__p_defaultEmail ?? optionalGivenGetterValue(.p_defaultEmail_get, "ProtocolWithPropertiesMock - stub value for defaultEmail was not defined") }
+		set {	ProtocolWithPropertiesMock.invocations.append(.p_defaultEmail_set(.value(newValue))); ProtocolWithPropertiesMock.__p_defaultEmail = newValue }
 	}
 	private static var __p_defaultEmail: (String)?
 
@@ -8710,6 +8716,8 @@ open class ProtocolWithPropoertiesMock: ProtocolWithPropoerties, Mock, StaticMoc
 		case p_name_set(Parameter<String>)
         case p_email_get
 		case p_email_set(Parameter<String?>)
+        case p_internalProperty_get
+		case p_internalProperty_set(Parameter<InternalType>)
 
         static func compareParameters(lhs: MethodType, rhs: MethodType, matcher: Matcher) -> Matcher.ComparisonResult {
             switch (lhs, rhs) {
@@ -8726,6 +8734,8 @@ open class ProtocolWithPropoertiesMock: ProtocolWithPropoerties, Mock, StaticMoc
 			case (.p_name_set(let left),.p_name_set(let right)): return Matcher.ComparisonResult([Matcher.ParameterComparisonResult(Parameter<String>.compare(lhs: left, rhs: right, with: matcher), left, right, "newValue")])
             case (.p_email_get,.p_email_get): return Matcher.ComparisonResult.match
 			case (.p_email_set(let left),.p_email_set(let right)): return Matcher.ComparisonResult([Matcher.ParameterComparisonResult(Parameter<String?>.compare(lhs: left, rhs: right, with: matcher), left, right, "newValue")])
+            case (.p_internalProperty_get,.p_internalProperty_get): return Matcher.ComparisonResult.match
+			case (.p_internalProperty_set(let left),.p_internalProperty_set(let right)): return Matcher.ComparisonResult([Matcher.ParameterComparisonResult(Parameter<InternalType>.compare(lhs: left, rhs: right, with: matcher), left, right, "newValue")])
             default: return .none
             }
         }
@@ -8738,6 +8748,8 @@ open class ProtocolWithPropoertiesMock: ProtocolWithPropoerties, Mock, StaticMoc
 			case .p_name_set(let newValue): return newValue.intValue
             case .p_email_get: return 0
 			case .p_email_set(let newValue): return newValue.intValue
+            case .p_internalProperty_get: return 0
+			case .p_internalProperty_set(let newValue): return newValue.intValue
             }
         }
         func assertionName() -> String {
@@ -8748,6 +8760,8 @@ open class ProtocolWithPropoertiesMock: ProtocolWithPropoerties, Mock, StaticMoc
 			case .p_name_set: return "[set] .name"
             case .p_email_get: return "[get] .email"
 			case .p_email_set: return "[set] .email"
+            case .p_internalProperty_get: return "[get] .internalProperty"
+			case .p_internalProperty_set: return "[set] .internalProperty"
             }
         }
     }
@@ -8766,6 +8780,9 @@ open class ProtocolWithPropoertiesMock: ProtocolWithPropoerties, Mock, StaticMoc
         public static func email(getter defaultValue: String?...) -> PropertyStub {
             return Given(method: .p_email_get, products: defaultValue.map({ StubProduct.return($0 as Any) }))
         }
+        public static func internalProperty(getter defaultValue: InternalType...) -> PropertyStub {
+            return Given(method: .p_internalProperty_get, products: defaultValue.map({ StubProduct.return($0 as Any) }))
+        }
 
     }
 
@@ -8778,6 +8795,8 @@ open class ProtocolWithPropoertiesMock: ProtocolWithPropoerties, Mock, StaticMoc
 		public static func name(set newValue: Parameter<String>) -> Verify { return Verify(method: .p_name_set(newValue)) }
         public static var email: Verify { return Verify(method: .p_email_get) }
 		public static func email(set newValue: Parameter<String?>) -> Verify { return Verify(method: .p_email_set(newValue)) }
+        public static var internalProperty: Verify { return Verify(method: .p_internalProperty_get) }
+		public static func internalProperty(set newValue: Parameter<InternalType>) -> Verify { return Verify(method: .p_internalProperty_set(newValue)) }
     }
 
     public struct Perform {