From e14480be9061906bc739c33de63d77456bd4889e Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Wed, 16 Mar 2016 17:37:39 +0100
Subject: [PATCH] enable passing tests
---
.../truffle/r/test/ExpectedTestOutput.test | 32 +++++++++----------
.../r/test/builtins/TestBuiltin_Im.java | 6 ++--
.../r/test/builtins/TestBuiltin_Re.java | 4 +--
.../r/test/builtins/TestBuiltin_c.java | 9 +++---
.../r/test/builtins/TestBuiltin_list.java | 3 +-
.../test/builtins/TestBuiltin_operators.java | 8 ++---
.../r/test/builtins/TestBuiltin_subset2.java | 3 +-
.../test/builtins/TestBuiltin_substitute.java | 4 +--
.../r/test/builtins/TestBuiltin_xtfrm.java | 6 ++--
.../test/library/base/TestSimpleVectors.java | 24 +++++++-------
.../r/test/library/stats/TestStats.java | 12 +++----
11 files changed, 53 insertions(+), 58 deletions(-)
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
index 74b740ab41..f77fbc3e9d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
@@ -104169,6 +104169,22 @@ In qnorm(c(0.1, 0.9, 0.5, 1.00001, 0.99999), 100, c(20, 1)) : NaNs produced
[616] 0.792576218 -0.949076754 0.904786982 -0.340110408 1.531007499
[621] 0.389403389 0.495981980 0.644858676 -0.043764773 -1.356868729
+##com.oracle.truffle.r.test.library.stats.TestStats.testRandom
+#{ set.seed(7); round( rbinom(3,10,(1:5)/5), digits = 5 ) }
+[1] 5 4 8
+
+##com.oracle.truffle.r.test.library.stats.TestStats.testRandom
+#{ set.seed(7); round( rbinom(3,3,0.9), digits = 5 ) }
+[1] 1 3 3
+
+##com.oracle.truffle.r.test.library.stats.TestStats.testRandom
+#{ set.seed(7); round( runif(3), digits = 5 ) }
+[1] 0.98891 0.39775 0.11570
+
+##com.oracle.truffle.r.test.library.stats.TestStats.testRandom
+#{ set.seed(7); round( runif(3,1,10), digits = 5 ) }
+[1] 9.90018 4.57971 2.04128
+
##com.oracle.truffle.r.test.library.stats.TestStats.testRandom
#{ set.seed(7); runif(10) }
[1] 0.98890930 0.39774545 0.11569778 0.06974868 0.24374939 0.79201043
@@ -104306,14 +104322,6 @@ In qnorm(c(0.1, 0.9, 0.5, 1.00001, 0.99999), 100, c(20, 1)) : NaNs produced
#{ set.seed(9567, "Marsaglia-Multicarry"); sum(runif(100)) }
[1] 52.92218
-##com.oracle.truffle.r.test.library.stats.TestStats.testRandomIgnore
-#{ set.seed(7); round( rbinom(3,10,(1:5)/5), digits = 5 ) }
-[1] 5 4 8
-
-##com.oracle.truffle.r.test.library.stats.TestStats.testRandomIgnore
-#{ set.seed(7); round( rbinom(3,3,0.9), digits = 5 ) }
-[1] 1 3 3
-
##com.oracle.truffle.r.test.library.stats.TestStats.testRandomIgnore
#{ set.seed(7); round( rcauchy(3), digits = 5 ) }
[1] -0.03486 3.00509 0.38038
@@ -104346,14 +104354,6 @@ In qnorm(c(0.1, 0.9, 0.5, 1.00001, 0.99999), 100, c(20, 1)) : NaNs produced
#{ set.seed(7); round( rnorm(3,c(1000,2,3),c(10,11)), digits = 5 ) }
[1] 1022.87247 -11.16449 -3.94293
-##com.oracle.truffle.r.test.library.stats.TestStats.testRandomIgnore
-#{ set.seed(7); round( runif(3), digits = 5 ) }
-[1] 0.98891 0.39775 0.11570
-
-##com.oracle.truffle.r.test.library.stats.TestStats.testRandomIgnore
-#{ set.seed(7); round( runif(3,1,10), digits = 5 ) }
-[1] 9.90018 4.57971 2.04128
-
##com.oracle.truffle.r.test.library.stats.TestStats.testRandomIgnore
#{ set.seed(7); round( runif(3,1:3,3:2), digits = 5 ) }
[1] 2.97782 2.00000 3.00000
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Im.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Im.java
index 6538af0b39..5eb2a4baba 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Im.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Im.java
@@ -56,10 +56,10 @@ public class TestBuiltin_Im extends TestBase {
// GnuR3.1.3 probably wrongly interprets complex NAs (should be verified)
assertEval(Ignored.ReferenceError, "{ Im(as.double(NA)) }");
assertEval(Ignored.ReferenceError, "{ Im(c(1,NA,2)) }");
- assertEval(Ignored.ReferenceError, "{ Im(NA+2i) }");
+ assertEval("{ Im(NA+2i) }");
- assertEval(Ignored.Unknown, "{ x <- 1:2 ; attr(x,\"my\") <- 2 ; Im(x) }");
- assertEval(Ignored.Unknown, "{ x <- c(1+2i,3-4i) ; attr(x,\"my\") <- 2 ; Im(x) }");
+ assertEval("{ x <- 1:2 ; attr(x,\"my\") <- 2 ; Im(x) }");
+ assertEval("{ x <- c(1+2i,3-4i) ; attr(x,\"my\") <- 2 ; Im(x) }");
assertEval("{ Im(as.raw(12)) }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Re.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Re.java
index 1209b66cc4..03476d49d5 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Re.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Re.java
@@ -62,8 +62,8 @@ public class TestBuiltin_Re extends TestBase {
assertEval("{ Re(c(1,NA,2)) }");
assertEval("{ Re(NA+2i) }");
- assertEval(Ignored.Unknown, "{ x <- 1:2 ; attr(x,\"my\") <- 2 ; Re(x) }");
- assertEval(Ignored.Unknown, "{ x <- c(1+2i,3-4i) ; attr(x,\"my\") <- 2 ; Re(x) }");
+ assertEval("{ x <- 1:2 ; attr(x,\"my\") <- 2 ; Re(x) }");
+ assertEval("{ x <- c(1+2i,3-4i) ; attr(x,\"my\") <- 2 ; Re(x) }");
assertEval("{ Re(as.raw(12)) }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_c.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_c.java
index aada2706b1..592804ab26 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_c.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_c.java
@@ -83,7 +83,7 @@ public class TestBuiltin_c extends TestBase {
@Test
public void testc13() {
- assertEval(Ignored.Unknown, "argv <- list(structure(1208822400, class = c('POSIXct', 'POSIXt')), structure(1209168000, class = c('POSIXct', 'POSIXt')));c(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(1208822400, class = c('POSIXct', 'POSIXt')), structure(1209168000, class = c('POSIXct', 'POSIXt')));c(argv[[1]],argv[[2]]);");
}
@Test
@@ -222,7 +222,7 @@ public class TestBuiltin_c extends TestBase {
@Test
public void testc39() {
- assertEval(Ignored.Unknown, "argv <- list(structure(list(c(1L, 2L, 4L), 1:3, c(2L, 1L)), class = c('package_version', 'numeric_version')));c(argv[[1]]);");
+ assertEval("argv <- list(structure(list(c(1L, 2L, 4L), 1:3, c(2L, 1L)), class = c('package_version', 'numeric_version')));c(argv[[1]]);");
}
@Test
@@ -232,8 +232,7 @@ public class TestBuiltin_c extends TestBase {
@Test
public void testc41() {
- assertEval(Ignored.Unknown,
- "argv <- list(structure(list(1:3), class = c('package_version', 'numeric_version')), structure(list(c(2L, 1L)), class = c('package_version', 'numeric_version')));c(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(list(1:3), class = c('package_version', 'numeric_version')), structure(list(c(2L, 1L)), class = c('package_version', 'numeric_version')));c(argv[[1]],argv[[2]]);");
}
@Test
@@ -351,7 +350,7 @@ public class TestBuiltin_c extends TestBase {
@Test
public void testc64() {
- assertEval(Ignored.Unknown, "argv <- list(structure(1386393974.25184, class = c('POSIXct', 'POSIXt')), structure(1386393974.25184, class = c('POSIXct', 'POSIXt')));c(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(1386393974.25184, class = c('POSIXct', 'POSIXt')), structure(1386393974.25184, class = c('POSIXct', 'POSIXt')));c(argv[[1]],argv[[2]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_list.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_list.java
index c97c287223..0ab197a2c3 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_list.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_list.java
@@ -64,8 +64,7 @@ public class TestBuiltin_list extends TestBase {
@Test
public void testlist9() {
- assertEval(Ignored.Unknown,
- "argv <- list(label = '', x = structure(0.5, unit = 'npc', valid.unit = 0L, class = 'unit'), y = structure(0.5, unit = 'npc', valid.unit = 0L, class = 'unit'), just = 'centre', hjust = NULL, vjust = NULL, rot = 0, check.overlap = FALSE, name = NULL, gp = structure(list(), class = 'gpar'), vp = NULL);list(argv[[1]],argv[[2]],argv[[3]],argv[[4]],argv[[5]],argv[[6]],argv[[7]],argv[[8]],argv[[9]],argv[[10]],argv[[11]]);");
+ assertEval("argv <- list(label = '', x = structure(0.5, unit = 'npc', valid.unit = 0L, class = 'unit'), y = structure(0.5, unit = 'npc', valid.unit = 0L, class = 'unit'), just = 'centre', hjust = NULL, vjust = NULL, rot = 0, check.overlap = FALSE, name = NULL, gp = structure(list(), class = 'gpar'), vp = NULL);list(argv[[1]],argv[[2]],argv[[3]],argv[[4]],argv[[5]],argv[[6]],argv[[7]],argv[[8]],argv[[9]],argv[[10]],argv[[11]]);");
}
@Test
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
index a7e4d902b2..fc799b1098 100644
--- 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
@@ -1555,8 +1555,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators308() {
- // GnuR formats !argv[[1]] not as a call
- assertEval(Ignored.WrongCaller, "argv <- list(list());`|`(argv[[1]]);");
+ assertEval(Output.ContainsError, "argv <- list(list());`|`(argv[[1]]);");
}
@Test
@@ -1699,7 +1698,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators335() {
- assertEval(Ignored.Unknown, "argv <- list(structure(numeric(0), .Dim = c(0L, 0L)));`&`(argv[[1]]);");
+ assertEval(Output.ContainsError, "argv <- list(structure(numeric(0), .Dim = c(0L, 0L)));`&`(argv[[1]]);");
}
@Test
@@ -1746,8 +1745,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators344() {
- // GnuR formats as &argv[[1]] not as a call
- assertEval(Ignored.WrongCaller, "argv <- list(list());`&`(argv[[1]]);");
+ assertEval(Output.ContainsError, "argv <- list(list());`&`(argv[[1]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_subset2.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_subset2.java
index 8e63240b74..ff797f01db 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_subset2.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_subset2.java
@@ -149,8 +149,7 @@ public class TestBuiltin_subset2 extends TestBase {
@Test
public void testsubset228() {
- assertEval(Ignored.Unknown,
- "argv <- list(structure(list(Df = c(NA, 1, 1, 1, 1), `Sum of Sq` = c(NA, 25.9509113775335, 2.97247824113524, 0.109090049888117, 0.246974722154086), RSS = c(47.863639350499, 73.8145507280325, 50.8361175916342, 47.9727294003871, 48.1106140726531), AIC = c(26.9442879283302, 30.5758847476115, 25.7275503692601, 24.9738836085411, 25.0111950072736)), .Names = c('Df', 'Sum of Sq', 'RSS', 'AIC'), row.names = c('<none>', '- x1', '- x2', '- x3', '- x4'), class = c('anova', 'data.frame')), 2L);.subset2(argv[[1]],argv[[2]]);");
+ assertEval("argv <- list(structure(list(Df = c(NA, 1, 1, 1, 1), `Sum of Sq` = c(NA, 25.9509113775335, 2.97247824113524, 0.109090049888117, 0.246974722154086), RSS = c(47.863639350499, 73.8145507280325, 50.8361175916342, 47.9727294003871, 48.1106140726531), AIC = c(26.9442879283302, 30.5758847476115, 25.7275503692601, 24.9738836085411, 25.0111950072736)), .Names = c('Df', 'Sum of Sq', 'RSS', 'AIC'), row.names = c('<none>', '- x1', '- x2', '- x3', '- x4'), class = c('anova', 'data.frame')), 2L);.subset2(argv[[1]],argv[[2]]);");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_substitute.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_substitute.java
index 93df387765..662a901327 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_substitute.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_substitute.java
@@ -65,10 +65,10 @@ public class TestBuiltin_substitute extends TestBase {
assertEval("{ f <- function(expra, exprb) { substitute(expra + exprb) } ; f(a * b, a + b) }");
assertEval("{ f <- function(z) { g <- function(y) { substitute(y) } ; g(z) } ; f(a + d) }");
- assertEval(Ignored.ReferenceError, "{ substitute(a[x], list(a = quote(x + y), x = 1)) }");
+ assertEval("{ substitute(a[x], list(a = quote(x + y), x = 1)) }");
assertEval("{ substitute(x <- x + 1, list(x = 1) }");
- assertEval(Ignored.Unknown, "{ f <- function(y) { substitute(y) } ; f() }");
+ assertEval("{ f <- function(y) { substitute(y) } ; f() }");
assertEval(Ignored.Unknown, "{ substitute(function(x, a) { x + a }, list(a = quote(x + y), x = 1)) }");
// GNU R generates warning here, but the test has been included nevertheless to make sure
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_xtfrm.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_xtfrm.java
index 9408f2d0bf..bf17cad560 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_xtfrm.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_xtfrm.java
@@ -24,17 +24,17 @@ public class TestBuiltin_xtfrm extends TestBase {
@Test
public void testxtfrm2() {
- assertEval(Ignored.Unknown, "argv <- list(structure(c('Tukey', 'Venables', 'Tierney', 'Ripley', 'Ripley', 'McNeil', 'R Core'), class = 'AsIs'));xtfrm(argv[[1]]);");
+ assertEval("argv <- list(structure(c('Tukey', 'Venables', 'Tierney', 'Ripley', 'Ripley', 'McNeil', 'R Core'), class = 'AsIs'));xtfrm(argv[[1]]);");
}
@Test
public void testxtfrm3() {
- assertEval(Ignored.Unknown, "argv <- list(c('9', '9', '8', '7', '6', '5', '4', '3', '2', '1'));xtfrm(argv[[1]]);");
+ assertEval("argv <- list(c('9', '9', '8', '7', '6', '5', '4', '3', '2', '1'));xtfrm(argv[[1]]);");
}
@Test
public void testxtfrm4() {
- assertEval(Ignored.Unknown, "argv <- list(list());xtfrm(argv[[1]]);");
+ assertEval("argv <- list(list());xtfrm(argv[[1]]);");
}
@Test
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
index 6a95850026..0e2271dfed 100644
--- 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
@@ -633,7 +633,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-list(data=list(matrix(1:4, ncol=2))); x$data[[1]][2,2]<-42; x }");
assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-NULL }");
- assertEval(Ignored.Unstable, Output.ContainsError, "{ x<-1:4; x[[1]]<-NULL; x }");
+ assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; x[[1]]<-NULL; x }");
assertEval("{ f<-function(x,y) sys.call(); x<-f(7, 42); x[c(1,2)] }");
assertEval("{ f<-function(x,y) sys.call(); x<-f(7, 42); typeof(x[c(1,2)]) }");
@@ -648,20 +648,20 @@ public class TestSimpleVectors extends TestBase {
* or some type-error, e.g. "incompatible types (from NULL to double) in [[ assignment". We
* could address this with a whitelist.
*/
- assertEval(Ignored.Unstable, Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1,1]]<-NULL; x }");
- assertEval(Ignored.Unstable, Output.ContainsError, "{ b<-as.list(3:5); dim(b) <- c(1,3) ; b[[c(1,2)]] <- NULL ; b }");
- assertEval(Ignored.Unstable, Output.ContainsError, "{ x<-c(1,2,3); x[[-4]]<-NULL }");
+ assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1,1]]<-NULL; x }");
+ assertEval(Output.ContainsAmbiguousError, "{ b<-as.list(3:5); dim(b) <- c(1,3) ; b[[c(1,2)]] <- NULL ; b }");
+ assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3); x[[-4]]<-NULL }");
// this came from testRawIndex
// weird problems with fluctuating error messages in GNU R
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x<-1:4; x[[0]]<-NULL; x }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ b<-3:5; dim(b) <- c(1,3) ; b[[c(1)]] <- NULL ; b }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ b<-3:5; dim(b) <- c(1,3) ; b[[0]] <- NULL ; b }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x <- integer() ; x[[NA]] <- NULL ; x }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x <- c(1) ; x[[NA]] <- NULL ; x }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x <- c(1,2) ; x[[NA]] <- NULL ; x }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x <- c(1,2,3) ; x[[NA]] <- NULL ; x }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1]]<-NULL; x }");
+ assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; x[[0]]<-NULL; x }");
+ assertEval(Output.ContainsAmbiguousError, "{ b<-3:5; dim(b) <- c(1,3) ; b[[c(1)]] <- NULL ; b }");
+ assertEval(Output.ContainsAmbiguousError, "{ b<-3:5; dim(b) <- c(1,3) ; b[[0]] <- NULL ; b }");
+ assertEval(Output.ContainsAmbiguousError, "{ x <- integer() ; x[[NA]] <- NULL ; x }");
+ assertEval(Output.ContainsAmbiguousError, "{ x <- c(1) ; x[[NA]] <- NULL ; x }");
+ assertEval(Output.ContainsAmbiguousError, "{ x <- c(1,2) ; x[[NA]] <- NULL ; x }");
+ assertEval(Output.ContainsAmbiguousError, "{ x <- c(1,2,3) ; x[[NA]] <- NULL ; x }");
+ assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1]]<-NULL; x }");
// inconsistent error messages in expected output and shell
assertEval(Output.ContainsAmbiguousError, "{ x <- c(1); x[[-4]] <- NULL }");
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
index 754d83b2de..f56c1ed1fb 100644
--- 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
@@ -140,23 +140,23 @@ public class TestStats extends TestBase {
assertEval("{ set.seed(7); matrix(rnorm(100), ncol=10) }");
assertEval("{ set.seed(7); matrix(rnorm(25*25), ncol=25) }");
assertEval("{ set.seed(4357, \"default\"); round( rnorm(3,1000,10), digits = 5 ) }");
+
+ assertEval("{ set.seed(7); round( runif(3), digits = 5 ) }");
+ assertEval("{ set.seed(7); round( runif(3,1,10), digits = 5 ) }");
+
+ assertEval("{ set.seed(7); round( rbinom(3,3,0.9), digits = 5 ) }");
+ assertEval("{ set.seed(7); round( rbinom(3,10,(1:5)/5), digits = 5 ) }");
}
@Test
public void testRandomIgnore() {
assertEval(Ignored.Unknown, "{ set.seed(7); round( rnorm(3,c(1000,2,3),c(10,11)), digits = 5 ) }");
-
- assertEval(Ignored.Unknown, "{ set.seed(7); round( runif(3), digits = 5 ) }");
- assertEval(Ignored.Unknown, "{ set.seed(7); round( runif(3,1,10), digits = 5 ) }");
assertEval(Ignored.Unknown, "{ set.seed(7); round( runif(3,1:3,3:2), digits = 5 ) }");
assertEval(Ignored.Unknown, "{ set.seed(7); round( rgamma(3,1), digits = 5 ) }");
assertEval(Ignored.Unknown, "{ set.seed(7); round( rgamma(3,0.5,scale=1:3), digits = 5 ) }");
assertEval(Ignored.Unknown, "{ set.seed(7); round( rgamma(3,0.5,rate=1:3), digits = 5 ) }");
- assertEval(Ignored.Unknown, "{ set.seed(7); round( rbinom(3,3,0.9), digits = 5 ) }");
- assertEval(Ignored.Unknown, "{ set.seed(7); round( rbinom(3,10,(1:5)/5), digits = 5 ) }");
-
assertEval(Ignored.Unknown, "{ set.seed(7); round( rlnorm(3), digits = 5 ) }");
assertEval(Ignored.Unknown, "{ set.seed(7); round( rlnorm(3,sdlog=c(10,3,0.5)), digits = 5 ) }");
--
GitLab