Merge pull request #19 from ABridoux/develop

Fixed missing quotes for enum string value

Author: ABridoux

Sources/SafeFetching/Predicate/DatabaseTestValue.swift

@@ -87,7 +87,13 @@ extension Array: DatabaseTestValue where Element: DatabaseTestValue {
 
 extension DatabaseTestValue where Self: RawRepresentable, RawValue: DatabaseValue {
 
-    public var testValue: String { String(describing: rawValue) }
+    public var testValue: String {
+        if RawValue.self == String.self {
+            return #""\#(rawValue)""#
+        } else {
+            return String(describing: rawValue)
+        }
+    }
 }
 
 // MARK: - Range

Sources/SafeFetching/Predicate/Declarations/PredicateRightValue+ValuesSet.swift

@@ -23,4 +23,3 @@ public extension Builders.KeyPathPredicateRightValue where Value: Equatable & Da
         .init { .init(keyPath: $0, operatorString: "IN", value: values, isInverted: true) }
     }
 }
-

Tests/SafeFetchingTests/BooleanPredicateBuilderTests.swift

@@ -42,6 +42,7 @@ final class BooleanPredicateTests: XCTestCase {
         testNSFormat(predicate: .stubForcedRaw > .foo, expecting: #"stubForcedRaw > 1"#)
         testNSFormat(predicate: .stubForcedRaw <= .foo, expecting: #"stubForcedRaw <= 1"#)
         testNSFormat(predicate: .stubForcedRaw < .foo, expecting: #"stubForcedRaw < 1"#)
+        testNSFormat(predicate: .stubStringRawValue == .foo, expecting: #"stubStringRawValue == "foo""#)
     }
 
     func testRawRepresentable() {
@@ -119,6 +120,7 @@ extension BooleanPredicateTests {
         @objc var score = 0.0
         @objc var property: String? = ""
         @objc var stubRawValue: Int = 0
+        @objc var stubStringRawValue = ""
         @objc var stubRawOption: Int = 0
 
         @objc var stubRelationship: StubEntity?
@@ -143,6 +145,11 @@ extension BooleanPredicateTests {
             lhs.rawValue < rhs.rawValue
         }
     }
+
+    enum StubStringEnum: String, DatabaseTestValue {
+        case foo
+        case bar
+    }
 }
 
 extension StringKeyPath where Entity == BooleanPredicateTests.StubEntity, Value == BooleanPredicateTests.StubEnum {
@@ -159,6 +166,13 @@ extension StringKeyPath where Entity == BooleanPredicateTests.StubEntity, Value
     }
 }
 
+extension StringKeyPath where Entity == BooleanPredicateTests.StubEntity, Value == BooleanPredicateTests.StubStringEnum {
+
+    static var stubStringRawValue: Self {
+        Self(key: "stubStringRawValue")
+    }
+}
+
 // MARK: - Stub option set
 
 extension BooleanPredicateTests {