aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/image_cache_task.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2015-02-21 12:25:06 -0500
committerJosh Matthews <josh@joshmatthews.net>2015-04-07 13:25:16 -0400
commit4a78da11589ce78f4bc80d3c0444f019c4b86380 (patch)
tree4f67932cb9d018ee3e52d99484b0c5b731a2d525 /components/net/image_cache_task.rs
parent23ae940abf2aeb836ca908dff147cca357483e6b (diff)
downloadservo-4a78da11589ce78f4bc80d3c0444f019c4b86380.tar.gz
servo-4a78da11589ce78f4bc80d3c0444f019c4b86380.zip
Fix unit tests.
Diffstat (limited to 'components/net/image_cache_task.rs')
-rw-r--r--components/net/image_cache_task.rs24
1 files changed, 4 insertions, 20 deletions
diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs
index 03ee5c8a52e..df38f9d7c31 100644
--- a/components/net/image_cache_task.rs
+++ b/components/net/image_cache_task.rs
@@ -428,11 +428,10 @@ mod tests {
use net_traits::image_cache_task::ImageResponseMsg::*;
use net_traits::image_cache_task::Msg::*;
- use resource_task::{start_sending, ResponseSenders};
+ use resource_task::start_sending;
use net_traits::{ControlMsg, Metadata, ProgressMsg, ResourceTask};
use net_traits::image_cache_task::{ImageCacheTask, ImageResponseMsg, Msg};
use net_traits::ProgressMsg::{Payload, Done};
- use sniffer_task;
use profile::time;
use std::sync::mpsc::{Sender, channel, Receiver};
use url::Url;
@@ -534,12 +533,7 @@ mod tests {
loop {
match port.recv().unwrap() {
ControlMsg::Load(response) => {
- let sniffer_task = sniffer_task::new_sniffer_task();
- let senders = ResponseSenders {
- immediate_consumer: sniffer_task,
- eventual_consumer: response.consumer.clone(),
- };
- let chan = start_sending(senders, Metadata::default(
+ let chan = start_sending(response.consumer, Metadata::default(
Url::parse("file:///fake").unwrap()));
on_load.invoke(chan);
}
@@ -709,12 +703,7 @@ mod tests {
loop {
match port.recv().unwrap() {
ControlMsg::Load(response) => {
- let sniffer_task = sniffer_task::new_sniffer_task();
- let senders = ResponseSenders {
- immediate_consumer: sniffer_task,
- eventual_consumer: response.consumer.clone(),
- };
- let chan = start_sending(senders, Metadata::default(
+ let chan = start_sending(response.consumer, Metadata::default(
Url::parse("file:///fake").unwrap()));
chan.send(Payload(test_image_bin()));
chan.send(Done(Ok(())));
@@ -763,12 +752,7 @@ mod tests {
loop {
match port.recv().unwrap() {
ControlMsg::Load(response) => {
- let sniffer_task = sniffer_task::new_sniffer_task();
- let senders = ResponseSenders {
- immediate_consumer: sniffer_task,
- eventual_consumer: response.consumer.clone(),
- };
- let chan = start_sending(senders, Metadata::default(
+ let chan = start_sending(response.consumer, Metadata::default(
Url::parse("file:///fake").unwrap()));
chan.send(Payload(test_image_bin()));
chan.send(Done(Err("".to_string())));