Rename and add sorting words

[factor.git] / core / sorting / sorting-tests.factor

diff --git a/core/sorting/sorting-tests.factor b/core/sorting/sorting-tests.factor
index 3f84bd4abc679965760e57b3525d650128361b59..359007f1294f5e9300b10aac8c2d99018f677311 100644 (file)
--- a/core/sorting/sorting-tests.factor
+++ b/core/sorting/sorting-tests.factor
@@ -1,22 +1,22 @@
 USING: grouping kernel math math.order random sequences sets
 sorting tools.test vocabs ;
 
-{ { } } [ { } natural-sort ] unit-test
+{ { } } [ { } sort ] unit-test
 
 { { 270000000 270000001 } }
-[ T{ slice f 270000000 270000002 T{ iota f 270000002 } } natural-sort ]
+[ T{ slice f 270000000 270000002 T{ iota f 270000002 } } sort ]
 unit-test
 
 { t } [
     100 [
         drop
         100 [ 20 random [ 1000 random ] replicate ] replicate
-        dup natural-sort
+        dup sort
         [ set= ] [ nip [ before=? ] monotonic? ] 2bi and
     ] all-integers?
 ] unit-test
 
-[ { 1 2 } [ 2drop 1 ] sort ] must-not-fail
+[ { 1 2 } [ 2drop 1 ] sort-with ] must-not-fail
 
 ! Is it a stable sort?
 { t } [ { { 1 "a" } { 1 "b" } { 1 "c" } } dup sort-keys = ] unit-test
@@ -24,4 +24,4 @@ unit-test
 { { { 1 "a" } { 1 "b" } { 1 "c" } { 1 "e" } { 2 "d" } } }
 [ { { 1 "a" } { 1 "b" } { 1 "c" } { 2 "d" } { 1 "e" } } sort-keys ] unit-test
 
-[ all-words natural-sort ] must-not-fail
+[ all-words sort ] must-not-fail