Skip to content

Commit bd6c993

Browse files
liuhuaguiliuhuagui
committed
Changed the previous Tests
1 parent 39ceb69 commit bd6c993

File tree

10 files changed

+172
-172
lines changed

10 files changed

+172
-172
lines changed

‎src/test/java/examples/animal/data/FetchFirstTest.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public void testOffsetAndFetchFirstAfterFrom() {
7979
assertAll(
8080
() -> assertThat(records.size()).isEqualTo(3),
8181
() -> assertThat(records.get(0).getId()).isEqualTo(23),
82-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData offset #{parameters._offset} rows fetch first #{parameters._fetchFirstRows} rows only"),
83-
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L),
84-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
82+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData offset #{parameters._offset1} rows fetch first #{parameters._fetchFirstRows2} rows only"),
83+
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows2")).isEqualTo(3L),
84+
() -> assertThat(selectStatement.getParameters().get("_offset1")).isEqualTo(22L)
8585
);
8686
}
8787
}
@@ -101,8 +101,8 @@ public void testFetchFirstOnlyAfterFrom() {
101101
assertAll(
102102
() -> assertThat(records.size()).isEqualTo(3),
103103
() -> assertThat(records.get(0).getId()).isEqualTo(1),
104-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData fetch first #{parameters._fetchFirstRows} rows only"),
105-
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L)
104+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData fetch first #{parameters._fetchFirstRows1} rows only"),
105+
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows1")).isEqualTo(3L)
106106
);
107107
}
108108
}
@@ -125,9 +125,9 @@ public void testOffsetAndFetchFirstAfterWhere() {
125125
assertAll(
126126
() -> assertThat(records.size()).isEqualTo(3),
127127
() -> assertThat(records.get(0).getId()).isEqualTo(45),
128-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} and id > #{parameters.p2,jdbcType=INTEGER} offset #{parameters._offset} rows fetch first #{parameters._fetchFirstRows} rows only"),
129-
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L),
130-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
128+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} and id > #{parameters.p2,jdbcType=INTEGER} offset #{parameters._offset3} rows fetch first #{parameters._fetchFirstRows4} rows only"),
129+
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows4")).isEqualTo(3L),
130+
() -> assertThat(selectStatement.getParameters().get("_offset3")).isEqualTo(22L)
131131
);
132132
}
133133
}
@@ -148,8 +148,8 @@ public void testFetchFirstOnlyAfterWhere() {
148148
assertAll(
149149
() -> assertThat(records.size()).isEqualTo(3),
150150
() -> assertThat(records.get(0).getId()).isEqualTo(1),
151-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} fetch first #{parameters._fetchFirstRows} rows only"),
152-
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L)
151+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} fetch first #{parameters._fetchFirstRows2} rows only"),
152+
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows2")).isEqualTo(3L)
153153
);
154154
}
155155
}
@@ -171,9 +171,9 @@ public void testOffsetAndFetchFirstAfterOrderBy() {
171171
assertAll(
172172
() -> assertThat(records.size()).isEqualTo(3),
173173
() -> assertThat(records.get(0).getId()).isEqualTo(23),
174-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id offset #{parameters._offset} rows fetch first #{parameters._fetchFirstRows} rows only"),
175-
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L),
176-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
174+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id offset #{parameters._offset1} rows fetch first #{parameters._fetchFirstRows2} rows only"),
175+
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows2")).isEqualTo(3L),
176+
() -> assertThat(selectStatement.getParameters().get("_offset1")).isEqualTo(22L)
177177
);
178178
}
179179
}
@@ -194,8 +194,8 @@ public void testLimitOnlyAfterOrderBy() {
194194
assertAll(
195195
() -> assertThat(records.size()).isEqualTo(3),
196196
() -> assertThat(records.get(0).getId()).isEqualTo(1),
197-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id fetch first #{parameters._fetchFirstRows} rows only"),
198-
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(3L)
197+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id fetch first #{parameters._fetchFirstRows1} rows only"),
198+
() -> assertThat(selectStatement.getParameters().get("_fetchFirstRows1")).isEqualTo(3L)
199199
);
200200
}
201201
}

‎src/test/java/examples/animal/data/LimitAndOffsetTest.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public void testLimitAndOffsetAfterFrom() {
7979
assertAll(
8080
() -> assertThat(records.size()).isEqualTo(3),
8181
() -> assertThat(records.get(0).getId()).isEqualTo(23),
82-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData limit #{parameters._limit} offset #{parameters._offset}"),
83-
() -> assertThat(selectStatement.getParameters().get("_limit")).isEqualTo(3L),
84-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
82+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData limit #{parameters._limit1} offset #{parameters._offset2}"),
83+
() -> assertThat(selectStatement.getParameters().get("_limit1")).isEqualTo(3L),
84+
() -> assertThat(selectStatement.getParameters().get("_offset2")).isEqualTo(22L)
8585
);
8686
}
8787
}
@@ -101,8 +101,8 @@ public void testLimitOnlyAfterFrom() {
101101
assertAll(
102102
() -> assertThat(records.size()).isEqualTo(3),
103103
() -> assertThat(records.get(0).getId()).isEqualTo(1),
104-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData limit #{parameters._limit}"),
105-
() -> assertThat(selectStatement.getParameters().get("_limit")).isEqualTo(3L)
104+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData limit #{parameters._limit1}"),
105+
() -> assertThat(selectStatement.getParameters().get("_limit1")).isEqualTo(3L)
106106
);
107107
}
108108
}
@@ -122,8 +122,8 @@ public void testOffsetOnlyAfterFrom() {
122122
assertAll(
123123
() -> assertThat(records.size()).isEqualTo(43),
124124
() -> assertThat(records.get(0).getId()).isEqualTo(23),
125-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData offset #{parameters._offset} rows"),
126-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
125+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData offset #{parameters._offset1} rows"),
126+
() -> assertThat(selectStatement.getParameters().get("_offset1")).isEqualTo(22L)
127127
);
128128
}
129129
}
@@ -146,9 +146,9 @@ public void testLimitAndOffsetAfterWhere() {
146146
assertAll(
147147
() -> assertThat(records.size()).isEqualTo(3),
148148
() -> assertThat(records.get(0).getId()).isEqualTo(45),
149-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} and id > #{parameters.p2,jdbcType=INTEGER} limit #{parameters._limit} offset #{parameters._offset}"),
150-
() -> assertThat(selectStatement.getParameters().get("_limit")).isEqualTo(3L),
151-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
149+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} and id > #{parameters.p2,jdbcType=INTEGER} limit #{parameters._limit3} offset #{parameters._offset4}"),
150+
() -> assertThat(selectStatement.getParameters().get("_limit3")).isEqualTo(3L),
151+
() -> assertThat(selectStatement.getParameters().get("_offset4")).isEqualTo(22L)
152152
);
153153
}
154154
}
@@ -169,8 +169,8 @@ public void testLimitOnlyAfterWhere() {
169169
assertAll(
170170
() -> assertThat(records.size()).isEqualTo(3),
171171
() -> assertThat(records.get(0).getId()).isEqualTo(1),
172-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} limit #{parameters._limit}"),
173-
() -> assertThat(selectStatement.getParameters().get("_limit")).isEqualTo(3L)
172+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} limit #{parameters._limit2}"),
173+
() -> assertThat(selectStatement.getParameters().get("_limit2")).isEqualTo(3L)
174174
);
175175
}
176176
}
@@ -191,8 +191,8 @@ public void testOffsetOnlyAfterWhere() {
191191
assertAll(
192192
() -> assertThat(records.size()).isEqualTo(27),
193193
() -> assertThat(records.get(0).getId()).isEqualTo(23),
194-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} offset #{parameters._offset} rows"),
195-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
194+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData where id < #{parameters.p1,jdbcType=INTEGER} offset #{parameters._offset2} rows"),
195+
() -> assertThat(selectStatement.getParameters().get("_offset2")).isEqualTo(22L)
196196
);
197197
}
198198
}
@@ -214,9 +214,9 @@ public void testLimitAndOffsetAfterOrderBy() {
214214
assertAll(
215215
() -> assertThat(records.size()).isEqualTo(3),
216216
() -> assertThat(records.get(0).getId()).isEqualTo(23),
217-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id limit #{parameters._limit} offset #{parameters._offset}"),
218-
() -> assertThat(selectStatement.getParameters().get("_limit")).isEqualTo(3L),
219-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
217+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id limit #{parameters._limit1} offset #{parameters._offset2}"),
218+
() -> assertThat(selectStatement.getParameters().get("_limit1")).isEqualTo(3L),
219+
() -> assertThat(selectStatement.getParameters().get("_offset2")).isEqualTo(22L)
220220
);
221221
}
222222
}
@@ -237,8 +237,8 @@ public void testLimitOnlyAfterOrderBy() {
237237
assertAll(
238238
() -> assertThat(records.size()).isEqualTo(3),
239239
() -> assertThat(records.get(0).getId()).isEqualTo(1),
240-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id limit #{parameters._limit}"),
241-
() -> assertThat(selectStatement.getParameters().get("_limit")).isEqualTo(3L)
240+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id limit #{parameters._limit1}"),
241+
() -> assertThat(selectStatement.getParameters().get("_limit1")).isEqualTo(3L)
242242
);
243243
}
244244
}
@@ -259,8 +259,8 @@ public void testOffsetOnlyAfterOrderBy() {
259259
assertAll(
260260
() -> assertThat(records.size()).isEqualTo(43),
261261
() -> assertThat(records.get(0).getId()).isEqualTo(23),
262-
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id offset #{parameters._offset} rows"),
263-
() -> assertThat(selectStatement.getParameters().get("_offset")).isEqualTo(22L)
262+
() -> assertThat(selectStatement.getSelectStatement()).isEqualTo("select * from AnimalData order by id offset #{parameters._offset1} rows"),
263+
() -> assertThat(selectStatement.getParameters().get("_offset1")).isEqualTo(22L)
264264
);
265265
}
266266
}

‎src/test/java/examples/complexquery/ComplexQueryTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ public void testId() {
4040
+ " from Person"
4141
+ " where person_id = #{parameters.p1}"
4242
+ " order by last_name, first_name"
43-
+ " fetch first #{parameters._fetchFirstRows} rows only";
43+
+ " fetch first #{parameters._fetchFirstRows2} rows only";
4444

4545
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
4646
assertThat(selectStatement.getParameters().get("p1")).isEqualTo(2);
47-
assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(50L);
47+
assertThat(selectStatement.getParameters().get("_fetchFirstRows2")).isEqualTo(50L);
4848
}
4949

5050
@Test
@@ -55,11 +55,11 @@ public void testFirstNameOnly() {
5555
+ " from Person"
5656
+ " where first_name like #{parameters.p1}"
5757
+ " order by last_name, first_name"
58-
+ " fetch first #{parameters._fetchFirstRows} rows only";
58+
+ " fetch first #{parameters._fetchFirstRows2} rows only";
5959

6060
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
6161
assertThat(selectStatement.getParameters().get("p1")).isEqualTo("%fred%");
62-
assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(50L);
62+
assertThat(selectStatement.getParameters().get("_fetchFirstRows2")).isEqualTo(50L);
6363
}
6464

6565
@Test
@@ -70,11 +70,11 @@ public void testLastNameOnly() {
7070
+ " from Person"
7171
+ " where last_name like #{parameters.p1}"
7272
+ " order by last_name, first_name"
73-
+ " fetch first #{parameters._fetchFirstRows} rows only";
73+
+ " fetch first #{parameters._fetchFirstRows2} rows only";
7474

7575
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
7676
assertThat(selectStatement.getParameters().get("p1")).isEqualTo("%flintstone%");
77-
assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(50L);
77+
assertThat(selectStatement.getParameters().get("_fetchFirstRows2")).isEqualTo(50L);
7878
}
7979

8080
@Test
@@ -86,12 +86,12 @@ public void testBothNames() {
8686
+ " where first_name like #{parameters.p1}"
8787
+ " and last_name like #{parameters.p2}"
8888
+ " order by last_name, first_name"
89-
+ " fetch first #{parameters._fetchFirstRows} rows only";
89+
+ " fetch first #{parameters._fetchFirstRows3} rows only";
9090

9191
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
9292
assertThat(selectStatement.getParameters().get("p1")).isEqualTo("%fred%");
9393
assertThat(selectStatement.getParameters().get("p2")).isEqualTo("%flintstone%");
94-
assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(50L);
94+
assertThat(selectStatement.getParameters().get("_fetchFirstRows3")).isEqualTo(50L);
9595
}
9696

9797
@Test
@@ -101,10 +101,10 @@ public void testAllNull() {
101101
String expected = "select person_id, first_name, last_name"
102102
+ " from Person"
103103
+ " order by last_name, first_name"
104-
+ " fetch first #{parameters._fetchFirstRows} rows only";
104+
+ " fetch first #{parameters._fetchFirstRows1} rows only";
105105

106106
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
107-
assertThat(selectStatement.getParameters().get("_fetchFirstRows")).isEqualTo(50L);
107+
assertThat(selectStatement.getParameters().get("_fetchFirstRows1")).isEqualTo(50L);
108108
}
109109

110110
public SelectStatementProvider search(Integer targetId, String fName, String lName) {

0 commit comments

Comments
 (0)