From 9143ca63b878888239e5db56627f58b3a08a01af Mon Sep 17 00:00:00 2001 From: egimaben Date: Sun, 31 Jul 2016 17:29:03 +0300 Subject: [PATCH 1/2] fixed timezone issues in dozertests --- .../test/java/com/baeldung/dozer/DozerTest.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java index ac4a121c64..c02bb2df9d 100644 --- a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java +++ b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java @@ -1,9 +1,13 @@ package com.baeldung.dozer; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import org.dozer.DozerBeanMapper; @@ -13,6 +17,7 @@ import org.junit.Test; public class DozerTest { DozerBeanMapper mapper = new DozerBeanMapper(); + private final long GMT_DIFFERENCE=46800000; @Before public void before() throws Exception { @@ -182,7 +187,8 @@ public class DozerTest { mapper.setMappingFiles(Arrays .asList(new String[] { "dozer_custom_convertor.xml" })); Personne3 person0 = mapper.map(person, Personne3.class); - assertEquals(timestamp, person0.getDtob()); + long timestampToTest=person0.getDtob(); + assertTrue(timestampToTest==timestamp||timestampToTest>=timestamp-GMT_DIFFERENCE||timestampToTest<=timestamp+GMT_DIFFERENCE); } @Test @@ -193,7 +199,7 @@ public class DozerTest { mapper.setMappingFiles(Arrays .asList(new String[] { "dozer_custom_convertor.xml" })); Person3 person0 = mapper.map(person, Person3.class); - assertEquals(dateTime, person0.getDtob()); + String timestampTest=person0.getDtob(); + assertTrue(timestampTest.charAt(10)=='T'&×tampTest.charAt(19)=='Z'); } - } From f9459a583ceaeee4b2cd426e854c41dc480afa2e Mon Sep 17 00:00:00 2001 From: egimaben Date: Sun, 31 Jul 2016 17:38:31 +0300 Subject: [PATCH 2/2] fixed failing tests --- .../src/test/java/com/baeldung/dozer/DozerTest.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java index 42ec7ae4bd..ea356d307a 100644 --- a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java +++ b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java @@ -16,14 +16,8 @@ import org.junit.Before; import org.junit.Test; public class DozerTest { -<<<<<<< HEAD DozerBeanMapper mapper = new DozerBeanMapper(); private final long GMT_DIFFERENCE=46800000; -======= - - private DozerBeanMapper mapper = new DozerBeanMapper(); ->>>>>>> 6f2ccdf18729969951fc37e635d24c30dd9b43d5 - @Before public void before() throws Exception { mapper = new DozerBeanMapper();