--- /dev/null
+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
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
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
\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
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