Introduce a date assert with second precision

git-svn-id: https://svn.argeo.org/slc/trunk@1081 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/UnitUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/UnitUtils.java
new file mode 100644 (file)
index 0000000..a150a90
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/UnitUtils.java
@@ -0,0 +1,33 @@
+package org.argeo.slc.unit;\r
+\r
+import java.util.Calendar;\r
+import java.util.Date;\r
+import java.util.GregorianCalendar;\r
+\r
+import static junit.framework.Assert.assertEquals;\r
+\r
+public abstract class UnitUtils {\r
+       public static void assertDateSec(Date expected, Date reached) {\r
+               Calendar expectedCal = new GregorianCalendar();\r
+               expectedCal.setTime(expected);\r
+               Calendar reachedCal = new GregorianCalendar();\r
+               reachedCal.setTime(reached);\r
+               assertEquals(expectedCal.get(Calendar.YEAR), reachedCal\r
+                               .get(Calendar.YEAR));\r
+               assertEquals(expectedCal.get(Calendar.MONTH), reachedCal\r
+                               .get(Calendar.MONTH));\r
+               assertEquals(expectedCal.get(Calendar.DATE), reachedCal\r
+                               .get(Calendar.DATE));\r
+               assertEquals(expectedCal.get(Calendar.HOUR_OF_DAY), reachedCal\r
+                               .get(Calendar.HOUR_OF_DAY));\r
+               assertEquals(expectedCal.get(Calendar.MINUTE), reachedCal\r
+                               .get(Calendar.MINUTE));\r
+               assertEquals(expectedCal.get(Calendar.SECOND), reachedCal\r
+                               .get(Calendar.SECOND));\r
+       }\r
+\r
+       private UnitUtils() {\r
+\r
+       }\r
+\r
+}\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
index 05c56acb69394c8892157da8b094fd5e87561d95..6f5e7b63b56864ceba761f81858caf3f0a4bba2e 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
@@ -4,6 +4,7 @@ import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;\r
 import static junit.framework.Assert.assertNull;\r
 import static junit.framework.Assert.fail;\r
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;\r
 \r
 import org.argeo.slc.core.structure.SimpleSElement;\r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
@@ -17,7 +18,7 @@ public class UnitTestTreeUtil {
        public static void assertTreeTestResult(TreeTestResult expected,\r
                        TreeTestResult reached) {\r
                assertEquals(expected.getTestResultId(), reached.getTestResultId());\r
-               assertEquals(expected.getCloseDate(), reached.getCloseDate());\r
+               assertDateSec(expected.getCloseDate(), reached.getCloseDate());\r
 \r
                assertEquals(expected.getResultParts().size(), reached.getResultParts()\r
                                .size());\r

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java
index d75fdfa60ed9a8586851be454e6889f7334ab2f4..c3c880366a7d2a6d26eaa94ad973acb241e91910 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionTestUtils.java
@@ -2,9 +2,11 @@ package org.argeo.slc.core.process;
 \r
 import java.util.UUID;\r
 \r
-import junit.framework.TestCase;\r
+import static junit.framework.Assert.assertEquals;\r
+import static junit.framework.Assert.assertNotNull;\r
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;\r
 \r
-public abstract class SlcExecutionTestUtils extends TestCase {\r
+public abstract class SlcExecutionTestUtils {\r
 \r
        public static SlcExecution createSimpleSlcExecution() {\r
                SlcExecution slcExec = new SlcExecution();\r
@@ -40,7 +42,7 @@ public abstract class SlcExecutionTestUtils extends TestCase {
                assertEquals(expected.getUuid(), reached.getUuid());\r
                assertEquals(expected.getType(), reached.getType());\r
                assertEquals(expected.logAsString(), reached.logAsString());\r
-               // assertEquals(expected.getBegin(), reached.getBegin());\r
+               assertDateSec(expected.getBegin(), reached.getBegin());\r
        }\r
 \r
        private SlcExecutionTestUtils() {\r