Skip to content

Commit 83abc7f

Browse files
committed
Relocate comparator parse testing
1 parent 2d34e8f commit 83abc7f

File tree

2 files changed

+40
-43
lines changed

2 files changed

+40
-43
lines changed

tests/test_identifier.rs

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -44,50 +44,8 @@ fn test_eq() {
4444
assert_ne!(build_metadata("1"), build_metadata("001"));
4545
}
4646

47-
#[test]
48-
fn test_comparator() {
49-
let parsed = comparator("1.2.3-alpha");
50-
assert_to_string(parsed, "^1.2.3-alpha");
51-
52-
let parsed = comparator("2.X");
53-
assert_to_string(parsed, "2.*");
54-
55-
let parsed = comparator("2");
56-
assert_to_string(parsed, "^2");
57-
58-
let parsed = comparator("2.x.x");
59-
assert_to_string(parsed, "2.*");
60-
}
61-
6247
#[test]
6348
fn test_prerelease() {
6449
let err = prerelease_err("1.b\0");
6550
assert_to_string(err, "unexpected character in pre-release identifier");
6651
}
67-
68-
#[test]
69-
fn test_comparator_err() {
70-
let err = comparator_err("1.2.3-01");
71-
assert_to_string(err, "invalid leading zero in pre-release identifier");
72-
73-
let err = comparator_err("1.2.3+4.");
74-
assert_to_string(err, "empty identifier segment in build metadata");
75-
76-
let err = comparator_err(">");
77-
assert_to_string(
78-
err,
79-
"unexpected end of input while parsing major version number",
80-
);
81-
82-
let err = comparator_err("1.");
83-
assert_to_string(
84-
err,
85-
"unexpected end of input while parsing minor version number",
86-
);
87-
88-
let err = comparator_err("1.*.");
89-
assert_to_string(err, "unexpected character after wildcard in version req");
90-
91-
let err = comparator_err("1.2.3+4ÿ");
92-
assert_to_string(err, "unexpected character 'ÿ' after build metadata");
93-
}

tests/test_version_req.rs

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ pub fn test_pre() {
335335
}
336336

337337
#[test]
338-
pub fn test_parse_errors() {
338+
pub fn test_parse() {
339339
let err = req_err("\0");
340340
assert_to_string(
341341
err,
@@ -370,6 +370,45 @@ pub fn test_parse_errors() {
370370
);
371371
}
372372

373+
#[test]
374+
fn test_comparator_parse() {
375+
let parsed = comparator("1.2.3-alpha");
376+
assert_to_string(parsed, "^1.2.3-alpha");
377+
378+
let parsed = comparator("2.X");
379+
assert_to_string(parsed, "2.*");
380+
381+
let parsed = comparator("2");
382+
assert_to_string(parsed, "^2");
383+
384+
let parsed = comparator("2.x.x");
385+
assert_to_string(parsed, "2.*");
386+
387+
let err = comparator_err("1.2.3-01");
388+
assert_to_string(err, "invalid leading zero in pre-release identifier");
389+
390+
let err = comparator_err("1.2.3+4.");
391+
assert_to_string(err, "empty identifier segment in build metadata");
392+
393+
let err = comparator_err(">");
394+
assert_to_string(
395+
err,
396+
"unexpected end of input while parsing major version number",
397+
);
398+
399+
let err = comparator_err("1.");
400+
assert_to_string(
401+
err,
402+
"unexpected end of input while parsing minor version number",
403+
);
404+
405+
let err = comparator_err("1.*.");
406+
assert_to_string(err, "unexpected character after wildcard in version req");
407+
408+
let err = comparator_err("1.2.3+4ÿ");
409+
assert_to_string(err, "unexpected character 'ÿ' after build metadata");
410+
}
411+
373412
#[test]
374413
fn test_cargo3202() {
375414
let ref r = req("0.*.*");

0 commit comments

Comments
 (0)