Skip to content

Commit 49b5070

Browse files
vadegvadeg
committed
Fix integration test
1 parent 4337559 commit 49b5070

File tree

1 file changed

+51
-47
lines changed

1 file changed

+51
-47
lines changed

‎src/test/java/org/zalando/typemapper/postgres/PgSerializerToDatabaseTestIT.java

Lines changed: 51 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
//J-
22
package org.zalando.typemapper.postgres;
33

4+
import org.junit.After;
5+
import org.junit.Before;
6+
import org.junit.Test;
7+
import org.junit.runner.RunWith;
8+
import org.junit.runners.Parameterized;
9+
import org.junit.runners.Parameterized.Parameters;
10+
import org.springframework.jdbc.core.JdbcTemplate;
11+
import org.springframework.jdbc.datasource.SingleConnectionDataSource;
12+
import org.springframework.test.context.TestContextManager;
413
import org.zalando.typemapper.AbstractTest;
514
import org.zalando.typemapper.namedresult.results.ClassWithEnum;
615
import org.zalando.typemapper.namedresult.results.ClassWithPredefinedTransformer;
@@ -13,58 +22,32 @@
1322
import org.zalando.typemapper.namedresult.results.InheritedClassWithPrimitivesDeprecated;
1423
import org.zalando.typemapper.namedresult.transformer.Hans;
1524

16-
17-
import org.junit.After;
18-
import org.junit.Before;
19-
import org.junit.Test;
20-
import org.junit.runner.RunWith;
21-
import org.junit.runners.Parameterized;
22-
import org.junit.runners.Parameterized.Parameters;
23-
import org.springframework.jdbc.core.JdbcTemplate;
24-
import org.springframework.jdbc.datasource.SingleConnectionDataSource;
25-
import org.springframework.test.context.TestContextManager;
26-
2725
import java.sql.SQLException;
2826
import java.sql.Types;
29-
import java.util.*;
30-
31-
32-
import static org.zalando.typemapper.postgres.PgArray.ARRAY;
33-
import static org.zalando.typemapper.postgres.PgRow.ROW;
34-
27+
import java.time.OffsetDateTime;
28+
import java.time.ZoneId;
29+
import java.time.format.DateTimeFormatter;
30+
import java.util.Arrays;
31+
import java.util.Collection;
32+
import java.util.Date;
33+
import java.util.HashMap;
34+
import java.util.Map;
3535

3636
import static org.hamcrest.CoreMatchers.is;
3737
import static org.hamcrest.MatcherAssert.assertThat;
38+
import static org.zalando.typemapper.postgres.PgArray.ARRAY;
39+
import static org.zalando.typemapper.postgres.PgRow.ROW;
3840

3941

4042
@RunWith(Parameterized.class)
4143
public class PgSerializerToDatabaseTestIT extends AbstractTest {
4244

43-
private TestContextManager testContextManager;
44-
45-
@Override
46-
protected void prepareContext() throws Exception {
47-
testContextManager = new TestContextManager(getClass());
48-
testContextManager.prepareTestInstance(this);
49-
}
50-
51-
@Before
52-
public void createJdbcTemplate() {
53-
// BasicConfigurator.configure();
54-
// Logger.getRootLogger().setLevel(Level.INFO);
55-
// Logger.getLogger(org.springframework.jdbc.datasource.DataSourceUtils.class).setLevel(Level.INFO);
56-
// Logger.getLogger("org.springframework.jdbc.core.JdbcTemplate").setLevel(Level.WARN);
57-
// Logger.getLogger("org.springframework.beans").setLevel(Level.WARN);
58-
// Logger.getLogger("org.springframework.jdbc.support").setLevel(Level.WARN);
59-
60-
this.template = new JdbcTemplate(new SingleConnectionDataSource(this.connection, false));
61-
}
62-
63-
// Fields
64-
private JdbcTemplate template;
6545
private final Object objectToSerialize;
6646
private final String expectedString;
6747
private final int expectedSQLType;
48+
private TestContextManager testContextManager;
49+
// Fields
50+
private JdbcTemplate template;
6851

6952
/*
7053
* Constructor. The JUnit test runner will instantiate this class once for
@@ -161,10 +144,10 @@ public static Collection<Object[]> generateData() throws SQLException {
161144
/* 13 */
162145
{
163146
ROW(1,
164-
new ClassWithPrimitives[]{
165-
new ClassWithPrimitives(1, 100L, 'a'), new ClassWithPrimitives(2, 200L,
166-
'b')
167-
}).asPGobject("int_with_additional_type_array"),
147+
new ClassWithPrimitives[]{
148+
new ClassWithPrimitives(1, 100L, 'a'), new ClassWithPrimitives(2, 200L,
149+
'b')
150+
}).asPGobject("int_with_additional_type_array"),
168151
"(1,\"{\"\"(a,1,100)\"\",\"\"(b,2,200)\"\"}\")", Types.OTHER
169152
},
170153

@@ -188,8 +171,9 @@ public static Collection<Object[]> generateData() throws SQLException {
188171
{
189172
PgTypeHelper.asPGobject(
190173
new ClassWithSimpleTransformers(GenderCode.MALE, GenderCode.MALE,
191-
GenderCode.MALE, "path",
192-
"listElement1", "listElement2", "listElement3")),
174+
GenderCode.MALE, "path",
175+
"listElement1", "listElement2",
176+
"listElement3")),
193177
"(path,homme,0,MALE,listElement1#listElement2#listElement3)", Types.OTHER
194178
},
195179

@@ -212,7 +196,9 @@ public static Collection<Object[]> generateData() throws SQLException {
212196
},
213197

214198
/* 20 */
215-
{new Date(1354338366000L), "2012-12-01 06:06:06+01", Types.TIMESTAMP},
199+
{new Date(1354338366000L), OffsetDateTime.parse("2012-12-01T06:06:06+01:00")
200+
.atZoneSameInstant(ZoneId.systemDefault())
201+
.format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ssx")), Types.TIMESTAMP},
216202

217203
/* 21 */
218204
{new Date(1349064366000L), "2012-10-01 06:06:06+02", Types.TIMESTAMP},
@@ -224,6 +210,24 @@ public static Collection<Object[]> generateData() throws SQLException {
224210
});
225211
}
226212

213+
@Override
214+
protected void prepareContext() throws Exception {
215+
testContextManager = new TestContextManager(getClass());
216+
testContextManager.prepareTestInstance(this);
217+
}
218+
219+
@Before
220+
public void createJdbcTemplate() {
221+
// BasicConfigurator.configure();
222+
// Logger.getRootLogger().setLevel(Level.INFO);
223+
// Logger.getLogger(org.springframework.jdbc.datasource.DataSourceUtils.class).setLevel(Level.INFO);
224+
// Logger.getLogger("org.springframework.jdbc.core.JdbcTemplate").setLevel(Level.WARN);
225+
// Logger.getLogger("org.springframework.beans").setLevel(Level.WARN);
226+
// Logger.getLogger("org.springframework.jdbc.support").setLevel(Level.WARN);
227+
228+
this.template = new JdbcTemplate(new SingleConnectionDataSource(this.connection, false));
229+
}
230+
227231
@Before
228232
public void createNeededTypes() throws SQLException {
229233
execute("CREATE TYPE tmp.int_duplet AS (a int, b int);");
@@ -267,7 +271,7 @@ public void dropUsedTypes() throws SQLException {
267271
@Test
268272
public void passingParametersToQueryTest() {
269273
assertThat(template.queryForObject("SELECT (?)::TEXT", new Object[]{this.objectToSerialize},
270-
new int[]{this.expectedSQLType}, String.class), is(this.expectedString));
274+
new int[]{this.expectedSQLType}, String.class), is(this.expectedString));
271275
}
272276
}
273277
//J+

0 commit comments

Comments
 (0)