|
1 | 1 | package org.jooby.internal; |
2 | 2 |
|
3 | | -import static org.easymock.EasyMock.createMock; |
4 | | -import static org.junit.Assert.assertEquals; |
5 | | -import static org.junit.Assert.assertNotNull; |
6 | | -import static org.junit.Assert.assertTrue; |
| 3 | +import com.google.common.collect.ImmutableList; |
| 4 | +import com.google.common.collect.Lists; |
| 5 | +import com.google.common.collect.Sets; |
| 6 | +import com.google.inject.Injector; |
| 7 | +import com.google.inject.TypeLiteral; |
| 8 | +import com.google.inject.util.Types; |
| 9 | +import com.typesafe.config.ConfigFactory; |
| 10 | +import org.jooby.MediaType; |
| 11 | +import org.jooby.internal.parser.*; |
| 12 | +import org.junit.Test; |
7 | 13 |
|
8 | 14 | import java.math.BigDecimal; |
9 | 15 | import java.math.BigInteger; |
10 | 16 | import java.nio.charset.Charset; |
11 | 17 | import java.text.SimpleDateFormat; |
12 | 18 | import java.time.LocalDate; |
| 19 | +import java.time.ZoneId; |
13 | 20 | import java.time.format.DateTimeFormatter; |
14 | | -import java.util.Arrays; |
15 | | -import java.util.Calendar; |
16 | | -import java.util.Date; |
17 | | -import java.util.List; |
18 | | -import java.util.Locale; |
19 | | -import java.util.Optional; |
20 | | -import java.util.SortedSet; |
21 | | -import java.util.UUID; |
| 21 | +import java.util.*; |
22 | 22 |
|
23 | | -import org.jooby.MediaType; |
24 | | -import org.jooby.internal.parser.DateParser; |
25 | | -import org.jooby.internal.parser.LocalDateParser; |
26 | | -import org.jooby.internal.parser.LocaleParser; |
27 | | -import org.jooby.internal.parser.ParserExecutor; |
28 | | -import org.jooby.internal.parser.StaticMethodParser; |
29 | | -import org.jooby.internal.parser.StringConstructorParser; |
30 | | -import org.junit.Test; |
31 | | - |
32 | | -import com.google.common.collect.ImmutableList; |
33 | | -import com.google.common.collect.Lists; |
34 | | -import com.google.common.collect.Sets; |
35 | | -import com.google.inject.Injector; |
36 | | -import com.google.inject.TypeLiteral; |
37 | | -import com.google.inject.util.Types; |
38 | | -import com.typesafe.config.ConfigFactory; |
| 23 | +import static org.easymock.EasyMock.*; |
| 24 | +import static org.junit.Assert.*; |
39 | 25 |
|
40 | 26 | public class ParamConverterTest { |
41 | 27 |
|
@@ -135,7 +121,9 @@ public void shouldConvertToDateFromLong() throws Throwable { |
135 | 121 | ParserExecutor resolver = newParser(); |
136 | 122 | Date date = resolver.convert(TypeLiteral.get(Date.class), data("1393038000000")); |
137 | 123 | assertNotNull(date); |
138 | | - assertEquals("22/02/2014", new SimpleDateFormat("dd/MM/yyyy").format(date)); |
| 124 | + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); |
| 125 | + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); |
| 126 | + assertEquals("22/02/2014", simpleDateFormat.format(date)); |
139 | 127 | } |
140 | 128 |
|
141 | 129 | @Test |
@@ -399,7 +387,8 @@ private ParserExecutor newParser() { |
399 | 387 | BuiltinParser.Optional, |
400 | 388 | BuiltinParser.Enum, |
401 | 389 | new DateParser("dd/MM/yyyy"), |
402 | | - new LocalDateParser(DateTimeFormatter.ofPattern("dd/MM/yyyy")), |
| 390 | + new LocalDateParser( |
| 391 | + DateTimeFormatter.ofPattern("dd/MM/yyyy").withZone(ZoneId.of("UTC"))), |
403 | 392 | new LocaleParser(), |
404 | 393 | new StaticMethodParser("valueOf"), |
405 | 394 | new StringConstructorParser(), |
|
0 commit comments