From 1d3622f2ece5951a4396bcb70e2f182a577f3084 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 29 Apr 2008 20:23:45 +0000
Subject: [PATCH] Introduce a date assert with second precision

git-svn-id: https://svn.argeo.org/slc/trunk@1081 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../java/org/argeo/slc/unit/UnitUtils.java    | 33 +++++++++++++++++++
 .../slc/unit/test/tree/UnitTestTreeUtil.java  |  3 +-
 .../core/process/SlcExecutionTestUtils.java   |  8 +++--
 3 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/unit/UnitUtils.java

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
index 000000000..a150a9089
--- /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;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import static junit.framework.Assert.assertEquals;
+
+public abstract class UnitUtils {
+	public static void assertDateSec(Date expected, Date reached) {
+		Calendar expectedCal = new GregorianCalendar();
+		expectedCal.setTime(expected);
+		Calendar reachedCal = new GregorianCalendar();
+		reachedCal.setTime(reached);
+		assertEquals(expectedCal.get(Calendar.YEAR), reachedCal
+				.get(Calendar.YEAR));
+		assertEquals(expectedCal.get(Calendar.MONTH), reachedCal
+				.get(Calendar.MONTH));
+		assertEquals(expectedCal.get(Calendar.DATE), reachedCal
+				.get(Calendar.DATE));
+		assertEquals(expectedCal.get(Calendar.HOUR_OF_DAY), reachedCal
+				.get(Calendar.HOUR_OF_DAY));
+		assertEquals(expectedCal.get(Calendar.MINUTE), reachedCal
+				.get(Calendar.MINUTE));
+		assertEquals(expectedCal.get(Calendar.SECOND), reachedCal
+				.get(Calendar.SECOND));
+	}
+
+	private UnitUtils() {
+
+	}
+
+}
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 05c56acb6..6f5e7b63b 100644
--- 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;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.fail;
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;
 
 import org.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.tree.TreeSPath;
@@ -17,7 +18,7 @@ public class UnitTestTreeUtil {
 	public static void assertTreeTestResult(TreeTestResult expected,
 			TreeTestResult reached) {
 		assertEquals(expected.getTestResultId(), reached.getTestResultId());
-		assertEquals(expected.getCloseDate(), reached.getCloseDate());
+		assertDateSec(expected.getCloseDate(), reached.getCloseDate());
 
 		assertEquals(expected.getResultParts().size(), reached.getResultParts()
 				.size());
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 d75fdfa60..c3c880366 100644
--- 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;
 
 import java.util.UUID;
 
-import junit.framework.TestCase;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;
 
-public abstract class SlcExecutionTestUtils extends TestCase {
+public abstract class SlcExecutionTestUtils {
 
 	public static SlcExecution createSimpleSlcExecution() {
 		SlcExecution slcExec = new SlcExecution();
@@ -40,7 +42,7 @@ public abstract class SlcExecutionTestUtils extends TestCase {
 		assertEquals(expected.getUuid(), reached.getUuid());
 		assertEquals(expected.getType(), reached.getType());
 		assertEquals(expected.logAsString(), reached.logAsString());
-		// assertEquals(expected.getBegin(), reached.getBegin());
+		assertDateSec(expected.getBegin(), reached.getBegin());
 	}
 
 	private SlcExecutionTestUtils() {
-- 
2.39.2