Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv21283
Modified Files:
CloudContextTest.java FilledNodeTest.java NodeTest.java
ProcessorTest.java
Log Message:
various details
See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge
Index: CloudContextTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/CloudContextTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CloudContextTest.java 2 Dec 2008 08:07:45 -0000 1.6
+++ CloudContextTest.java 30 Apr 2009 22:36:13 -0000 1.7
@@ -18,7 +18,7 @@
* Test class <code>CloudContext</code> from the bridge package.
*
* @author Jaco de Groot
- * @version $Id: CloudContextTest.java,v 1.6 2008/12/02 08:07:45 michiel Exp $
+ * @version $Id: CloudContextTest.java,v 1.7 2009/04/30 22:36:13 michiel Exp $
*/
public class CloudContextTest extends BridgeTest {
@@ -43,9 +43,9 @@
CloudContext cloudContext = getCloudContext();
// System.out.println(cloudContext.getClass() + " " +
cloudContext.getUri());
-
- // temporary removed, because failing
- assertEquals(cloudContext.getUri(),
cloudContext.getCloud("mmbase").getCloudContext().getUri());
+ Cloud cloud = cloudContext.getCloud("mmbase");
+ assertEquals("" + cloud.getCloudContext().getClass() + " " +
cloudContext.getClass(),
+ cloudContext.getUri(), cloud.getCloudContext().getUri());
// FAILS
}
Index: FilledNodeTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/FilledNodeTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- FilledNodeTest.java 30 Apr 2009 14:14:15 -0000 1.29
+++ FilledNodeTest.java 30 Apr 2009 22:36:13 -0000 1.30
@@ -33,6 +33,7 @@
protected Date TEST_DATE = new Date(TEST_TIME);
protected BigDecimal TEST_DECIMAL = new BigDecimal("123123123.123456789");
protected Long TEST_LONG = Long.MAX_VALUE - 10;
+ protected Double TEST_DOUBLE = new Double(Double.MAX_VALUE);
public FilledNodeTest(String name) {
super(name);
@@ -62,7 +63,7 @@
assertTrue(typedefNode != null);
byte[] bytes = { 72, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100,
33 }; // 'Hello World!'
node.setValue("binaryfield", bytes);
- node.setValue("doublefield", new Double(Double.MAX_VALUE));
+ node.setValue("doublefield", TEST_DOUBLE);
node.setValue("floatfield", new Float(Float.MAX_VALUE));
node.setValue("intfield", new Integer(Integer.MAX_VALUE));
node.setValue("longfield", TEST_LONG);
@@ -96,8 +97,8 @@
assertTrue("getValue on byte field should give 'Hello World!'
but gave '" + new String(bytes) + "'",
"Hello world!".equals(new String(bytes)));
} else if (element.equals("double")) {
- assertTrue("getValue on double field should give " +
Double.MAX_VALUE + " but gave " + object,
- new Double(Double.MAX_VALUE).compareTo((Double)object) ==
0);
+ assertTrue("getValue on double field should give " +
TEST_DOUBLE + " but gave " + object,
+ TEST_DOUBLE.compareTo((Double)object) == 0);
} else if (element.equals("float")) {
assertTrue("getValue on float field should give " +
Float.MAX_VALUE + " but gave " + object,
new Float(Float.MAX_VALUE).compareTo((Float)object) == 0);
@@ -182,7 +183,7 @@
if (element.equals("binary")) {
assertTrue(d == -1);
} else if (element.equals("double")) {
- assertTrue(d == Double.MAX_VALUE);
+ assertTrue(d == TEST_DOUBLE);
} else if (element.equals("float")) {
assertTrue(d == Float.MAX_VALUE);
} else if (element.equals("int")) {
@@ -319,8 +320,8 @@
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,
- String.valueOf(Double.MAX_VALUE).equals(string));
+ assertTrue(element + "field queried as string did not return "
+ TEST_DOUBLE + " but " + string,
+ String.valueOf(TEST_DOUBLE).equals(string));
} else if (element.equals("float")) {
// SQLDB causes some problems when rounding floats, which it
stores internally as Doubles.
// so compare the resulting string to both Float.MAX_VALUE and
Double(Float.MAX_VALUE )
@@ -400,7 +401,7 @@
}
public void testGetDateTimeValue() {
- for (String element : fieldTypes) {
+ for (final String element : fieldTypes) {
Date value = null;
if (element.equals("node")) {
value = node.getDateValue(element + "field");
@@ -412,14 +413,14 @@
value.getTime()==TEST_TIME);
} else if (element.equals("double")) {
value = node.getDateValue(element + "field");
- long time = new Double(Double.MAX_VALUE).longValue() * 1000;
- assertTrue(element + " field queried as datetime did not
return "+new Date(time)+", but " + value,
- value.getTime()==time);
+ Date time = Casting.toDate(TEST_DOUBLE);
+ assertTrue(element + " field queried as datetime did not
return " + time + ", but " + value,
+ value.getTime() == time.getTime());
} else if (element.equals("float")) {
value = node.getDateValue(element + "field");
- long time = new Float(Float.MAX_VALUE).longValue() * 1000;
- assertTrue(element + " field queried as datetime did not
return "+new Date(time)+", but " + value,
- value.getTime()==time);
+ Date time = Casting.toDate(Float.MAX_VALUE);
+ assertTrue(element + " field queried as datetime did not
return "+ time +", but " + value,
+ value.getTime() == time.getTime());
} else if (element.equals("int")) {
value = node.getDateValue(element + "field");
long time = new Integer(Integer.MAX_VALUE).longValue()*1000;
@@ -427,9 +428,9 @@
value.getTime()==time);
} else if (element.equals("long")) {
value = node.getDateValue(element + "field");
- long time = Long.MAX_VALUE * 1000; // oddd..
- assertTrue(element + " field queried as datetime did not
return "+new Date(time) + ", but " + value,
- value.getTime()==time);
+ Date time = Casting.toDate(Long.MAX_VALUE);
+ assertTrue(element + " field queried as datetime did not
return "+ time + ", but " + value,
+ value.getTime() == time.getTime());
} else if (element.equals("decimal")) {
value = node.getDateValue(element + "field");
long time = TEST_DECIMAL.longValue() * 1000;
@@ -440,11 +441,12 @@
value = node.getDateValue(element + "field");
fail(element + " field 's value '" +
node.getStringValue(element + "field") + "' cannot be queried as a date, should
have thrown exception");
} catch (Throwable e) {
- return;
+ continue;
}
}
assertTrue(element + " field queried as datetime returned null",
value != null);
}
+
}
public void testGetDecimalValue() {
@@ -453,7 +455,7 @@
if (element.equals("binary")) {
assertTrue(new BigDecimal(-1).compareTo(l) == 0);
} else if (element.equals("double")) {
- assertTrue("" + l + " != " + Double.MAX_VALUE, new
BigDecimal(Double.MAX_VALUE).compareTo(l) == 0);
+ assertTrue("" + l + " != " + TEST_DOUBLE, new
BigDecimal(TEST_DOUBLE).compareTo(l) == 0);
} else if (element.equals("float")) {
assertTrue(new BigDecimal(Float.MAX_VALUE).compareTo(l) == 0);
} else if (element.equals("int")) {
Index: NodeTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/NodeTest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- NodeTest.java 1 Dec 2008 22:41:58 -0000 1.26
+++ NodeTest.java 30 Apr 2009 22:36:13 -0000 1.27
@@ -23,7 +23,7 @@
*/
public abstract class NodeTest extends BridgeTest {
protected Node node;
- protected static String[] fieldTypes = {"binary", "double", "float",
"int", "long", "string", "xml", "node", "datetime", "boolean", "decimal"}; //,
"list"};
+ protected final static String[] fieldTypes = {"float", "int", "long",
"string", "xml", "node", "datetime", "boolean", "decimal", "double", "binary"};
//, "list"};
//protected static String[] fieldTypes = {"datetime"};
public NodeTest(String name) {
Index: ProcessorTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/ProcessorTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ProcessorTest.java 30 Apr 2009 19:07:43 -0000 1.7
+++ ProcessorTest.java 30 Apr 2009 22:36:13 -0000 1.8
@@ -24,7 +24,7 @@
* Testing wether the processors of datatypes behave as expected.
*
* @author Michiel Meeuwissen
- * @version $Id: ProcessorTest.java,v 1.7 2009/04/30 19:07:43 michiel Exp $
+ * @version $Id: ProcessorTest.java,v 1.8 2009/04/30 22:36:13 michiel Exp $
* @since MMBase-1.9.1
*/
public class ProcessorTest extends BridgeTest {
@@ -119,7 +119,7 @@
// Creates an commits a node, and checks if that increased the commit count
protected void testCommitCount(Cloud c) {
- if
(c.getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{ // only test on local
+ if
(getCloudContext().getUri().equals(ContextProvider.DEFAULT_CLOUD_CONTEXT_NAME))
{ // only test on local
NodeManager nm = c.getNodeManager("datatypes");
int ccbefore = CountCommitProcessor.count;
Node n = nm.createNode();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
