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 2016/08/18 14:47:25 UTC
cayenne git commit: predictable BigDecimal comparisons
Repository: cayenne
Updated Branches:
refs/heads/master 1095966a2 -> 09f01c007
predictable BigDecimal comparisons
* slway switching gtom homegrown API to vanilla JUnit
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/09f01c00
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/09f01c00
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/09f01c00
Branch: refs/heads/master
Commit: 09f01c00706a6d28e93c24fd11f21ae11f6b5a47
Parents: 1095966
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Thu Aug 18 17:42:16 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Thu Aug 18 17:42:16 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/test/junit/AssertExtras.java | 33 --------------------
.../access/DataContextEJBQLGroupByHavingIT.java | 17 +++++-----
.../cayenne/access/DataContextEJBQLQueryIT.java | 26 +++++++--------
3 files changed, 19 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/09f01c00/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/junit/AssertExtras.java
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/junit/AssertExtras.java b/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/junit/AssertExtras.java
deleted file mode 100644
index c207220..0000000
--- a/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/junit/AssertExtras.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.test.junit;
-
-import java.math.BigDecimal;
-
-import junit.framework.Assert;
-
-public class AssertExtras {
-
- public static void assertEquals(BigDecimal d1, Object d2, double delta) {
- Assert.assertNotNull(d2);
- Assert.assertTrue("d2: " + d2.getClass().getName(), d2 instanceof BigDecimal);
- BigDecimal d3 = d1.subtract((BigDecimal) d2);
- Assert.assertTrue(Math.abs(d3.doubleValue()) < delta);
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/09f01c00/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java
index 11bb93c..d65ddbc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java
@@ -23,7 +23,6 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.test.junit.AssertExtras;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.unit.di.server.CayenneProjects;
@@ -128,11 +127,11 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- AssertExtras.assertEquals(new BigDecimal(1d), row0[0], 0.001d);
+ assertEquals(1d, ((BigDecimal) row0[0]).doubleValue(), 0.00001d);
assertEquals(new Long(3), row0[1]);
Object[] row1 = (Object[]) data.get(1);
- AssertExtras.assertEquals(new BigDecimal(2d), row1[0], 0.001d);
+ assertEquals(2d, ((BigDecimal) row1[0]).doubleValue(), 0.00001d);
assertEquals(new Long(2l), row1[1]);
}
@@ -150,17 +149,17 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- AssertExtras.assertEquals(new BigDecimal(1d), row0[0], 0.001d);
+ assertEquals(1d, ((BigDecimal) row0[0]).doubleValue(), 0.00001d);
assertEquals("PX", row0[1]);
assertEquals(new Long(1), row0[2]);
Object[] row1 = (Object[]) data.get(1);
- AssertExtras.assertEquals(new BigDecimal(1), row1[0], 0.001d);
+ assertEquals(1d, ((BigDecimal) row1[0]).doubleValue(), 0.00001d);
assertEquals("PZ", row1[1]);
assertEquals(new Long(2), row1[2]);
Object[] row2 = (Object[]) data.get(2);
- AssertExtras.assertEquals(new BigDecimal(2d), row2[0], 0.001d);
+ assertEquals(2d, ((BigDecimal) row2[0]).doubleValue(), 0.00001d);
assertEquals("PY", row2[1]);
assertEquals(new Long(2), row2[2]);
}
@@ -221,7 +220,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- AssertExtras.assertEquals(new BigDecimal(2d), row0[0], 0.001d);
+ assertEquals(2d, ((BigDecimal) row0[0]).doubleValue(), 0.00001d);
assertEquals(new Long(2), row0[1]);
}
@@ -239,7 +238,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- AssertExtras.assertEquals(new BigDecimal(1d), row0[0], 0.001d);
+ assertEquals(1d, ((BigDecimal) row0[0]).doubleValue(), 0.00001d);
assertEquals(new Long(3l), row0[1]);
}
@@ -257,7 +256,7 @@ public class DataContextEJBQLGroupByHavingIT extends ServerCase {
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- AssertExtras.assertEquals(new BigDecimal(1d), row0[0], 0.001d);
+ assertEquals(1d, ((BigDecimal) row0[0]).doubleValue(), 0.00001d);
assertEquals(new Long(3l), row0[1]);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/09f01c00/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java
index 62c4cf3..44191e3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java
@@ -27,7 +27,6 @@ import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.reflect.LifecycleCallbackRegistry;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.test.junit.AssertExtras;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.unit.UnitDbAdapter;
@@ -137,8 +136,8 @@ public class DataContextEJBQLQueryIT extends ServerCase {
Object[] aggregates = (Object[]) data.get(0);
assertEquals(new Long(2), aggregates[0]);
assertEquals(new Long(2), aggregates[1]);
- AssertExtras.assertEquals(new BigDecimal(5000d), aggregates[2], 0.01);
- AssertExtras.assertEquals(new BigDecimal(8000d), aggregates[3], 0.01);
+ assertEquals(5000d, ((BigDecimal) aggregates[2]).doubleValue(), 0.00001);
+ assertEquals(8000d, ((BigDecimal) aggregates[3]).doubleValue(), 0.00001);
}
@Test
@@ -190,13 +189,13 @@ public class DataContextEJBQLQueryIT extends ServerCase {
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
assertEquals(2, row0.length);
- AssertExtras.assertEquals(new BigDecimal(3000d), row0[0], 0.01);
+ assertEquals(3000d, ((BigDecimal) row0[0]).doubleValue(), 0.00001);
assertEquals("AA1", row0[1]);
assertTrue(data.get(1) instanceof Object[]);
Object[] row1 = (Object[]) data.get(1);
assertEquals(2, row1.length);
- AssertExtras.assertEquals(new BigDecimal(5000d), row1[0], 0.01);
+ assertEquals(5000d, ((BigDecimal) row1[0]).doubleValue(), 0.00001);
assertEquals("AA2", row1[1]);
}
@@ -211,11 +210,8 @@ public class DataContextEJBQLQueryIT extends ServerCase {
List<?> data = context.performQuery(query);
assertEquals(2, data.size());
- assertTrue(data.get(0) instanceof BigDecimal);
- assertEquals(new BigDecimal(3000d), data.get(0));
-
- assertTrue(data.get(1) instanceof BigDecimal);
- assertEquals(new BigDecimal(5000d), data.get(1));
+ assertEquals(3000d, ((BigDecimal) data.get(0)).doubleValue(), 0.00001);
+ assertEquals(5000d, ((BigDecimal) data.get(1)).doubleValue(), 0.00001);
}
@Test
@@ -354,7 +350,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
+ assertEquals(3000d, p.getEstimatedPrice().doubleValue(), 0.00001);
}
@Test
@@ -369,7 +365,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
+ assertEquals(3000d, p.getEstimatedPrice().doubleValue(), 0.00001);
}
@Test
@@ -384,7 +380,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
Painting p = (Painting) ps.get(0);
assertEquals("P2", p.getPaintingTitle());
- AssertExtras.assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
+ assertEquals(5000d, p.getEstimatedPrice().doubleValue(), 0.00001);
}
@Test
@@ -399,7 +395,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
Painting p = (Painting) ps.get(0);
assertEquals("P2", p.getPaintingTitle());
- AssertExtras.assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
+ assertEquals(5000d, p.getEstimatedPrice().doubleValue(), 0.00001);
}
@Test
@@ -425,7 +421,7 @@ public class DataContextEJBQLQueryIT extends ServerCase {
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
+ assertEquals(3000d, p.getEstimatedPrice().doubleValue(), 0.00001);
}
@Test