Move make_server to the root of the net unit tests crate.

2 files changed, 13 insertions, 12 deletions

diff --git a/tests/unit/net/fetch.rs b/tests/unit/net/fetch.rs
index 308ef309204..bdffa9fc121 100644
--- a/tests/unit/net/fetch.rs
+++ b/tests/unit/net/fetch.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use {DEFAULT_USER_AGENT, FetchResponseCollector, new_fetch_context, fetch_async, fetch_sync};
+use {DEFAULT_USER_AGENT, FetchResponseCollector, new_fetch_context, fetch_async, fetch_sync, make_server};
 use devtools_traits::DevtoolsControlMsg;
 use devtools_traits::HttpRequest as DevtoolsHttpRequest;
 use devtools_traits::HttpResponse as DevtoolsHttpResponse;
@@ -16,7 +16,6 @@ use hyper::header::{Encoding, Location, Pragma, SetCookie, qitem};
 use hyper::header::{Headers, Host, HttpDate, Referer as HyperReferer};
 use hyper::method::Method;
 use hyper::mime::{Mime, SubLevel, TopLevel};
-use hyper::server::{Handler, Listening, Server};
 use hyper::server::{Request as HyperRequest, Response as HyperResponse};
 use hyper::status::StatusCode;
 use hyper::uri::RequestUri;
@@ -39,16 +38,6 @@ use util::resource_files::resources_dir_path;
 
 // TODO write a struct that impls Handler for storing test values
 
-fn make_server<H: Handler + 'static>(handler: H) -> (Listening, Url) {
-    // this is a Listening server because of handle_threads()
-    let server = Server::http("0.0.0.0:0").unwrap().handle_threads(handler, 1).unwrap();
-    let port = server.socket.port().to_string();
-    let mut url_string = "http://localhost:".to_owned();
-    url_string.push_str(&port);
-    let url = Url::parse(&url_string).unwrap();
-    (server, url)
-}
-
 #[test]
 fn test_fetch_response_is_not_network_error() {
     static MESSAGE: &'static [u8] = b"";
diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs
index 4f1f91f923d..4dbaa6fb3e5 100644
--- a/tests/unit/net/lib.rs
+++ b/tests/unit/net/lib.rs
@@ -35,6 +35,7 @@ extern crate util;
 
 use devtools_traits::DevtoolsControlMsg;
 use filemanager_thread::{TestProvider, TEST_PROVIDER};
+use hyper::server::{Handler, Listening, Server};
 use net::fetch::methods::{FetchContext, fetch};
 use net::filemanager_thread::FileManager;
 use net::test::HttpState;
@@ -44,6 +45,7 @@ use net_traits::response::Response;
 use std::rc::Rc;
 use std::sync::mpsc::Sender;
 use std::thread;
+use url::Url;
 
 const DEFAULT_USER_AGENT: &'static str = "Such Browser. Very Layout. Wow.";
 
@@ -79,3 +81,13 @@ fn fetch_async(request: Request, target: Box<FetchTaskTarget + Send>, dc: Option
 fn fetch_sync(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
     fetch(Rc::new(request), &mut None, new_fetch_context(dc))
 }
+
+fn make_server<H: Handler + 'static>(handler: H) -> (Listening, Url) {
+    // this is a Listening server because of handle_threads()
+    let server = Server::http("0.0.0.0:0").unwrap().handle_threads(handler, 1).unwrap();
+    let port = server.socket.port().to_string();
+    let mut url_string = "http://localhost:".to_owned();
+    url_string.push_str(&port);
+    let url = Url::parse(&url_string).unwrap();
+    (server, url)
+}