From 0391212cbb098cd7c3a0f301588d8b802942c993 Mon Sep 17 00:00:00 2001 From: Florian Angerer <florian.angerer@oracle.com> Date: Wed, 15 Nov 2017 14:17:19 +0100 Subject: [PATCH] TestRRNG cleanup. --- .../truffle/r/test/ExpectedTestOutput.test | 16 ---------------- .../com/oracle/truffle/r/test/rng/TestRRNG.java | 4 ++-- 2 files changed, 2 insertions(+), 18 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 44e7089ee7..e606f005be 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 @@ -167873,22 +167873,6 @@ non-integer value 12345678909876543212L qualified with L; using numeric value [619] -346017954 -1916029881 -1735526436 1461823277 580724746 -622095869 [625] -686746776 705745481 -##com.oracle.truffle.r.test.rng.TestRRNG.testDirectSeedAssignment#Output.MayIgnoreWarningContext# -#.Random.seed <- c(401, 1, 2); invisible(runif(3)) -Warning message: -In runif(3) : - '.Random.seed' is not an integer vector but of type 'double', so ignored - -##com.oracle.truffle.r.test.rng.TestRRNG.testDirectSeedAssignment# -#.Random.seed <- c(401L, 1L, 2L); runif(3) -[1] 0.5641106 0.2932388 0.6696743 - -##com.oracle.truffle.r.test.rng.TestRRNG.testDirectSeedAssignment#Output.MayIgnoreWarningContext# -#.Random.seed <- c(999, 1, 2); invisible(runif(3)) -Warning message: -In runif(3) : - '.Random.seed' is not an integer vector but of type 'double', so ignored - ##com.oracle.truffle.r.test.rng.TestRRNG.testGeneratorChange# #RNGkind('Marsaglia-Multicarry'); RNGkind('Mersenne-Twister'); set.seed(2); runif(5); [1] 0.1848823 0.7023740 0.5733263 0.1680519 0.9438393 diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rng/TestRRNG.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rng/TestRRNG.java index 13d90a9fd5..3fe3ed89c3 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rng/TestRRNG.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rng/TestRRNG.java @@ -32,9 +32,9 @@ public class TestRRNG extends TestBase { // changes generator to MarsagliaMulticarry and sets its 2 seeds assertEval(".Random.seed <- c(401L, 1L, 2L); runif(3)"); // wrong values: not integer - assertEval(Output.MayIgnoreWarningContext, ".Random.seed <- c(401, 1, 2); invisible(runif(3))"); + assertEval(".Random.seed <- c(401, 1, 2); invisible(runif(3))"); // wrong values: wrong generator number - assertEval(Output.MayIgnoreWarningContext, ".Random.seed <- c(999, 1, 2); invisible(runif(3))"); + assertEval(".Random.seed <- c(999, 1, 2); invisible(runif(3))"); } @Test -- GitLab