Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv6966/bridge
Modified Files:
EmptyNodeTest.java FilledNodeTest.java NodeTest.java
Log Message:
See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge
Index: EmptyNodeTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/EmptyNodeTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- EmptyNodeTest.java 21 Jun 2007 15:50:23 -0000 1.16
+++ EmptyNodeTest.java 24 Sep 2008 21:28:15 -0000 1.17
@@ -44,10 +44,10 @@
}
}
- public void testGetByteValue() {
+ public void testGetBinaryValue() {
for (String element : fieldTypes) {
byte[] bytes = node.getByteValue(element + "field");
- if (element.equals("byte")) {
+ if (element.equals("binary")) {
assertTrue(bytes.length == 0);
} else if (element.equals("double")) {
assertTrue(bytes.length == 0);
Index: FilledNodeTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/FilledNodeTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- FilledNodeTest.java 23 Sep 2008 06:53:28 -0000 1.22
+++ FilledNodeTest.java 24 Sep 2008 21:28:15 -0000 1.23
@@ -84,7 +84,7 @@
public void testGetValue() {
for (String element : fieldTypes) {
Object object = node.getValue(element + "field");
- if (element.equals("byte")) {
+ if (element.equals("binary")) {
byte[] bytes = (byte[])object;
assertTrue("getValue on byte field should give 'Hello World!'
but gave '" + new String(bytes) + "'",
"Hello world!".equals(new String(bytes)));
@@ -127,10 +127,10 @@
}
}
- public void testGetByteValue() {
+ public void testGetBinaryValue() {
for (String element : fieldTypes) {
byte[] bytes = node.getByteValue(element + "field");
- if (element.equals("byte")) {
+ if (element.equals("binary")) {
byte[] check = { 72, 101, 108, 108, 111, 32, 119, 111, 114,
108, 100, 33 };
for (int j = 0; j < bytes.length; j++) {
assertTrue(bytes[j] == check[j]);
@@ -164,7 +164,7 @@
public void testGetDoubleValue() {
for (String element : fieldTypes) {
double d = node.getDoubleValue(element + "field");
- if (element.equals("byte")) {
+ if (element.equals("binary")) {
assertTrue(d == -1);
} else if (element.equals("double")) {
assertTrue(d == Double.MAX_VALUE);
@@ -196,7 +196,7 @@
public void testGetFloatValue() {
for (String element : fieldTypes) {
float f = node.getFloatValue(element + "field");
- if (element.equals("byte")) {
+ if (element.equals("binary")) {
assertTrue(f == -1);
} else if (element.equals("double")) {
assertTrue("Infinity".equals(String.valueOf(f)));
@@ -228,7 +228,7 @@
public void testGetIntValue() {
for (String element : fieldTypes) {
int integer = node.getIntValue(element + "field");
- if (element.equals("byte")) {
+ if (element.equals("binary")) {
assertTrue(integer == -1);
} else if (element.equals("double")) {
assertTrue(integer == Integer.MAX_VALUE);
@@ -260,7 +260,7 @@
public void testGetLongValue() {
for (String element : fieldTypes) {
long l = node.getLongValue(element + "field");
- if (element.equals("byte")) {
+ if (element.equals("binary")) {
assertTrue(l == -1);
} else if (element.equals("double")) {
assertTrue(l == Long.MAX_VALUE);
@@ -292,7 +292,7 @@
public void testGetStringValue() {
for (String element : fieldTypes) {
String string = node.getStringValue(element + "field");
- if (element.equals("byte")) {
+ if (element.equals("binary")) {
assertTrue(element + "field queried as string did not return
\"Hello world!\" but " + string, "Hello world!".equals(string));
} else if (element.equals("double")) {
assertTrue(element + "field queried as string did not return "
+ Double.MAX_VALUE + " but " + string,
@@ -364,7 +364,7 @@
for (String element : fieldTypes) {
boolean bool = node.getBooleanValue(element + "field");
if (element.equals("list") || element.equals("xml") ||
element.equals("string")
- || element.equals("byte")) {
+ || element.equals("binary")) {
assertTrue(element + " field queried as boolean returns TRUE",
!bool);
} else {
assertTrue(element + " field queried as boolean returns FALSE",
bool);
Index: NodeTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/NodeTest.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- NodeTest.java 22 Sep 2008 17:12:39 -0000 1.24
+++ NodeTest.java 24 Sep 2008 21:28:15 -0000 1.25
@@ -23,7 +23,7 @@
*/
public abstract class NodeTest extends BridgeTest {
protected Node node;
- protected static String[] fieldTypes = {"byte", "double", "float", "int",
"long", "string", "xml", "node", "datetime", "boolean"}; //, "list"};
+ protected static String[] fieldTypes = {"binary", "double", "float",
"int", "long", "string", "xml", "node", "datetime", "boolean"}; //, "list"};
//protected static String[] fieldTypes = {"datetime"};
public NodeTest(String name) {
@@ -39,7 +39,7 @@
public void testGetValueCache() {
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetIntValue();
@@ -52,11 +52,11 @@
testGetListValue();
}
- abstract public void testGetByteValue();
+ abstract public void testGetBinaryValue();
- public void testGetByteValueCache() {
+ public void testGetBinaryValueCache() {
// Test if the first call doesn't make MMBase cache an incorrect value.
- testGetByteValue();
+ testGetBinaryValue();
testGetValue();
testGetDoubleValue();
testGetFloatValue();
@@ -76,7 +76,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetDoubleValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetFloatValue();
testGetIntValue();
testGetLongValue();
@@ -94,7 +94,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetFloatValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetIntValue();
testGetLongValue();
@@ -109,7 +109,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetIntValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetLongValue();
@@ -127,7 +127,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetLongValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetIntValue();
@@ -145,7 +145,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetStringValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetIntValue();
@@ -163,7 +163,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetXMLValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetIntValue();
@@ -181,7 +181,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetNodeValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetIntValue();
@@ -199,7 +199,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetBooleanValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetIntValue();
@@ -217,7 +217,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetDateTimeValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetIntValue();
@@ -235,7 +235,7 @@
// Test if the first call doesn't make MMBase cache an incorrect value.
testGetListValue();
testGetValue();
- testGetByteValue();
+ testGetBinaryValue();
testGetDoubleValue();
testGetFloatValue();
testGetIntValue();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
