Skip to content

Commit 99b87f5

Browse files
author
Vojta Hordejcuk
committed
little refactoring, improved tests
1 parent 3371856 commit 99b87f5

File tree

5 files changed

+63
-28
lines changed

5 files changed

+63
-28
lines changed

‎src/test/java/cz/voho/jdbcis/operation/InsertQueriesTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public void testInsertSingleRowAndGetKeyUsingPreparedStatement() throws Exceptio
4444
assertThat(actual).isGreaterThan(1);
4545
}
4646

47-
4847
@Test
4948
public void testInsertSingleRowAndGetKeyUsingRawValues() throws Exception {
5049
final Long actual = toTest().insertSingleAndGetFirstLongKey("INSERT INTO t (c_text) VALUES ('testInsertSingleRowAndGetKeyUsingRawValues')");

‎src/test/java/cz/voho/jdbcis/operation/ListQueriesTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public class ListQueriesTest extends AbstractOperationTest {
1515
@Test
1616
public void queryForListUsingPreparedStatement() throws Exception {
1717
final List<TestRow> list = toTest().queryForList(
18-
"SELECT * FROM t WHERE c_text LIKE ?",
18+
"SELECT c_pk,c_decimal,c_date,c_timestamp,c_double,c_integer,c_bigint,c_varchar,c_text,c_time FROM t WHERE c_text LIKE ?",
1919
preparedStatement -> DataType.STRING.setNullableToPreparedStatement(preparedStatement, 1, "Predefined-%"),
2020
TestRow.ROW_MAPPER
2121
);
2222

2323
assertThat(list)
24-
.extracting(TestRow::getcString)
24+
.extracting(TestRow::getcLongString)
2525
.contains(
2626
"Predefined-1",
2727
"Predefined-2",
@@ -34,12 +34,12 @@ public void queryForListUsingPreparedStatement() throws Exception {
3434
@Test
3535
public void queryForListUsingRawValues() throws Exception {
3636
final List<TestRow> list = toTest().queryForList(
37-
"SELECT * FROM t WHERE c_text LIKE 'Predefined-%'",
37+
"SELECT c_pk,c_decimal,c_date,c_timestamp,c_double,c_integer,c_bigint,c_varchar,c_text,c_time FROM t WHERE c_text LIKE 'Predefined-%'",
3838
TestRow.ROW_MAPPER
3939
);
4040

4141
assertThat(list)
42-
.extracting(TestRow::getcString)
42+
.extracting(TestRow::getcLongString)
4343
.contains(
4444
"Predefined-1",
4545
"Predefined-2",

‎src/test/java/cz/voho/jdbcis/operation/SingleQueriesTest.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,20 @@
1212
public class SingleQueriesTest extends AbstractOperationTest {
1313
@Test
1414
public void queryForSingleRowUsingPreparedStatement() throws Exception {
15-
TestRow row = toTest().queryForSingle(
16-
"SELECT * FROM t WHERE c_pk = ?",
15+
final TestRow row = toTest().queryForSingle(
16+
"SELECT c_pk,c_decimal,c_date,c_timestamp,c_double,c_integer,c_bigint,c_varchar,c_text,c_time FROM t WHERE c_pk = ?",
1717
preparedStatement -> DataType.LONG.setNullableToPreparedStatement(preparedStatement, 1, 1L),
1818
TestRow.ROW_MAPPER);
1919

20-
assertThat(row.getcString()).isEqualTo("Predefined-1");
20+
assertThat(row.getcLongString()).isEqualTo("Predefined-1");
2121
}
2222

23-
2423
@Test
2524
public void queryForSingleRowUsingRawValues() throws Exception {
26-
TestRow row = toTest().queryForSingle(
27-
"SELECT * FROM t WHERE c_pk = 1",
25+
final TestRow row = toTest().queryForSingle(
26+
"SELECT c_pk,c_decimal,c_date,c_timestamp,c_double,c_integer,c_bigint,c_varchar,c_text,c_time FROM t WHERE c_pk = 1",
2827
TestRow.ROW_MAPPER);
2928

30-
assertThat(row.getcString()).isEqualTo("Predefined-1");
29+
assertThat(row.getcLongString()).isEqualTo("Predefined-1");
3130
}
3231
}

‎src/test/java/cz/voho/jdbcis/operation/UpdateQueriesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class UpdateQueriesTest extends AbstractOperationTest {
1212
@Test
1313
public void updateSingleRowUsingPreparedStatement() throws Exception {
14-
long actual = toTest().update("UPDATE t SET c_text = ?", preparedStatement -> {
14+
final long actual = toTest().update("UPDATE t SET c_text = ?", preparedStatement -> {
1515
DataType.STRING.setNullableToPreparedStatement(preparedStatement, 1, "updateSingleRowUsingPreparedStatement");
1616
});
1717

@@ -20,7 +20,7 @@ public void updateSingleRowUsingPreparedStatement() throws Exception {
2020

2121
@Test
2222
public void updateSingleRowUsingRawValues() throws Exception {
23-
long actual = toTest().update("UPDATE t SET c_text = 'updateSingleRowUsingRawValues'");
23+
final long actual = toTest().update("UPDATE t SET c_text = 'updateSingleRowUsingRawValues'");
2424

2525
assertThat(actual).isEqualTo(5L);
2626
}

‎src/test/java/cz/voho/jdbcis/operation/model/TestRow.java

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,95 +8,132 @@
88
import java.time.LocalDateTime;
99
import java.time.LocalTime;
1010

11+
import static org.assertj.core.api.Assertions.assertThat;
12+
1113
/**
1214
* Test model object.
1315
*/
1416
public class TestRow {
1517
public static RowMapper<TestRow> ROW_MAPPER = resultSet -> {
1618
TestRow row = new TestRow();
19+
1720
// primary key
18-
row.setcLong(DataType.LONG.getNullableFromResultSet(resultSet, "c_pk"));
21+
row.setcPK(DataType.LONG.getNullableFromResultSet(resultSet, "c_pk"));
1922
// other columns
23+
row.setcBigDecimal(DataType.BIG_DECIMAL.getNullableFromResultSet(resultSet, "c_decimal"));
2024
row.setcLocalDate(DataType.DATE.getNullableFromResultSet(resultSet, "c_date"));
2125
row.setcLocalDateTime(DataType.DATE_TIME.getNullableFromResultSet(resultSet, "c_timestamp"));
2226
row.setcDouble(DataType.DOUBLE.getNullableFromResultSet(resultSet, "c_double"));
2327
row.setcInteger(DataType.INTEGER.getNullableFromResultSet(resultSet, "c_integer"));
2428
row.setcLong(DataType.LONG.getNullableFromResultSet(resultSet, "c_bigint"));
25-
row.setcString(DataType.STRING.getNullableFromResultSet(resultSet, "c_text"));
29+
row.setcShortString(DataType.STRING.getNullableFromResultSet(resultSet, "c_varchar"));
30+
row.setcLongString(DataType.STRING.getNullableFromResultSet(resultSet, "c_text"));
2631
row.setcLocalTime(DataType.TIME.getNullableFromResultSet(resultSet, "c_time"));
32+
33+
// primary key
34+
assertThat(DataType.LONG.getNullableFromResultSet(resultSet, 1)).isEqualTo(row.getcPK());
35+
// other columns
36+
assertThat(DataType.BIG_DECIMAL.getNullableFromResultSet(resultSet, 2)).isEqualTo(row.getcBigDecimal());
37+
assertThat(DataType.DATE.getNullableFromResultSet(resultSet, 3)).isEqualTo(row.getcLocalDate());
38+
assertThat(DataType.DATE_TIME.getNullableFromResultSet(resultSet, 4)).isEqualTo(row.getcLocalDateTime());
39+
assertThat(DataType.DOUBLE.getNullableFromResultSet(resultSet, 5)).isEqualTo(row.getcDouble());
40+
assertThat(DataType.INTEGER.getNullableFromResultSet(resultSet, 6)).isEqualTo(row.getcInteger());
41+
assertThat(DataType.LONG.getNullableFromResultSet(resultSet, 7)).isEqualTo(row.getcLong());
42+
assertThat(DataType.STRING.getNullableFromResultSet(resultSet, 8)).isEqualTo(row.getcShortString());
43+
assertThat(DataType.STRING.getNullableFromResultSet(resultSet, 9)).isEqualTo(row.getcLongString());
44+
assertThat(DataType.TIME.getNullableFromResultSet(resultSet, 10)).isEqualTo(row.getcLocalTime());
45+
2746
return row;
2847
};
2948

49+
private Long cPK;
3050
private BigDecimal cBigDecimal;
3151
private LocalDate cLocalDate;
3252
private LocalDateTime cLocalDateTime;
3353
private Double cDouble;
3454
private Integer cInteger;
3555
private Long cLong;
36-
private String cString;
56+
private String cShortString;
57+
private String cLongString;
3758
private LocalTime cLocalTime;
3859

60+
public Long getcPK() {
61+
return cPK;
62+
}
63+
64+
public void setcPK(final Long cPK) {
65+
this.cPK = cPK;
66+
}
67+
3968
public BigDecimal getcBigDecimal() {
4069
return cBigDecimal;
4170
}
4271

43-
public void setcBigDecimal(BigDecimal cBigDecimal) {
72+
public void setcBigDecimal(final BigDecimal cBigDecimal) {
4473
this.cBigDecimal = cBigDecimal;
4574
}
4675

4776
public LocalDate getcLocalDate() {
4877
return cLocalDate;
4978
}
5079

51-
public void setcLocalDate(LocalDate cLocalDate) {
80+
public void setcLocalDate(final LocalDate cLocalDate) {
5281
this.cLocalDate = cLocalDate;
5382
}
5483

5584
public LocalDateTime getcLocalDateTime() {
5685
return cLocalDateTime;
5786
}
5887

59-
public void setcLocalDateTime(LocalDateTime cLocalDateTime) {
88+
public void setcLocalDateTime(final LocalDateTime cLocalDateTime) {
6089
this.cLocalDateTime = cLocalDateTime;
6190
}
6291

6392
public Double getcDouble() {
6493
return cDouble;
6594
}
6695

67-
public void setcDouble(Double cDouble) {
96+
public void setcDouble(final Double cDouble) {
6897
this.cDouble = cDouble;
6998
}
7099

71100
public Integer getcInteger() {
72101
return cInteger;
73102
}
74103

75-
public void setcInteger(Integer cInteger) {
104+
public void setcInteger(final Integer cInteger) {
76105
this.cInteger = cInteger;
77106
}
78107

79108
public Long getcLong() {
80109
return cLong;
81110
}
82111

83-
public void setcLong(Long cLong) {
112+
public void setcLong(final Long cLong) {
84113
this.cLong = cLong;
85114
}
86115

87-
public String getcString() {
88-
return cString;
116+
public String getcShortString() {
117+
return cShortString;
118+
}
119+
120+
public void setcShortString(final String cShortString) {
121+
this.cShortString = cShortString;
122+
}
123+
124+
public String getcLongString() {
125+
return cLongString;
89126
}
90127

91-
public void setcString(String cString) {
92-
this.cString = cString;
128+
public void setcLongString(final String cLongString) {
129+
this.cLongString = cLongString;
93130
}
94131

95132
public LocalTime getcLocalTime() {
96133
return cLocalTime;
97134
}
98135

99-
public void setcLocalTime(LocalTime cLocalTime) {
136+
public void setcLocalTime(final LocalTime cLocalTime) {
100137
this.cLocalTime = cLocalTime;
101138
}
102139
}

0 commit comments

Comments
 (0)