From d94def6b4a9ba3779869edf6409d29e8817ddc42 Mon Sep 17 00:00:00 2001 From: OJ Kwon Date: Mon, 16 Apr 2018 07:52:57 -0700 Subject: [PATCH] test(net): update test cases --- components/net/tests/fetch.rs | 9 +++--- components/net/tests/filemanager_thread.rs | 5 ++- components/net/tests/http_loader.rs | 16 +++++----- components/net/tests/main.rs | 37 +++++++++++++++++++--- components/net/tests/resource_thread.rs | 10 ++---- 5 files changed, 49 insertions(+), 28 deletions(-) diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs index 18607dc8cc20..1baa2d0c275f 100644 --- a/components/net/tests/fetch.rs +++ b/components/net/tests/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, new_fetch_context, fetch, make_server}; +use {DEFAULT_USER_AGENT, new_fetch_context, create_embedder_proxy, fetch, make_server}; use devtools_traits::DevtoolsControlMsg; use devtools_traits::HttpRequest as DevtoolsHttpRequest; use devtools_traits::HttpResponse as DevtoolsHttpResponse; @@ -124,7 +124,7 @@ fn test_fetch_blob() { use ipc_channel::ipc; use net_traits::blob_url_store::BlobBuf; - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); let bytes = b"content"; let blob_buf = BlobBuf { @@ -552,13 +552,12 @@ fn test_fetch_with_hsts() { let mut ca_content = String::new(); File::open(cert_path).unwrap().read_to_string(&mut ca_content).unwrap(); let ssl_client = create_ssl_client(&ca_content); - let (sender, _) = channel(); - let context = FetchContext { + let context = FetchContext { state: Arc::new(HttpState::new(ssl_client)), user_agent: DEFAULT_USER_AGENT.into(), devtools_chan: None, - filemanager: FileManager::new(sender), + filemanager: FileManager::new(create_embedder_proxy()), cancellation_listener: Arc::new(Mutex::new(CancellationListener::new(None))), }; diff --git a/components/net/tests/filemanager_thread.rs b/components/net/tests/filemanager_thread.rs index 557cbc0af455..d71c9f30187d 100644 --- a/components/net/tests/filemanager_thread.rs +++ b/components/net/tests/filemanager_thread.rs @@ -2,6 +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 create_embedder_proxy; use ipc_channel::ipc; use net::filemanager_thread::FileManager; use net_traits::blob_url_store::BlobURLStoreError; @@ -10,12 +11,10 @@ use servo_config::prefs::{PrefValue, PREFS}; use std::fs::File; use std::io::Read; use std::path::PathBuf; -use std::sync::mpsc::channel; #[test] fn test_filemanager() { - let (sender, _) = channel(); - let filemanager = FileManager::new(sender); + let filemanager = FileManager::new(create_embedder_proxy()); PREFS.set("dom.testing.htmlinputelement.select_files.enabled", PrefValue::Boolean(true)); // Try to open a dummy file "components/net/tests/test.jpeg" in tree diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs index 941dda40b203..ef5bd9a0622f 100644 --- a/components/net/tests/http_loader.rs +++ b/components/net/tests/http_loader.rs @@ -506,7 +506,7 @@ fn test_load_doesnt_add_host_to_sts_list_when_url_is_http_even_if_sts_headers_ar pipeline_id: Some(TEST_PIPELINE_ID), .. RequestInit::default() }); - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); let response = fetch_with_context(&mut request, &context); let _ = server.close(); @@ -523,7 +523,7 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_ }; let (mut server, url) = make_server(handler); - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None); @@ -555,7 +555,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re }; let (mut server, url) = make_server(handler); - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); { let mut cookie_jar = context.state.cookie_jar.write().unwrap(); @@ -593,7 +593,7 @@ fn test_load_sends_cookie_if_nonhttp() { }; let (mut server, url) = make_server(handler); - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); { let mut cookie_jar = context.state.cookie_jar.write().unwrap(); @@ -631,7 +631,7 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl( }; let (mut server, url) = make_server(handler); - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None); @@ -665,7 +665,7 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() { }; let (mut server, url) = make_server(handler); - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None); @@ -983,7 +983,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() { let url_y = ServoUrl::parse(&format!("http://mozilla.org:{}/org/", port)).unwrap(); *shared_url_y_clone.lock().unwrap() = Some(url_y.clone()); - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); { let mut cookie_jar = context.state.cookie_jar.write().unwrap(); let cookie_x = Cookie::new_wrapped( @@ -1087,7 +1087,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() { credentials_mode: CredentialsMode::Include, .. RequestInit::default() }); - let context = new_fetch_context(None); + let context = new_fetch_context(None, None); let auth_entry = AuthCacheEntry { user_name: "username".to_owned(), diff --git a/components/net/tests/main.rs b/components/net/tests/main.rs index 2fe0e7399230..a644a6a2fd46 100644 --- a/components/net/tests/main.rs +++ b/components/net/tests/main.rs @@ -4,6 +4,7 @@ #![cfg(test)] +extern crate compositing; extern crate cookie as cookie_rs; extern crate devtools_traits; extern crate embedder_traits; @@ -16,7 +17,6 @@ extern crate msg; extern crate net; extern crate net_traits; extern crate profile_traits; -extern crate script_traits; extern crate servo_config; extern crate servo_url; extern crate time; @@ -35,6 +35,7 @@ mod mime_classifier; mod resource_thread; mod subresource_integrity; +use compositing::compositor_thread::{EmbedderProxy, EventLoopWaker}; use devtools_traits::DevtoolsControlMsg; use embedder_traits::resources::{self, Resource}; use hyper::server::{Handler, Listening, Server}; @@ -56,9 +57,35 @@ struct FetchResponseCollector { sender: Sender, } -fn new_fetch_context(dc: Option>) -> FetchContext { - let ssl_client = create_ssl_client(&resources::read_string(Resource::SSLCertificates)); +fn create_embedder_proxy() -> EmbedderProxy { let (sender, _) = channel(); + let event_loop_waker = | | { + struct DummyEventLoopWaker { + } + impl DummyEventLoopWaker { + fn new() -> DummyEventLoopWaker { + DummyEventLoopWaker { } + } + } + impl EventLoopWaker for DummyEventLoopWaker { + fn wake(&self) { } + fn clone(&self) -> Box { + Box::new(DummyEventLoopWaker { }) + } + } + + Box::new(DummyEventLoopWaker::new()) + }; + + EmbedderProxy { + sender: sender, + event_loop_waker: event_loop_waker() + } +} + +fn new_fetch_context(dc: Option>, fc: Option) -> FetchContext { + let ssl_client = create_ssl_client(&resources::read_string(Resource::SSLCertificates)); + let sender = fc.unwrap_or_else(|| create_embedder_proxy()); FetchContext { state: Arc::new(HttpState::new(ssl_client)), user_agent: DEFAULT_USER_AGENT.into(), @@ -79,7 +106,7 @@ impl FetchTaskTarget for FetchResponseCollector { } fn fetch(request: &mut Request, dc: Option>) -> Response { - fetch_with_context(request, &new_fetch_context(dc)) + fetch_with_context(request, &new_fetch_context(dc, None)) } fn fetch_with_context(request: &mut Request, context: &FetchContext) -> Response { @@ -99,7 +126,7 @@ fn fetch_with_cors_cache(request: &mut Request, cache: &mut CorsCache) -> Respon sender: sender, }; - methods::fetch_with_cors_cache(request, cache, &mut target, &new_fetch_context(None)); + methods::fetch_with_cors_cache(request, cache, &mut target, &new_fetch_context(None, None)); receiver.recv().unwrap() } diff --git a/components/net/tests/resource_thread.rs b/components/net/tests/resource_thread.rs index 1e6c52378d9e..575b67dc7de6 100644 --- a/components/net/tests/resource_thread.rs +++ b/components/net/tests/resource_thread.rs @@ -2,15 +2,14 @@ * 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 create_embedder_proxy; use ipc_channel::ipc; use net::resource_thread::new_core_resource_thread; use net::test::parse_hostsfile; use net_traits::CoreResourceMsg; use profile_traits::mem::ProfilerChan as MemProfilerChan; use profile_traits::time::ProfilerChan; -use script_traits::ConstellationMsg; use std::net::IpAddr; -use std::sync::mpsc::channel; fn ip(s: &str) -> IpAddr { s.parse().unwrap() @@ -20,12 +19,9 @@ fn ip(s: &str) -> IpAddr { fn test_exit() { let (tx, _rx) = ipc::channel().unwrap(); let (mtx, _mrx) = ipc::channel().unwrap(); - let (constellation, _) = channel(); let (sender, receiver) = ipc::channel().unwrap(); - let (resource_thread, _private_resource_thread, constellation_sender) = new_core_resource_thread( - "".into(), None, ProfilerChan(tx), MemProfilerChan(mtx), None); - constellation_sender.send(constellation.clone()).unwrap(); - let _ = constellation.send(ConstellationMsg::Exit); + let (resource_thread, _private_resource_thread) = new_core_resource_thread( + "".into(), None, ProfilerChan(tx), MemProfilerChan(mtx), create_embedder_proxy(), None); resource_thread.send(CoreResourceMsg::Exit(sender)).unwrap(); receiver.recv().unwrap(); }