You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/06/26 22:35:06 UTC
svn commit: r550934 - in
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne:
access/DataContextEJBQLQueryTest.java unit/BasicCase.java
Author: aadamchik
Date: Tue Jun 26 13:35:05 2007
New Revision: 550934
URL: http://svn.apache.org/viewvc?view=rev&rev=550934
Log:
testing on MySQL - fixing some unit tests that fail only cause BigDecimals retuedn by MySQL used different precision
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/unit/BasicCase.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java?view=diff&rev=550934&r1=550933&r2=550934
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java Tue Jun 26 13:35:05 2007
@@ -54,8 +54,8 @@
Object[] aggregates = (Object[]) data.get(0);
assertEquals(new Long(2), aggregates[0]);
assertEquals(new Long(2), aggregates[1]);
- assertEquals(new BigDecimal(5000d), aggregates[2]);
- assertEquals(new BigDecimal(8000d), aggregates[3]);
+ assertEquals(new BigDecimal(5000d), aggregates[2], 0.01);
+ assertEquals(new BigDecimal(8000d), aggregates[3], 0.01);
}
public void testSelectAggregateNull() throws Exception {
@@ -100,13 +100,13 @@
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
assertEquals(2, row0.length);
- assertEquals(new BigDecimal(3000d), row0[0]);
+ assertEquals(new BigDecimal(3000d), row0[0], 0.01);
assertEquals("AA1", row0[1]);
assertTrue(data.get(1) instanceof Object[]);
Object[] row1 = (Object[]) data.get(1);
assertEquals(2, row1.length);
- assertEquals(new BigDecimal(5000d), row1[0]);
+ assertEquals(new BigDecimal(5000d), row1[0], 0.01);
assertEquals("AA2", row1[1]);
}
@@ -205,7 +205,7 @@
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- assertEquals(new BigDecimal(3000d), p.getEstimatedPrice());
+ assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereBetween() throws Exception {
@@ -219,7 +219,7 @@
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- assertEquals(new BigDecimal(3000d), p.getEstimatedPrice());
+ assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereNotBetween() throws Exception {
@@ -233,7 +233,7 @@
Painting p = (Painting) ps.get(0);
assertEquals("P2", p.getPaintingTitle());
- assertEquals(new BigDecimal(5000d), p.getEstimatedPrice());
+ assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereGreater() throws Exception {
@@ -247,7 +247,7 @@
Painting p = (Painting) ps.get(0);
assertEquals("P2", p.getPaintingTitle());
- assertEquals(new BigDecimal(5000d), p.getEstimatedPrice());
+ assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereGreaterOrEqual() throws Exception {
@@ -271,7 +271,7 @@
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- assertEquals(new BigDecimal(3000d), p.getEstimatedPrice());
+ assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereLessOrEqual() throws Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/unit/BasicCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/unit/BasicCase.java?view=diff&rev=550934&r1=550933&r2=550934
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/unit/BasicCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/test/java/org/apache/cayenne/unit/BasicCase.java Tue Jun 26 13:35:05 2007
@@ -20,6 +20,7 @@
package org.apache.cayenne.unit;
import java.io.File;
+import java.math.BigDecimal;
import junit.framework.TestCase;
@@ -30,6 +31,12 @@
* @author Andrus Adamchik
*/
public abstract class BasicCase extends TestCase {
+
+ public static void assertEquals(BigDecimal d1, Object d2, double delta) {
+ assertTrue(d2 instanceof BigDecimal);
+ BigDecimal d3 = d1.subtract((BigDecimal) d2);
+ assertTrue(Math.abs(d3.doubleValue()) < delta);
+ }
/**
* Returns directory that should be used by all test cases that perform file