From 8ed6d205c0c28691aee5cfbd0b37475b1b597b5a Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Wed, 27 May 2015 13:53:05 +0200
Subject: [PATCH] enable passing tests
---
.../r/test/library/base/TestSimpleArrays.java | 2 +-
.../TestrGenBuiltinasDatecharacter.java | 5 ++---
.../TestrGenBuiltinasDatedefault.java | 5 ++---
.../testrgen/TestrGenBuiltinasDatefactor.java | 5 ++---
.../TestrGenBuiltinasDatenumeric.java | 5 ++---
.../testrgen/TestrGenBuiltinascharacter.java | 20 ++++++++-----------
.../r/test/testrgen/TestrGenBuiltinattr.java | 2 +-
.../testrgen/TestrGenBuiltindfltWarn.java | 9 +++++----
...estrGenBuiltinextract_parentasis_Date.java | 5 ++---
.../testrgen/TestrGenBuiltinminus_Date.java | 6 ++----
.../testrgen/TestrGenBuiltinoperators.java | 4 ++--
.../testrgen/TestrGenBuiltinplus_Date.java | 6 ++----
.../testrgen/TestrGenBuiltinstrptime.java | 3 +--
.../test/testrgen/TestrGenBuiltinsubset.java | 3 +--
.../test/testrgen/TestrGenBuiltinsubset2.java | 4 ++--
.../testrgen/TestrGenBuiltintruncDate.java | 5 ++---
.../testrgen/TestrGenBuiltinweekdaysDate.java | 5 ++---
17 files changed, 39 insertions(+), 55 deletions(-)
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArrays.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArrays.java
index 5246a34a79..3e81bf0186 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArrays.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArrays.java
@@ -66,7 +66,7 @@ public class TestSimpleArrays extends TestBase {
assertEval(Output.ContainsError, "{ e <- new.env(); assign(\"a\", 1, e); e[\"a\"] }");
assertEval(Output.ContainsError, "{ e <- new.env(); assign(\"a\", 1, e); e[[1]] }");
- assertEval(Ignored.Unimplemented, "{ x <- c(1, 2); names(x) <- c(\"A\", \"A2\"); x[\"A\"] }");
+ assertEval("{ x <- c(1, 2); names(x) <- c(\"A\", \"A2\"); x[\"A\"] }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatecharacter.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatecharacter.java
index 4886a633fb..c7a5fcd4a3 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatecharacter.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatecharacter.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,7 +19,6 @@ public class TestrGenBuiltinasDatecharacter extends TestBase {
@Test
public void testasDatecharacter1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(x = c('2007-11-06', NA)), .Names = 'x');do.call('as.Date.character', argv)");
+ assertEval("argv <- structure(list(x = c('2007-11-06', NA)), .Names = 'x');do.call('as.Date.character', argv)");
}
-
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatedefault.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatedefault.java
index 8c06358695..d4f03ec782 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatedefault.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatedefault.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,7 +19,6 @@ public class TestrGenBuiltinasDatedefault extends TestBase {
@Test
public void testasDatedefault1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(x = logical(0)), .Names = 'x');do.call('as.Date.default', argv)");
+ assertEval("argv <- structure(list(x = logical(0)), .Names = 'x');do.call('as.Date.default', argv)");
}
-
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatefactor.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatefactor.java
index e1afbe0e1b..50f9b8a5e7 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatefactor.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatefactor.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,7 +19,6 @@ public class TestrGenBuiltinasDatefactor extends TestBase {
@Test
public void testasDatefactor1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(x = structure(1L, .Label = '2000-01-02', class = 'factor')), .Names = 'x');do.call('as.Date.factor', argv)");
+ assertEval("argv <- structure(list(x = structure(1L, .Label = '2000-01-02', class = 'factor')), .Names = 'x');do.call('as.Date.factor', argv)");
}
-
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatenumeric.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatenumeric.java
index ab3ddfde95..b57b7afa67 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatenumeric.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinasDatenumeric.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,7 +19,6 @@ public class TestrGenBuiltinasDatenumeric extends TestBase {
@Test
public void testasDatenumeric1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(x = 0.5, origin = '1969-12-31'), .Names = c('x', 'origin'));do.call('as.Date.numeric', argv)");
+ assertEval("argv <- structure(list(x = 0.5, origin = '1969-12-31'), .Names = c('x', 'origin'));do.call('as.Date.numeric', argv)");
}
-
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinascharacter.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinascharacter.java
index cdf64c1de7..a146dfc490 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinascharacter.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinascharacter.java
@@ -24,8 +24,7 @@ public class TestrGenBuiltinascharacter extends TestBase {
@Test
public void testascharacter2() {
- assertEval(Ignored.Unknown,
- "argv <- list(structure(c(12784, 12874, 12965, 13057, 13149, 13239, 13330, 13422, 13514, 13604, 13695, 13787, 13879, 13970, 14061, 14153, 14245), class = 'Date'));as.character(argv[[1]]);");
+ assertEval("argv <- list(structure(c(12784, 12874, 12965, 13057, 13149, 13239, 13330, 13422, 13514, 13604, 13695, 13787, 13879, 13970, 14061, 14153, 14245), class = 'Date'));as.character(argv[[1]]);");
}
@Test
@@ -41,7 +40,7 @@ public class TestrGenBuiltinascharacter extends TestBase {
@Test
public void testascharacter5() {
- assertEval(Ignored.Unknown, "argv <- list(structure(1395082040.29392, class = c('POSIXct', 'POSIXt')));as.character(argv[[1]]);");
+ assertEval("argv <- list(structure(1395082040.29392, class = c('POSIXct', 'POSIXt')));as.character(argv[[1]]);");
}
@Test
@@ -96,7 +95,7 @@ public class TestrGenBuiltinascharacter extends TestBase {
@Test
public void testascharacter16() {
- assertEval(Ignored.Unknown, "argv <- list(structure(-841, class = 'Date'));as.character(argv[[1]]);");
+ assertEval("argv <- list(structure(-841, class = 'Date'));as.character(argv[[1]]);");
}
@Test
@@ -160,7 +159,7 @@ public class TestrGenBuiltinascharacter extends TestBase {
@Test
public void testascharacter28() {
- assertEval(Ignored.Unknown, "argv <- list(structure(c(11323, 11330, 11337, 11344, 11351, 11358, 11365, 11372, 11379, 11386), class = 'Date'));as.character(argv[[1]]);");
+ assertEval("argv <- list(structure(c(11323, 11330, 11337, 11344, 11351, 11358, 11365, 11372, 11379, 11386), class = 'Date'));as.character(argv[[1]]);");
}
@Test
@@ -175,8 +174,7 @@ public class TestrGenBuiltinascharacter extends TestBase {
@Test
public void testascharacter31() {
- assertEval(Ignored.Unknown,
- "argv <- list(structure(c(1338523200, 1338609600, 1338696000, 1338782400, 1338868800, 1338955200, 1339041600), class = c('POSIXct', 'POSIXt'), tzone = ''));as.character(argv[[1]]);");
+ assertEval("argv <- list(structure(c(1338523200, 1338609600, 1338696000, 1338782400, 1338868800, 1338955200, 1339041600), class = c('POSIXct', 'POSIXt'), tzone = ''));as.character(argv[[1]]);");
}
@Test
@@ -191,8 +189,7 @@ public class TestrGenBuiltinascharacter extends TestBase {
@Test
public void testascharacter34() {
- assertEval(Ignored.Unknown,
- "argv <- list(structure(c(1104537600, 1107216000, 1109635200, 1112313600, 1114905600, 1117584000, 1120176000, 1122854400, 1125532800, 1128124800, 1130803200, 1133395200, 1136073600, 1138752000, 1141171200, 1143849600, 1146441600, 1149120000, 1151712000, 1154390400, 1157068800, 1159660800, 1162339200, 1164931200, 1167609600, 1170288000, 1172707200, 1175385600, 1177977600, 1180656000, 1183248000, 1185926400, 1188604800, 1191196800, 1193875200, 1196467200, 1199145600, 1201824000, 1204329600, 1207008000, 1209600000, 1212278400, 1214870400, 1217548800, 1220227200, 1222819200, 1225497600, 1228089600, 1230768000), class = c('POSIXct', 'POSIXt'), tzone = 'UTC'));as.character(argv[[1]]);");
+ assertEval("argv <- list(structure(c(1104537600, 1107216000, 1109635200, 1112313600, 1114905600, 1117584000, 1120176000, 1122854400, 1125532800, 1128124800, 1130803200, 1133395200, 1136073600, 1138752000, 1141171200, 1143849600, 1146441600, 1149120000, 1151712000, 1154390400, 1157068800, 1159660800, 1162339200, 1164931200, 1167609600, 1170288000, 1172707200, 1175385600, 1177977600, 1180656000, 1183248000, 1185926400, 1188604800, 1191196800, 1193875200, 1196467200, 1199145600, 1201824000, 1204329600, 1207008000, 1209600000, 1212278400, 1214870400, 1217548800, 1220227200, 1222819200, 1225497600, 1228089600, 1230768000), class = c('POSIXct', 'POSIXt'), tzone = 'UTC'));as.character(argv[[1]]);");
}
@Test
@@ -212,8 +209,7 @@ public class TestrGenBuiltinascharacter extends TestBase {
@Test
public void testascharacter38() {
- assertEval(Ignored.Unknown,
- "argv <- list(structure(c(978307200, 978912000, 979516800, 980121600, 980726400, 981331200, 981936000, 982540800, 983145600, 983750400), class = c('POSIXct', 'POSIXt'), tzone = 'GMT'));as.character(argv[[1]]);");
+ assertEval("argv <- list(structure(c(978307200, 978912000, 979516800, 980121600, 980726400, 981331200, 981936000, 982540800, 983145600, 983750400), class = c('POSIXct', 'POSIXt'), tzone = 'GMT'));as.character(argv[[1]]);");
}
@Test
@@ -234,7 +230,7 @@ public class TestrGenBuiltinascharacter extends TestBase {
@Test
public void testascharacter42() {
- assertEval(Ignored.Unknown, "argv <- list(structure(c(12784, 13879), class = 'Date'));as.character(argv[[1]]);");
+ assertEval("argv <- list(structure(c(12784, 13879), class = 'Date'));as.character(argv[[1]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinattr.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinattr.java
index a3ec13ad1e..8f613e98f8 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinattr.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinattr.java
@@ -174,7 +174,7 @@ public class TestrGenBuiltinattr extends TestBase {
@Test
public void testattr32() {
- assertEval(Ignored.Unknown, "argv <- list(structure(1:10, date = structure(200171400, class = c('POSIXct', 'POSIXt'), tzone = ''), class = 'stamped'), 'date');attr(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(1:10, date = structure(200171400, class = c('POSIXct', 'POSIXt'), tzone = ''), class = 'stamped'), 'date');attr(argv[[1]],argv[[2]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltindfltWarn.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltindfltWarn.java
index edf0620c0f..a5f28bbb9b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltindfltWarn.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltindfltWarn.java
@@ -24,12 +24,13 @@ public class TestrGenBuiltindfltWarn extends TestBase {
@Test
public void testdfltWarn2() {
- assertEval(Ignored.Unknown, "argv <- list('bessel_y(2,nu=288.12): precision lost in result', quote(besselY(2, nu = nu <- seq(3, 300, len = 51)))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
+ assertEval(Output.ContainsWarning,
+ "argv <- list('bessel_y(2,nu=288.12): precision lost in result', quote(besselY(2, nu = nu <- seq(3, 300, len = 51)))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
}
@Test
public void testdfltWarn3() {
- assertEval(Ignored.Unknown, Output.ContainsWarning, "argv <- list('glm.fit: algorithm stopped at boundary value', NULL); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
+ assertEval(Output.ContainsWarning, "argv <- list('glm.fit: algorithm stopped at boundary value', NULL); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
}
@Test
@@ -40,13 +41,13 @@ public class TestrGenBuiltindfltWarn extends TestBase {
@Test
public void testdfltWarn5() {
- assertEval(Ignored.Unknown, Output.ContainsWarning,
+ assertEval(Output.ContainsWarning,
"argv <- list('‘graphics’ namespace cannot be unloaded:\\n namespace ‘graphics’ is imported by ‘stats’ so cannot be unloaded', NULL); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
}
@Test
public void testdfltWarn6() {
- assertEval(Ignored.Unknown, "argv <- list('NaNs produced', quote(log(ifelse(y == 0, 1, y/mu)))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
+ assertEval("argv <- list('NaNs produced', quote(log(ifelse(y == 0, 1, y/mu)))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinextract_parentasis_Date.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinextract_parentasis_Date.java
index 5f1441ddcb..7181cc093d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinextract_parentasis_Date.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinextract_parentasis_Date.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,7 +19,6 @@ public class TestrGenBuiltinextract_parentasis_Date extends TestBase {
@Test
public void testextract_parentasis_Date1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(x = structure(c(14579, 14580), class = 'Date'), 2), .Names = c('x', ''));do.call('[.Date', argv)");
+ assertEval("argv <- structure(list(x = structure(c(14579, 14580), class = 'Date'), 2), .Names = c('x', ''));do.call('[.Date', argv)");
}
-
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinminus_Date.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinminus_Date.java
index 8c6f6c08e7..d22089f50a 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinminus_Date.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinminus_Date.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,8 +19,6 @@ public class TestrGenBuiltinminus_Date extends TestBase {
@Test
public void testminus_Date1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(e1 = structure(14580, class = 'Date'), e2 = structure(1, units = 'days', class = 'difftime')), .Names = c('e1', 'e2'));"
- + "do.call('-.Date', argv)");
+ assertEval("argv <- structure(list(e1 = structure(14580, class = 'Date'), e2 = structure(1, units = 'days', class = 'difftime')), .Names = c('e1', 'e2'));" + "do.call('-.Date', argv)");
}
-
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinoperators.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinoperators.java
index 214f27a856..8ec2545b87 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinoperators.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinoperators.java
@@ -1139,7 +1139,7 @@ public class TestrGenBuiltinoperators extends TestBase {
@Test
public void testoperators220() {
- assertEval(Ignored.Unknown, "argv <- list(structure(11323, class = 'Date'), c(12, 24, 36, 48, 60, 72, 84, 96, 108));`+`(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(11323, class = 'Date'), c(12, 24, 36, 48, 60, 72, 84, 96, 108));`+`(argv[[1]],argv[[2]]);");
}
@Test
@@ -1217,7 +1217,7 @@ public class TestrGenBuiltinoperators extends TestBase {
@Test
public void testoperators236() {
- assertEval(Ignored.Unknown, "argv <- list(structure(1395082079.75887, class = c('POSIXct', 'POSIXt')), 3600);`-`(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(1395082079.75887, class = c('POSIXct', 'POSIXt')), 3600);`-`(argv[[1]],argv[[2]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinplus_Date.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinplus_Date.java
index 7ca1c12664..8c10e7c146 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinplus_Date.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinplus_Date.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,8 +19,6 @@ public class TestrGenBuiltinplus_Date extends TestBase {
@Test
public void testplus_Date1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(e1 = structure(1, units = 'days', class = 'difftime'), e2 = structure(14579, class = 'Date')), .Names = c('e1', 'e2'));"
- + "do.call('+.Date', argv)");
+ assertEval("argv <- structure(list(e1 = structure(1, units = 'days', class = 'difftime'), e2 = structure(14579, class = 'Date')), .Names = c('e1', 'e2'));" + "do.call('+.Date', argv)");
}
-
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinstrptime.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinstrptime.java
index efb7e9a4f3..ed0f6e7c01 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinstrptime.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinstrptime.java
@@ -59,8 +59,7 @@ public class TestrGenBuiltinstrptime extends TestBase {
@Test
public void teststrptime9() {
- assertEval(Ignored.Unimplemented,
- "argv <- list(c('1890/01/01', '1891/01/01', '1892/01/01', '1893/01/01', '1894/01/01', '1895/01/01'), '%Y/%m/%d', ''); .Internal(strptime(argv[[1]], argv[[2]], argv[[3]]))");
+ assertEval("argv <- list(c('1890/01/01', '1891/01/01', '1892/01/01', '1893/01/01', '1894/01/01', '1895/01/01'), '%Y/%m/%d', ''); .Internal(strptime(argv[[1]], argv[[2]], argv[[3]]))");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinsubset.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinsubset.java
index 1f669bb780..b14d3ccb8f 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinsubset.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinsubset.java
@@ -135,8 +135,7 @@ public class TestrGenBuiltinsubset extends TestBase {
@Test
public void testsubset23() {
- assertEval(Ignored.Unknown,
- "argv <- list(structure(list(Fertility = c(80.2, 83.1, 92.5, 85.8, 76.9), Agriculture = c(17, 45.1, 39.7, 36.5, 43.5), Examination = c(15L, 6L, 5L, 12L, 17L), Education = c(12L, 9L, 5L, 7L, 15L)), .Names = c('Fertility', 'Agriculture', 'Examination', 'Education'), row.names = c('Courtelary', 'Delemont', 'Franches-Mnt', 'Moutier', 'Neuveville'), class = 'data.frame'), 'Ferti');.subset(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(list(Fertility = c(80.2, 83.1, 92.5, 85.8, 76.9), Agriculture = c(17, 45.1, 39.7, 36.5, 43.5), Examination = c(15L, 6L, 5L, 12L, 17L), Education = c(12L, 9L, 5L, 7L, 15L)), .Names = c('Fertility', 'Agriculture', 'Examination', 'Education'), row.names = c('Courtelary', 'Delemont', 'Franches-Mnt', 'Moutier', 'Neuveville'), class = 'data.frame'), 'Ferti');.subset(argv[[1]],argv[[2]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinsubset2.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinsubset2.java
index 6eaf9bb991..a3cfd3b7fe 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinsubset2.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinsubset2.java
@@ -81,7 +81,7 @@ public class TestrGenBuiltinsubset2 extends TestBase {
@Test
public void testsubset214() {
- assertEval(Ignored.Unknown, "argv <- list(structure(list(mtime = structure(1395082258.61787, class = c('POSIXct', 'POSIXt'))), .Names = 'mtime'), 1L);.subset2(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(list(mtime = structure(1395082258.61787, class = c('POSIXct', 'POSIXt'))), .Names = 'mtime'), 1L);.subset2(argv[[1]],argv[[2]]);");
}
@Test
@@ -158,7 +158,7 @@ public class TestrGenBuiltinsubset2 extends TestBase {
@Test
public void testsubset229() {
- assertEval(Ignored.Unknown, "argv <- list(structure(list(mtime = structure(1342423171, class = c('POSIXct', 'POSIXt'))), .Names = 'mtime'), 1L);.subset2(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(list(mtime = structure(1342423171, class = c('POSIXct', 'POSIXt'))), .Names = 'mtime'), 1L);.subset2(argv[[1]],argv[[2]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltintruncDate.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltintruncDate.java
index 524c2fad64..0b8166e32e 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltintruncDate.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltintruncDate.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,7 +19,6 @@ public class TestrGenBuiltintruncDate extends TestBase {
@Test
public void testtruncDate1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(x = structure(-3620.8, class = 'Date')), .Names = 'x');do.call('trunc.Date', argv)");
+ assertEval("argv <- structure(list(x = structure(-3620.8, class = 'Date')), .Names = 'x');do.call('trunc.Date', argv)");
}
-
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinweekdaysDate.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinweekdaysDate.java
index a1b27753f9..71966727ce 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinweekdaysDate.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/testrgen/TestrGenBuiltinweekdaysDate.java
@@ -2,7 +2,7 @@
* This material is distributed under the GNU General Public License
* Version 2. You may review the terms of this license at
* http://www.gnu.org/licenses/gpl-2.0.html
- *
+ *
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, Oracle and/or its affiliates
* All rights reserved.
@@ -19,7 +19,6 @@ public class TestrGenBuiltinweekdaysDate extends TestBase {
@Test
public void testweekdaysDate1() {
- assertEval(Ignored.Unknown, "argv <- structure(list(x = structure(16352, class = 'Date')), .Names = 'x');do.call('weekdays.Date', argv)");
+ assertEval("argv <- structure(list(x = structure(16352, class = 'Date')), .Names = 'x');do.call('weekdays.Date', argv)");
}
-
}
--
GitLab