RUMM-1000 Revert tests added for workarounds in #147

DataDog · Feb 9, 2021 · f6b5cbf · f6b5cbf
1 parent d829781
commit f6b5cbf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/Sources/Datadog/Core/Utils/JSONEncoder.swift b/Sources/Datadog/Core/Utils/JSONEncoder.swift
@@ -14,6 +14,9 @@ extension JSONEncoder {
             let formatted = iso8601DateFormatter.string(from: date)
             try container.encode(formatted)
         }
+        if #available(iOS 13.0, OSX 10.15, *) {
+            encoder.outputFormatting = [.withoutEscapingSlashes]
+        }
         return encoder
     }
 }
diff --git a/Tests/DatadogTests/Datadog/Core/Utils/JSONEncoderTests.swift b/Tests/DatadogTests/Datadog/Core/Utils/JSONEncoderTests.swift
@@ -29,31 +29,4 @@ class JSONEncoderTests: XCTestCase {
             XCTAssertEqual(encodedURL.utf8String, #"{"value":"https:\/\/example.com\/foo"}"#)
         }
     }
-
-    func testWhenEncoding_thenKeysFollowLexicographicOrder() throws {
-        struct Foo: Codable {
-            var one = 1
-            var two = 1
-            var three = 1
-            var four = 1
-            var five = 1
-
-            enum CodingKeys: String, CodingKey {
-                case one = "aaaaaa"
-                case two = "bb"
-                case three = "aaa"
-                case four = "bbb"
-                case five = "aaa.aaa"
-            }
-        }
-
-        // When
-        let encodedFoo = try jsonEncoder.encode(Foo())
-
-        // Then
-        XCTAssertEqual(
-            encodedFoo.utf8String,
-            #"{"aaa":1,"aaa.aaa":1,"aaaaaa":1,"bb":1,"bbb":1}"#
-        )
-    }
 }
diff --git a/Tests/DatadogTests/Datadog/TracerTests.swift b/Tests/DatadogTests/Datadog/TracerTests.swift
@@ -583,7 +583,7 @@ class TracerTests: XCTestCase {
         )
         XCTAssertEqual(
             try spanMatcher.meta.custom(keyPath: "meta.person"),
-            #"{"age":30,"name":"Adam","nationality":"Polish"}"#
+            #"{"name":"Adam","age":30,"nationality":"Polish"}"#
         )
         XCTAssertEqual(try spanMatcher.meta.custom(keyPath: "meta.nested.string"), "hello")
         XCTAssertEqual(try spanMatcher.meta.custom(keyPath: "meta.url"), "https://example.com/image.png")