Reorganized Tests

chipp · Sep 7, 2020 · cc9bc54 · cc9bc54
1 parent 16ba949
commit cc9bc54
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 122 deletions.
diff --git a/Tests/miniGnomonTests/LoggingSpec.swift b/Tests/miniGnomonTests/LoggingSpec.swift
diff --git a/...s/miniGnomonTests/RequestParamsSpec.swift → ...ts/Request params/RequestParamsSpec.swift b/...s/miniGnomonTests/RequestParamsSpec.swift → ...ts/Request params/RequestParamsSpec.swift
@@ -56,8 +56,9 @@ class ParamsSpec: XCTestCase {
     func testMultipartFormParams() throws {
         let form = ["question": "The Ultimate Question of Life, the Universe, and Everything", "answer": "42"]
         let expected = String(data: try Data(
-            contentsOf: URL(fileURLWithPath: #file).deletingLastPathComponent().appendingPathComponent("Fixtures")
-                .appendingPathComponent("multipart-simple").appendingPathExtension("txt")
+            contentsOf: URL(fileURLWithPath: #file)
+                .deletingLastPathComponent().deletingLastPathComponent()
+                .appendingPathComponent("Fixtures").appendingPathComponent("multipart-simple").appendingPathExtension("txt")
             ), encoding: .utf8)!
 
         for method in bodyMethods {
@@ -76,14 +77,16 @@ class ParamsSpec: XCTestCase {
 
     func testMultipartFilesParams() throws {
         let data = try Data(
-            contentsOf: URL(fileURLWithPath: #file).deletingLastPathComponent().appendingPathComponent("Fixtures")
-                .appendingPathComponent("lorem-ipsum").appendingPathExtension("txt")
+            contentsOf: URL(fileURLWithPath: #file)
+                .deletingLastPathComponent().deletingLastPathComponent()
+                .appendingPathComponent("Fixtures").appendingPathComponent("lorem-ipsum").appendingPathExtension("txt")
         )
         let file = MultipartFile(data: data, contentType: "text/plain", filename: "lorem-ipsum.txt")
 
         let expected = String(data: try Data(
-            contentsOf: URL(fileURLWithPath: #file).deletingLastPathComponent().appendingPathComponent("Fixtures")
-                .appendingPathComponent("multipart-file").appendingPathExtension("txt")
+            contentsOf: URL(fileURLWithPath: #file)
+                .deletingLastPathComponent().deletingLastPathComponent()
+                .appendingPathComponent("Fixtures").appendingPathComponent("multipart-file").appendingPathExtension("txt")
             ), encoding: .utf8)!
 
         for method in bodyMethods {
@@ -105,14 +108,16 @@ class ParamsSpec: XCTestCase {
     func testMultipartMixedParams() throws {
         let form = ["question": "The Ultimate Question of Life, the Universe, and Everything"]
         let data = try Data(
-            contentsOf: URL(fileURLWithPath: #file).deletingLastPathComponent().appendingPathComponent("Fixtures")
-                .appendingPathComponent("lorem-ipsum").appendingPathExtension("txt")
+            contentsOf: URL(fileURLWithPath: #file)
+                .deletingLastPathComponent().deletingLastPathComponent()
+                .appendingPathComponent("Fixtures").appendingPathComponent("lorem-ipsum").appendingPathExtension("txt")
         )
         let file = MultipartFile(data: data, contentType: "text/plain", filename: "lorem-ipsum.txt")
 
         let expected = String(data: try Data(
-            contentsOf: URL(fileURLWithPath: #file).deletingLastPathComponent().appendingPathComponent("Fixtures")
-                .appendingPathComponent("multipart-mixed").appendingPathExtension("txt")
+            contentsOf: URL(fileURLWithPath: #file)
+                .deletingLastPathComponent().deletingLastPathComponent()
+                .appendingPathComponent("Fixtures").appendingPathComponent("multipart-mixed").appendingPathExtension("txt")
             ), encoding: .utf8)!
 
         for method in bodyMethods {

diff --git a/...niGnomonTests/URLParamsEncodingSpec.swift → ...equest params/URLParamsEncodingSpec.swift b/...niGnomonTests/URLParamsEncodingSpec.swift → ...equest params/URLParamsEncodingSpec.swift
diff --git a/...nomonTests/URLRequestGenerationSpec.swift → ...est params/URLRequestGenerationSpec.swift b/...nomonTests/URLRequestGenerationSpec.swift → ...est params/URLRequestGenerationSpec.swift
diff --git a/Tests/miniGnomonTests/XPathSpec.swift → ...nomonTests/Request params/XPathSpec.swift b/Tests/miniGnomonTests/XPathSpec.swift → ...nomonTests/Request params/XPathSpec.swift
diff --git a/Tests/miniGnomonTests/CacheSpec.swift → .../miniGnomonTests/Requests/CacheSpec.swift b/Tests/miniGnomonTests/CacheSpec.swift → .../miniGnomonTests/Requests/CacheSpec.swift
diff --git a/...miniGnomonTests/CachedThenFetchSpec.swift → ...nTests/Requests/CachedThenFetchSpec.swift b/...miniGnomonTests/CachedThenFetchSpec.swift → ...nTests/Requests/CachedThenFetchSpec.swift
diff --git a/Tests/miniGnomonTests/DecodableSpec.swift → ...iGnomonTests/Requests/DecodableSpec.swift b/Tests/miniGnomonTests/DecodableSpec.swift → ...iGnomonTests/Requests/DecodableSpec.swift
diff --git a/...iniGnomonTests/MultipleRequestsSpec.swift → ...Tests/Requests/MultipleRequestsSpec.swift b/...iniGnomonTests/MultipleRequestsSpec.swift → ...Tests/Requests/MultipleRequestsSpec.swift
diff --git a/Tests/miniGnomonTests/RequestSpec.swift → ...iniGnomonTests/Requests/RequestSpec.swift b/Tests/miniGnomonTests/RequestSpec.swift → ...iniGnomonTests/Requests/RequestSpec.swift