Enable r.core-tests
diff --git a/r/org.eclipse.statet.r.core-tests/META-INF/MANIFEST.MF b/r/org.eclipse.statet.r.core-tests/META-INF/MANIFEST.MF
index fdbedd1..e432757 100644
--- a/r/org.eclipse.statet.r.core-tests/META-INF/MANIFEST.MF
+++ b/r/org.eclipse.statet.r.core-tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.statet.r.core-tests
+Bundle-SymbolicName: org.eclipse.statet.r.core.tests
Bundle-Version: 4.1.0.qualifier
Bundle-Vendor: Eclipse StatET
Bundle-Name: StatET R - Core - Tests (Incubation)
diff --git a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/AbstractRValueValidatorTest.java b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/AbstractRValueValidatorTest.java
index 29045d3..cf51968 100644
--- a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/AbstractRValueValidatorTest.java
+++ b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/AbstractRValueValidatorTest.java
@@ -15,9 +15,10 @@
package org.eclipse.statet.r.core.data;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import org.junit.Assert;
import org.junit.Test;
import org.eclipse.statet.rj.data.RStore;
@@ -44,7 +45,7 @@
final RStore<?> data= this.validator.toRData(this.targetType, expression);
if (expected) {
- Assert.assertNotNull(data);
+ assertNotNull(data);
final byte storeType= data.getStoreType();
switch (this.targetType.getStoreType()) {
@@ -69,7 +70,7 @@
}
}
else {
- Assert.assertNull(data);
+ assertNull(data);
}
}
diff --git a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter03numTest.java b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter03numTest.java
index a574c1c..f48636e 100644
--- a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter03numTest.java
+++ b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter03numTest.java
@@ -14,8 +14,10 @@
package org.eclipse.statet.r.core.data;
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Test;
+import org.junit.internal.ArrayComparisonFailure;
public class RValueFormatter03numTest {
@@ -32,70 +34,70 @@
public void print() {
this.formatter.clear();
this.formatter.appendNum(0);
- Assert.assertEquals("0.0", this.formatter.getString());
+ assertEquals("0.0", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(1);
- Assert.assertEquals("1.0", this.formatter.getString());
+ assertEquals("1.0", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(10);
- Assert.assertEquals("10.0", this.formatter.getString());
+ assertEquals("10.0", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(10000);
- Assert.assertEquals("10000.0", this.formatter.getString());
+ assertEquals("10000.0", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(100000);
- Assert.assertEquals("1.0e+5", this.formatter.getString());
+ assertEquals("1.0e+5", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(1e40);
- Assert.assertEquals("1.0e+40", this.formatter.getString());
+ assertEquals("1.0e+40", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(0.1);
- Assert.assertEquals("0.1", this.formatter.getString());
+ assertEquals("0.1", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(0.001);
- Assert.assertEquals("0.001", this.formatter.getString());
+ assertEquals("0.001", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(0.0001);
- Assert.assertEquals("0.0001", this.formatter.getString());
+ assertEquals("0.0001", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(0.00001);
- Assert.assertEquals("1.0e-5", this.formatter.getString());
+ assertEquals("1.0e-5", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(1e-40);
- Assert.assertEquals("1.0e-40", this.formatter.getString());
+ assertEquals("1.0e-40", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(0.00009999999999999);
- Assert.assertEquals("9.999999999999e-5", this.formatter.getString());
+ assertEquals("9.999999999999e-5", this.formatter.getString());
}
@Test
public void printNegative() {
this.formatter.clear();
this.formatter.appendNum(-0.0);
- Assert.assertEquals("-0.0", this.formatter.getString());
+ assertEquals("-0.0", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(-1);
- Assert.assertEquals("-1.0", this.formatter.getString());
+ assertEquals("-1.0", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(-1e15);
- Assert.assertEquals("-1.0e+15", this.formatter.getString());
+ assertEquals("-1.0e+15", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(-1e-15);
- Assert.assertEquals("-1.0e-15", this.formatter.getString());
+ assertEquals("-1.0e-15", this.formatter.getString());
}
@Test
@@ -109,10 +111,15 @@
Double.MIN_VALUE
};
for (int i= 0; i < values.length; i++) {
- this.formatter.clear();
- this.formatter.appendNum(values[i]);
- final String expected= Double.toString(values[i]).toLowerCase();
- Assert.assertEquals(expected, this.formatter.getString());
+ try {
+ this.formatter.clear();
+ this.formatter.appendNum(values[i]);
+ final String expected= Double.toString(values[i]).toLowerCase();
+ assertEquals(expected, this.formatter.getString());
+ }
+ catch (final AssertionError e) {
+ throw new ArrayComparisonFailure("", e, i);
+ }
}
}
@@ -120,15 +127,15 @@
public void printSpecial() {
this.formatter.clear();
this.formatter.appendNum(Double.NaN);
- Assert.assertEquals("NaN", this.formatter.getString());
+ assertEquals("NaN", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(Double.POSITIVE_INFINITY);
- Assert.assertEquals("Inf", this.formatter.getString());
+ assertEquals("Inf", this.formatter.getString());
this.formatter.clear();
this.formatter.appendNum(Double.NEGATIVE_INFINITY);
- Assert.assertEquals("-Inf", this.formatter.getString());
+ assertEquals("-Inf", this.formatter.getString());
}
}
diff --git a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter05chrTest.java b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter05chrTest.java
index a4fb65c..64a0c24 100644
--- a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter05chrTest.java
+++ b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter05chrTest.java
@@ -14,7 +14,8 @@
package org.eclipse.statet.r.core.data;
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Test;
@@ -30,9 +31,9 @@
private void assertStringD(final String expected) {
final String s= this.formatter.getString();
- Assert.assertEquals('\"', s.charAt(0));
- Assert.assertEquals('\"', s.charAt(s.length() - 1));
- Assert.assertEquals(expected, s.substring(1, s.length() - 1));
+ assertEquals('\"', s.charAt(0));
+ assertEquals('\"', s.charAt(s.length() - 1));
+ assertEquals(expected, s.substring(1, s.length() - 1));
}
diff --git a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter06rawTest.java b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter06rawTest.java
index b142fbf..4c409df 100644
--- a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter06rawTest.java
+++ b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatter06rawTest.java
@@ -14,7 +14,8 @@
package org.eclipse.statet.r.core.data;
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Test;
@@ -32,19 +33,19 @@
public void print() {
this.formatter.clear();
this.formatter.appendRaw((byte) 0);
- Assert.assertEquals("00", this.formatter.getString());
+ assertEquals("00", this.formatter.getString());
this.formatter.clear();
this.formatter.appendRaw((byte) 1);
- Assert.assertEquals("01", this.formatter.getString());
+ assertEquals("01", this.formatter.getString());
this.formatter.clear();
this.formatter.appendRaw((byte) 0x0F);
- Assert.assertEquals("0F", this.formatter.getString());
+ assertEquals("0F", this.formatter.getString());
this.formatter.clear();
this.formatter.appendRaw((byte) 0xFF);
- Assert.assertEquals("FF", this.formatter.getString());
+ assertEquals("FF", this.formatter.getString());
}
}
diff --git a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatterValidatorTest.java b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatterValidatorTest.java
index ce35ac2..70efc25 100644
--- a/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatterValidatorTest.java
+++ b/r/org.eclipse.statet.r.core-tests/src/org/eclipse/statet/r/core/data/RValueFormatterValidatorTest.java
@@ -14,12 +14,15 @@
package org.eclipse.statet.r.core.data;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.Arrays;
import com.ibm.icu.lang.UCharacter;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.internal.ArrayComparisonFailure;
import org.eclipse.statet.rj.data.RCharacterStore;
import org.eclipse.statet.rj.data.RComplexStore;
@@ -50,14 +53,19 @@
store.setLogi(1, false);
for (int i= 0; i < store.getLength(); i++) {
- final String fString= this.formatter.format(store, i);
-// this.formatter.clear();
-// this.formatter.appendLogi(store.getNum(i));
-// final String aString= this.formatter.getString();
-
- final RStore<?> vData= this.validator.toRData(store, fString);
- Assert.assertEquals(false, vData.isNA(0));
- Assert.assertEquals(store.getLogi(i), vData.getLogi(0));
+ try {
+ final String fString= this.formatter.format(store, i);
+// this.formatter.clear();
+// this.formatter.appendLogi(store.getNum(i));
+// final String aString= this.formatter.getString();
+
+ final RStore<?> vData= this.validator.toRData(store, fString);
+ assertEquals(false, vData.isNA(0));
+ assertEquals(store.getLogi(i), vData.getLogi(0));
+ }
+ catch (final AssertionError e) {
+ throw new ArrayComparisonFailure("", e, i);
+ }
}
}
@@ -72,9 +80,9 @@
final String aString= this.formatter.getString();
final RStore<?> vData= this.validator.toRData(store, fString);
- Assert.assertEquals(true, vData.isNA(0));
+ assertEquals(true, vData.isNA(0));
- Assert.assertEquals(fString, aString);
+ assertEquals(fString, aString);
}
@Test
@@ -89,17 +97,22 @@
});
for (int i= 0; i < store.getLength(); i++) {
- final String fString= this.formatter.format(store, i);
-// this.formatter.clear();
-// this.formatter.appendInt(store.getNum(i));
-// final String aString= this.formatter.getString();
-
- final RStore<?> vData= this.validator.toRData(store, fString);
-
- Assert.assertEquals(false, vData.isNA(0));
- Assert.assertEquals(store.getNum(i), vData.getNum(0), 0);
-
-// Assert.assertEquals(fString, aString);
+ try {
+ final String fString= this.formatter.format(store, i);
+// this.formatter.clear();
+// this.formatter.appendInt(store.getNum(i));
+// final String aString= this.formatter.getString();
+
+ final RStore<?> vData= this.validator.toRData(store, fString);
+
+ assertEquals(false, vData.isNA(0));
+ assertEquals(store.getNum(i), vData.getNum(0), 0);
+
+// assertEquals(fString, aString);
+ }
+ catch (final AssertionError e) {
+ throw new ArrayComparisonFailure("", e, i);
+ }
}
}
@@ -114,9 +127,9 @@
final String aString= this.formatter.getString();
final RStore<?> vData= this.validator.toRData(store, fString);
- Assert.assertEquals(true, vData.isNA(0));
+ assertEquals(true, vData.isNA(0));
- Assert.assertEquals(fString, aString);
+ assertEquals(fString, aString);
}
@Test
@@ -143,17 +156,23 @@
});
for (int i= 0; i < store.getLength(); i++) {
- final String fString= this.formatter.format(store, i);
- this.formatter.clear();
- this.formatter.appendNum(store.getNum(i));
- final String aString= this.formatter.getString();
-
- final RStore<?> vData= this.validator.toRData(store, fString);
-
- Assert.assertEquals(false, vData.isNA(0));
- Assert.assertEquals(store.getNum(i), vData.getNum(0), 0);
-
- Assert.assertEquals(fString, aString);
+ try {
+ final String fString= this.formatter.format(store, i);
+ this.formatter.clear();
+ this.formatter.appendNum(store.getNum(i));
+ final String aString= this.formatter.getString();
+
+ final RStore<?> vData= this.validator.toRData(store, fString);
+
+ assertNotNull(vData);
+ assertEquals(false, vData.isNA(0));
+ assertEquals(store.getNum(i), vData.getNum(0), 0);
+
+ assertEquals(fString, aString);
+ }
+ catch (final AssertionError e) {
+ throw new ArrayComparisonFailure("", e, i);
+ }
}
}
@@ -168,9 +187,9 @@
final String aString= this.formatter.getString();
final RStore<?> vData= this.validator.toRData(store, fString);
- Assert.assertEquals(true, vData.isNA(0));
+ assertEquals(true, vData.isNA(0));
- Assert.assertEquals(fString, aString);
+ assertEquals(fString, aString);
}
@Test
@@ -184,9 +203,9 @@
final String aString= this.formatter.getString();
final RStore<?> vData= this.validator.toRData(store, fString);
- Assert.assertEquals(true, vData.isNA(0));
+ assertEquals(true, vData.isNA(0));
- Assert.assertEquals(fString, aString);
+ assertEquals(fString, aString);
}
@Test
@@ -216,10 +235,10 @@
final String aString= this.formatter.getString();
final RStore<?> vData= this.validator.toRData(DefaultRObjectFactory.CHR_STRUCT_DUMMY, fString);
- Assert.assertEquals(false, vData.isNA(0));
- Assert.assertEquals(s, vData.getChar(0));
+ assertEquals(false, vData.isNA(0));
+ assertEquals(s, vData.getChar(0));
- Assert.assertEquals(fString, aString);
+ assertEquals(fString, aString);
}
@Test
@@ -233,27 +252,32 @@
final String aString= this.formatter.getString();
final RStore<?> vData= this.validator.toRData(store, fString);
- Assert.assertEquals(true, vData.isNA(0));
+ assertEquals(true, vData.isNA(0));
- Assert.assertEquals(fString, aString);
+ assertEquals(fString, aString);
}
@Test
public void reparse_06raw() {
final RRawStore store= DefaultRObjectFactory.INSTANCE.createRawData(1);
for (int i= 0; i <= 0xFF; i++) {
- final byte b= (byte) i;
- store.setRaw(0, b);
- final String fString= this.formatter.format(store, 0);
- this.formatter.clear();
- this.formatter.appendRaw(b);
- final String aString= this.formatter.getString();
-
- final RStore<?> vData= this.validator.toRData(DefaultRObjectFactory.RAW_STRUCT_DUMMY, fString);
- Assert.assertEquals(false, vData.isNA(0));
- Assert.assertEquals(b, vData.getRaw(0));
-
- Assert.assertEquals(fString, aString);
+ try {
+ final byte b= (byte) i;
+ store.setRaw(0, b);
+ final String fString= this.formatter.format(store, 0);
+ this.formatter.clear();
+ this.formatter.appendRaw(b);
+ final String aString= this.formatter.getString();
+
+ final RStore<?> vData= this.validator.toRData(DefaultRObjectFactory.RAW_STRUCT_DUMMY, fString);
+ assertEquals(false, vData.isNA(0));
+ assertEquals(b, vData.getRaw(0));
+
+ assertEquals(fString, aString);
+ }
+ catch (final AssertionError e) {
+ throw new ArrayComparisonFailure("", e, i);
+ }
}
}
