Merge pull request #19 from metajack/check-up

Update tests for latest Rust

Author: jdm

Makefile.in

@@ -5,7 +5,7 @@ CXX ?= g++
 CXXFLAGS ?=
 AR ?= ar
 RUSTC ?= rustc
-RUSTFLAGS ?=
+RUSTFLAGS += -L . -L ../../netsurfcss/libcss -L ../../libparserutils/libparserutils -L ../../wapcaplet/libwapcaplet
 
 RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
 

color.rs

@@ -200,58 +200,58 @@ mod test {
 
     #[test]
     fn test_parse_by_name() {
-        assert!(red().eq(&parse_color(~"red").unwrap()));
-        assert!(lime().eq(&parse_color(~"Lime").unwrap()));
-        assert!(blue().eq(&parse_color(~"BLUE").unwrap()));
-        assert!(green().eq(&parse_color(~"GreEN").unwrap()));
-        assert!(white().eq(&parse_color(~"white").unwrap()));
-        assert!(black().eq(&parse_color(~"Black").unwrap()));
-        assert!(gray().eq(&parse_color(~"Gray").unwrap()));
+        assert!(red().eq(&parse_color("red").unwrap()));
+        assert!(lime().eq(&parse_color("Lime").unwrap()));
+        assert!(blue().eq(&parse_color("BLUE").unwrap()));
+        assert!(green().eq(&parse_color("GreEN").unwrap()));
+        assert!(white().eq(&parse_color("white").unwrap()));
+        assert!(black().eq(&parse_color("Black").unwrap()));
+        assert!(gray().eq(&parse_color("Gray").unwrap()));
         println("silver");
-        assert!(silver().eq(&parse_color(~"SiLvEr").unwrap()));
-        assert!(maroon().eq(&parse_color(~"maroon").unwrap()));
-        assert!(purple().eq(&parse_color(~"PURPLE").unwrap()));
-        assert!(fuchsia().eq(&parse_color(~"FUCHSIA").unwrap()));
-        assert!(olive().eq(&parse_color(~"oLiVe").unwrap()));
-        assert!(yellow().eq(&parse_color(~"yellow").unwrap()));
-        assert!(navy().eq(&parse_color(~"NAVY").unwrap()));
-        assert!(teal().eq(&parse_color(~"Teal").unwrap()));
-        assert!(aqua().eq(&parse_color(~"Aqua").unwrap()));
-        assert!(None == parse_color(~"foobarbaz"));
+        assert!(silver().eq(&parse_color("SiLvEr").unwrap()));
+        assert!(maroon().eq(&parse_color("maroon").unwrap()));
+        assert!(purple().eq(&parse_color("PURPLE").unwrap()));
+        assert!(fuchsia().eq(&parse_color("FUCHSIA").unwrap()));
+        assert!(olive().eq(&parse_color("oLiVe").unwrap()));
+        assert!(yellow().eq(&parse_color("yellow").unwrap()));
+        assert!(navy().eq(&parse_color("NAVY").unwrap()));
+        assert!(teal().eq(&parse_color("Teal").unwrap()));
+        assert!(aqua().eq(&parse_color("Aqua").unwrap()));
+        assert!(None == parse_color("foobarbaz"));
     }
 
     #[test]
     fn test_parsing_rgb() {
-        assert!(red().eq(&parse_color(~"rgb(255,0,0)").unwrap()));
-        assert!(red().eq(&parse_color(~"rgba(255,0,0,1.0)").unwrap()));
-        assert!(red().eq(&parse_color(~"rgba(255,0,0,1)").unwrap()));
-        assert!(lime().eq(&parse_color(~"rgba(0,255,0,1.00)").unwrap()));
-        assert!(rgb(1u8,2u8,3u8).eq(&parse_color(~"rgb(1,2,03)").unwrap()));
-        assert!(rgba(15u8,250u8,3u8,0.5).eq(&parse_color(~"rgba(15,250,3,.5)").unwrap()));
-        assert!(rgba(15u8,250u8,3u8,0.5).eq(&parse_color(~"rgba(15,250,3,0.5)").unwrap()));
-        assert!(None == parse_color(~"rbga(1,2,3)"));
+        assert!(red().eq(&parse_color("rgb(255,0,0)").unwrap()));
+        assert!(red().eq(&parse_color("rgba(255,0,0,1.0)").unwrap()));
+        assert!(red().eq(&parse_color("rgba(255,0,0,1)").unwrap()));
+        assert!(lime().eq(&parse_color("rgba(0,255,0,1.00)").unwrap()));
+        assert!(rgb(1u8,2u8,3u8).eq(&parse_color("rgb(1,2,03)").unwrap()));
+        assert!(rgba(15u8,250u8,3u8,0.5).eq(&parse_color("rgba(15,250,3,.5)").unwrap()));
+        assert!(rgba(15u8,250u8,3u8,0.5).eq(&parse_color("rgba(15,250,3,0.5)").unwrap()));
+        assert!(None == parse_color("rbga(1,2,3)"));
     }
 
     #[test]
     fn test_parsing_hsl() {
-        assert!(red().eq(&parse_color(~"hsl(0,1,.5)").unwrap()));
-        assert!(lime().eq(&parse_color(~"hsl(120.0,1.0,.5)").unwrap()));
-        assert!(blue().eq(&parse_color(~"hsl(240.0,1.0,.5)").unwrap()));
-        assert!(green().eq(&parse_color(~"hsl(120.0,1.0,.25)").unwrap()));
-        assert!(white().eq(&parse_color(~"hsl(1.0,1.,1.0)").unwrap()));
-        assert!(white().eq(&parse_color(~"hsl(129.0,0.3,1.0)").unwrap()));
-        assert!(black().eq(&parse_color(~"hsl(231.2,0.75,0.0)").unwrap()));
-        assert!(black().eq(&parse_color(~"hsl(11.2,0.0,0.0)").unwrap()));
-        assert!(gray().eq(&parse_color(~"hsl(0.0,0.0,0.5)").unwrap()));
-        assert!(maroon().eq(&parse_color(~"hsl(0.0,1.0,0.25)").unwrap()));
-        assert!(purple().eq(&parse_color(~"hsl(300.0,1.0,0.25)").unwrap()));
-        assert!(fuchsia().eq(&parse_color(~"hsl(300,1.0,0.5)").unwrap()));
-        assert!(olive().eq(&parse_color(~"hsl(60.,1.0,0.25)").unwrap()));
-        assert!(yellow().eq(&parse_color(~"hsl(60.,1.0,0.5)").unwrap()));
-        assert!(navy().eq(&parse_color(~"hsl(240.0,1.0,.25)").unwrap()));
-        assert!(teal().eq(&parse_color(~"hsl(180.0,1.0,.25)").unwrap()));
-        assert!(aqua().eq(&parse_color(~"hsl(180.0,1.0,.5)").unwrap()));
-        assert!(None == parse_color(~"hsl(1,2,3,.4)"));
+        assert!(red().eq(&parse_color("hsl(0,1,.5)").unwrap()));
+        assert!(lime().eq(&parse_color("hsl(120.0,1.0,.5)").unwrap()));
+        assert!(blue().eq(&parse_color("hsl(240.0,1.0,.5)").unwrap()));
+        assert!(green().eq(&parse_color("hsl(120.0,1.0,.25)").unwrap()));
+        assert!(white().eq(&parse_color("hsl(1.0,1.,1.0)").unwrap()));
+        assert!(white().eq(&parse_color("hsl(129.0,0.3,1.0)").unwrap()));
+        assert!(black().eq(&parse_color("hsl(231.2,0.75,0.0)").unwrap()));
+        assert!(black().eq(&parse_color("hsl(11.2,0.0,0.0)").unwrap()));
+        assert!(gray().eq(&parse_color("hsl(0.0,0.0,0.5)").unwrap()));
+        assert!(maroon().eq(&parse_color("hsl(0.0,1.0,0.25)").unwrap()));
+        assert!(purple().eq(&parse_color("hsl(300.0,1.0,0.25)").unwrap()));
+        assert!(fuchsia().eq(&parse_color("hsl(300,1.0,0.5)").unwrap()));
+        assert!(olive().eq(&parse_color("hsl(60.,1.0,0.25)").unwrap()));
+        assert!(yellow().eq(&parse_color("hsl(60.,1.0,0.5)").unwrap()));
+        assert!(navy().eq(&parse_color("hsl(240.0,1.0,.25)").unwrap()));
+        assert!(teal().eq(&parse_color("hsl(180.0,1.0,.25)").unwrap()));
+        assert!(aqua().eq(&parse_color("hsl(180.0,1.0,.5)").unwrap()));
+        assert!(None == parse_color("hsl(1,2,3,.4)"));
     }
 }
 

test.rs

@@ -108,31 +108,31 @@ impl SelectHandler<TestNode> for TestHandler {
 fn single_div_test(style: &str, f: &fn(&ComputedStyle)) {
     let sheet = Stylesheet::new(test_url(), style_stream(style));
     let mut select_ctx = SelectCtx::new();
-    let handler = &TestHandler::new();
+    let handler = TestHandler::new();
     select_ctx.append_sheet(sheet, OriginAuthor);
-    let dom = &TestNode(@NodeData {
+    let dom = TestNode(@NodeData {
         name: ~"div",
         id: ~"id1",
         children: ~[],
         parent: @mut None
     });
-    let style = select_ctx.select_style(dom, handler);
+    let style = select_ctx.select_style(&dom, &handler);
     let computed = style.computed_style();
     f(&computed);
 }
 
 fn single_html_test(style: &str, f: &fn(&ComputedStyle)) {
     let sheet = Stylesheet::new(test_url(), style_stream(style));
     let mut select_ctx = SelectCtx::new();
-    let handler = &TestHandler::new();
+    let handler = TestHandler::new();
     select_ctx.append_sheet(sheet, OriginAuthor);
-    let dom = &TestNode(@NodeData {
+    let dom = TestNode(@NodeData {
         name: ~"html",
         id: ~"id1",
         children: ~[],
         parent: @mut None
     });
-    let style = select_ctx.select_style(dom, handler);
+    let style = select_ctx.select_style(&dom, &handler);
     let computed = style.computed_style();
     f(&computed);
 }