Merge pull request #3 from jemmons/implicit_start

Makes `start` implicit with initialization.
jemmons · Feb 11, 2024 · 2b489dd · 2b489dd
2 parents 2e65175 + 0110e32
commit 2b489dd
Show file tree

Hide file tree

Showing 6 changed files with 238 additions and 221 deletions.
diff --git a/Sources/Perfidy/FakeServer.swift b/Sources/Perfidy/FakeServer.swift
@@ -7,18 +7,17 @@ public class FakeServer {
   private let routeManager = RouteManager()
   private let port: Int
   private let defaultStatus: Int
+  private var group: EventLoopGroup?
+  private var channel: Channel?
 
 
   public static let defaultURL: URL = URL(string: "http://localhost:\(Default.port)")!
 
 
-  private var group: EventLoopGroup?
-  private var channel: Channel?
-
-
-  public init(port: Int = Default.port, defaultStatusCode: Int = Default.status) {
+  public init(port: Int = Default.port, defaultStatusCode: Int = Default.status) throws {
     self.port = port
     self.defaultStatus = defaultStatusCode
+    try start()
   }
 }
 
@@ -63,22 +62,6 @@ public extension FakeServer {
   }
 
 
-  static func runWith(port: Int = Default.port, defaultStatusCode: Int = Default.status, ƒ: (FakeServer)->Void) {
-    let server = FakeServer(port: port, defaultStatusCode: defaultStatusCode)
-    try! server.start()
-    defer {
-      server.stop()
-    }
-    ƒ(server)
-  }
-
-
-  func start() throws {
-    group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
-    channel = try Helper.doBootstrap(port: port, defaultStatus: defaultStatus, group: group!, delegate: routeManager)
-  }
-
-
   func stop() {
     routeManager.clear()
 
@@ -89,7 +72,6 @@ public extension FakeServer {
   }
 
 
-
   func add(_ route: Route, response: Response = 200, handler: ((URLRequest) -> Void)? = nil) {
     routeManager.add(response: response, forRoute: route)
     if let someHandler = handler {
@@ -163,6 +145,15 @@ public extension FakeServer {
 
 
 
+private extension FakeServer {
+  func start() throws {
+    group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+    channel = try Helper.doBootstrap(port: port, defaultStatus: defaultStatus, group: group!, delegate: routeManager)
+  }
+}
+
+
+
 // MARK: - Helper
 private enum Helper {
   static func doBootstrap(port: Int, defaultStatus: Int, group: EventLoopGroup, delegate: HTTPHandlerDelegate) throws -> Channel {

diff --git a/Tests/PerfidyTests/FromFileTests.swift b/Tests/PerfidyTests/FromFileTests.swift
@@ -12,12 +12,10 @@ private enum K {
 
 
 class FromFileTests: XCTestCase {
-
-  func testMockInterface() {
-    let server = FakeServer()
-    try! server.add(fromFileName: "mockinterface", bundle: fetchFakeBundle())
-    try! server.start()
+  func testMockInterface() throws {
+    let server = try FakeServer()
     defer { server.stop() }
+    try server.add(fromFileName: "mockinterface", bundle: fetchFakeBundle())
 
     let expectedGETResponse = expectation(description: "Waiting for GET response")
     let expectedPOSTResponse = expectation(description: "Waiting for POST response")
@@ -48,7 +46,7 @@ class FromFileTests: XCTestCase {
       expectedPUTResponse.fulfill()
     }
 
-    wait(for: [expectedGETResponse, expectedPOSTResponse, expectedPUTResponse], timeout: 1)
+    wait(for: [expectedGETResponse, expectedPOSTResponse, expectedPUTResponse], timeout: 10)
   }
 }
 
diff --git a/Tests/PerfidyTests/RequestTrackingTests.swift b/Tests/PerfidyTests/RequestTrackingTests.swift
@@ -5,46 +5,46 @@ import Perfidy
 
 
 class RequestTrackingTests: XCTestCase {
-  func testRequestWasSent() {
+  func testRequestWasSent() throws {
     let responseReceived = expectation(description: "Waiting for response")
     let route: Route = "PUT /hello"
 
-    FakeServer.runWith { server in
-      server.add(route)
+    let server = try FakeServer()
+    defer { server.stop() }
+    server.add(route)
 
-      XCTAssertFalse(server.didRequest(route: route))
+    XCTAssertFalse(server.didRequest(route: route))
 
-      session.resumeRequest("PUT", "/hello") { _, _, _ in
-        XCTAssert(server.didRequest(route: route))
-        responseReceived.fulfill()
-      }
-      wait(for: [responseReceived], timeout: 1)
+    session.resumeRequest("PUT", "/hello") { _, _, _ in
+      XCTAssert(server.didRequest(route: route))
+      responseReceived.fulfill()
     }
+    wait(for: [responseReceived], timeout: 1)
   }
 
 
-  func testRequestWasSentTwice() {
+  func testRequestWasSentTwice() throws {
     let responseReceived = expectation(description: "Waiting for responses")
     responseReceived.expectedFulfillmentCount = 2
 
     let route: Route = "POST /content/111"
 
-    FakeServer.runWith { server in
-      server.add(route)
+    let server = try FakeServer()
+    defer { server.stop() }
+    server.add(route)
 
-      XCTAssertEqual(server.numberOfRequests(for: route), 0)
+    XCTAssertEqual(server.numberOfRequests(for: route), 0)
 
-      session.resumeRequest("POST", "/content/111") { _, _, _ in
-        responseReceived.fulfill()
-      }
+    session.resumeRequest("POST", "/content/111") { _, _, _ in
+      responseReceived.fulfill()
+    }
 
-      session.resumeRequest("POST", "/content/111") { _, _, _ in
-        responseReceived.fulfill()
-      }
+    session.resumeRequest("POST", "/content/111") { _, _, _ in
+      responseReceived.fulfill()
+    }
 
-      waitForExpectations(timeout: 1) { _ in
-        XCTAssertEqual(server.numberOfRequests(for: route), 2)
-      }
+    waitForExpectations(timeout: 1) { _ in
+      XCTAssertEqual(server.numberOfRequests(for: route), 2)
     }
   }
 }
diff --git a/Tests/PerfidyTests/ResponseTests.swift b/Tests/PerfidyTests/ResponseTests.swift
@@ -26,8 +26,8 @@ class ResponseTests : XCTestCase{
   }
 
 
-  func testRawJSON() {
-    let subject = try! Response(rawJSON: "{\"foo\":\"bar\"}")
+  func testRawJSON() throws {
+    let subject = try Response(rawJSON: "{\"foo\":\"bar\"}")
     XCTAssertEqual(String(data: subject.body!, encoding: String.Encoding.utf8), "{\"foo\":\"bar\"}")
     XCTAssertEqual(subject.headers[lengthKey], "13")
     XCTAssertEqual(subject.headers[typeKey], "application/json")
@@ -51,16 +51,16 @@ class ResponseTests : XCTestCase{
   }
 
 
-  func testJSONObject() {
-    let subject = try! Response(jsonObject: ["foo":"bar"])
+  func testJSONObject() throws {
+    let subject = try Response(jsonObject: ["foo":"bar"])
     XCTAssertEqual(String(data: subject.body!, encoding: .utf8), "{\"foo\":\"bar\"}")
     XCTAssertEqual(subject.headers[lengthKey], "13")
     XCTAssertEqual(subject.headers[typeKey], "application/json")
   }
 
 
-  func testJSONArray() {
-    let subject = try! Response(jsonArray: [1,2,3])
+  func testJSONArray() throws {
+    let subject = try Response(jsonArray: [1,2,3])
     XCTAssertEqual(String(data: subject.body!, encoding: .utf8), "[1,2,3]")
     XCTAssertEqual(subject.headers[lengthKey], "7")
     XCTAssertEqual(subject.headers[typeKey], "application/json")