Don't use # for empty strings

dhardiman · Apr 26, 2019 · 09c32b0 · 09c32b0
1 parent 0e139ca
commit 09c32b0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Sources/Config/Property.swift b/Sources/Config/Property.swift
@@ -82,8 +82,11 @@ enum PropertyType: String {
     }
 
     func valueDeclaration(for value: Any, iv: IV, key: String?) -> String {
-        let stringValue = {
-            "#\"\(value)\"#"
+        let stringValue = { () -> String in
+            if let string = value as? String, string.isEmpty {
+                return "\"\""
+            }
+            return "#\"\(value)\"#"
         }
         switch self {
         case .string:

diff --git a/Tests/ConfigTests/ConfigurationPropertyTests.swift b/Tests/ConfigTests/ConfigurationPropertyTests.swift
@@ -16,7 +16,8 @@ class ConfigurationPropertyTests: XCTestCase {
             "defaultValue": "test value",
             "overrides": [
                 "hello": "hello value",
-                "pattern": "pattern value"
+                "pattern": "pattern value",
+                "empty": ""
             ]
         ])
     }
@@ -34,6 +35,13 @@ class ConfigurationPropertyTests: XCTestCase {
         expect(actualValue).to(equal(expectedValue))
     }
 
+    func testItCanWriteADeclarationForAnEmptyStringProperty() throws {
+        let stringProperty = givenAStringProperty()
+        let expectedValue = ##"    static let test: String = """##
+        let actualValue = try whenTheDeclarationIsWritten(for: stringProperty, scheme: "empty")
+        expect(actualValue).to(equal(expectedValue))
+    }
+
     func testItAddsAPublicAccessorWhenRequired() throws {
         let stringProperty = givenAStringProperty()
         let expectedValue = ##"    public static let test: String = #"test value"#"##
@@ -125,7 +133,7 @@ class ConfigurationPropertyTests: XCTestCase {
     func testItCanWriteABoolProperty() throws {
         let floatProperty = ConfigurationProperty<Bool>(key: "test", typeHint: "Bool", dict: [
             "defaultValue": true,
-            ])
+        ])
         let expectedValue = #"    static let test: Bool = true"#
         let actualValue = try whenTheDeclarationIsWritten(for: floatProperty)
         expect(actualValue).to(equal(expectedValue))