From e80b4f6d0018b6725234074269cc9c479a504709 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Fri, 13 May 2016 15:29:38 +0200
Subject: [PATCH] fix BinaryBooleanNodeTest to properly recognize empty logical
vectors
---
.../oracle/truffle/r/nodes/test/BinaryBooleanNodeTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/test/BinaryBooleanNodeTest.java b/com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/test/BinaryBooleanNodeTest.java
index c706cf0580..5403b51d50 100644
--- a/com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/test/BinaryBooleanNodeTest.java
+++ b/com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/test/BinaryBooleanNodeTest.java
@@ -211,15 +211,14 @@ public class BinaryBooleanNodeTest extends BinaryVectorTest {
RAbstractVector vector = originalVector.copy();
assumeFalse(isLogicOp(factory));
assumeFalse(vector.getRType() == RType.Raw);
- RAbstractVector result = createEmptyLogicalVector();
- assertThat(executeArithmetic(factory, vector, RNull.instance), is(result));
- assertThat(executeArithmetic(factory, RNull.instance, vector), is(result));
+ assertThat(executeArithmetic(factory, vector, RNull.instance), isEmptyVectorOf(RType.Logical));
+ assertThat(executeArithmetic(factory, RNull.instance, vector), isEmptyVectorOf(RType.Logical));
}
@Theory
public void testBothNull(BooleanOperationFactory factory) {
assumeFalse(isLogicOp(factory));
- assertThat(executeArithmetic(factory, RNull.instance, RNull.instance), is(createEmptyLogicalVector()));
+ assertThat(executeArithmetic(factory, RNull.instance, RNull.instance), isEmptyVectorOf(RType.Logical));
}
@Theory
--
GitLab