diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cache.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cache.java index f4488af18f15d90bb854305d7cd69ac86a717f49..2495112e0326f2144bdb38e365868151b419037c 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cache.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cache.java @@ -19,11 +19,11 @@ public class TestBuiltin_cache extends TestBase { @Test public void testcache1() { - assertEval(Ignored.Unknown, "argv <- list('ddenseMatrix', c('ddenseMatrix', 'dMatrix', 'denseMatrix', 'Matrix', 'mMatrix'));.cache_class(argv[[1]],argv[[2]]);"); + assertEval("argv <- list('ddenseMatrix', c('ddenseMatrix', 'dMatrix', 'denseMatrix', 'Matrix', 'mMatrix'));.cache_class(argv[[1]],argv[[2]]);"); } @Test public void testcache2() { - assertEval(Ignored.Unknown, "argv <- list('numeric', c('numeric', 'vector', 'atomicVector'));.cache_class(argv[[1]],argv[[2]]);"); + assertEval("argv <- list('numeric', c('numeric', 'vector', 'atomicVector'));.cache_class(argv[[1]],argv[[2]]);"); } } diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_range.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_range.java index d6c052886fb36efe6bbcae72d791115e4b12aacc..0eae3eaab5cacd9b8cf6ee22767d8f741c073f32 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_range.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_range.java @@ -94,7 +94,7 @@ public class TestBuiltin_range extends TestBase { @Test public void testrange17() { - assertEval(Ignored.ImplementationError, "argv <- list(structure(c(1012633320L, 1012633620L), class = c('POSIXct', 'POSIXt'), tzone = ''));range(argv[[1]][[1]],argv[[1]][[2]], na.rm = TRUE);"); + assertEval("argv <- list(structure(c(1012633320L, 1012633620L), class = c('POSIXct', 'POSIXt'), tzone = ''));range(argv[[1]][[1]],argv[[1]][[2]], na.rm = TRUE);"); } @Test @@ -104,8 +104,7 @@ public class TestBuiltin_range extends TestBase { @Test public void testrange21() { - assertEval(Ignored.ImplementationError, - "argv <- list(structure(c(12053, 12054, 12055, 12056, 12057, 12058, 12059, 12060, 12061, 12062), class = 'Date'));range(argv[[1]][[1]],argv[[1]][[2]], na.rm = TRUE);"); + assertEval("argv <- list(structure(c(12053, 12054, 12055, 12056, 12057, 12058, 12059, 12060, 12061, 12062), class = 'Date'));range(argv[[1]][[1]],argv[[1]][[2]], na.rm = TRUE);"); } @Test @@ -115,7 +114,7 @@ public class TestBuiltin_range extends TestBase { @Test public void testrange23() { - assertEval(Ignored.ImplementationError, "argv <- list(structure(c(13823, NA), class = 'Date'));range(argv[[1]][[1]],argv[[1]][[2]], na.rm = TRUE);"); + assertEval("argv <- list(structure(c(13823, NA), class = 'Date'));range(argv[[1]][[1]],argv[[1]][[2]], na.rm = TRUE);"); } @Test @@ -145,8 +144,7 @@ public class TestBuiltin_range extends TestBase { @Test public void testrange29() { - assertEval(Ignored.Unknown, - "argv <- list(structure(c(1208822400, 1209168000, 1208822400, 1209168000), class = c('POSIXct', 'POSIXt'), tzone = 'GMT'));range(argv[[1]][[1]],argv[[1]][[2]], na.rm = TRUE);"); + assertEval("argv <- list(structure(c(1208822400, 1209168000, 1208822400, 1209168000), class = c('POSIXct', 'POSIXt'), tzone = 'GMT'));range(argv[[1]][[1]],argv[[1]][[2]], na.rm = TRUE);"); } @Test diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unlist.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unlist.java index e03cda8667d2363cb15bf325f18f010e74889654..853d5074055bfc51991e6ef5c3263b5b823511cc 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unlist.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unlist.java @@ -215,14 +215,12 @@ public class TestBuiltin_unlist extends TestBase { @Test public void testunlist39() { - assertEval(Ignored.Unknown, - "argv <- list(list(structure(list(b = structure(2L, .Label = c('C', 'D'), class = 'factor')), .Names = 'b', row.names = 2L, class = 'data.frame'), structure(list(a = structure(NA_real_, class = c('POSIXct', 'POSIXt'))), .Names = 'a', row.names = 'NA', class = 'data.frame')), FALSE, FALSE); .Internal(unlist(argv[[1]], argv[[2]], argv[[3]]))"); + assertEval("argv <- list(list(structure(list(b = structure(2L, .Label = c('C', 'D'), class = 'factor')), .Names = 'b', row.names = 2L, class = 'data.frame'), structure(list(a = structure(NA_real_, class = c('POSIXct', 'POSIXt'))), .Names = 'a', row.names = 'NA', class = 'data.frame')), FALSE, FALSE); .Internal(unlist(argv[[1]], argv[[2]], argv[[3]]))"); } @Test public void testunlist40() { - assertEval( - "argv <- list(list(structure(list(structure(c('0.007239522', '0.014584634', '0.014207936', '0.018442267', '0.011128505', '0.019910082', '0.027072311', '0.034140379', '0.028320657', '0.037525507'), class = 'AsIs')), row.names = c(NA, -10L), class = 'data.frame'), structure(list(structure(c(' 1', ' 6', ' 7', ' 8', '13', '14', '15', '20', '21', '22'), class = 'AsIs')), row.names = c(NA, -10L), class = 'data.frame'), structure(list(structure(c(' 16', ' 16', '144', ' 16', ' 16', '128', ' 16', ' 16', '112', ' 16'), .Dim = 10L, .Dimnames = structure(list(c('1', '6', '7', '8', '13', '14', '15', '20', '21', '22')), .Names = ''))), row.names = c('1', '6', '7', '8', '13', '14', '15', '20', '21', '22'), class = 'data.frame')), FALSE, FALSE); .Internal(unlist(argv[[1]], argv[[2]], argv[[3]]))"); + assertEval("argv <- list(list(structure(list(structure(c('0.007239522', '0.014584634', '0.014207936', '0.018442267', '0.011128505', '0.019910082', '0.027072311', '0.034140379', '0.028320657', '0.037525507'), class = 'AsIs')), row.names = c(NA, -10L), class = 'data.frame'), structure(list(structure(c(' 1', ' 6', ' 7', ' 8', '13', '14', '15', '20', '21', '22'), class = 'AsIs')), row.names = c(NA, -10L), class = 'data.frame'), structure(list(structure(c(' 16', ' 16', '144', ' 16', ' 16', '128', ' 16', ' 16', '112', ' 16'), .Dim = 10L, .Dimnames = structure(list(c('1', '6', '7', '8', '13', '14', '15', '20', '21', '22')), .Names = ''))), row.names = c('1', '6', '7', '8', '13', '14', '15', '20', '21', '22'), class = 'data.frame')), FALSE, FALSE); .Internal(unlist(argv[[1]], argv[[2]], argv[[3]]))"); } @Test