Skip to content

Commit 456279c

Browse files
vietjvietj
committed
Remove callback usage in tests
1 parent 98a435d commit 456279c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1241
-723
lines changed

‎vertx-pg-client/src/test/java/io/vertx/pgclient/CloseConnectionTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public void setup() throws Exception {
2626

2727
@After
2828
public void tearDown(TestContext ctx) {
29-
vertx.close(ctx.asyncAssertSuccess());
29+
vertx.close().onComplete(ctx.asyncAssertSuccess());
3030
}
3131

3232
@Test
3333
public void testCloseConnection(TestContext ctx) {
3434
testCloseConnection(ctx, () -> {
3535
PgConnection.connect(vertx, options).onComplete(ctx.asyncAssertSuccess(conn -> {
36-
conn.close(ctx.asyncAssertSuccess());
36+
conn.close().onComplete(ctx.asyncAssertSuccess());
3737
}));
3838
});
3939
}
@@ -43,8 +43,8 @@ public void testClosePooledConnection(TestContext ctx) {
4343
testCloseConnection(ctx, () -> {
4444
PgPool pool = PgPool.pool(vertx, options, new PoolOptions().setMaxSize(1));
4545
pool.getConnection().onComplete(ctx.asyncAssertSuccess(conn -> {
46-
conn.close(ctx.asyncAssertSuccess(v -> {
47-
pool.close(ctx.asyncAssertSuccess());
46+
conn.close().onComplete(ctx.asyncAssertSuccess(v -> {
47+
pool.close().onComplete(ctx.asyncAssertSuccess());
4848
}));
4949
}));
5050
});
@@ -57,7 +57,7 @@ public void testCloseNetSocket(TestContext ctx) {
5757
ConnectionFactory factory = PgDriver.INSTANCE.createConnectionFactory(vertx, options);
5858
pool.connectionProvider(factory::connect);
5959
pool.getConnection().onComplete(ctx.asyncAssertSuccess(conn -> {
60-
conn.close(ctx.asyncAssertSuccess(v -> {
60+
conn.close().onComplete(ctx.asyncAssertSuccess(v -> {
6161
factory.close(Promise.promise());
6262
}));
6363
}));

‎vertx-pg-client/src/test/java/io/vertx/pgclient/NoticeTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,19 @@ public void setup() throws Exception {
4545

4646
@After
4747
public void teardown(TestContext ctx) {
48-
vertx.close(ctx.asyncAssertSuccess());
48+
vertx.close().onComplete(ctx.asyncAssertSuccess());
4949
}
5050

5151
@Test
5252
public void testHandleNotice(TestContext ctx) {
5353
Async async = ctx.async();
54-
PgConnection.connect(vertx, options, ctx.asyncAssertSuccess(conn -> {
54+
PgConnection.connect(vertx, options).onComplete(ctx.asyncAssertSuccess(conn -> {
5555
List<PgNotice> notices = new ArrayList<>();
5656
conn.noticeHandler(notices::add);
5757
conn
5858
.query("SELECT raise_message('the message')")
59-
.execute(ctx.asyncAssertSuccess(result1 -> {
59+
.execute()
60+
.onComplete(ctx.asyncAssertSuccess(result1 -> {
6061
ctx.assertEquals(1, notices.size());
6162
PgNotice notice = notices.get(0);
6263
ctx.assertEquals("the message", notice.getMessage());

‎vertx-pg-client/src/test/java/io/vertx/pgclient/PgClientTestBase.java‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void setup() throws Exception {
5858

5959
@After
6060
public void tearDown(TestContext ctx) {
61-
vertx.close(ctx.asyncAssertSuccess());
61+
vertx.close().onComplete(ctx.asyncAssertSuccess());
6262
}
6363

6464
@Test
@@ -75,8 +75,10 @@ public void testConnectNonSSLServer(TestContext ctx) {
7575
public void testMultipleQuery(TestContext ctx) {
7676
Async async = ctx.async();
7777
connector.accept(ctx.asyncAssertSuccess(conn -> {
78-
conn.query("SELECT id, message from FORTUNE LIMIT 1;SELECT message, id from FORTUNE LIMIT 1")
79-
.execute(ctx.asyncAssertSuccess(result1 -> {
78+
conn
79+
.query("SELECT id, message from FORTUNE LIMIT 1;SELECT message, id from FORTUNE LIMIT 1")
80+
.execute()
81+
.onComplete(ctx.asyncAssertSuccess(result1 -> {
8082
ctx.assertEquals(1, result1.size());
8183
ctx.assertEquals(Arrays.asList("id", "message"), result1.columnsNames());
8284
Tuple row1 = result1.iterator().next();
@@ -102,7 +104,8 @@ public void testInsertReturning(TestContext ctx) {
102104
deleteFromTestTable(ctx, client, () -> {
103105
client
104106
.preparedQuery("INSERT INTO Test (id, val) VALUES ($1, $2) RETURNING id")
105-
.execute(Tuple.of(14, "SomeMessage"), ctx.asyncAssertSuccess(result -> {
107+
.execute(Tuple.of(14, "SomeMessage"))
108+
.onComplete(ctx.asyncAssertSuccess(result -> {
106109
ctx.assertEquals(14, result.iterator().next().getInteger("id"));
107110
async.complete();
108111
}));
@@ -120,7 +123,8 @@ public void testInsertReturningBatch(TestContext ctx) {
120123
Tuple.of(15, "SomeMessage2"));
121124
client
122125
.preparedQuery("INSERT INTO Test (id, val) VALUES ($1, $2) RETURNING id")
123-
.executeBatch(batch, ctx.asyncAssertSuccess(r1 -> {
126+
.executeBatch(batch)
127+
.onComplete(ctx.asyncAssertSuccess(r1 -> {
124128
ctx.assertEquals(14, r1.iterator().next().getInteger("id"));
125129
RowSet<Row> r2 = r1.next();
126130
ctx.assertEquals(15, r2.iterator().next().getInteger("id"));
@@ -136,11 +140,13 @@ public void testInsertReturningError(TestContext ctx) {
136140
connector.accept(ctx.asyncAssertSuccess(client -> {
137141
deleteFromTestTable(ctx, client, () -> {
138142
client.preparedQuery("INSERT INTO Test (id, val) VALUES ($1, $2) RETURNING id")
139-
.execute(Tuple.of(15, "SomeMessage"), ctx.asyncAssertSuccess(result -> {
143+
.execute(Tuple.of(15, "SomeMessage"))
144+
.onComplete(ctx.asyncAssertSuccess(result -> {
140145
ctx.assertEquals(15, result.iterator().next().getInteger("id"));
141146
client
142147
.preparedQuery("INSERT INTO Test (id, val) VALUES ($1, $2) RETURNING id")
143-
.execute(Tuple.of(15, "SomeMessage"), ctx.asyncAssertFailure(err -> {
148+
.execute(Tuple.of(15, "SomeMessage"))
149+
.onComplete(ctx.asyncAssertFailure(err -> {
144150
ctx.assertEquals("23505", ((PgException) err).getSqlState());
145151
async.complete();
146152
}));
@@ -184,7 +190,8 @@ public void testBatchSelect(TestContext ctx) {
184190
batch.add(Tuple.tuple());
185191
conn
186192
.preparedQuery("SELECT count(id) FROM World")
187-
.executeBatch(batch, ctx.asyncAssertSuccess(result -> {
193+
.executeBatch(batch)
194+
.onComplete(ctx.asyncAssertSuccess(result -> {
188195
ctx.assertEquals(result.size(), result.next().size());
189196
async.complete();
190197
}));
@@ -214,12 +221,14 @@ public void testTx(TestContext ctx) {
214221
connector.accept(ctx.asyncAssertSuccess(conn -> {
215222
conn
216223
.query("BEGIN")
217-
.execute(ctx.asyncAssertSuccess(result1 -> {
224+
.execute()
225+
.onComplete(ctx.asyncAssertSuccess(result1 -> {
218226
ctx.assertEquals(0, result1.size());
219227
ctx.assertNotNull(result1.iterator());
220228
conn
221229
.query("COMMIT")
222-
.execute(ctx.asyncAssertSuccess(result2 -> {
230+
.execute()
231+
.onComplete(ctx.asyncAssertSuccess(result2 -> {
223232
ctx.assertEquals(0, result2.size());
224233
async.complete();
225234
}));
@@ -231,12 +240,18 @@ public void testTx(TestContext ctx) {
231240
public void testGrouping(TestContext ctx) {
232241
connector.accept(ctx.asyncAssertSuccess(conn -> {
233242
((SqlClientInternal)conn).group(client -> {
234-
client.query("SHOW TIME ZONE").execute(ctx.asyncAssertSuccess(res -> {
243+
client
244+
.query("SHOW TIME ZONE")
245+
.execute()
246+
.onComplete(ctx.asyncAssertSuccess(res -> {
235247
ctx.assertEquals(1, res.size());
236248
Row row = res.iterator().next();
237249
ctx.assertEquals("PST8PDT", row.getString(0));
238250
}));
239-
conn.query("SET TIME ZONE 'PST8PDT'").execute(ctx.asyncAssertSuccess());
251+
conn
252+
.query("SET TIME ZONE 'PST8PDT'")
253+
.execute()
254+
.onComplete(ctx.asyncAssertSuccess());
240255
});
241256
}));
242257
}

‎vertx-pg-client/src/test/java/io/vertx/pgclient/PgConnectionTest.java‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919

2020
import io.vertx.ext.unit.Async;
2121
import io.vertx.ext.unit.TestContext;
22-
import io.vertx.sqlclient.ClosedConnectionException;
23-
import io.vertx.sqlclient.Row;
24-
import io.vertx.sqlclient.SqlResult;
25-
import io.vertx.sqlclient.Tuple;
22+
import io.vertx.sqlclient.*;
2623
import org.junit.Test;
2724

2825
import java.util.ArrayList;
@@ -34,7 +31,7 @@
3431
public class PgConnectionTest extends PgConnectionTestBase {
3532

3633
public PgConnectionTest() {
37-
connector = (handler) -> PgConnection.connect(vertx, options, ar -> {
34+
connector = (handler) -> PgConnection.connect(vertx, options).onComplete(ar -> {
3835
handler.handle(ar.map(p -> p));
3936
});
4037
}
@@ -43,7 +40,10 @@ public PgConnectionTest() {
4340
public void testSettingSchema(TestContext ctx) {
4441
options.addProperty("search_path", "myschema");
4542
connector.accept(ctx.asyncAssertSuccess(conn -> {
46-
conn.query("SHOW search_path;").execute(ctx.asyncAssertSuccess(pgRowSet -> {
43+
conn
44+
.query("SHOW search_path;")
45+
.execute()
46+
.onComplete(ctx.asyncAssertSuccess(pgRowSet -> {
4747
ctx.assertEquals("myschema", pgRowSet.iterator().next().getString("search_path"));
4848
}));
4949
}));
@@ -55,17 +55,20 @@ public void testBatchUpdate(TestContext ctx) {
5555
connector.accept(ctx.asyncAssertSuccess(conn -> {
5656
deleteFromTestTable(ctx, conn, () -> {
5757
insertIntoTestTable(ctx, conn, 10, () -> {
58-
conn.prepare("UPDATE Test SET val=$1 WHERE id=$2", ctx.asyncAssertSuccess(ps -> {
58+
conn.prepare("UPDATE Test SET val=$1 WHERE id=$2").onComplete(ctx.asyncAssertSuccess(ps -> {
5959
List<Tuple> batch = new ArrayList<>();
6060
batch.add(Tuple.of("val0", 0));
6161
batch.add(Tuple.of("val1", 1));
62-
ps.query().executeBatch(batch, ctx.asyncAssertSuccess(result -> {
62+
ps
63+
.query()
64+
.executeBatch(batch)
65+
.onComplete(ctx.asyncAssertSuccess(result -> {
6366
for (int i = 0;i < 2;i++) {
6467
ctx.assertEquals(1, result.rowCount());
6568
result = result.next();
6669
}
6770
ctx.assertNull(result);
68-
ps.close(ctx.asyncAssertSuccess(v -> {
71+
ps.close().onComplete(ctx.asyncAssertSuccess(v -> {
6972
async.complete();
7073
}));
7174
}));
@@ -83,9 +86,10 @@ public void testQueueQueries(TestContext ctx) {
8386
for (int i = 0;i < num;i++) {
8487
conn
8588
.query("SELECT id, randomnumber from WORLD")
86-
.execute(ar -> {
89+
.execute()
90+
.onComplete(ar -> {
8791
if (ar.succeeded()) {
88-
SqlResult result = ar.result();
92+
RowSet<Row> result = ar.result();
8993
ctx.assertEquals(10000, result.size());
9094
} else {
9195
ctx.assertEquals("closed", ar.cause().getMessage());
@@ -107,11 +111,14 @@ public void testCancelRequest(TestContext ctx) {
107111
connector.accept(ctx.asyncAssertSuccess(conn -> {
108112
conn
109113
.query("SELECT pg_sleep(10)")
110-
.execute(ctx.asyncAssertFailure(error -> {
114+
.execute()
115+
.onComplete(ctx.asyncAssertFailure(error -> {
111116
ctx.assertTrue(hasSqlstateCode(error, ERRCODE_QUERY_CANCELED), error.getMessage());
112117
async.countDown();
113118
}));
114-
((PgConnection)conn).cancelRequest(ctx.asyncAssertSuccess());
119+
((PgConnection)conn)
120+
.cancelRequest()
121+
.onComplete(ctx.asyncAssertSuccess());
115122

116123
conn.closeHandler(v -> {
117124
ctx.assertEquals(1, async.count());
@@ -124,15 +131,24 @@ public void testCancelRequest(TestContext ctx) {
124131
@Test
125132
public void testInflightCommandsFailWhenConnectionClosed(TestContext ctx) {
126133
connector.accept(ctx.asyncAssertSuccess(conn1 -> {
127-
conn1.query("SELECT pg_sleep(20)").execute(ctx.asyncAssertFailure(t -> {
134+
conn1
135+
.query("SELECT pg_sleep(20)")
136+
.execute()
137+
.onComplete(ctx.asyncAssertFailure(t -> {
128138
ctx.assertTrue(t instanceof ClosedConnectionException);
129139
}));
130140
connector.accept(ctx.asyncAssertSuccess(conn2 -> {
131-
conn2.query("SELECT * FROM pg_stat_activity WHERE state = 'active' AND query = 'SELECT pg_sleep(20)'").execute(ctx.asyncAssertSuccess(statRes -> {
141+
conn2
142+
.query("SELECT * FROM pg_stat_activity WHERE state = 'active' AND query = 'SELECT pg_sleep(20)'")
143+
.execute()
144+
.onComplete(ctx.asyncAssertSuccess(statRes -> {
132145
for (Row row : statRes) {
133146
Integer id = row.getInteger("pid");
134147
// kill the connection
135-
conn2.query(String.format("SELECT pg_terminate_backend(%d);", id)).execute(ctx.asyncAssertSuccess(v -> conn2.close()));
148+
conn2
149+
.query(String.format("SELECT pg_terminate_backend(%d);", id))
150+
.execute()
151+
.onComplete(ctx.asyncAssertSuccess(v -> conn2.close()));
136152
break;
137153
}
138154
}));

0 commit comments

Comments
 (0)