fix: update tests to sort

Kaua-Klassmann · sylvestre · commit 1fa6681ab283 · 2026-01-20T23:24:42.000+01:00
diff --git a/tests/by-util/test_sort.rs b/tests/by-util/test_sort.rs
@@ -258,6 +258,14 @@ fn test_multiple_decimals_numeric() {
     );
 }
 
+#[test]
+fn test_multiple_groupings_numeric() {
+    test_helper(
+        "multiple_groupings_numeric",
+        &["-n", "--numeric-sort", "--sort=numeric", "--sort=n"],
+    );
+}
+
 #[test]
 fn test_numeric_with_trailing_invalid_chars() {
     test_helper(
@@ -2359,18 +2367,18 @@ _
 __
 1
 _
-2,5
-_
 2.4
 ___
+2,5
+_
 2.,,3
 __
 2.4
 ___
-2,,3
-_
 2.4
 ___
+2,,3
+_
 1a
 _
 2b
diff --git a/tests/fixtures/sort/mixed_floats_ints_chars_numeric.expected b/tests/fixtures/sort/mixed_floats_ints_chars_numeric.expected
@@ -21,10 +21,10 @@ CARAvan
 8.013
 45
 46.89
-576,446.88800000
-576,446.890
                4567.
 				37800
+576,446.88800000
+576,446.890
 4798908.340000000000
 4798908.45
 4798908.8909800
diff --git a/tests/fixtures/sort/mixed_floats_ints_chars_numeric.expected.debug b/tests/fixtures/sort/mixed_floats_ints_chars_numeric.expected.debug
@@ -67,18 +67,18 @@ __
 46.89
 _____
 _____
-576,446.88800000
-___
-________________
-576,446.890
-___
-___________
                4567.
                _____
 ____________________
 >>>>37800
     _____
 _________
+576,446.88800000
+___
+________________
+576,446.890
+___
+___________
 4798908.340000000000
 ____________________
 ____________________
diff --git a/tests/fixtures/sort/mixed_floats_ints_chars_numeric_stable.expected b/tests/fixtures/sort/mixed_floats_ints_chars_numeric_stable.expected
@@ -24,10 +24,10 @@ CARAvan
 8.013
 45
 46.89
-576,446.890
-576,446.88800000
                4567.
 				37800
+576,446.88800000
+576,446.890
 4798908.340000000000
 4798908.45
 4798908.8909800
diff --git a/tests/fixtures/sort/mixed_floats_ints_chars_numeric_stable.expected.debug b/tests/fixtures/sort/mixed_floats_ints_chars_numeric_stable.expected.debug
@@ -50,14 +50,14 @@ _____
 __
 46.89
 _____
-576,446.890
-___
-576,446.88800000
-___
                4567.
                _____
 >>>>37800
     _____
+576,446.88800000
+___
+576,446.890
+___
 4798908.340000000000
 ____________________
 4798908.45
diff --git a/tests/fixtures/sort/mixed_floats_ints_chars_numeric_unique.expected b/tests/fixtures/sort/mixed_floats_ints_chars_numeric_unique.expected
@@ -11,9 +11,10 @@
 8.013
 45
 46.89
-576,446.890
                4567.
 				37800
+576,446.88800000
+576,446.890
 4798908.340000000000
 4798908.45
 4798908.8909800
diff --git a/tests/fixtures/sort/mixed_floats_ints_chars_numeric_unique.expected.debug b/tests/fixtures/sort/mixed_floats_ints_chars_numeric_unique.expected.debug
@@ -24,12 +24,14 @@ _____
 __
 46.89
 _____
-576,446.890
-___
                4567.
                _____
 >>>>37800
     _____
+576,446.88800000
+___
+576,446.890
+___
 4798908.340000000000
 ____________________
 4798908.45
diff --git a/tests/fixtures/sort/mixed_floats_ints_chars_numeric_unique_reverse.expected b/tests/fixtures/sort/mixed_floats_ints_chars_numeric_unique_reverse.expected
@@ -1,9 +1,10 @@
 4798908.8909800
 4798908.45
 4798908.340000000000
+576,446.890
+576,446.88800000
 				37800
                4567.
-576,446.890
 46.89
 45
 8.013
diff --git a/tests/fixtures/sort/mixed_floats_ints_chars_numeric_unique_reverse.expected.debug b/tests/fixtures/sort/mixed_floats_ints_chars_numeric_unique_reverse.expected.debug
@@ -4,12 +4,14 @@ _______________
 __________
 4798908.340000000000
 ____________________
+576,446.890
+___
+576,446.88800000
+___
 >>>>37800
     _____
                4567.
                _____
-576,446.890
-___
 46.89
 _____
 45
diff --git a/tests/fixtures/sort/multiple_decimals_numeric.expected b/tests/fixtures/sort/multiple_decimals_numeric.expected
@@ -21,15 +21,15 @@ CARAvan
 8.013
 45
 46.89
-576,446.88800000
-576,446.890
 										4567..457
                4567.
 4567.1
 4567.34
 				37800
 						45670.89079.098
 						45670.89079.1
+576,446.88800000
+576,446.890
 4798908.340000000000
 4798908.45
 4798908.8909800
diff --git a/tests/fixtures/sort/multiple_decimals_numeric.expected.debug b/tests/fixtures/sort/multiple_decimals_numeric.expected.debug
@@ -67,12 +67,6 @@ __
 46.89
 _____
 _____
-576,446.88800000
-___
-________________
-576,446.890
-___
-___________
 >>>>>>>>>>4567..457
           _____
 ___________________
@@ -94,6 +88,12 @@ _____________________
 >>>>>>45670.89079.1
       ___________
 ___________________
+576,446.88800000
+___
+________________
+576,446.890
+___
+___________
 4798908.340000000000
 ____________________
 ____________________
diff --git a/tests/fixtures/sort/multiple_groupings_numeric.expected b/tests/fixtures/sort/multiple_groupings_numeric.expected
@@ -0,0 +1,15 @@
+
+
+
+CARAvan
+	1.234
+2.000
+2.000,50
+22
+23,.
+111
+	210
+1,234
+12,34
+		1,999.99
+			2,000
diff --git a/tests/fixtures/sort/multiple_groupings_numeric.expected.debug b/tests/fixtures/sort/multiple_groupings_numeric.expected.debug
@@ -0,0 +1,45 @@
+
+^ no match for key
+^ no match for key
+
+^ no match for key
+^ no match for key
+
+^ no match for key
+^ no match for key
+CARAvan
+^ no match for key
+_______
+>1.234
+ _____
+______
+2.000
+_____
+_____
+2.000,50
+_____
+________
+22
+__
+__
+23,.
+__
+____
+111
+___
+___
+>210
+ ___
+____
+1,234
+_
+_____
+12,34
+__
+_____
+>>1,999.99
+  _
+__________
+>>>2,000
+   _
+________
diff --git a/tests/fixtures/sort/multiple_groupings_numeric.txt b/tests/fixtures/sort/multiple_groupings_numeric.txt
@@ -0,0 +1,15 @@
+1,234
+12,34
+
+	1.234
+2.000
+			2,000
+111
+
+
+CARAvan
+22
+23,.
+	210
+		1,999.99
+2.000,50

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ CARAvan`
`21`	`21`	`8.013`
`22`	`22`	`45`
`23`	`23`	`46.89`
`24`		`-576,446.88800000`
`25`		`-576,446.890`
`26`	`24`	`4567.`
`27`	`25`	`37800`
	`26`	`+576,446.88800000`
	`27`	`+576,446.890`
`28`	`28`	`4798908.340000000000`
`29`	`29`	`4798908.45`
`30`	`30`	`4798908.8909800`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ CARAvan`
`24`	`24`	`8.013`
`25`	`25`	`45`
`26`	`26`	`46.89`
`27`		`-576,446.890`
`28`		`-576,446.88800000`
`29`	`27`	`4567.`
`30`	`28`	`37800`
	`29`	`+576,446.88800000`
	`30`	`+576,446.890`
`31`	`31`	`4798908.340000000000`
`32`	`32`	`4798908.45`
`33`	`33`	`4798908.8909800`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@`
`11`	`11`	`8.013`
`12`	`12`	`45`
`13`	`13`	`46.89`
`14`		`-576,446.890`
`15`	`14`	`4567.`
`16`	`15`	`37800`
	`16`	`+576,446.88800000`
	`17`	`+576,446.890`
`17`	`18`	`4798908.340000000000`
`18`	`19`	`4798908.45`
`19`	`20`	`4798908.8909800`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`4798908.8909800`
`2`	`2`	`4798908.45`
`3`	`3`	`4798908.340000000000`
	`4`	`+576,446.890`
	`5`	`+576,446.88800000`
`4`	`6`	`37800`
`5`	`7`	`4567.`
`6`		`-576,446.890`
`7`	`8`	`46.89`
`8`	`9`	`45`
`9`	`10`	`8.013`