Touch up PR 299 test cases

dtolnay · dtolnay · commit 2d34e8fe6033 · 2023-09-22T12:47:25.000-07:00
diff --git a/tests/test_identifier.rs b/tests/test_identifier.rs
@@ -46,31 +46,31 @@ fn test_eq() {
 
 #[test]
 fn test_comparator() {
-    let compatator = comparator("4.4.5-44");
-    assert_to_string(compatator, "^4.4.5-44");
+    let parsed = comparator("1.2.3-alpha");
+    assert_to_string(parsed, "^1.2.3-alpha");
 
-    let compatator = comparator("2.X");
-    assert_to_string(compatator, "2.*");
+    let parsed = comparator("2.X");
+    assert_to_string(parsed, "2.*");
 
-    let compatator = comparator("2");
-    assert_to_string(compatator, "^2");
+    let parsed = comparator("2");
+    assert_to_string(parsed, "^2");
 
-    let compatator = comparator("5.x.x");
-    assert_to_string(compatator, "5.*");
+    let parsed = comparator("2.x.x");
+    assert_to_string(parsed, "2.*");
 }
 
 #[test]
 fn test_prerelease() {
-    let err = prerelease_err("88.6688.b.rrrrrrr8.b.6bbbbbbb66.66\0");
+    let err = prerelease_err("1.b\0");
     assert_to_string(err, "unexpected character in pre-release identifier");
 }
 
 #[test]
 fn test_comparator_err() {
-    let err = comparator_err("4.4.4-012");
+    let err = comparator_err("1.2.3-01");
     assert_to_string(err, "invalid leading zero in pre-release identifier");
 
-    let err = comparator_err("5.4.4+4.");
+    let err = comparator_err("1.2.3+4.");
     assert_to_string(err, "empty identifier segment in build metadata");
 
     let err = comparator_err(">");
@@ -79,15 +79,15 @@ fn test_comparator_err() {
         "unexpected end of input while parsing major version number",
     );
 
-    let err = comparator_err("4.");
+    let err = comparator_err("1.");
     assert_to_string(
         err,
         "unexpected end of input while parsing minor version number",
     );
 
-    let err = comparator_err("4.*.");
+    let err = comparator_err("1.*.");
     assert_to_string(err, "unexpected character after wildcard in version req");
 
-    let err = comparator_err("55444.4.45-6+6.4.5.45-5644ÿ");
+    let err = comparator_err("1.2.3+4ÿ");
     assert_to_string(err, "unexpected character 'ÿ' after build metadata");
 }
diff --git a/tests/test_version.rs b/tests/test_version.rs
@@ -47,13 +47,13 @@ fn test_parse() {
     let err = version_err("1.2.3-01");
     assert_to_string(err, "invalid leading zero in pre-release identifier");
 
-    let err = version_err("5.1.5++");
+    let err = version_err("1.2.3++");
     assert_to_string(err, "empty identifier segment in build metadata");
 
     let err = version_err("07");
     assert_to_string(err, "invalid leading zero in major version number");
 
-    let err = version_err("75774777777757777757");
+    let err = version_err("111111111111111111111.0.0");
     assert_to_string(err, "value of major version number exceeds u64::MAX");
 
     let err = version_err("8\0");
diff --git a/tests/util/mod.rs b/tests/util/mod.rs
@@ -23,6 +23,16 @@ pub(super) fn req_err(text: &str) -> Error {
     VersionReq::parse(text).unwrap_err()
 }
 
+#[cfg_attr(not(no_track_caller), track_caller)]
+pub(super) fn comparator(text: &str) -> Comparator {
+    Comparator::parse(text).unwrap()
+}
+
+#[cfg_attr(not(no_track_caller), track_caller)]
+pub(super) fn comparator_err(text: &str) -> Error {
+    Comparator::parse(text).unwrap_err()
+}
+
 #[cfg_attr(not(no_track_caller), track_caller)]
 pub(super) fn prerelease(text: &str) -> Prerelease {
     Prerelease::new(text).unwrap()
@@ -42,13 +52,3 @@ pub(super) fn build_metadata(text: &str) -> BuildMetadata {
 pub(super) fn assert_to_string(value: impl Display, expected: &str) {
     assert_eq!(value.to_string(), expected);
 }
-
-#[cfg_attr(not(no_track_caller), track_caller)]
-pub(super) fn comparator(text: &str) -> Comparator {
-    Comparator::parse(text).unwrap()
-}
-
-#[cfg_attr(not(no_track_caller), track_caller)]
-pub(super) fn comparator_err(text: &str) -> Error {
-    Comparator::parse(text).unwrap_err()
-}
