Move script crate unit tests into the unit_tests crate.

tests/unit/Cargo.toml

@@ -26,6 +26,9 @@ path = "../../components/profile"
 [dependencies.style]
 path = "../../components/style"
 
+[dependencies.script]
+path = "../../components/script"
+
 [dependencies.geom]
 git = "https://github.com/servo/rust-geom"
 

tests/unit/lib.rs

@@ -9,6 +9,7 @@ extern crate gfx;
 extern crate net;
 extern crate net_traits;
 extern crate profile;
+extern crate script;
 extern crate selectors;
 extern crate string_cache;
 extern crate style;
@@ -17,5 +18,6 @@ extern crate url;
 
 #[cfg(test)] #[path="gfx/mod.rs"] mod gfx_tests;
 #[cfg(test)] #[path="net/mod.rs"] mod net_tests;
+#[cfg(test)] #[path="script/mod.rs"] mod script_tests;
 #[cfg(test)] #[path="style/mod.rs"] mod style_tests;
 #[cfg(test)] #[path="util/mod.rs"] mod util_tests;

tests/unit/script/mod.rs

@@ -0,0 +1,2 @@
+#[cfg(target_pointer_width = "64")] mod size_of;
+mod textinput;

tests/unit/script/size_of.rs

@@ -0,0 +1,48 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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 script::dom::characterdata::CharacterData;
+use script::dom::element::Element;
+use script::dom::eventtarget::EventTarget;
+use script::dom::htmldivelement::HTMLDivElement;
+use script::dom::htmlelement::HTMLElement;
+use script::dom::htmlspanelement::HTMLSpanElement;
+use script::dom::node::Node;
+use script::dom::text::Text;
+
+use std::mem::size_of;
+
+// Macro so that we can stringify type names
+// I'd really prefer the tests themselves to be run at plugin time,
+// however rustc::middle doesn't have access to the full type data
+macro_rules! sizeof_checker (
+    ($testname: ident, $t:ty, $known_size:expr) => (
+        #[test]
+        fn $testname() {
+            let new = size_of::<$t>();
+            let old = $known_size;
+            if new < old {
+                panic!("Your changes have decreased the stack size of commonly used DOM struct {} from {} to {}. \
+                        Good work! Please update the size in script/tests.rs",
+                        stringify!($t), old, new)
+            } else if new > old {
+                panic!("Your changes have increased the stack size of commonly used DOM struct {} from {} to {}. \
+                        These structs are present in large quantities in the DOM, and increasing the size \
+                        may dramatically affect our memory footprint. Please consider choosing a design which \
+                        avoids this increase. If you feel that the increase is necessary, \
+                        update to the new size in script/tests.rs.",
+                        stringify!($t), old, new)
+        }
+    });
+);
+
+// Update the sizes here
+sizeof_checker!(size_event_target, EventTarget, 48);
+sizeof_checker!(size_node, Node, 216);
+sizeof_checker!(size_element, Element, 328);
+sizeof_checker!(size_htmlelement, HTMLElement, 344);
+sizeof_checker!(size_div, HTMLDivElement, 344);
+sizeof_checker!(size_span, HTMLSpanElement, 344);
+sizeof_checker!(size_text, Text, 248);
+sizeof_checker!(size_characterdata, CharacterData, 248);

tests/unit/script/textinput.rs

@@ -0,0 +1,158 @@
+use script::textinput::{TextInput, Selection, Lines, DeleteDir};
+use std::borrow::ToOwned;
+
+#[test]
+fn test_textinput_delete_char() {
+    let mut textinput = TextInput::new(Lines::Single, "abcdefg".to_owned());
+    textinput.adjust_horizontal(2, Selection::NotSelected);
+    textinput.delete_char(DeleteDir::Backward);
+    assert_eq!(textinput.get_content(), "acdefg");
+
+    textinput.delete_char(DeleteDir::Forward);
+    assert_eq!(textinput.get_content(), "adefg");
+
+    textinput.adjust_horizontal(2, Selection::Selected);
+    textinput.delete_char(DeleteDir::Forward);
+    assert_eq!(textinput.get_content(), "afg");
+}
+
+#[test]
+fn test_textinput_insert_char() {
+    let mut textinput = TextInput::new(Lines::Single, "abcdefg".to_owned());
+    textinput.adjust_horizontal(2, Selection::NotSelected);
+    textinput.insert_char('a');
+    assert_eq!(textinput.get_content(), "abacdefg");
+
+    textinput.adjust_horizontal(2, Selection::Selected);
+    textinput.insert_char('b');
+    assert_eq!(textinput.get_content(), "ababefg");
+}
+
+#[test]
+fn test_textinput_get_sorted_selection() {
+    let mut textinput = TextInput::new(Lines::Single, "abcdefg".to_owned());
+    textinput.adjust_horizontal(2, Selection::NotSelected);
+    textinput.adjust_horizontal(2, Selection::Selected);
+    let (begin, end) = textinput.get_sorted_selection();
+    assert_eq!(begin.index, 2);
+    assert_eq!(end.index, 4);
+
+    textinput.clear_selection();
+
+    textinput.adjust_horizontal(-2, Selection::Selected);
+    let (begin, end) = textinput.get_sorted_selection();
+    assert_eq!(begin.index, 2);
+    assert_eq!(end.index, 4);
+}
+
+#[test]
+fn test_textinput_replace_selection() {
+    let mut textinput = TextInput::new(Lines::Single, "abcdefg".to_owned());
+    textinput.adjust_horizontal(2, Selection::NotSelected);
+    textinput.adjust_horizontal(2, Selection::Selected);
+
+    textinput.replace_selection("xyz".to_owned());
+    assert_eq!(textinput.get_content(), "abxyzefg");
+}
+
+#[test]
+fn test_textinput_current_line_length() {
+    let mut textinput = TextInput::new(Lines::Multiple, "abc\nde\nf".to_owned());
+    assert_eq!(textinput.current_line_length(), 3);
+
+    textinput.adjust_vertical(1, Selection::NotSelected);
+    assert_eq!(textinput.current_line_length(), 2);
+
+    textinput.adjust_vertical(1, Selection::NotSelected);
+    assert_eq!(textinput.current_line_length(), 1);
+}
+
+#[test]
+fn test_textinput_adjust_vertical() {
+    let mut textinput = TextInput::new(Lines::Multiple, "abc\nde\nf".to_owned());
+    textinput.adjust_horizontal(3, Selection::NotSelected);
+    textinput.adjust_vertical(1, Selection::NotSelected);
+    assert_eq!(textinput.edit_point.line, 1);
+    assert_eq!(textinput.edit_point.index, 2);
+
+    textinput.adjust_vertical(-1, Selection::NotSelected);
+    assert_eq!(textinput.edit_point.line, 0);
+    assert_eq!(textinput.edit_point.index, 2);
+
+    textinput.adjust_vertical(2, Selection::NotSelected);
+    assert_eq!(textinput.edit_point.line, 2);
+    assert_eq!(textinput.edit_point.index, 1);
+}
+
+#[test]
+fn test_textinput_adjust_horizontal() {
+    let mut textinput = TextInput::new(Lines::Multiple, "abc\nde\nf".to_owned());
+    textinput.adjust_horizontal(4, Selection::NotSelected);
+    assert_eq!(textinput.edit_point.line, 1);
+    assert_eq!(textinput.edit_point.index, 0);
+
+    textinput.adjust_horizontal(1, Selection::NotSelected);
+    assert_eq!(textinput.edit_point.line, 1);
+    assert_eq!(textinput.edit_point.index, 1);
+
+    textinput.adjust_horizontal(2, Selection::NotSelected);
+    assert_eq!(textinput.edit_point.line, 2);
+    assert_eq!(textinput.edit_point.index, 0);
+
+    textinput.adjust_horizontal(-1, Selection::NotSelected);
+    assert_eq!(textinput.edit_point.line, 1);
+    assert_eq!(textinput.edit_point.index, 2);
+}
+
+#[test]
+fn test_textinput_handle_return() {
+    let mut single_line_textinput = TextInput::new(Lines::Single, "abcdef".to_owned());
+    single_line_textinput.adjust_horizontal(3, Selection::NotSelected);
+    single_line_textinput.handle_return();
+    assert_eq!(single_line_textinput.get_content(), "abcdef");
+
+    let mut multi_line_textinput = TextInput::new(Lines::Multiple, "abcdef".to_owned());
+    multi_line_textinput.adjust_horizontal(3, Selection::NotSelected);
+    multi_line_textinput.handle_return();
+    assert_eq!(multi_line_textinput.get_content(), "abc\ndef");
+}
+
+#[test]
+fn test_textinput_select_all() {
+    let mut textinput = TextInput::new(Lines::Multiple, "abc\nde\nf".to_owned());
+    assert_eq!(textinput.edit_point.line, 0);
+    assert_eq!(textinput.edit_point.index, 0);
+
+    textinput.select_all();
+    assert_eq!(textinput.edit_point.line, 2);
+    assert_eq!(textinput.edit_point.index, 1);
+}
+
+#[test]
+fn test_textinput_get_content() {
+    let single_line_textinput = TextInput::new(Lines::Single, "abcdefg".to_owned());
+    assert_eq!(single_line_textinput.get_content(), "abcdefg");
+
+    let multi_line_textinput = TextInput::new(Lines::Multiple, "abc\nde\nf".to_owned());
+    assert_eq!(multi_line_textinput.get_content(), "abc\nde\nf");
+}
+
+#[test]
+fn test_textinput_set_content() {
+    let mut textinput = TextInput::new(Lines::Multiple, "abc\nde\nf".to_owned());
+    assert_eq!(textinput.get_content(), "abc\nde\nf");
+
+    textinput.set_content("abc\nf".to_owned());
+    assert_eq!(textinput.get_content(), "abc\nf");
+
+    assert_eq!(textinput.edit_point.line, 0);
+    assert_eq!(textinput.edit_point.index, 0);
+    textinput.adjust_horizontal(3, Selection::Selected);
+    assert_eq!(textinput.edit_point.line, 0);
+    assert_eq!(textinput.edit_point.index, 3);
+    textinput.set_content("de".to_owned());
+    assert_eq!(textinput.get_content(), "de");
+    assert_eq!(textinput.edit_point.line, 0);
+    assert_eq!(textinput.edit_point.index, 2);
+}
+