assocs.extras: Combinator for merging two assocs, rename assoc-merge

[factor.git] / extra / assocs / extras / extras-tests.factor

diff --git a/extra/assocs/extras/extras-tests.factor b/extra/assocs/extras/extras-tests.factor
index 23dd663aff2cf6793a9c34644478ad641fa21ac5..e14ef76a9444938246efb23d087b47e59bcd809a 100644 (file)
--- a/extra/assocs/extras/extras-tests.factor
+++ b/extra/assocs/extras/extras-tests.factor
@@ -1,4 +1,4 @@
-USING: assocs.extras kernel math sequences tools.test ;
+USING: arrays assocs.extras kernel math math.order sequences tools.test ;
 
 { f } [ f { } deep-at ] unit-test
 { f } [ f { "foo" } deep-at ] unit-test
@@ -12,7 +12,7 @@ USING: assocs.extras kernel math sequences tools.test ;
 { H{ { "a" V{ 2 5 } } { "b" V{ 3 } } { "c" V{ 10 } } } }
 [
     { H{ { "a" 2 } { "b" 3 } } H{ { "a" 5 } { "c" 10 } } }
-    [ ] [ assoc-merge ] map-reduce
+    [ ] [ assoc-collect ] map-reduce
 ] unit-test
 
 { H{ } } [ H{ { 1 2 } } 2 over delete-value-at ] unit-test
@@ -80,4 +80,59 @@ USING: assocs.extras kernel math sequences tools.test ;
 { t } [
     H{ { "1" 1 } { "2" 2 } { "3" 3 } }
     [ { "1" "2" "2" } rekey-assoc ] keep eq?
-] unit-test
\ No newline at end of file
+] unit-test
+
+{ H{ { 1 11 } { 2 22 } { 3 33 } } } [
+    H{ { 1 11 } { 2 20 } }
+    H{ { 2 22 } { 3 33 } }
+    [ max ] assoc-merge
+] unit-test
+
+{ H{ { 1 11 } { 2 22 } { 3 33 } } } [
+    H{ { 2 22 } { 3 33 } }
+    H{ { 1 11 } { 2 20 } }
+    [ max ] assoc-merge
+] unit-test
+
+{ H{ { 1 11 } { 2 20 } { 3 33 } } } [
+    H{ { 1 11 } { 2 20 } }
+    H{ { 2 22 } { 3 33 } }
+    [ min ] assoc-merge
+] unit-test
+
+{ f } [ f f [ min ] assoc-merge ] unit-test
+
+! Ensure non-destructive
+{
+    H{ { 1 11 } { 2 20 } }
+    H{ { 2 22 } { 3 33 } }
+    H{ { 1 11 } { 2 20 } { 3 33 } }
+} [
+    H{ { 1 11 } { 2 20 } }
+    H{ { 2 22 } { 3 33 } } 2dup
+    [ min ] assoc-merge
+] unit-test
+
+! Ensure destructive
+{
+    H{ { 1 11 } { 2 20 } { 3 33 } }
+    H{ { 2 22 } { 3 33 } }
+    H{ { 1 11 } { 2 20 } { 3 33 } }
+} [
+    H{ { 1 11 } { 2 20 } }
+    H{ { 2 22 } { 3 33 } } 2dup
+    [ min ] assoc-merge!
+] unit-test
+
+! assoc-collapse
+{ f } [ f [ min ] assoc-collapse ] unit-test
+
+{
+    H{ { 1 11 } { 2 20 } }
+    H{ { 1 11 } { 2 20 } { 3 30 } { 4 40 } }
+} [
+    H{ { 1 11 } { 2 20 } } dup
+    H{ { 2 22 } { 3 33 } }
+    H{ { 3 30 } { 4 40 } } 3array
+    [ min ] assoc-collapse
+] unit-test