fixed flatmap tests

rgrannell1 · Jun 30, 2014 · cb1c783 · cb1c783
1 parent ad80ea4
commit cb1c783
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/tests/test-xFlatMap.R b/tests/test-xFlatMap.R
@@ -7,8 +7,14 @@ message("xFlatMap")
 
 	describe("flatmap of empty collection is always empty") +
 	holdsWhen(
-		is.function(fn) && is_collection(coll) && length(coll) == 0,
-		xFlatMap(fn, coll) %is% list()
+		is_collection(coll) && length(coll) == 0 && !is_named(coll),
+		xFlatMap(identity, coll) %is% list()
+	) +
+
+	describe("flatmap of empty collection is always empty (named)") +
+	holdsWhen(
+		is_collection(coll) && length(coll) == 0 && is_named(coll),
+		xFlatMap(identity, coll) %is% as_named(list())
 	) +
 
 	describe("flatmap with identity is the coll") +

diff --git a/tests/test-xIsNan.R b/tests/test-xIsNan.R
@@ -1,7 +1,6 @@
 
 kiwi ::: load_test_dependencies(environment())
 
-
 message("xIsNan (+)")
 
 	over(val) +