Skip to content
Snippets Groups Projects
Commit abb83ad5 authored by Lukas Stadler's avatar Lukas Stadler
Browse files

enable passing tests

parent ce1b5bf3
Branches
No related tags found
No related merge requests found
Showing
with 12 additions and 19 deletions
......@@ -627,7 +627,7 @@ public class CastBuilderTest {
assertEquals(value, cast(value));
}
private void assertVectorEquals(RAbstractVector expected, Object actualObj) {
private static void assertVectorEquals(RAbstractVector expected, Object actualObj) {
RAbstractVector actual = (RAbstractVector) actualObj;
assertEquals("vectors differ in size", expected.getLength(), actual.getLength());
for (int i = 0; i < expected.getLength(); i++) {
......@@ -635,10 +635,6 @@ public class CastBuilderTest {
}
}
private void assertCastWarning(Object value, Object expectedValue) {
assertCastWarning(value, expectedValue, String.format(RError.Message.INVALID_ARGUMENT.message, "x"));
}
private void assertCastWarning(Object value, Object expectedValue, String expectedMessage) {
assertEquals(expectedValue, cast(value));
assertEquals("Expected warning message", expectedMessage, CastNode.getLastWarning());
......
......@@ -35,7 +35,7 @@ public class TestBuiltin_bitwiseAnd extends TestBase {
assertEval("{ bitwAnd(c(10.5,11.6,17.8), c(5L,7L,8L)) }");
assertEval(Output.IgnoreErrorContext, "{ bitwAnd(NULL, NULL) }");
assertEval(Ignored.Unknown, "{ bitwAnd(c(), c(1,2,3)) }");
assertEval(Output.IgnoreErrorContext, Output.IgnoreErrorMessage, "{ bitwAnd(c(), c(1,2,3)) }");
// Error message mismatch
assertEval(Output.IgnoreErrorMessage, "{ bitwAnd(c(1,2,3,4), c(TRUE)) }");
}
......
......@@ -19,14 +19,12 @@ public class TestBuiltin_det extends TestBase {
@Test
public void testdet1() {
assertEval(Ignored.Unknown,
"argv <- list(structure(c(FALSE, TRUE, TRUE, FALSE), .Dim = c(2L, 2L), .Dimnames = list(c('A', 'B'), c('A', 'B'))), TRUE); .Internal(det_ge_real(argv[[1]], argv[[2]]))");
assertEval("argv <- list(structure(c(FALSE, TRUE, TRUE, FALSE), .Dim = c(2L, 2L), .Dimnames = list(c('A', 'B'), c('A', 'B'))), TRUE); .Internal(det_ge_real(argv[[1]], argv[[2]]))");
}
@Test
public void testdet2() {
assertEval(Ignored.Unknown,
"argv <- list(structure(c(TRUE, TRUE, TRUE, TRUE), .Dim = c(2L, 2L), .Dimnames = list(c('A', 'B'), c('A', 'B'))), TRUE); .Internal(det_ge_real(argv[[1]], argv[[2]]))");
assertEval("argv <- list(structure(c(TRUE, TRUE, TRUE, TRUE), .Dim = c(2L, 2L), .Dimnames = list(c('A', 'B'), c('A', 'B'))), TRUE); .Internal(det_ge_real(argv[[1]], argv[[2]]))");
}
@Test
......
......@@ -74,8 +74,7 @@ public class TestBuiltin_dimnamesassign extends TestBase {
@Test
public void testdimnamesassign12() {
assertEval(Ignored.Unknown,
"argv <- list(structure(list(fair = c(326L, 688L, 343L, 98L), red = c(38L, 116L, 84L, 48L), medium = c(241L, 584L, 909L, 403L), dark = c(110L, 188L, 412L, 681L), black = c(3L, 4L, 26L, 85L)), .Names = c('fair', 'red', 'medium', 'dark', 'black'), class = 'data.frame', row.names = c('blue', 'light', 'medium', 'dark')), value = list(c('blue', 'light', 'medium', 'dark'), c('F', 'R', 'M', 'D', 'B')));`dimnames<-`(argv[[1]],argv[[2]]);");
assertEval("argv <- list(structure(list(fair = c(326L, 688L, 343L, 98L), red = c(38L, 116L, 84L, 48L), medium = c(241L, 584L, 909L, 403L), dark = c(110L, 188L, 412L, 681L), black = c(3L, 4L, 26L, 85L)), .Names = c('fair', 'red', 'medium', 'dark', 'black'), class = 'data.frame', row.names = c('blue', 'light', 'medium', 'dark')), value = list(c('blue', 'light', 'medium', 'dark'), c('F', 'R', 'M', 'D', 'B')));`dimnames<-`(argv[[1]],argv[[2]]);");
}
@Test
......
......@@ -46,7 +46,7 @@ public class TestBuiltin_lengthassign extends TestBase {
public void testlengthassign6() {
assertEval("argv <- list(list(), value = 0L);`length<-`(argv[[1]],argv[[2]]);");
assertEval(Ignored.Unknown, "argv <- structure(list(1:3, value = TRUE), .Names = c('', 'value'));do.call('length<-', argv)");
assertEval(Output.IgnoreErrorContext, "argv <- structure(list(1:3, value = TRUE), .Names = c('', 'value'));do.call('length<-', argv)");
}
@Test
......
......@@ -45,7 +45,7 @@ public class TestBuiltin_options extends TestBase {
@Test
public void testOptions() {
assertEval("{ getOption(NULL) }");
assertEval(Output.IgnoreErrorContext, Ignored.ImplementationError, "{ getOption(character()) }");
assertEval("{ getOption(character()) }");
assertEval("{ options(\"timeout\", \"width\") }");
}
}
......@@ -44,7 +44,7 @@ public class TestBuiltin_qr extends TestBase {
assertEval(Ignored.Unknown, "{ round( qr(matrix(1:6,nrow=2), LAPACK=TRUE)$qr, digits=5) }");
// qr.coef
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ x <- qr(cbind(1:10,2:11), LAPACK=TRUE) ; qr.coef(x, 1:2) }");
assertEval(Output.IgnoreErrorContext, "{ x <- qr(cbind(1:10,2:11), LAPACK=TRUE) ; qr.coef(x, 1:2) }");
assertEval(Ignored.Unknown, " { x <- qr(cbind(1:10,2:11), LAPACK=TRUE) ; round( qr.coef(x, 1:10), digits=5 ) }");
assertEval(Ignored.Unknown, "{ x <- qr(c(3,1,2), LAPACK=TRUE) ; round( qr.coef(x, c(1,3,2)), digits=5 ) }");
// FIXME: GNU-R will print negative zero as zero
......
......@@ -33,7 +33,7 @@ public class TestBuiltin_rm extends TestBase {
assertEval("tmp <- 42; rm(tmp); tmp");
assertEval("tmp <- 42; rm(list='tmp'); tmp");
assertEval(" e <- new.env(); e$a <- 42; rm(list='a', envir=e); e$a");
assertEval(Ignored.Unimplemented, "tmp <- 42; f <- function() rm(list='tmp',inherits=T); f(); tmp");
assertEval(Output.IgnoreErrorContext, "tmp <- 42; f <- function() rm(list='tmp',inherits=T); f(); tmp");
}
@Test
......
......@@ -148,7 +148,7 @@ public class TestFunctions extends TestBase {
assertEval("{ f <- function(a,b,c,d) { a + b } ; f(1,x=1,2,3,4) }");
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ x<-function(y, b){1} ; x(y=1, 2, 3, z = 5) }");
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ x<-function(a){1} ; x(1,) }");
assertEval("{ x<-function(a){1} ; x(1,) }");
// note exactly GNU-R message
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(a,a) {1} }");
......@@ -331,7 +331,7 @@ public class TestFunctions extends TestBase {
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ lapply(1:3, \"dummy\") }");
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(a, barg, bextra, dummy) { a + barg } ; g <- function(...) { f(a=1, ..., x=2,z=3) } ; g(1) }");
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(a, barg, bextra, dummy) { a + barg } ; g <- function(...) { f(a=1, ...,,,) } ; g(1) }");
assertEval("{ f <- function(a, barg, bextra, dummy) { a + barg } ; g <- function(...) { f(a=1, ...,,,) } ; g(1) }");
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(...) { ..2 + ..2 } ; f(1,,2) }");
assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(...) { ..1 + ..2 } ; f(1,,3) }");
}
......
......@@ -307,7 +307,7 @@ public class TestSimpleArithmetic extends TestBase {
public void testVectorsComplex() {
assertEval("{ 1:4+c(1,2+2i) }");
assertEval("{ c(1,2+2i)+1:4 }");
assertEval(Ignored.ImplementationError, "x <- c(NaN, 3+2i); xre <- Re(x); xim <- (0+1i) * Im(x); xre + xim");
assertEval("x <- c(NaN, 3+2i); xre <- Re(x); xim <- (0+1i) * Im(x); xre + xim");
}
@Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment