move tests for the api into their own file

an alternative would have been to make a lib.rs co-exist with main.rs
and have an integration test there. Unsure which option I like the most
right now

Author: Andres Medina

src/api.rs

@@ -26,93 +26,3 @@ fn info(location: Location, client: State<Client>) -> Result<Json<String>, Strin
 fn bus_stops(area: Area, client: State<Client>) -> Result<Json<Vec<client::BusStop>>, String> {
     client.bus_stops(area).map(Json)
 }
-
-#[cfg(all(test, not(feature = "contract")))]
-mod unit_test {
-    use super::*;
-
-    use mocktopus::mocking::{MockResult, Mockable};
-
-    #[test]
-    fn info_route() {
-        let mut location = None;
-        unsafe {
-            Client::info.mock_raw(|_, loc| {
-                location = Some(loc);
-                MockResult::Return(Ok("Hello".to_string()))
-            });
-        }
-
-        test::crime();
-    }
-
-    #[test]
-    fn bus_stops() {
-        let mut area = None;
-        let expected = vec![client::BusStop {
-            direction: String::from("S"),
-            id: String::from("1_2345"),
-            name: String::from("hello darkness"),
-            lat: 1.23,
-            lon: 123.23,
-        }];
-        unsafe {
-            Client::bus_stops.mock_raw(|_, a| {
-                area = Some(a);
-                MockResult::Return(Ok(expected.clone()))
-            });
-        }
-
-        let actual = test::bus_stops();
-        assert_eq!(actual, expected);
-
-        let area = area.expect("Client::bus_stops not called");
-        assert_eq!(area.lat, 47.653435);
-        assert_eq!(area.lon, -122.305641);
-        assert_eq!(area.lat_span, 0.002);
-        assert_eq!(area.lon_span, 0.003);
-    }
-}
-
-#[cfg(all(test, feature = "contract"))]
-mod contract_test {
-    #[test]
-    fn info_route() {
-        super::test::crime();
-    }
-
-    #[test]
-    fn bus_route() {
-        let stops = super::test::bus_stops();
-        assert!(stops.len() > 0);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use client;
-    use rocket::http::{ContentType, Status};
-    use serde_json;
-
-    pub fn bus_stops() -> Vec<client::BusStop> {
-        let client = ::client();
-        let mut response = client
-            .get("/api/bus_stops?lat=47.653435&lon=-122.305641&lat_span=0.002&lon_span=0.003")
-            .dispatch();
-        assert_eq!(response.status(), Status::Ok);
-        assert_eq!(response.content_type(), Some(ContentType::JSON));
-        let body = response.body_string().expect("body was empty");
-        serde_json::from_str(body.as_str())
-            .expect("Could not parse api response into 'Vec<client::BusStop'")
-    }
-
-    pub fn crime() -> String {
-        let client = ::client();
-        let mut response = client
-            .get("/api/info?latitude=-122.33&longitude=47.59")
-            .dispatch();
-        assert_eq!(response.status(), Status::Ok);
-        assert_eq!(response.content_type(), Some(ContentType::JSON));
-        response.body_string().expect("body was empty")
-    }
-}

src/api_test.rs

@@ -0,0 +1,95 @@
+use client;
+use rocket::{
+    self,
+    http::{ContentType, Status},
+};
+use serde_json;
+
+fn client() -> rocket::local::Client {
+    rocket::local::Client::new(::rocket()).unwrap()
+}
+
+pub fn get_bus_stops() -> Vec<client::BusStop> {
+    let client = client();
+    let mut response = client
+        .get("/api/bus_stops?lat=47.653435&lon=-122.305641&lat_span=0.002&lon_span=0.003")
+        .dispatch();
+    assert_eq!(response.status(), Status::Ok);
+    assert_eq!(response.content_type(), Some(ContentType::JSON));
+    let body = response.body_string().expect("body was empty");
+    serde_json::from_str(body.as_str())
+        .expect("Could not parse api response into 'Vec<client::BusStop>'")
+}
+
+pub fn get_crime() -> String {
+    let client = client();
+    let mut response = client
+        .get("/api/info?latitude=-122.33&longitude=47.59")
+        .dispatch();
+    assert_eq!(response.status(), Status::Ok);
+    assert_eq!(response.content_type(), Some(ContentType::JSON));
+    response.body_string().expect("body was empty")
+}
+
+#[cfg(not(feature = "contract"))]
+mod unit {
+    use super::*;
+
+    use mocktopus::mocking::{MockResult, Mockable};
+
+    #[test]
+    fn crime() {
+        let mut location = None;
+        unsafe {
+            client::Client::info.mock_raw(|_, loc| {
+                location = Some(loc);
+                MockResult::Return(Ok("Hello".to_string()))
+            });
+        }
+
+        get_crime();
+    }
+
+    #[test]
+    fn bus_stops() {
+        let mut area = None;
+        let expected = vec![client::BusStop {
+            direction: String::from("S"),
+            id: String::from("1_2345"),
+            name: String::from("hello darkness"),
+            lat: 1.23,
+            lon: 123.23,
+        }];
+        unsafe {
+            client::Client::bus_stops.mock_raw(|_, a| {
+                area = Some(a);
+                MockResult::Return(Ok(expected.clone()))
+            });
+        }
+
+        let actual = get_bus_stops();
+        assert_eq!(actual, expected);
+
+        let area = area.expect("Client::bus_stops not called");
+        assert_eq!(area.lat, 47.653435);
+        assert_eq!(area.lon, -122.305641);
+        assert_eq!(area.lat_span, 0.002);
+        assert_eq!(area.lon_span, 0.003);
+    }
+}
+
+#[cfg(feature = "contract")]
+mod integration {
+    use super::*;
+
+    #[test]
+    fn crime() {
+        get_crime();
+    }
+
+    #[test]
+    fn bus_stops() {
+        let stops = get_bus_stops();
+        assert!(stops.len() > 0);
+    }
+}

src/main.rs

@@ -47,6 +47,4 @@ fn main() {
 }
 
 #[cfg(test)]
-fn client() -> rocket::local::Client {
-    rocket::local::Client::new(rocket()).unwrap()
-}
+mod api_test;