Skip to content

Commit 1237484

Browse files
committed
fix failing test
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent b96f475 commit 1237484

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/conversion/TestJavaTimeTypeConverter.java

+13-18
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.eclipse.persistence.jpa.test.conversion;
1919

20-
import java.time.Instant;
2120
import java.time.LocalDate;
2221
import java.time.LocalDateTime;
2322
import java.time.LocalTime;
@@ -26,19 +25,16 @@
2625
import java.time.OffsetTime;
2726
import java.time.ZoneOffset;
2827
import java.util.Calendar;
28+
import java.util.Date;
2929

30-
import jakarta.persistence.EntityManagerFactory;
30+
import java.util.TimeZone;
3131

3232
import org.eclipse.persistence.exceptions.ConversionException;
3333
import org.eclipse.persistence.internal.helper.ClassConstants;
3434
import org.eclipse.persistence.internal.helper.ConversionManager;
35-
import org.eclipse.persistence.jpa.test.framework.Emf;
36-
import org.eclipse.persistence.jpa.test.framework.EmfRunner;
3735
import org.junit.Assert;
3836
import org.junit.Test;
39-
import org.junit.runner.RunWith;
4037

41-
@RunWith(EmfRunner.class)
4238
public class TestJavaTimeTypeConverter {
4339
private ConversionManager cm = ConversionManager.getDefaultManager();
4440

@@ -49,7 +45,7 @@ public void timeConvertLocalDateToLocalDate() {
4945
LocalDate ld = (LocalDate) cm.convertObject(src, ClassConstants.TIME_LDATE);
5046

5147
Assert.assertNotNull(ld);
52-
Assert.assertEquals(src, ld);;
48+
Assert.assertEquals(src, ld);
5349
Assert.assertEquals(Month.JANUARY, ld.getMonth());
5450
Assert.assertEquals(1, ld.getDayOfMonth());
5551
Assert.assertEquals(2020, ld.getYear());
@@ -71,23 +67,22 @@ public void timeConvertCalendarToLocalDate() {
7167
@Test
7268
public void timeConvertUtilDateToLocalDate() {
7369
Calendar cal = Calendar.getInstance();
74-
java.util.Date date = null;
75-
OffsetDateTime odt = null;
76-
70+
71+
cal.setTimeZone(TimeZone.getTimeZone("UTC"));
7772
cal.set(2020, 0, 1, 0, 0, 0);
78-
date = cal.getTime();
73+
Date date = cal.getTime();
7974
Assert.assertEquals(2020 - 1900, date.getYear());
8075
Assert.assertEquals(0, date.getMonth());
81-
Assert.assertEquals(1, date.getDate());
82-
76+
Assert.assertEquals(1, date.getDate());
77+
8378
LocalDate ld = (LocalDate) cm.convertObject(date, ClassConstants.TIME_LDATE);
84-
79+
8580
Assert.assertNotNull(ld);
8681
Assert.assertEquals(Month.JANUARY, ld.getMonth());
8782
Assert.assertEquals(1, ld.getDayOfMonth());
88-
Assert.assertEquals(2020, ld.getYear());
83+
Assert.assertEquals(2020, ld.getYear());
8984
}
90-
85+
9186
@Test
9287
public void timeConvertSqlDateToLocalDate() {
9388
java.sql.Date date = java.sql.Date.valueOf("2020-01-01");
@@ -154,7 +149,7 @@ public void timeConvertLocalDateTimeToLocalDateTime() {
154149
LocalDateTime ld = (LocalDateTime) cm.convertObject(src, ClassConstants.TIME_LDATETIME);
155150

156151
Assert.assertNotNull(ld);
157-
Assert.assertEquals(src, ld);;
152+
Assert.assertEquals(src, ld);
158153
Assert.assertEquals(Month.JANUARY, ld.getMonth());
159154
Assert.assertEquals(1, ld.getDayOfMonth());
160155
Assert.assertEquals(2020, ld.getYear());
@@ -243,7 +238,7 @@ public void timeConvertLocalTimeToLocalTime() {
243238
LocalTime ld = (LocalTime) cm.convertObject(src, ClassConstants.TIME_LTIME);
244239

245240
Assert.assertNotNull(ld);
246-
Assert.assertEquals(src, ld);;
241+
Assert.assertEquals(src, ld);
247242
Assert.assertEquals(1, ld.getHour());
248243
Assert.assertEquals(15, ld.getMinute());
249244
Assert.assertEquals(30, ld.getSecond());

0 commit comments

Comments
 (0)