sets: rename combine/refine to union-all/intersect-all

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

diff --git a/core/sets/sets-tests.factor b/core/sets/sets-tests.factor
index b53edbcfb736238d9e3947993b409523fb03089e..6334c467143c65d12b2a1581badfb8ca62af3519 100644 (file)
--- a/core/sets/sets-tests.factor
+++ b/core/sets/sets-tests.factor
@@ -104,13 +104,13 @@ IN: sets.tests
 { { 1 } } [ { 1 2 3 } { 2 3 4 } without ] unit-test
 { { 1 1 } } [ { 1 1 2 3 3 } { 2 3 4 4 } without ] unit-test
 
-{ f } [ { } combine ] unit-test
-{ { 1 2 3 } } [ { { 1 } { 2 } { 1 3 } } combine ] unit-test
+{ f } [ { } union-all ] unit-test
+{ { 1 2 3 } } [ { { 1 } { 2 } { 1 3 } } union-all ] unit-test
 
-{ f } [ { } refine ] unit-test
-{ HS{ } } [ { HS{ } } refine ] unit-test
-{ HS{ 1 } } [ { HS{ 1 2 3 } HS{ 1 } } refine ] unit-test
-{ { 2 } } [ { { 2 3 } { 2 4 } { 9 8 4 2 } } refine ] unit-test
+{ f } [ { } intersect-all ] unit-test
+{ HS{ } } [ { HS{ } } intersect-all ] unit-test
+{ HS{ 1 } } [ { HS{ 1 2 3 } HS{ 1 } } intersect-all ] unit-test
+{ { 2 } } [ { { 2 3 } { 2 4 } { 9 8 4 2 } } intersect-all ] unit-test
 
 { { 1 4 9 16 25 36 } }
 [ { { 1 2 3 } { 4 5 6 } } [ [ sq ] map ] gather ] unit-test