Fix test build

5 files changed, 17 insertions, 16 deletions

diff --git a/src/servo/css/parser_util.rs b/src/servo/css/parser_util.rs
index 5ae9a7f6c9c..3806f7b34a8 100644
--- a/src/servo/css/parser_util.rs
+++ b/src/servo/css/parser_util.rs
@@ -62,8 +62,9 @@ fn parse_display_type(str : ~str) -> Option<DisplayType> {
 
 #[cfg(test)]
 mod test {
-    import css_lexer::spawn_css_lexer_from_string;
-    import css_builder::build_stylesheet;
+    import css::lexer::spawn_css_lexer_from_string;
+    import css::parser::build_stylesheet;
+    import css::values::{Stylesheet, Element, FontSize, Width, Height};
     
     #[test]
     fn should_match_font_sizes() {
diff --git a/src/servo/css/resolve/apply.rs b/src/servo/css/resolve/apply.rs
index ed92766d0af..91090125040 100644
--- a/src/servo/css/resolve/apply.rs
+++ b/src/servo/css/resolve/apply.rs
@@ -161,7 +161,7 @@ mod test {
     #[allow(non_implicitly_copyable_typarams)]
     fn new_node(scope: NodeScope, -name: ~str) -> Node {
         let elmt = ElementData(name, ~HTMLDivElement);
-        return scope.new_node(base::Element(elmt));
+        return scope.new_node(dom::base::Element(elmt));
     }
 
     #[test]
@@ -187,14 +187,14 @@ mod test {
         do g2.aux |aux| { aux.specified_style.height = Some(Px(10.0)); }
 
         let parent_box = parent.construct_boxes();
-        let child_box = parent_box.tree.first_child.get();
-        let child2_box = parent_box.tree.last_child.get();
+        let child_box = parent_box.get().tree.first_child.get();
+        let child2_box = parent_box.get().tree.last_child.get();
         let g1_box = child_box.tree.first_child.get();
         let g2_box = child_box.tree.last_child.get();
         
-        top_down_traversal(parent_box, inhereit_height);
+        top_down_traversal(parent_box.get(), inhereit_height);
 
-        assert parent_box.appearance.height == Px(100.0);
+        assert parent_box.get().appearance.height == Px(100.0);
         assert child_box.appearance.height == Auto;
         assert child2_box.appearance.height == Px(50.0);
         assert g1_box.appearance.height == Auto;
diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs
index 6695960a538..11f826ee353 100644
--- a/src/servo/layout/base.rs
+++ b/src/servo/layout/base.rs
@@ -367,10 +367,10 @@ mod test {
         tree::add_child(s, n3, n1);
         tree::add_child(s, n3, n2);
 
-        let b0 = n0.construct_boxes();
-        let b1 = n1.construct_boxes();
-        let b2 = n2.construct_boxes();
-        let b3 = n3.construct_boxes();
+        let b0 = n0.construct_boxes().get();
+        let b1 = n1.construct_boxes().get();
+        let b2 = n2.construct_boxes().get();
+        let b3 = n3.construct_boxes().get();
 
         tree::add_child(BTree, b3, b0);
         tree::add_child(BTree, b3, b1);
diff --git a/src/servo/layout/display_list_builder.rs b/src/servo/layout/display_list_builder.rs
index ab9babcc007..3d168099dfe 100644
--- a/src/servo/layout/display_list_builder.rs
+++ b/src/servo/layout/display_list_builder.rs
@@ -111,7 +111,7 @@ fn should_convert_text_boxes_to_solid_color_background_items() {
 
     let s = Scope();
     let n = s.new_node(Text(~"firecracker"));
-    let b = n.construct_boxes();
+    let b = n.construct_boxes().get();
 
     let subbox = match b.kind {
       TextBoxKind(subbox) => subbox,
@@ -134,7 +134,7 @@ fn should_convert_text_boxes_to_text_items() {
 
     let s = Scope();
     let n = s.new_node(Text(~"firecracker"));
-    let b = n.construct_boxes();
+    let b = n.construct_boxes().get();
 
     let subbox = match b.kind {
       TextBoxKind(subbox) => { subbox },
@@ -157,7 +157,7 @@ fn should_calculate_the_bounds_of_the_text_box_background_color() {
 
     let s = Scope();
     let n = s.new_node(Text(~"firecracker"));
-    let b = n.construct_boxes();
+    let b = n.construct_boxes().get();
 
     let subbox = match b.kind {
       TextBoxKind(subbox) => { subbox },
@@ -182,7 +182,7 @@ fn should_calculate_the_bounds_of_the_text_items() {
 
     let s = Scope();
     let n = s.new_node(Text(~"firecracker"));
-    let b = n.construct_boxes();
+    let b = n.construct_boxes().get();
 
     let subbox = match b.kind {
       TextBoxKind(subbox) => { subbox },
diff --git a/src/servo/layout/text.rs b/src/servo/layout/text.rs
index 92c3cf6cfc6..1c4ca2ea884 100644
--- a/src/servo/layout/text.rs
+++ b/src/servo/layout/text.rs
@@ -48,7 +48,7 @@ fn should_calculate_the_size_of_the_text_box() {
 
     let s = Scope();
     let n = s.new_node(Text(~"firecracker"));
-    let b = n.construct_boxes();
+    let b = n.construct_boxes().get();
 
     let subbox = match b.kind {
       TextBoxKind(subbox) => { subbox },