Clean-up tests after debug!/std-macros change.

The entire testsuite is converted to using info! rather than debug!
because some depend on the code within the debug! being trans'd.

Author: huonw

src/librustdoc/astsrv.rs

@@ -140,7 +140,8 @@ fn should_prune_unconfigured_items() {
     let source = ~"#[cfg(shut_up_and_leave_me_alone)]fn a() { }";
     do from_str(source) |srv| {
         do exec(srv) |ctxt| {
-            assert!(ctxt.ast.node.module.items.is_empty());
+            // one item: the __std_macros secret module
+            assert_eq!(ctxt.ast.node.module.items.len(), 1);
         }
     }
 }

src/librustdoc/attr_pass.rs

@@ -255,7 +255,8 @@ mod test {
     #[test]
     fn should_should_extract_mod_attributes() {
         let doc = mk_doc(~"#[doc = \"test\"] mod a { }");
-        assert!(doc.cratemod().mods()[0].desc() == Some(~"test"));
+        // hidden __std_macros module at the start.
+        assert!(doc.cratemod().mods()[1].desc() == Some(~"test"));
     }
 
     #[test]

src/librustdoc/desc_to_brief_pass.rs

@@ -190,7 +190,8 @@ mod test {
     #[test]
     fn should_promote_desc() {
         let doc = mk_doc(~"#[doc = \"desc\"] mod m { }");
-        assert_eq!(doc.cratemod().mods()[0].brief(), Some(~"desc"));
+        // hidden __std_macros module at the start.
+        assert_eq!(doc.cratemod().mods()[1].brief(), Some(~"desc"));
     }
 
     #[test]

src/librustdoc/markdown_index_pass.rs

@@ -172,6 +172,7 @@ mod test {
     use extract;
     use markdown_index_pass::run;
     use path_pass;
+    use prune_hidden_pass;
     use super::pandoc_header_id;
 
     fn mk_doc(output_style: config::OutputStyle, source: ~str)
@@ -183,8 +184,10 @@ mod test {
             };
             let doc = extract::from_srv(srv.clone(), ~"");
             let doc = (attr_pass::mk_pass().f)(srv.clone(), doc);
+            let doc = (prune_hidden_pass::mk_pass().f)(srv.clone(), doc);
             let doc = (desc_to_brief_pass::mk_pass().f)(srv.clone(), doc);
             let doc = (path_pass::mk_pass().f)(srv.clone(), doc);
+
             run(srv.clone(), doc, config)
         }
     }
@@ -240,13 +243,13 @@ mod test {
             config::DocPerMod,
             ~"mod a { } fn b() { }"
         );
-        assert!(doc.cratemod().index.get().entries[0] == doc::IndexEntry {
+        assert_eq!(doc.cratemod().index.get().entries[0], doc::IndexEntry {
             kind: ~"Module",
             name: ~"a",
             brief: None,
             link: ~"a.html"
         });
-        assert!(doc.cratemod().index.get().entries[1] == doc::IndexEntry {
+        assert_eq!(doc.cratemod().index.get().entries[1], doc::IndexEntry {
             kind: ~"Function",
             name: ~"b",
             brief: None,
@@ -260,8 +263,7 @@ mod test {
             config::DocPerMod,
             ~"#[doc = \"test\"] mod a { }"
         );
-        assert!(doc.cratemod().index.get().entries[0].brief
-                == Some(~"test"));
+        assert_eq!(doc.cratemod().index.get().entries[0].brief, Some(~"test"));
     }
 
     #[test]
@@ -270,12 +272,13 @@ mod test {
             config::DocPerCrate,
             ~"extern { fn b(); }"
         );
-        assert!(doc.cratemod().nmods()[0].index.get().entries[0]
-                == doc::IndexEntry {
-                    kind: ~"Function",
-                    name: ~"b",
-                    brief: None,
-                    link: ~"#function-b"
-                });
+        // hidden __std_macros module at the start.
+        assert_eq!(doc.cratemod().nmods()[0].index.get().entries[0],
+                   doc::IndexEntry {
+                       kind: ~"Function",
+                       name: ~"b",
+                       brief: None,
+                       link: ~"#function-b"
+                   });
     }
 }

src/librustdoc/markdown_pass.rs

@@ -529,6 +529,7 @@ mod test {
     use markdown_writer;
     use path_pass;
     use page_pass;
+    use prune_hidden_pass;
     use sectionalize_pass;
     use trim_pass;
     use tystr_pass;
@@ -557,6 +558,8 @@ mod test {
             debug!("doc (path): %?", doc);
             let doc = (attr_pass::mk_pass().f)(srv.clone(), doc);
             debug!("doc (attr): %?", doc);
+            let doc = (prune_hidden_pass::mk_pass().f)(srv.clone(), doc);
+            debug!("doc (prune_hidden): %?", doc);
             let doc = (desc_to_brief_pass::mk_pass().f)(srv.clone(), doc);
             debug!("doc (desc_to_brief): %?", doc);
             let doc = (unindent_pass::mk_pass().f)(srv.clone(), doc);

src/librustdoc/markdown_writer.rs

@@ -277,7 +277,8 @@ mod test {
             .. config::default_config(&Path("input/test.rc"))
         };
         let doc = mk_doc(~"", ~"mod a { mod b { } }");
-        let modb = copy doc.cratemod().mods()[0].mods()[0];
+        // hidden __std_macros module at the start.
+        let modb = copy doc.cratemod().mods()[1].mods()[0];
         let page = doc::ItemPage(doc::ModTag(modb));
         let filename = make_local_filename(&config, page);
         assert_eq!(filename, Path("output/dir/a_b.html"));

src/librustdoc/page_pass.rs

@@ -152,8 +152,10 @@ fn fold_nmod(
 mod test {
     use astsrv;
     use config;
+    use attr_pass;
     use doc;
     use extract;
+    use prune_hidden_pass;
     use page_pass::run;
 
     fn mk_doc_(
@@ -162,6 +164,8 @@ mod test {
     ) -> doc::Doc {
         do astsrv::from_str(copy source) |srv| {
             let doc = extract::from_srv(srv.clone(), ~"");
+            let doc = (attr_pass::mk_pass().f)(srv.clone(), doc);
+            let doc = (prune_hidden_pass::mk_pass().f)(srv.clone(), doc);
             run(srv.clone(), doc, output_style)
         }
     }
@@ -182,6 +186,7 @@ mod test {
     #[test]
     fn should_make_a_page_for_every_mod() {
         let doc = mk_doc(~"mod a { }");
+        // hidden __std_macros module at the start.
         assert_eq!(doc.pages.mods()[0].name(), ~"a");
     }
 

src/librustdoc/path_pass.rs

@@ -97,10 +97,11 @@ fn should_record_mod_paths() {
     do astsrv::from_str(source) |srv| {
         let doc = extract::from_srv(srv.clone(), ~"");
         let doc = run(srv.clone(), doc);
-        assert!(doc.cratemod().mods()[0].mods()[0].mods()[0].path()
-            == ~[~"a", ~"b"]);
-        assert!(doc.cratemod().mods()[0].mods()[1].mods()[0].path()
-            == ~[~"a", ~"d"]);
+        // hidden __std_macros module at the start.
+        assert_eq!(doc.cratemod().mods()[1].mods()[0].mods()[0].path(),
+                   ~[~"a", ~"b"]);
+        assert_eq!(doc.cratemod().mods()[1].mods()[1].mods()[0].path(),
+                   ~[~"a", ~"d"]);
     }
 }
 
@@ -110,6 +111,7 @@ fn should_record_fn_paths() {
     do astsrv::from_str(source) |srv| {
         let doc = extract::from_srv(srv.clone(), ~"");
         let doc = run(srv.clone(), doc);
-        assert_eq!(doc.cratemod().mods()[0].fns()[0].path(), ~[~"a"]);
+        // hidden __std_macros module at the start.
+        assert_eq!(doc.cratemod().mods()[1].fns()[0].path(), ~[~"a"]);
     }
 }

src/librustdoc/sectionalize_pass.rs

@@ -166,12 +166,14 @@ mod test {
     use attr_pass;
     use doc;
     use extract;
+    use prune_hidden_pass;
     use sectionalize_pass::run;
 
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(copy source) |srv| {
             let doc = extract::from_srv(srv.clone(), ~"");
             let doc = (attr_pass::mk_pass().f)(srv.clone(), doc);
+            let doc = (prune_hidden_pass::mk_pass().f)(srv.clone(), doc);
             run(srv.clone(), doc)
         }
     }

src/librustdoc/sort_item_name_pass.rs

@@ -31,7 +31,8 @@ fn test() {
     do astsrv::from_str(source) |srv| {
         let doc = extract::from_srv(srv.clone(), ~"");
         let doc = (mk_pass().f)(srv.clone(), doc);
-        assert_eq!(doc.cratemod().items[0].name(), ~"y");
-        assert_eq!(doc.cratemod().items[1].name(), ~"z");
+        // hidden __std_macros module at the start.
+        assert_eq!(doc.cratemod().items[1].name(), ~"y");
+        assert_eq!(doc.cratemod().items[2].name(), ~"z");
     }
 }