fix (?) tests

Author: MichaelChirico

inst/tests/tests.Rraw

@@ -7088,10 +7088,10 @@ test(1483.53, merge(x, y, by="i"), data.table(i=let, key="i"))
 test(1483.54, merge(y, x, by="i"), data.table(i=let, key="i"))
 x = data.table(i1=1:3, i2=rlet)
 y = data.table(i1=1:3, i2=factor(let, levels=rlet), key=c("i1", "i2"))
-test(1483.55, x[y, on=c("i1", "i2")], x)
+test(1483.55, x[y, on=c("i1", "i2")], data.table(i1=1:3, i2=let))
 test(1483.56, y[x, on=c("i1", "i2")], x)
-test(1483.57, merge(x, y, by=c("i1", "i2")), data.table(i1=1:3, i2=let, key=c("i1", "i2")))
-test(1483.58, merge(y, x, by=c("i1", "i2")), data.table(i1=1:3, i2=let, key=c("i2", "i2")))
+test(1483.57, merge(x, y, by=c("i1", "i2")), data.table(i1=2L, i2="b", key=c("i1", "i2")))
+test(1483.58, merge(y, x, by=c("i1", "i2")), data.table(i1=2L, i2="b", key=c("i1", "i2")))
 
 x = data.table(i=rlet, key="i")
 y = data.table(i=factor(let, levels=rlet))
@@ -7101,10 +7101,10 @@ test(1483.63, merge(x, y, by="i"), data.table(i=let, key="i"))
 test(1483.64, merge(y, x, by="i"), data.table(i=let, key="i"))
 x = data.table(i1=1:3, i2=rlet, key=c("i1", "i2"))
 y = data.table(i1=1:3, i2=factor(let, levels=rlet))
-test(1483.65, x[y, on=c("i1", "i2")], x)
-test(1483.66, y[x, on=c("i1", "i2")], data.table(i1=1:3, i2=let))
-test(1483.67, merge(x, y, by=c("i1", "i2")), data.table(i1=1:3, i2=let, key=c("i1", "i2")))
-test(1483.68, merge(y, x, by=c("i1", "i2")), data.table(i1=1:3, i2=let, key=c("i1", "i2")))
+test(1483.65, x[y, on=c("i1", "i2")], data.table(i1=1:3, i2=let))
+test(1483.66, y[x, on=c("i1", "i2")], data.table(i1=1:3, i2=rlet))
+test(1483.67, merge(x, y, by=c("i1", "i2")), data.table(i1=2L, i2="b", key=c("i1", "i2")))
+test(1483.68, merge(y, x, by=c("i1", "i2")), data.table(i1=2L, i2="b", key=c("i1", "i2")))
 
 x = data.table(i=rlet, a=rlet)
 y = data.table(i=factor(let, levels=rlet), b=let, key="i")
@@ -7118,7 +7118,7 @@ some_more_letters <- rep(c("a", "b", "c"), 2L)
 dt1 <- data.table(x = some_letters, y=1:3)
 dt2 <- data.table(x = factor(some_more_letters, levels=some_letters), z=1:6, key=c("x", "z"))
 dt3 <- merge(dt1, dt2, by="x")
-test(1483.81, key(dt3), NULL)
+test(1483.81, key(dt3), "x")
 test(1483.82, nrow(dt3[x %in% "c", ]), 2L)
 
 # NULL items should be removed when making data.table from list, #842