tests/: renamed test document functions

niklak · Oct 7, 2024 · 2db01dd · 2db01dd
1 parent 73e241b
commit 2db01dd
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/test-pages/page2.html → test-pages/tests_with_siblings.html b/test-pages/page2.html → test-pages/tests_with_siblings.html
diff --git a/tests/data.rs b/tests/data.rs
@@ -5,10 +5,10 @@ pub fn doc() -> Document {
     include_str!("../test-pages/page.html").into()
 }
 
-pub fn docwiki() -> Document {
+pub fn doc_wiki() -> Document {
     include_str!("../test-pages/rustwiki.html").into()
 }
 
-pub fn doc2() -> Document {
-    include_str!("../test-pages/page2.html").into()
+pub fn doc_with_siblings() -> Document {
+    include_str!("../test-pages/tests_with_siblings.html").into()
 }
diff --git a/tests/html-dom.rs b/tests/html-dom.rs
@@ -24,6 +24,7 @@ fn parse_and_serialize(input: StrTendril) -> StrTendril {
     serialize(&mut result, &inner, Default::default()).unwrap();
     StrTendril::try_from_byte_slice(&result).unwrap()
 }
+
 macro_rules! test_fn {
     ($f:ident, $name:ident, $input:expr, $output:expr) => {
         #[test]

diff --git a/tests/selection-manipulation.rs b/tests/selection-manipulation.rs
@@ -1,10 +1,10 @@
 mod data;
 
-use data::doc2;
+use data::doc_with_siblings;
 
 #[test]
 fn test_replace_with_html() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
 
     println!("{}", doc.html());
 
@@ -20,7 +20,7 @@ fn test_replace_with_html() {
 
 #[test]
 fn test_set_html() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut q = doc.select("#main, #foot");
     q.set_html(r#"<div id="replace">test</div>"#);
 
@@ -33,15 +33,15 @@ fn test_set_html() {
 
 #[test]
 fn test_set_html_no_match() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut q = doc.select("#notthere");
     q.set_html(r#"<div id="replace">test</div>"#);
     assert_eq!(doc.select("#replace").length(), 0);
 }
 
 #[test]
 fn test_set_html_empty() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut q = doc.select("#main");
     q.set_html("");
     assert_eq!(doc.select("#main").length(), 1);
@@ -50,7 +50,7 @@ fn test_set_html_empty() {
 
 #[test]
 fn test_replace_with_selection() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
 
     let s1 = doc.select("#nf5");
     let mut sel = doc.select("#nf6");

diff --git a/tests/selection-property.rs b/tests/selection-property.rs
@@ -1,7 +1,7 @@
 mod data;
 
 use data::doc;
-use data::doc2;
+use data::doc_with_siblings;
 
 #[test]
 fn test_attr_exists() {
@@ -26,7 +26,7 @@ fn test_attr_not_exist() {
 
 #[test]
 fn test_remove_attr() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("div");
 
     sel.remove_attr("id");
@@ -36,7 +36,7 @@ fn test_remove_attr() {
 
 #[test]
 fn test_set_attr() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("#main");
     sel.set_attr("id", "not-main");
 
@@ -46,7 +46,7 @@ fn test_set_attr() {
 
 #[test]
 fn test_set_attr2() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("#main");
 
     sel.set_attr("foo", "bar");
@@ -65,7 +65,7 @@ fn test_text() {
 
 #[test]
 fn test_add_class() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("#main");
 
     sel.add_class("main main main");
@@ -75,7 +75,7 @@ fn test_add_class() {
 
 #[test]
 fn test_add_class_similar() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("#nf5");
 
     sel.add_class("odd");
@@ -87,7 +87,7 @@ fn test_add_class_similar() {
 
 #[test]
 fn test_add_empty_class() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("#main");
 
     sel.add_class("");
@@ -96,7 +96,7 @@ fn test_add_empty_class() {
 
 #[test]
 fn test_add_classes() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("#main");
 
     sel.add_class("a b");
@@ -127,7 +127,7 @@ fn has_class_not_first() {
 
 #[test]
 fn test_remove_class() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("#nf1");
     sel.remove_class("one row");
 
@@ -138,7 +138,7 @@ fn test_remove_class() {
 
 #[test]
 fn test_remove_class_similar() {
-    let doc = doc2();
+    let doc = doc_with_siblings();
     let mut sel = doc.select("#nf5, #nf6");
     assert_eq!(sel.length(), 2);
 

diff --git a/tests/selection-traversal.rs b/tests/selection-traversal.rs
@@ -1,7 +1,7 @@
 mod data;
 
 use data::doc;
-use data::docwiki;
+use data::doc_wiki;
 use dom_query::Document;
 
 #[test]
@@ -28,7 +28,7 @@ fn test_select_invalid() {
 
 #[test]
 fn test_select_big() {
-    let doc = docwiki();
+    let doc = doc_wiki();
     let sel = doc.select("li");
     assert_eq!(sel.length(), 420);
     let sel = doc.select("span");