Added mock sniffer task and fixed logic bug

components/net/data_loader.rs

@@ -93,7 +93,7 @@ fn assert_parse(url:          &'static str,
     use sniffer_task;
 
     let (start_chan, start_port) = comm::channel();
-    let sniffer_task = sniffer_task::new_sniffer_task();
+    let sniffer_task = sniffer_task::new_mock_sniffer_task();
     load(LoadData::new(Url::parse(url).unwrap(), start_chan), sniffer_task);
 
     let response = start_port.recv();

components/net/mime_classifier.rs

@@ -291,13 +291,13 @@ struct BinaryOrPlaintextClassifier;
 impl BinaryOrPlaintextClassifier {
     fn classify_impl(&self, data: &Vec<u8>) -> Option<(&'static str,&'static str)> {
         if (data.len() >=2 &&
-            (data[0] == 0xFFu8 && data[1] == 0xFEu8) ||
-            (data[0] == 0xFEu8 && data[1] == 0xFFu8)) ||
+            ((data[0] == 0xFFu8 && data[1] == 0xFEu8) ||
+            (data[0] == 0xFEu8 && data[1] == 0xFFu8))) ||
            (data.len() >= 3 && data[0] == 0xEFu8 && data[1] == 0xBBu8 && data[2] == 0xBFu8)
         {
             Some(("text", "plain"))
         }
-        else if data.iter().any(|x| *x<=0x08u8 ||
+        else if data.len() >= 1 && data.iter().any(|x| *x<=0x08u8 ||
                                  *x==0x0Bu8 ||
                                  (*x>=0x0Eu8 && *x <= 0x1Au8) ||
                                  (*x>=0x1Cu8 && *x <= 0x1Fu8)) {

components/net/sniffer_task.rs

@@ -85,3 +85,41 @@ impl SnifferManager {
     }
 
 }
+
+#[cfg(test)]
+pub fn new_mock_sniffer_task() -> SnifferTask {
+    let(sen, rec) = channel();
+    let builder = TaskBuilder::new().named("SnifferManager");
+    builder.spawn(proc() {
+        MockSnifferManager::new(rec).start();
+    });
+    sen
+}
+
+#[cfg(test)]
+struct MockSnifferManager {
+    data_receiver: Receiver<TargetedLoadResponse>,
+}
+
+#[cfg(test)]
+impl MockSnifferManager {
+    fn new(data_receiver: Receiver <TargetedLoadResponse>) -> MockSnifferManager {
+        MockSnifferManager {
+            data_receiver: data_receiver,
+        }
+    }
+}
+
+#[cfg(test)]
+impl MockSnifferManager {
+    fn start(self) {
+        loop {
+            match self.data_receiver.recv_opt() {
+                Ok(snif_data) => {
+                    let _ = snif_data.consumer.send_opt(snif_data.load_response);
+                }
+                Err(_) => break,
+            }
+        }
+    }
+}