Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Ms2ger 2016-11-07 15:00:47 +01:00
parent 1c26f44cbb
commit b64ca44953
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/unit/net/fetch.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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::DevtoolsControlMsg;
use devtools_traits::HttpRequest as DevtoolsHttpRequest; use devtools_traits::HttpRequest as DevtoolsHttpRequest;
use devtools_traits::HttpResponse as DevtoolsHttpResponse; 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::header::{Headers, Host, HttpDate, Referer as HyperReferer};
use hyper::method::Method; use hyper::method::Method;
use hyper::mime::{Mime, SubLevel, TopLevel}; use hyper::mime::{Mime, SubLevel, TopLevel};
use hyper::server::{Handler, Listening, Server};
use hyper::server::{Request as HyperRequest, Response as HyperResponse}; use hyper::server::{Request as HyperRequest, Response as HyperResponse};
use hyper::status::StatusCode; use hyper::status::StatusCode;
use hyper::uri::RequestUri; 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 // 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] #[test]
fn test_fetch_response_is_not_network_error() { fn test_fetch_response_is_not_network_error() {
static MESSAGE: &'static [u8] = b""; static MESSAGE: &'static [u8] = b"";

12
tests/unit/net/lib.rs
View file

@ -35,6 +35,7 @@ extern crate util;
use devtools_traits::DevtoolsControlMsg; use devtools_traits::DevtoolsControlMsg;
use filemanager_thread::{TestProvider, TEST_PROVIDER}; use filemanager_thread::{TestProvider, TEST_PROVIDER};
use hyper::server::{Handler, Listening, Server};
use net::fetch::methods::{FetchContext, fetch}; use net::fetch::methods::{FetchContext, fetch};
use net::filemanager_thread::FileManager; use net::filemanager_thread::FileManager;
use net::test::HttpState; use net::test::HttpState;
@ -44,6 +45,7 @@ use net_traits::response::Response;
use std::rc::Rc; use std::rc::Rc;
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use std::thread; use std::thread;
use url::Url;
const DEFAULT_USER_AGENT: &'static str = "Such Browser. Very Layout. Wow."; 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 { fn fetch_sync(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
fetch(Rc::new(request), &mut None, new_fetch_context(dc)) 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)
}