Merge branch 'develop' of https://github.com/IBM/BluePic into develop

IBM · Jul 10, 2017 · 7c9449a · 7c9449a
2 parents 5649444 + 3de9324
commit 7c9449a
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/BluePic-Server/Tests/BluePicAppTests/RouteTests.swift b/BluePic-Server/Tests/BluePicAppTests/RouteTests.swift
@@ -37,11 +37,13 @@ class RouteTests: XCTestCase {
   private let serverController = try? ServerController()
 
   private var accessToken: String = ""
+
+  private let timeout: TimeInterval = 25.0
 
   static var allTests : [(String, (RouteTests) -> () throws -> Void)] {
       return [
-          ("testPing", testPing),
           ("testGetTags", testGetTags),
+          ("testPing", testPing),
           ("testGettingImages", testGettingImages),
           ("testGettingSingleImage", testGettingSingleImage),
           ("testGettingImagesByTag", testGettingImagesByTag),
@@ -121,7 +123,7 @@ class RouteTests: XCTestCase {
         XCTAssertTrue(pingResult!.contains("Hello World"))
         pingExpectation.fulfill()
     }
-    waitForExpectations(timeout: 10.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   func testGetTags() {
@@ -137,7 +139,7 @@ class RouteTests: XCTestCase {
         }
         tagExpectation.fulfill()
     }
-    waitForExpectations(timeout: 10.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   // MARK: Image related tests
@@ -161,7 +163,7 @@ class RouteTests: XCTestCase {
         imageExpectation.fulfill()
 
     }
-    waitForExpectations(timeout: 10.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   func testGettingSingleImage() {
@@ -176,7 +178,7 @@ class RouteTests: XCTestCase {
         imageExpectation.fulfill()
     }
 
-    waitForExpectations(timeout: 10.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   func testGettingImagesByTag() {
@@ -201,7 +203,7 @@ class RouteTests: XCTestCase {
         imageExpectation.fulfill()
 
     }
-    waitForExpectations(timeout: 10.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   func testPostingImage() {
@@ -284,7 +286,7 @@ class RouteTests: XCTestCase {
       XCTFail("Failed to convert image dictionary to binary data.")
     }
 
-    waitForExpectations(timeout: 20.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   func testGettingImagesForUser() {
@@ -303,7 +305,7 @@ class RouteTests: XCTestCase {
         }
         imageExpectation.fulfill()
     }
-    waitForExpectations(timeout: 10.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   // MARK: User related tests
@@ -326,7 +328,7 @@ class RouteTests: XCTestCase {
         }
         userExpectation.fulfill()
     }
-    waitForExpectations(timeout: 10.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   func testGettingSingleUser() {
@@ -343,7 +345,7 @@ class RouteTests: XCTestCase {
         XCTAssertNotNil(user["_rev"].string)
         userExpectation.fulfill()
     }
-    waitForExpectations(timeout: 10.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   func testCreatingUser() {
@@ -366,7 +368,7 @@ class RouteTests: XCTestCase {
     } catch {
       XCTFail("Faild to convert dictionary to JSON")
     }
-    waitForExpectations(timeout: 20.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
   func testPushNotification() {
@@ -405,7 +407,7 @@ class RouteTests: XCTestCase {
     }
     req.end(close: true)
 
-    waitForExpectations(timeout: 15.0, handler: nil)
+    waitForExpectations(timeout: timeout, handler: nil)
   }
 
 }
@@ -524,6 +526,9 @@ private extension URLRequest {
       XCTFail("Invalid request params")
       return
     }
+    print("method: \(method)")
+    print("path: \(path)")
+    print("headers: \(headers)")
 
     if let query = url?.query {
       path += "?" + query
@@ -532,7 +537,7 @@ private extension URLRequest {
     let requestOptions: [ClientRequest.Options] = [.method(method), .hostname("localhost"), .port(8080), .path(path), .headers(headers)]
 
     let req = HTTP.request(requestOptions) { resp in
-
+        print("in RESPONSE: \(resp)")
         if let resp = resp, resp.statusCode == HTTPStatusCode.OK || resp.statusCode == HTTPStatusCode.accepted {
         do {
           var body = Data()