test style

Author: MichaelChirico

inst/tests/tests.Rraw

@@ -21542,27 +21542,24 @@ local({
     "lst_named$inner", "lst_unnamed[[1]]", "nested$l1$l2",
     "mixed[[1]]", "mixed$y",
     "mixed_nested$A[[1]]", "mixed_nested$A$q")
-  test(2335.1, identical(out, sort(expected)))
+  test(2335.1, out, expected)
 })
 local({
   dt <- data.table(val=42)
   e <- new.env()
   e$dt <- dt
-  e$self <- e
-  out <- tables(recursive=TRUE, env=e)$NAME
-  test(2335.2, identical(out, "dt"))
+  e$self <- e # possible infinite loop if we're not careful
+  test(2335.2, tables(recursive=TRUE, env=e)$NAME, "dt")
 })
 local({
   test_obj <- local({
     common_list <- list(dt_inner=data.table(d=4))
-    outer_list <- list(
-      first=common_list,
-      unique=data.table(e=5))
+    outer_list <- list(first=common_list, unique=data.table(e=5))
     outer_list$second <- outer_list$first
-    outer_list})
+    outer_list
+  })
   out <- tables(recursive=TRUE)$NAME
-  test(2335.3,
-       (length(out) == 2) &&
-       ("test_obj$unique" %in% out) &&
-       (sum(grepl("\\$dt_inner$", out)) == 1))
+  test(2335.3, length(out), 2L)
+  test(2335.4, "test_obj$unique" %in% out)
+  test(2335.5, sum(endsWith(out, "$dt_inner")), 1L)
 })