Enable ignored unit tests.

Pavel Marek · Pavel Marek · commit 2cb4de9fd759 · 2021-03-24T17:02:16.000+01:00
Also ignore error messages in some tests due to incosistent GNU-R behavior, and add some tests. (cherry picked from commit c470744)
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/TestS4.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/TestS4.java
@@ -175,7 +175,7 @@ public void testObjectValueSemantics() {
     @Test
     public void testActiveBindings() {
         assertEval("someSymbol0 <- 1; makeActiveBinding('someSymbol0', function(x) { x }, .GlobalEnv)");
-        assertEval(Ignored.NewRVersionMigration, Output.IgnoreErrorContext, "lockEnvironment(.GlobalEnv); makeActiveBinding('someSymbol1', function(x) { x }, .GlobalEnv)");
+        assertEval(Output.IgnoreErrorMessage, "lockEnvironment(.GlobalEnv); makeActiveBinding('someSymbol1', function(x) { x }, .GlobalEnv)");
         assertEval("makeActiveBinding('someSymbol2', function(x) { x }, .GlobalEnv); bindingIsActive('someSymbol2', .GlobalEnv)");
         assertEval("bindingIsActive('someSymbol3', .GlobalEnv)");
         assertEval(".Internal(bindingIsActive(as.name('someSymbol4'), .GlobalEnv))");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allvars.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_allvars.java
@@ -35,6 +35,6 @@ public void testallvars1() {
 
     @Test
     public void testallvars2() {
-        assertEval(Ignored.NewRVersionMigration, "{ fml <- as.formula('v ~ a + b'); fml[[2]] <- NULL; all.vars(fml) }");
+        assertEval("{ fml <- as.formula('v ~ a + b'); fml[[2]] <- NULL; all.vars(fml) }");
     }
 }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ascomplex.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ascomplex.java
@@ -112,8 +112,7 @@ public void testAsComplex() {
         assertEval(Ignored.ImplementationError, "{ as.complex(\"+.1e+2-3i\") }");
 
         assertEval("{ as.complex(list(42)) }");
-        // TODO: Wrong IgnoreErrorContext
-        assertEval(Ignored.NewRVersionMigration, Output.IgnoreErrorContext, "{ as.complex(list(NULL)) }");
+        assertEval(Output.IgnoreErrorContext, "{ as.complex(list(NULL)) }");
         assertEval(Output.IgnoreWarningContext, "{ as.complex(list(\"foo\")) }");
         assertEval("{ as.complex.cls <- function(x) 42; as.complex(structure(c(1,2), class='cls')); }");
 
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asinteger.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asinteger.java
@@ -146,8 +146,7 @@ public void testAsInteger() {
         assertEval("{ as.integer(list(integer(),2,3)) }");
         assertEval("{ as.integer(list(list(1),2,3)) }");
         assertEval("{ as.integer(list(1,2,3,list())) }");
-        // TODO: Wrong IgnoreErrorContext
-        assertEval(Ignored.NewRVersionMigration, Output.IgnoreErrorContext, "{ as.integer(list(c(1L, 2L))) }");
+        assertEval(Output.IgnoreErrorContext, "{ as.integer(list(c(1L, 2L))) }");
         assertEval("{ as.integer(10000000000) }");
         assertEval("{ as.integer(c(1, 10000000000)) }");
         assertEval("{ as.integer(-10000000000) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bcVersion.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bcVersion.java
@@ -29,6 +29,6 @@ public class TestBuiltin_bcVersion extends TestBase {
 
     @Test
     public void testbcVersion1() {
-        assertEval(Ignored.NewRVersionMigration, ".Internal(bcVersion())");
+        assertEval(".Internal(bcVersion())");
     }
 }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_class.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_class.java
@@ -124,8 +124,7 @@ public void testclass19() {
 
     @Test
     public void testclass20() {
-        assertEval(Ignored.NewRVersionMigration,
-                        "argv <- list(structure(c(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), .Dim = c(24L, 13L), .Dimnames = list(c('1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24'), c('(Intercept)', 'block2', 'block3', 'block4', 'block5', 'block6', 'N1', 'P1', 'K1', 'N1:P1', 'N1:K1', 'P1:K1', 'N1:P1:K1')), assign = c(0L, 1L, 1L, 1L, 1L, 1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L), contrasts = structure(list(block = 'contr.treatment', N = 'contr.treatment', P = 'contr.treatment', K = 'contr.treatment'), .Names = c('block', 'N', 'P', 'K'))));class(argv[[1]]);");
+        assertEval("argv <- list(structure(c(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), .Dim = c(24L, 13L), .Dimnames = list(c('1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24'), c('(Intercept)', 'block2', 'block3', 'block4', 'block5', 'block6', 'N1', 'P1', 'K1', 'N1:P1', 'N1:K1', 'P1:K1', 'N1:P1:K1')), assign = c(0L, 1L, 1L, 1L, 1L, 1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L), contrasts = structure(list(block = 'contr.treatment', N = 'contr.treatment', P = 'contr.treatment', K = 'contr.treatment'), .Names = c('block', 'N', 'P', 'K'))));class(argv[[1]]);");
     }
 
     @Test
@@ -202,6 +201,22 @@ public void testGetClass() {
         assertEval("{  gen<-function(object) 0; setGeneric(\"gen\"); class(gen) }");
     }
 
+    /**
+     * From GNU-R version 4.0.0, matrix objects also have class array.
+     */
+    @Test
+    public void testGetClassFromMatrix() {
+        assertEval("{ m <- matrix(1:9, ncol=3); class(m) }");
+        assertEval("{ v <- 1:9; dim(v) <- c(3,3); class(v) }");
+        assertEval("{ v <- as.double(1:9); dim(v) <- c(3,3); class(v) }");
+        assertEval("{ v <- 1:9; attr(v, 'dim') <- c(3,3); class(v) }");
+        // The following test succeeds, but if assign just 'matrix' or 'array' class at one time, it
+        // fails
+        assertEval("{ v <- 1:9; class(v) <- c('matrix', 'array') }");
+        assertEval("{ v <- 1:9; class(v) <- c('matrix') }");
+        assertEval("{ v <- 1:9; class(v) <- c('array') }");
+    }
+
     @Test
     public void testSetClass() {
         assertEval("{ x <- c(1,2,3); class(x) <- NULL; attributes(x); x }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_classassign.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_classassign.java
@@ -178,7 +178,7 @@ public void testUpdateClass() {
 
         assertEval("{x<-c(1,2,3,4); dim(x)<-c(2,2); class(x)<-\"array\"; x; class(x)<-\"matrix\"; x;}");
 
-        assertEval(Ignored.NewRVersionMigration, "{x<-c(1,2,3,4); dim(x)<-c(2,2); class(x)}");
+        assertEval("{x<-c(1,2,3,4); dim(x)<-c(2,2); class(x)}");
 
         assertEval("{x<-c(1,2,3,4); dim(x)<-c(2,2); class(x);dim(x)<-c(2,2,1);class(x)}");
 
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_colMeans.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_colMeans.java
@@ -115,7 +115,7 @@ public void testColMeans() {
         assertEval("{colMeans(matrix(c(TRUE,FALSE,FALSE,NaN),nrow=2,ncol=2), na.rm = FALSE)}");
         assertEval("{colMeans(matrix(c(TRUE,FALSE,FALSE,NA),nrow=2,ncol=2), na.rm = FALSE)}");
         // Whichever value(NA or NaN) is first in the row will be returned for that row.
-        assertEval(Ignored.NewRVersionMigration, "{colMeans(matrix(c(NA,NaN,NaN,NA),ncol=2,nrow=2))}");
+        assertEval("{colMeans(matrix(c(NA,NaN,NaN,NA),ncol=2,nrow=2))}");
         assertEval("{ a = colSums(array(1:24,c(2,3,4))); colMeans(a)}");
 
         assertEval("{colMeans(matrix(c(NaN,4+5i,2+0i,5+10i),nrow=2,ncol=2), na.rm = TRUE)}");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cummax.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cummax.java
@@ -80,8 +80,8 @@ public void testCumulativeMax() {
         assertEval("{ cummax(c(1+1i,2-3i,4+5i)) }");
         assertEval("{ cummax(c(1+1i, NA, 2+3i)) }");
 
-        assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NaN,1, NA); cummax(values); cummax(as.integer(values))");
-        assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NA,1, NaN); cummax(values); cummax(as.integer(values))");
+        assertEval("values <- c(1,2,NaN,1, NA); cummax(values); cummax(as.integer(values))");
+        assertEval("values <- c(1,2,NA,1, NaN); cummax(values); cummax(as.integer(values))");
 
         assertEval("a <- structure(1:3, names=c('a1','a2','a3')); b<-cummax(a); names(b)[1]<-'x'; a; ");
     }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cummin.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cummin.java
@@ -79,8 +79,8 @@ public void testCumulativeMin() {
         assertEval("{ cummin(c(1+1i,2-3i,4+5i)) }");
         assertEval("{ cummin(c(1+1i, NA, 2+3i)) }");
 
-        assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NaN,1, NA); cummin(values); cummin(as.integer(values))");
-        assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NA,1, NaN); cummin(values); cummin(as.integer(values))");
+        assertEval("values <- c(1,2,NaN,1, NA); cummin(values); cummin(as.integer(values))");
+        assertEval("values <- c(1,2,NA,1, NaN); cummin(values); cummin(as.integer(values))");
 
         assertEval("a <- structure(1:3, names=c('a1','a2','a3')); b<-cummin(a); names(b)[1]<-'x'; a; ");
     }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cumprod.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cumprod.java
@@ -79,7 +79,7 @@ public void testcumprod10() {
 
     @Test
     public void testCumProd() {
-        assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NaN,1, NA); cumprod(values); cumprod(as.integer(values))");
+        assertEval("values <- c(1,2,NaN,1, NA); cumprod(values); cumprod(as.integer(values))");
         assertEval("values <- c(1,2,NA,1, NaN); cumprod(values); cumprod(as.integer(values))");
 
         assertEval("a <- structure(c(1,2,3), names=c('a1','a2','a3')); b<-cumprod(a); names(b)[1]<-'x'; a; ");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cumsum.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cumsum.java
@@ -123,7 +123,7 @@ public void testCumulativeSum() {
         assertEval("{ cumsum(c(2000000000L, 2000000000L)) }");
         assertEval("{ cumsum(c(-2147483647L, -1L)) }");
 
-        assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NaN,1, NA); cumsum(values); cumsum(as.integer(values))");
+        assertEval("values <- c(1,2,NaN,1, NA); cumsum(values); cumsum(as.integer(values))");
         assertEval("values <- c(1,2,NA,1, NaN); cumsum(values); cumsum(as.integer(values))");
 
         assertEval("a <- structure(c(1,2,3), names=c('a1','a2','a3')); b<-cumsum(a); names(b)[1]<-'x'; a; ");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dimassign.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dimassign.java
@@ -91,7 +91,7 @@ public void testdimassign12() {
     @Test
     public void testDimAssignError() {
         assertEval("dim(environment()) <- c(1,2)");
-        assertEval(Ignored.NewRVersionMigration, "f <- function() {}; dim(f) <- c(1,2)");
+        assertEval("f <- function() {}; dim(f) <- c(1,2)");
     }
 
     @Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dotdotdotelt.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dotdotdotelt.java
@@ -33,10 +33,7 @@ public class TestBuiltin_dotdotdotelt extends TestBase {
     @Test
     public void testdotdotdotelt1() {
         assertEval("tst <- function(n,...) ...elt(n); tst(1, 1, 2, 3)");
-        assertEval(Ignored.NewRVersionMigration, "tst <- function(n,...) ...elt(n); tst(c(3,2,1), 1, 2, 3)");
         assertEval("tst <- function(n,...) ...elt(n); tst(1.6, 1, 2, 3)");
-        // TODO: error with conversion of string to interger
-        assertEval(Ignored.ImplementationError, "tst <- function(n,...) ...elt(n); tst('1.6', 1, 2, 3)");
         assertEval("tst <- function(n,...) ...elt(n); a <- 1; tst(a, 1, 2, 3)");
         assertEval("tst <- function(n,...) ...elt(n); f <- function() {print('hello')}; tst(1, f(), f(), 3)");
         assertEval("tst <- function(n,...) ...elt(n); tst(c(1), c(1,2,3))");
@@ -47,14 +44,18 @@ public void testdotdotdotelt1() {
 
     @Test
     public void testdotdotdoteltError() {
+        // Parameter n must be of length 1 and only integer or real type
+        assertEval("tst <- function(n,...) ...elt(n); tst(c(3,2,1), 1, 2, 3)");
         assertEval("tst <- function(n,...) ...elt(n); tst(-1, 1)");
         assertEval("tst <- function(n,...) ...elt(n); tst(1)");
         assertEval("tst <- function(n,...) ...elt(n); tst(0, 1)");
         assertEval("tst <- function(n,...) ...elt(n); tst(5, 1, 2, 3)");
+        assertEval("tst <- function(n,...) ...elt(n); tst('1', 1, 2, 3)");
+        assertEval("tst <- function(n,...) ...elt(n); tst(1+1i, 1, 2, 3)");
+        assertEval("tst <- function(n,...) ...elt(n); tst(list(1), 1, 2, 3)");
         // TODO: different error reporting for primitives
         assertEval(Output.IgnoreErrorMessage, "tst <- function(n,...) ...elt(); tst(c(1), c(1,2,3))");
-        // TODO: error with conversion of string to interger
-        assertEval(Ignored.ReferenceError, "tst <- function(n,...) ...elt(n); tst(' ', 1, 2)");
+        assertEval("tst <- function(n,...) ...elt(n); tst(' ', 1, 2)");
         assertEval("tst <- function(n,...) ...elt(n); tst(NA, 1, 2, 3)");
     }
 
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_intToBits.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_intToBits.java
@@ -59,7 +59,7 @@ public void testintToBits() {
         assertEval(Output.IgnoreErrorMessage, "intToBits(new.env())");
         assertEval("intToBits(environment)");
         assertEval("intToBits(stdout())");
-        assertEval(Ignored.NewRVersionMigration, "intToBits(list(c(5,5,7,8),88,6L))");
+        assertEval("intToBits(list(c(5,5,7,8),88,6L))");
         assertEval("intToBits(list(5,5,7,8))");
         assertEval("intToBits(2147483648)");
         assertEval("intToBits(c(2147483648, 2147483648))");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_intToUtf8.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_intToUtf8.java
@@ -70,7 +70,8 @@ public void testintToUtf8() {
         assertEval("intToUtf8(65535)");
         // GNU-R outputs a real char vs. FastR outputs "\U00010000"
         assertEval(Ignored.ImplementationError, "intToUtf8(65536)");
-        assertEval(Ignored.NewRVersionMigration, "intToUtf8(200000)");
+        assertEval(Ignored.ImplementationError, "intToUtf8(200000)");
+
         assertEval("intToUtf8(1:100)");
         assertEval("intToUtf8(1:100, FALSE)");
         assertEval("intToUtf8(1:100, TRUE)");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java
@@ -2073,9 +2073,9 @@ public void testEqualsList() {
 
     @Test
     public void testListWithNull() {
-        assertEval(Ignored.NewRVersionMigration, "{ list(NULL) < 1 }");
-        assertEval(Ignored.NewRVersionMigration, "{ list(1, NULL) < c(1, 1) }");
-        assertEval(Ignored.NewRVersionMigration, "{ c(1, 1) < list(1, NULL) }");
+        assertEval("{ list(NULL) < 1 }");
+        assertEval("{ list(1, NULL) < c(1, 1) }");
+        assertEval("{ c(1, 1) < list(1, NULL) }");
     }
 
     @Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_options.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_options.java
@@ -40,7 +40,9 @@ public void testoptions2() {
 
     @Test
     public void testoptions3() {
-        assertEval(Ignored.NewRVersionMigration, "argv <- list('str'); .Internal(options(argv[[1]]))");
+        // options("str") returns, among other elements, 'formatNum', which is a function that has
+        // an environment, and GNU-R, obviously, outputs different environment than FastR
+        assertEval(Ignored.OutputFormatting, "argv <- list('str'); .Internal(options(argv[[1]]))");
     }
 
     @Test
@@ -95,7 +97,7 @@ public void testMandatory() {
             if ("keep.source".equals(option) || "warn".equals(option)) {
                 assertEval(Ignored.Unknown, "{ options('" + option + "') }");
             } else {
-                assertEval(Ignored.NewRVersionMigration, "{ options('" + option + "') }");
+                assertEval("{ options('" + option + "') }");
             }
         }
     }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_parse.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_parse.java
@@ -99,7 +99,6 @@ public void testParseData() {
                         "tmp$parent <- match(tmp$parent, tmp$id, nomatch=0); " +
                         "tmp$id <- 1:nrow(tmp); " +
                         "rownames(tmp) <- 1:nrow(tmp); tmp }";
-        // TODO: remove IgnoreWhitespace (GR-18943)
-        assertEval(Ignored.NewRVersionMigration, Output.IgnoreWhitespace, template(testTemplate, PARSE_DATA_TESTS));
+        assertEval(template(testTemplate, PARSE_DATA_TESTS));
     }
 }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowMeans.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowMeans.java
@@ -67,7 +67,7 @@ public void testRowMeans() {
         assertEval("{rowMeans(matrix(c(NaN,4+5i,2+0i,5+10i),nrow=2,ncol=2), na.rm = TRUE)}");
 
         // Whichever value(NA or NaN) is first in the row will be returned for that row.
-        assertEval(Ignored.NewRVersionMigration, "{rowMeans(matrix(c(NA,NaN,NaN,NA),ncol=2,nrow=2))}");
+        assertEval("{rowMeans(matrix(c(NA,NaN,NaN,NA),ncol=2,nrow=2))}");
 
         assertEval("{x<-matrix(c(\"1\",\"2\",\"3\",\"4\"),ncol=2);rowMeans(x)}");
         assertEval("{rowMeans(matrix(c(NaN,4+5i,2+0i,5+10i),nrow=2,ncol=2), na.rm = FALSE)}");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowSums.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowSums.java
@@ -90,7 +90,7 @@ public void testRowSums() {
         assertEval("{rowSums(matrix(c(NaN,4+5i,2+0i,5+10i),nrow=2,ncol=2), na.rm = TRUE)}");
 
         // Whichever value(NA or NaN) is first in the row will be returned for that row.
-        assertEval(Ignored.NewRVersionMigration, "{rowSums(matrix(c(NA,NaN,NaN,NA),ncol=2,nrow=2))}");
+        assertEval("{rowSums(matrix(c(NA,NaN,NaN,NA),ncol=2,nrow=2))}");
 
         // rowSums on matrix drop dimension
         assertEval("{ a = rowSums(matrix(1:12,3,4)); is.null(dim(a)) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_serialize.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_serialize.java
@@ -93,9 +93,8 @@ public void testserialize() {
         assertEval(template("options(keep.source=FALSE); serialize(quote(if (a * 2 < 199) b + foo(x,y,foo=z+1,bar=)), connection=NULL, version=%0)", VERSIONS));
         assertEval(template("options(keep.source=FALSE); serialize(quote(\"bar\"), connection=NULL, version=%0)", VERSIONS));
         assertEval(template("options(keep.source=FALSE); serialize(quote('baz'), connection=NULL, version=%0)", VERSIONS));
-        assertEval(Ignored.NewRVersionMigration,
-                        template("setClass('foo', slots = c(x='numeric', y='numeric')); t1 <- new('foo', x=4, y=c(77,88)); options(keep.source=FALSE); serialize(t1, connection=NULL, version=%0)",
-                                        VERSIONS));
+        assertEval(template("setClass('foo', slots = c(x='numeric', y='numeric')); t1 <- new('foo', x=4, y=c(77,88)); options(keep.source=FALSE); serialize(t1, connection=NULL, version=%0)",
+                        VERSIONS));
         assertEval(template("options(keep.source=FALSE); serialize(quote(a(b(c(d(function (e, ...) { f(g)$h.i}))))), connection=NULL, version=%0)", VERSIONS));
         assertEval(template("options(keep.source=FALSE); serialize(quote(f(g)$h.i), connection=NULL, version=%0)", VERSIONS));
         assertEval(template("options(keep.source=FALSE); val <- new.env(hash=FALSE); serialize(val, connection=NULL, version=%0)", VERSIONS));
@@ -128,8 +127,7 @@ public void testserialize() {
                         "options(keep.source=FALSE); val <- new.env(hash=FALSE); makeActiveBinding('a', function(x) print('hello'), val); data <- serialize(val, connection=NULL, version=%0); newenv <- unserialize(rawConnection(data)); newenv$a",
                         VERSIONS));
 
-        assertEval(Ignored.NewRVersionMigration, template(
-                        "options(keep.source=FALSE); mc <- setClass('FooSerial0', representation(a = 'call')); obj <- new('FooSerial0'); serialize(obj, connection=NULL, version=%0)", VERSIONS));
+        assertEval(template("options(keep.source=FALSE); mc <- setClass('FooSerial0', representation(a = 'call')); obj <- new('FooSerial0'); serialize(obj, connection=NULL, version=%0)", VERSIONS));
         assertEval(Ignored.ImplementationError, template("options(keep.source=FALSE); fc <- setClass('FooSerial1', representation(a = 'call')); serialize(fc, connection=NULL, version=%0)", VERSIONS));
 
         assertEval(template(
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_storagemodeassign.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_storagemodeassign.java
@@ -66,7 +66,7 @@ public void testUpdateStorageModeWithNull() {
 
     @Test
     public void testErrors() {
-        assertEval(Ignored.NewRVersionMigration, template("{ x <- %0; storage.mode(x) <- 'integer'; }", new String[]{"new.env()", "quote(a+b)", "as.pairlist(1)"}));
+        assertEval(Output.IgnoreErrorMessage, template("{ x <- %0; storage.mode(x) <- 'integer'; }", new String[]{"new.env()", "quote(a+b)", "as.pairlist(1)"}));
         assertEval("{ x <- 1; storage.mode(x) <- 42.5; }");
     }
 }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unserialize.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unserialize.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/functions/TestS3Dispatch.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/functions/TestS3Dispatch.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleDataFrames.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleDataFrames.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleLists.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleLists.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleVectors.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleVectors.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/fastr/TestJavaInterop.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/fastr/TestJavaInterop.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestRandGenerationFunctions.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestRandGenerationFunctions.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestStats.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestStats.java
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestUpdateForm.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestUpdateForm.java

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ public void testallvars1() {`
`35`	`35`
`36`	`36`	`@Test`
`37`	`37`	`public void testallvars2() {`
`38`		`- assertEval(Ignored.NewRVersionMigration, "{ fml <- as.formula('v ~ a + b'); fml[[2]] <- NULL; all.vars(fml) }");`
	`38`	`+ assertEval("{ fml <- as.formula('v ~ a + b'); fml[[2]] <- NULL; all.vars(fml) }");`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ public class TestBuiltin_bcVersion extends TestBase {`
`29`	`29`
`30`	`30`	`@Test`
`31`	`31`	`public void testbcVersion1() {`
`32`		`- assertEval(Ignored.NewRVersionMigration, ".Internal(bcVersion())");`
	`32`	`+ assertEval(".Internal(bcVersion())");`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ public void testCumulativeMax() {`
`80`	`80`	`assertEval("{ cummax(c(1+1i,2-3i,4+5i)) }");`
`81`	`81`	`assertEval("{ cummax(c(1+1i, NA, 2+3i)) }");`
`82`	`82`
`83`		`- assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NaN,1, NA); cummax(values); cummax(as.integer(values))");`
`84`		`- assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NA,1, NaN); cummax(values); cummax(as.integer(values))");`
	`83`	`+ assertEval("values <- c(1,2,NaN,1, NA); cummax(values); cummax(as.integer(values))");`
	`84`	`+ assertEval("values <- c(1,2,NA,1, NaN); cummax(values); cummax(as.integer(values))");`
`85`	`85`
`86`	`86`	`assertEval("a <- structure(1:3, names=c('a1','a2','a3')); b<-cummax(a); names(b)[1]<-'x'; a; ");`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ public void testCumulativeMin() {`
`79`	`79`	`assertEval("{ cummin(c(1+1i,2-3i,4+5i)) }");`
`80`	`80`	`assertEval("{ cummin(c(1+1i, NA, 2+3i)) }");`
`81`	`81`
`82`		`- assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NaN,1, NA); cummin(values); cummin(as.integer(values))");`
`83`		`- assertEval(Ignored.NewRVersionMigration, "values <- c(1,2,NA,1, NaN); cummin(values); cummin(as.integer(values))");`
	`82`	`+ assertEval("values <- c(1,2,NaN,1, NA); cummin(values); cummin(as.integer(values))");`
	`83`	`+ assertEval("values <- c(1,2,NA,1, NaN); cummin(values); cummin(as.integer(values))");`
`84`	`84`
`85`	`85`	`assertEval("a <- structure(1:3, names=c('a1','a2','a3')); b<-cummin(a); names(b)[1]<-'x'; a; ");`
`86`	`86`	`}`