Refactor text and path tests with rstest

Author: trypsynth

src/parser/path.rs

@@ -13,33 +13,24 @@ pub fn extract_title_from_path(path: &str) -> String {
 
 #[cfg(test)]
 mod tests {
-	use super::*;
-
-	#[test]
-	fn extracts_title_from_path() {
-		assert_eq!(extract_title_from_path("foo.txt"), "foo");
-		assert_eq!(extract_title_from_path("/home/quin/books/worm.epub"), "worm");
-		assert_eq!(extract_title_from_path("C:\\Users\\Quin\\Desktop\\file.log"), "file");
-		assert_eq!(extract_title_from_path("/path/with/trailing/slash/"), "Untitled");
-		assert_eq!(extract_title_from_path("C:\\path\\with\\trailing\\slash\\"), "Untitled");
-		assert_eq!(extract_title_from_path("  spaced.txt  "), "spaced");
-		assert_eq!(extract_title_from_path(""), "Untitled");
-	}
+	use rstest::rstest;
 
-	#[test]
-	fn extracts_title_from_paths_without_extension() {
-		assert_eq!(extract_title_from_path("README"), "README");
-		assert_eq!(extract_title_from_path("/var/log/system"), "system");
-	}
-
-	#[test]
-	fn returns_untitled_for_whitespace_only_or_trailing_separator() {
-		assert_eq!(extract_title_from_path("   "), "Untitled");
-		assert_eq!(extract_title_from_path(" /tmp/dir/ "), "Untitled");
-	}
+	use super::*;
 
-	#[test]
-	fn extracts_title_from_multi_dot_filename() {
-		assert_eq!(extract_title_from_path("archive.tar.gz"), "archive.tar");
+	#[rstest]
+	#[case("foo.txt", "foo")]
+	#[case("/home/quin/books/worm.epub", "worm")]
+	#[case("C:\\Users\\Quin\\Desktop\\file.log", "file")]
+	#[case("/path/with/trailing/slash/", "Untitled")]
+	#[case("C:\\path\\with\\trailing\\slash\\", "Untitled")]
+	#[case("  spaced.txt  ", "spaced")]
+	#[case("", "Untitled")]
+	#[case("README", "README")]
+	#[case("/var/log/system", "system")]
+	#[case("   ", "Untitled")]
+	#[case(" /tmp/dir/ ", "Untitled")]
+	#[case("archive.tar.gz", "archive.tar")]
+	fn extracts_title_from_path(#[case] input: &str, #[case] expected: &str) {
+		assert_eq!(extract_title_from_path(input), expected);
 	}
 }

src/text.rs

@@ -136,41 +136,50 @@ fn to_alpha(mut n: i32, uppercase: bool) -> String {
 
 #[cfg(test)]
 mod tests {
+	use rstest::rstest;
+
 	use super::*;
 
-	#[test]
-	fn test_remove_soft_hyphens() {
-		assert_eq!(remove_soft_hyphens("hel\u{00AD}lo"), "hello");
-		assert_eq!(remove_soft_hyphens("no hyphens"), "no hyphens");
-		assert_eq!(remove_soft_hyphens("mul\u{00AD}ti\u{00AD}ple"), "multiple");
+	#[rstest]
+	#[case("hel\u{00AD}lo", "hello")]
+	#[case("no hyphens", "no hyphens")]
+	#[case("mul\u{00AD}ti\u{00AD}ple", "multiple")]
+	fn test_remove_soft_hyphens(#[case] input: &str, #[case] expected: &str) {
+		assert_eq!(remove_soft_hyphens(input), expected);
 	}
 
-	#[test]
-	fn test_url_decode() {
-		assert_eq!(url_decode("hello%20world"), "hello world");
-		assert_eq!(url_decode("test%2Fpath"), "test/path");
-		assert_eq!(url_decode("100%25"), "100%");
-		// Test UTF-8 encoded characters.
-		assert_eq!(url_decode("caf%C3%A9"), "café");
+	#[rstest]
+	#[case("hello%20world", "hello world")]
+	#[case("test%2Fpath", "test/path")]
+	#[case("100%25", "100%")]
+	#[case("caf%C3%A9", "café")]
+	#[case("bad%ZZvalue", "bad%ZZvalue")]
+	#[case("%", "%")]
+	fn test_url_decode(#[case] input: &str, #[case] expected: &str) {
+		assert_eq!(url_decode(input), expected);
 	}
 
-	#[test]
-	fn test_collapse_whitespace() {
-		assert_eq!(collapse_whitespace("hello   world"), "hello world");
-		assert_eq!(collapse_whitespace("hello\n\nworld"), "hello world");
-		assert_eq!(collapse_whitespace("hello\t\tworld"), "hello world");
-		assert_eq!(collapse_whitespace("  spaces  "), "  spaces ");
-		assert_eq!(collapse_whitespace("hello\u{00A0}\u{00A0}world"), "hello world");
-		assert_eq!(collapse_whitespace("hello\u{200B}\u{200B}world"), "hello world");
+	#[rstest]
+	#[case("hello   world", "hello world")]
+	#[case("hello\n\nworld", "hello world")]
+	#[case("hello\t\tworld", "hello world")]
+	#[case("  spaces  ", "  spaces ")]
+	#[case("hello\u{00A0}\u{00A0}world", "hello world")]
+	#[case("hello\u{200B}\u{200B}world", "hello world")]
+	#[case("\u{00A0}\u{200B}alpha\t \n beta\u{00A0}", "  alpha beta ")]
+	fn test_collapse_whitespace(#[case] input: &str, #[case] expected: &str) {
+		assert_eq!(collapse_whitespace(input), expected);
 	}
 
-	#[test]
-	fn test_trim_string() {
-		assert_eq!(trim_string("  hello  "), "hello");
-		assert_eq!(trim_string("\n\nhello\n\n"), "hello");
-		assert_eq!(trim_string("\u{00A0}hello\u{00A0}"), "hello");
-		assert_eq!(trim_string("\u{200B}hello\u{200B}"), "hello");
-		assert_eq!(trim_string("hello"), "hello");
+	#[rstest]
+	#[case("  hello  ", "hello")]
+	#[case("\n\nhello\n\n", "hello")]
+	#[case("\u{00A0}hello\u{00A0}", "hello")]
+	#[case("\u{200B}hello\u{200B}", "hello")]
+	#[case("hello", "hello")]
+	#[case("\u{200B}\u{00A0}  hello  \u{00A0}\u{200B}", "hello")]
+	fn test_trim_string(#[case] input: &str, #[case] expected: &str) {
+		assert_eq!(trim_string(input), expected);
 	}
 
 	#[cfg(windows)]
@@ -189,25 +198,30 @@ mod tests {
 		assert_eq!(display_len("line\nwrap"), 9);
 	}
 
-	#[test]
-	fn test_format_list_item() {
-		assert_eq!(format_list_item(1, "1"), "1");
-		assert_eq!(format_list_item(5, "1"), "5");
-		assert_eq!(format_list_item(1, "a"), "a");
-		assert_eq!(format_list_item(26, "a"), "z");
-		assert_eq!(format_list_item(27, "a"), "aa");
-		assert_eq!(format_list_item(1, "A"), "A");
-		assert_eq!(format_list_item(26, "A"), "Z");
-		assert_eq!(format_list_item(27, "A"), "AA");
-		assert_eq!(format_list_item(1, "i"), "i");
-		assert_eq!(format_list_item(4, "i"), "iv");
-		assert_eq!(format_list_item(1994, "i"), "mcmxciv");
-		assert_eq!(format_list_item(1, "I"), "I");
-		assert_eq!(format_list_item(4, "I"), "IV");
-		assert_eq!(format_list_item(1994, "I"), "MCMXCIV");
-		assert_eq!(format_list_item(10, "unknown"), "10");
-		assert_eq!(format_list_item(0, "a"), "0");
-		assert_eq!(format_list_item(-5, "i"), "-5");
+	#[rstest]
+	#[case(1, "1", "1")]
+	#[case(5, "1", "5")]
+	#[case(1, "a", "a")]
+	#[case(26, "a", "z")]
+	#[case(27, "a", "aa")]
+	#[case(1, "A", "A")]
+	#[case(26, "A", "Z")]
+	#[case(27, "A", "AA")]
+	#[case(1, "i", "i")]
+	#[case(4, "i", "iv")]
+	#[case(1994, "i", "mcmxciv")]
+	#[case(1, "I", "I")]
+	#[case(4, "I", "IV")]
+	#[case(1994, "I", "MCMXCIV")]
+	#[case(10, "unknown", "10")]
+	#[case(0, "a", "0")]
+	#[case(-5, "i", "-5")]
+	#[case(52, "a", "az")]
+	#[case(53, "a", "ba")]
+	#[case(52, "A", "AZ")]
+	#[case(53, "A", "BA")]
+	fn test_format_list_item(#[case] number: i32, #[case] list_type: &str, #[case] expected: &str) {
+		assert_eq!(format_list_item(number, list_type), expected);
 	}
 
 	#[test]
@@ -233,38 +247,13 @@ mod tests {
 		assert_eq!(text, "Topic #rust and issue #x1");
 	}
 
-	#[test]
-	fn test_url_decode_invalid_sequences_are_left_as_is() {
-		assert_eq!(url_decode("bad%ZZvalue"), "bad%ZZvalue");
-		assert_eq!(url_decode("%"), "%");
-	}
-
-	#[test]
-	fn test_collapse_whitespace_handles_mixed_space_types() {
-		let input = "\u{00A0}\u{200B}alpha\t \n beta\u{00A0}";
-		assert_eq!(collapse_whitespace(input), "  alpha beta ");
-	}
-
-	#[test]
-	fn test_trim_string_handles_mixed_space_like_chars() {
-		let input = "\u{200B}\u{00A0}  hello  \u{00A0}\u{200B}";
-		assert_eq!(trim_string(input), "hello");
-	}
-
-	#[test]
-	fn test_is_space_like_variants() {
-		assert!(is_space_like(' '));
-		assert!(is_space_like('\n'));
-		assert!(is_space_like('\u{00A0}'));
-		assert!(is_space_like('\u{200B}'));
-		assert!(!is_space_like('x'));
-	}
-
-	#[test]
-	fn test_format_list_item_alpha_boundaries() {
-		assert_eq!(format_list_item(52, "a"), "az");
-		assert_eq!(format_list_item(53, "a"), "ba");
-		assert_eq!(format_list_item(52, "A"), "AZ");
-		assert_eq!(format_list_item(53, "A"), "BA");
+	#[rstest]
+	#[case(' ', true)]
+	#[case('\n', true)]
+	#[case('\u{00A0}', true)]
+	#[case('\u{200B}', true)]
+	#[case('x', false)]
+	fn test_is_space_like_variants(#[case] ch: char, #[case] expected: bool) {
+		assert_eq!(is_space_like(ch), expected);
 	}
 }