auto merge of #3566 : metajack/servo/fixup-unit-tests, r=mbrubeck

This adds the subpackages to `./mach test-unit`.

6 files changed, 33 insertions, 26 deletions

diff --git a/components/style/selector_matching.rs b/components/style/selector_matching.rs
index 984630deabb..5b64840d491 100644
--- a/components/style/selector_matching.rs
+++ b/components/style/selector_matching.rs
@@ -999,6 +999,7 @@ mod tests {
     use sync::Arc;
     use super::{DeclarationBlock, Rule, SelectorMap};
     use selectors::LocalName;
+    use string_cache::Atom;
 
     /// Helper method to get some Rules from selector strings.
     /// Each sublist of the result contains the Rules for one StyleRule.
@@ -1043,7 +1044,7 @@ mod tests {
     fn test_get_class_name(){
         let rules_list = get_mock_rules([".intro.foo", "#top"]);
         assert_eq!(SelectorMap::get_class_name(&rules_list[0][0]), Some(Atom::from_slice("intro")));
-        assert_eq!(SelectorMap::get_class_name(rules_list.get(1).get(0)), None);
+        assert_eq!(SelectorMap::get_class_name(&rules_list[1][0]), None);
     }
 
     #[test]
diff --git a/components/style/selectors.rs b/components/style/selectors.rs
index e69135e1ed1..7a6f8637cda 100644
--- a/components/style/selectors.rs
+++ b/components/style/selectors.rs
@@ -574,6 +574,7 @@ mod tests {
     use sync::Arc;
     use cssparser;
     use namespaces::NamespaceMap;
+    use string_cache::Atom;
     use super::*;
 
     fn parse(input: &str) -> Result<Vec<Selector>, ()> {
@@ -649,8 +650,8 @@ mod tests {
         assert!(parse_ns("[Foo]", &namespaces) == Ok(vec!(Selector {
             compound_selectors: Arc::new(CompoundSelector {
                 simple_selectors: vec!(AttrExists(AttrSelector {
-                    name: Atom::from_slice("Foo"),
-                    lower_name: Atom::from_slice("foo"),
+                    name: String::from_str("Foo"),
+                    lower_name: String::from_str("foo"),
                     namespace: SpecificNamespace(ns!("")),
                 })),
                 next: None,
@@ -664,8 +665,8 @@ mod tests {
         assert!(parse_ns("[Foo]", &namespaces) == Ok(vec!(Selector {
             compound_selectors: Arc::new(CompoundSelector {
                 simple_selectors: vec!(AttrExists(AttrSelector {
-                    name: Atom::from_slice("Foo"),
-                    lower_name: Atom::from_slice("foo"),
+                    name: String::from_str("Foo"),
+                    lower_name: String::from_str("foo"),
                     namespace: SpecificNamespace(ns!("")),
                 })),
                 next: None,
diff --git a/components/util/smallvec.rs b/components/util/smallvec.rs
index 998f8ef1d57..5185c4ee521 100644
--- a/components/util/smallvec.rs
+++ b/components/util/smallvec.rs
@@ -498,7 +498,7 @@ pub mod tests {
         let mut v = SmallVec16::new();
         v.push("hello".to_string());
         v.push("there".to_string());
-        assert_eq!(v.as_slice(), &["hello".to_string(), "there".to_string()]);
+        assert_eq!(v.as_slice(), vec!["hello".to_string(), "there".to_string()].as_slice());
     }
 
     #[test]
@@ -508,7 +508,7 @@ pub mod tests {
         v.push("there".to_string());
         v.push("burma".to_string());
         v.push("shave".to_string());
-        assert_eq!(v.as_slice(), &["hello".to_string(), "there".to_string(), "burma".to_string(), "shave".to_string()]);
+        assert_eq!(v.as_slice(), vec!["hello".to_string(), "there".to_string(), "burma".to_string(), "shave".to_string()].as_slice());
     }
 
     #[test]
@@ -522,9 +522,9 @@ pub mod tests {
         v.push("there".to_string());
         v.push("burma".to_string());
         v.push("shave".to_string());
-        assert_eq!(v.as_slice(), &[
+        assert_eq!(v.as_slice(), vec![
             "hello".to_string(), "there".to_string(), "burma".to_string(), "shave".to_string(), "hello".to_string(), "there".to_string(), "burma".to_string(), "shave".to_string(),
-        ]);
+        ].as_slice());
     }
 }
 
diff --git a/components/util/sort.rs b/components/util/sort.rs
index bf0c37d8ea6..73a244f713f 100644
--- a/components/util/sort.rs
+++ b/components/util/sort.rs
@@ -91,9 +91,9 @@ pub mod test {
             let len: uint = rng.gen();
             let mut v: Vec<int> = rng.gen_iter::<int>().take((len % 32) + 1).collect();
             fn compare_ints(a: &int, b: &int) -> Ordering { a.cmp(b) }
-            sort::quicksort_by(v.as_slice_mut(), compare_ints);
+            sort::quicksort_by(v.as_mut_slice(), compare_ints);
             for i in range(0, v.len() - 1) {
-                assert!(v.get(i) <= v.get(i + 1))
+                assert!(v[i] <= v[i + 1])
             }
         }
     }
diff --git a/components/util/vec.rs b/components/util/vec.rs
index b8d24687d28..61fd05fe0c5 100644
--- a/components/util/vec.rs
+++ b/components/util/vec.rs
@@ -11,7 +11,7 @@ pub trait Comparator<K,T> {
 }
 
 pub trait BinarySearchMethods<'a, T: Ord + PartialOrd + PartialEq> {
-    fn binary_search(&self, key: &T) -> Option<&'a T>;
+    fn binary_search_(&self, key: &T) -> Option<&'a T>;
     fn binary_search_index(&self, key: &T) -> Option<uint>;
 }
 
@@ -20,7 +20,7 @@ pub trait FullBinarySearchMethods<T> {
 }
 
 impl<'a, T: Ord + PartialOrd + PartialEq> BinarySearchMethods<'a, T> for &'a [T] {
-    fn binary_search(&self, key: &T) -> Option<&'a T> {
+    fn binary_search_(&self, key: &T) -> Option<&'a T> {
         self.binary_search_index(key).map(|i| &self[i])
     }
 
@@ -65,7 +65,7 @@ impl<T:PartialEq + PartialOrd + Ord> Comparator<T,T> for DefaultComparator {
 fn test_find_all_elems<T: PartialEq + PartialOrd + Eq + Ord>(arr: &[T]) {
     let mut i = 0;
     while i < arr.len() {
-        assert!(test_match(&arr[i], arr.binary_search(&arr[i])));
+        assert!(test_match(&arr[i], arr.binary_search_(&arr[i])));
         i += 1;
     }
 }
@@ -74,9 +74,9 @@ fn test_find_all_elems<T: PartialEq + PartialOrd + Eq + Ord>(arr: &[T]) {
 fn test_miss_all_elems<T: PartialEq + PartialOrd + Eq + Ord>(arr: &[T], misses: &[T]) {
     let mut i = 0;
     while i < misses.len() {
-        let res = arr.binary_search(&misses[i]);
+        let res = arr.binary_search_(&misses[i]);
         debug!("{:?} == {:?} ?", misses[i], res);
-        assert!(!test_match(&misses[i], arr.binary_search(&misses[i])));
+        assert!(!test_match(&misses[i], arr.binary_search_(&misses[i])));
         i += 1;
     }
 }
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 3d20aeb27da..05242f7af5b 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -54,22 +54,27 @@ class MachCommands(CommandBase):
         print("Tests completed in %0.2fs" % elapsed)
 
     @Command('test-unit',
-             description='Run libservo unit tests',
+             description='Run unit tests',
              category='testing',
              allow_all_args=True)
     @CommandArgument('test_name', default=None, nargs="...",
                      help="Only run tests that match this pattern")
-    @CommandArgument(
-        'params', default=None, nargs="...",
-        help="Command-line arguments to be passed to the test harness")
-    def test_unit(self, test_name=None, params=None):
-        if params is None:
-            params = []
-        if test_name is not None:
-            params.append(test_name)
+    def test_unit(self, test_name=None):
+        if test_name is None:
+            test_name = []
         self.ensure_bootstrapped()
         self.ensure_built_tests()
-        return self.run_test("servo", params)
+
+        ret = self.run_test("servo", test_name) != 0
+
+        def cargo_test(component):
+            return 0 != subprocess.call(
+                ["cargo", "test", "-p", component], env=self.build_env())
+
+        for component in os.listdir("components"):
+            ret = ret or cargo_test(component)
+
+        return ret
 
     @Command('test-ref',
              description='Run the reference tests',