rearrange tests using options to be in nested local() calls

Author: MichaelChirico

inst/tests/mergelist.Rraw

@@ -613,50 +613,59 @@ local({
   test(104.04, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x"])
   test(104.05, mergelist(l, on="x", how="left"), error="multiple matches during merge")
   test(104.06, l$to[l$fm, on="x", mult="error"], error="multiple matches during merge")
+})
+
+## with join.many=FALSE option set
+local({
+  old = options(datatable.join.many=FALSE)
+  on.exit(options(old))
 
-  options(datatable.join.many=FALSE)
+  d = function(n) as.data.table(list(x=rep(1L, n)))
+
+  l = list(fm=d(1L), to=d(2L))
   test(104.07, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x"]) ## covers !join.many && length(f__)==1L && len__==nrow(x)
 
   l = list(fm=d(2L), to=d(2L))
-  options(datatable.join.many=FALSE)
   test(104.08, mergelist(l, on="x", how="left", mult="all"), error="many-to-many join")
   test(104.09, l$to[l$fm, on="x"], error="many-to-many join")
 
-  options(datatable.join.many=TRUE)
-  test(104.10, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x"]) ## join in [ does not stop on cartesian product
+  l = list(fm=d(3L), to=d(2L))
+  test(104.10, mergelist(l, on="x", how="left", mult="all"), error="many-to-many join")
+  test(104.11, l$to[l$fm, on="x"], error="many-to-many join")
 
-  l = list(fm=d(3L), to=d(1L))
-  test(104.11, mergelist(l, on="x", how="left"), l$to[l$fm, on="x"])
+  l = list(fm=d(2L), to=d(3L))
+  test(104.12, mergelist(l, on="x", how="left", mult="all"), error="many-to-many join")
+  test(104.13, l$to[l$fm, on="x"], error="many-to-many join")
 
-  l = list(fm=d(1L), to=d(3L))
-  test(104.12, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x"])
-  test(104.13, mergelist(l, on="x", how="left"), error="multiple matches during merge")
-  test(104.14, l$to[l$fm, on="x", mult="error"], error="multiple matches during merge")
+  l = list(fm=d(3L), to=d(3L))
+  test(104.14, mergelist(l, on="x", how="left", mult="all"), error="many-to-many join")
+  test(104.15, l$to[l$fm, on="x"], error="many-to-many join")
+})
 
-  l = list(fm=d(3L), to=d(2L))
-  options(datatable.join.many=FALSE)
-  test(104.15, mergelist(l, on="x", how="left", mult="all"), error="many-to-many join")
-  test(104.16, l$to[l$fm, on="x"], error="many-to-many join")
+# with join.many=TRUE option set
+local({
+  old = options(datatable.join.many=TRUE)
+  on.exit(options(old))
 
-  options(datatable.join.many=TRUE)
-  test(104.17, l$to[l$fm, on="x"], error="Check for duplicate key values")
-  test(104.18, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x", allow.cartesian=TRUE])
+  d = function(n) as.data.table(list(x=rep(1L, n)))
 
-  l = list(fm=d(2L), to=d(3L))
-  options(datatable.join.many=FALSE)
-  test(104.19, mergelist(l, on="x", how="left", mult="all"), error="many-to-many join")
-  test(104.20, l$to[l$fm, on="x"], error="many-to-many join")
+  l = list(fm=d(2L), to=d(2L))
+  test(104.16, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x"]) ## join in [ does not stop on cartesian product
+
+  l = list(fm=d(3L), to=d(1L))
+  test(104.17, mergelist(l, on="x", how="left"), l$to[l$fm, on="x"])
+
+  l = list(fm=d(1L), to=d(3L))
+  test(104.18, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x"])
+  test(104.19, mergelist(l, on="x", how="left"), error="multiple matches during merge")
+  test(104.20, l$to[l$fm, on="x", mult="error"], error="multiple matches during merge")
 
-  options(datatable.join.many=TRUE)
   test(104.21, l$to[l$fm, on="x"], error="Check for duplicate key values")
   test(104.22, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x", allow.cartesian=TRUE])
 
-  l = list(fm=d(3L), to=d(3L))
-  options(datatable.join.many=FALSE)
-  test(104.23, mergelist(l, on="x", how="left", mult="all"), error="many-to-many join")
-  test(104.24, l$to[l$fm, on="x"], error="many-to-many join")
+  test(104.23, l$to[l$fm, on="x"], error="Check for duplicate key values")
+  test(104.24, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x", allow.cartesian=TRUE])
 
-  options(datatable.join.many=TRUE)
   test(104.25, l$to[l$fm, on="x"], error="Check for duplicate key values")
   test(104.26, mergelist(l, on="x", how="left", mult="all"), l$to[l$fm, on="x", allow.cartesian=TRUE])
 })