|
From: <be...@us...> - 2010-03-31 20:25:23
|
Revision: 338
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=338&view=rev
Author: benoitx
Date: 2010-03-31 20:25:15 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
Fixing tests.
Modified Paths:
--------------
trunk/utils/src/main/java/net/objectlab/kit/util/BooleanUtil.java
trunk/utils/src/test/java/net/objectlab/kit/util/TotalTest.java
Added Paths:
-----------
trunk/utils/src/test/java/net/objectlab/kit/util/BigDecimalAssert.java
Removed Paths:
-------------
trunk/utils/src/test/java/net/objectlab/kit/util/TestAssert.java
Modified: trunk/utils/src/main/java/net/objectlab/kit/util/BooleanUtil.java
===================================================================
--- trunk/utils/src/main/java/net/objectlab/kit/util/BooleanUtil.java 2010-03-31 20:22:01 UTC (rev 337)
+++ trunk/utils/src/main/java/net/objectlab/kit/util/BooleanUtil.java 2010-03-31 20:25:15 UTC (rev 338)
@@ -56,6 +56,6 @@
}
public static boolean isFalse(final Boolean b) {
- return b == null ? true : !b;
+ return b == null ? false : !b;
}
}
Added: trunk/utils/src/test/java/net/objectlab/kit/util/BigDecimalAssert.java
===================================================================
--- trunk/utils/src/test/java/net/objectlab/kit/util/BigDecimalAssert.java (rev 0)
+++ trunk/utils/src/test/java/net/objectlab/kit/util/BigDecimalAssert.java 2010-03-31 20:25:15 UTC (rev 338)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+package net.objectlab.kit.util;
+
+import java.math.BigDecimal;
+
+import org.junit.Assert;
+
+/**
+ * @author Benoit
+ *
+ */
+public class BigDecimalAssert {
+
+ public static void assertSameValue(final String msg, final BigDecimal bd1, final BigDecimal bd2) {
+ Assert.assertTrue(msg, BigDecimalUtil.isSameValue(bd1, bd2));
+ }
+}
Deleted: trunk/utils/src/test/java/net/objectlab/kit/util/TestAssert.java
===================================================================
--- trunk/utils/src/test/java/net/objectlab/kit/util/TestAssert.java 2010-03-31 20:22:01 UTC (rev 337)
+++ trunk/utils/src/test/java/net/objectlab/kit/util/TestAssert.java 2010-03-31 20:25:15 UTC (rev 338)
@@ -1,19 +0,0 @@
-/**
- *
- */
-package net.objectlab.kit.util;
-
-import java.math.BigDecimal;
-
-import org.junit.Assert;
-
-/**
- * @author Benoit
- *
- */
-public class TestAssert {
-
- public static void assertSameValue(final String msg, final BigDecimal bd1, final BigDecimal bd2) {
- Assert.assertTrue(msg, BigDecimalUtil.isSameValue(bd1, bd2));
- }
-}
Modified: trunk/utils/src/test/java/net/objectlab/kit/util/TotalTest.java
===================================================================
--- trunk/utils/src/test/java/net/objectlab/kit/util/TotalTest.java 2010-03-31 20:22:01 UTC (rev 337)
+++ trunk/utils/src/test/java/net/objectlab/kit/util/TotalTest.java 2010-03-31 20:25:15 UTC (rev 338)
@@ -13,72 +13,72 @@
public void testSum() {
final Total sum = new Total();
assertEquals("scale", 0, sum.getTotal().scale());
- TestAssert.assertSameValue("ctor", BigDecimal.ZERO, sum.getTotal());
+ BigDecimalAssert.assertSameValue("ctor", BigDecimal.ZERO, sum.getTotal());
}
@Test
public void testSumInt() {
final Total sum = new Total(BigDecimal.ZERO, 2);
assertEquals("scale", 2, sum.getTotal().scale());
- TestAssert.assertSameValue("ctor", BigDecimal.ZERO, sum.getTotal());
+ BigDecimalAssert.assertSameValue("ctor", BigDecimal.ZERO, sum.getTotal());
}
// @Test
public void testSumBigDecimal() {
final Total sum = new Total(BigDecimal.TEN);
assertEquals("scale", 2, sum.getTotal().scale());
- TestAssert.assertSameValue("ctor", BigDecimal.TEN, sum.getTotal());
+ BigDecimalAssert.assertSameValue("ctor", BigDecimal.TEN, sum.getTotal());
final Total sum2 = new Total(BigDecimal.TEN.setScale(4));
assertEquals("scale", 4, sum2.getTotal().scale());
- TestAssert.assertSameValue("ctor", BigDecimal.TEN, sum2.getTotal());
+ BigDecimalAssert.assertSameValue("ctor", BigDecimal.TEN, sum2.getTotal());
}
@Test
public void testSumBigDecimalInt() {
final Total sum = new Total(BigDecimal.TEN, 4);
assertEquals("scale", 4, sum.getTotal().scale());
- TestAssert.assertSameValue("ctor", BigDecimal.TEN, sum.getTotal());
+ BigDecimalAssert.assertSameValue("ctor", BigDecimal.TEN, sum.getTotal());
}
@Test
public void testgetTotal() {
final Total sum = new Total(BigDecimal.TEN, 4);
- TestAssert.assertSameValue("ctor", BigDecimal.TEN, sum.getTotal());
+ BigDecimalAssert.assertSameValue("ctor", BigDecimal.TEN, sum.getTotal());
}
@Test
public void testAdd() {
final Total sum = new Total();
sum.add((BigDecimal[]) null);
- TestAssert.assertSameValue("add null", BigDecimal.ZERO, sum.getTotal());
+ BigDecimalAssert.assertSameValue("add null", BigDecimal.ZERO, sum.getTotal());
sum.add(BigDecimal.ZERO);
- TestAssert.assertSameValue("add 0", BigDecimal.ZERO, sum.getTotal());
+ BigDecimalAssert.assertSameValue("add 0", BigDecimal.ZERO, sum.getTotal());
sum.add(BigDecimal.ONE).add(BigDecimal.ONE);
- TestAssert.assertSameValue("add 1 + 1", new BigDecimal("2"), sum.getTotal());
+ BigDecimalAssert.assertSameValue("add 1 + 1", new BigDecimal("2"), sum.getTotal());
sum.add(BigDecimal.ONE.negate());
- TestAssert.assertSameValue("add -1", new BigDecimal("1"), sum.getTotal());
+ BigDecimalAssert.assertSameValue("add -1", new BigDecimal("1"), sum.getTotal());
sum.add(BigDecimal.TEN.negate());
- TestAssert.assertSameValue("add -10", new BigDecimal("-9"), sum.getTotal());
+ BigDecimalAssert.assertSameValue("add -10", new BigDecimal("-9"), sum.getTotal());
sum.add(BigDecimal.ONE, BigDecimal.ONE, null, BigDecimal.TEN);
- TestAssert.assertSameValue("add 1 1 null 10", new BigDecimal("3"), sum.getTotal());
+ BigDecimalAssert.assertSameValue("add 1 1 null 10", new BigDecimal("3"), sum.getTotal());
}
@Test
public void testSubtract() {
final Total sum = new Total();
sum.subtract((BigDecimal[]) null);
- TestAssert.assertSameValue("subtract null", BigDecimal.ZERO, sum.getTotal());
+ BigDecimalAssert.assertSameValue("subtract null", BigDecimal.ZERO, sum.getTotal());
sum.subtract(BigDecimal.ZERO);
- TestAssert.assertSameValue("subtract 0", BigDecimal.ZERO, sum.getTotal());
+ BigDecimalAssert.assertSameValue("subtract 0", BigDecimal.ZERO, sum.getTotal());
sum.subtract(BigDecimal.ONE).subtract(BigDecimal.ONE);
- TestAssert.assertSameValue("subtract 1 + 1", new BigDecimal("-2"), sum.getTotal());
+ BigDecimalAssert.assertSameValue("subtract 1 + 1", new BigDecimal("-2"), sum.getTotal());
sum.subtract(BigDecimal.ONE.negate());
- TestAssert.assertSameValue("subtract -1", new BigDecimal("-1"), sum.getTotal());
+ BigDecimalAssert.assertSameValue("subtract -1", new BigDecimal("-1"), sum.getTotal());
sum.subtract(BigDecimal.TEN.negate());
- TestAssert.assertSameValue("subtract -10", new BigDecimal("9"), sum.getTotal());
+ BigDecimalAssert.assertSameValue("subtract -10", new BigDecimal("9"), sum.getTotal());
sum.subtract(BigDecimal.ONE, BigDecimal.ONE, null, BigDecimal.TEN);
- TestAssert.assertSameValue("subtract 1 1 null 10", new BigDecimal("-3"), sum.getTotal());
+ BigDecimalAssert.assertSameValue("subtract 1 1 null 10", new BigDecimal("-3"), sum.getTotal());
}
@Test
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|