Skip to content

Commit 63c11bb

Browse files
committed
Convert classes inheriting from AsyncTestBase and VertxTestBase but not using them to plain simple tests.
1 parent 6f1e3fe commit 63c11bb

21 files changed

Lines changed: 73 additions & 61 deletions

vertx-core-java21-tests/src/test/java/io/vertx/tests/jacksonv3/JacksonDatabindTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.List;
2626
import java.util.Map;
2727

28+
import static org.junit.Assert.*;
2829

2930
/**
3031
* @author <a href="http://tfox.org">Tim Fox</a>

vertx-core/src/test/java/io/vertx/it/jackson/JacksonDatabindAbsenceTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313

1414
import io.vertx.core.json.DecodeException;
1515
import io.vertx.core.json.JsonObject;
16-
import io.vertx.test.core.VertxTestBase;
1716
import org.junit.Test;
1817

18+
import static org.junit.Assert.*;
19+
1920
/**
2021
* @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
2122
*/
22-
public class JacksonDatabindAbsenceTest extends VertxTestBase {
23+
public class JacksonDatabindAbsenceTest {
2324

2425
@Test
2526
public void testJsonObject() {

vertx-core/src/test/java/io/vertx/it/json/CustomJsonFactoryTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
import io.vertx.core.json.Json;
1515
import io.vertx.core.json.JsonArray;
1616
import io.vertx.core.json.JsonObject;
17-
import io.vertx.test.core.VertxTestBase;
1817
import org.junit.Test;
1918

19+
import static org.junit.Assert.*;
20+
2021
/**
2122
* @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
2223
*/
23-
public class CustomJsonFactoryTest extends VertxTestBase {
24+
public class CustomJsonFactoryTest {
2425

2526
@Test
2627
public void testJsonObject() {

vertx-core/src/test/java/io/vertx/it/json/JsonFactoryOrderingTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@
1313

1414
import io.vertx.core.json.Json;
1515
import io.vertx.core.spi.JsonFactory;
16-
import io.vertx.test.core.VertxTestBase;
1716
import org.junit.Test;
1817

1918
import java.io.File;
2019
import java.net.URL;
2120
import java.net.URLClassLoader;
2221
import java.util.TreeMap;
2322

23+
import static org.junit.Assert.*;
24+
2425
/**
2526
* @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
2627
*/
27-
public class JsonFactoryOrderingTest extends VertxTestBase {
28+
public class JsonFactoryOrderingTest {
2829

2930
static {
3031
// Make sure that the default Jackson codec is initialized before running this test

vertx-core/src/test/java/io/vertx/it/transport/IoUringTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212

1313
import io.vertx.core.impl.Utils;
1414
import io.vertx.core.transport.Transport;
15-
import io.vertx.test.core.AsyncTestBase;
1615
import org.junit.Test;
1716

18-
public class IoUringTest extends AsyncTestBase {
17+
import static org.junit.Assert.*;
18+
19+
public class IoUringTest {
1920
@Test
2021
public void testNativeTransportFallback() {
2122
if (Utils.isLinux()) {

vertx-core/src/test/java/io/vertx/it/vertx/VertxTracerFactoryTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313

1414
import io.vertx.core.Vertx;
1515
import io.vertx.core.internal.VertxInternal;
16-
import io.vertx.test.core.AsyncTestBase;
1716
import org.junit.Test;
1817

18+
import static org.junit.Assert.*;
19+
1920
/**
2021
* @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
2122
*/
22-
public class VertxTracerFactoryTest extends AsyncTestBase {
23+
public class VertxTracerFactoryTest {
2324

2425
@Test
2526
public void testNoOptions() {

vertx-core/src/test/java/io/vertx/test/fakestream/FakeStreamTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.vertx.core.AsyncResult;
1414
import io.vertx.core.Future;
1515
import io.vertx.core.Promise;
16-
import io.vertx.test.core.AsyncTestBase;
16+
import org.junit.Before;
1717
import org.junit.Test;
1818

1919
import java.util.ArrayList;
@@ -27,15 +27,16 @@
2727
import java.util.stream.IntStream;
2828
import java.util.stream.Stream;
2929

30-
public class FakeStreamTest extends AsyncTestBase {
30+
import static org.junit.Assert.*;
31+
32+
public class FakeStreamTest {
3133

3234
private FakeStream<Integer> stream;
3335
private List<Integer> emitted;
3436
private int drained;
3537

36-
@Override
37-
protected void setUp() throws Exception {
38-
super.setUp();
38+
@Before
39+
public void setUp() {
3940
emitted = new ArrayList<>();
4041
stream = new FakeStream<>();
4142
stream.handler(emitted::add);

vertx-core/src/test/java/io/vertx/tests/concurrent/InboundReadQueueTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package io.vertx.tests.concurrent;
22

33
import io.vertx.core.streams.impl.MessagePassingQueue;
4-
import io.vertx.test.core.AsyncTestBase;
54
import org.junit.Test;
65

76
import java.util.LinkedList;
87
import java.util.concurrent.atomic.AtomicInteger;
98

109
import static io.vertx.core.streams.impl.MessagePassingQueue.drainResult;
10+
import static org.junit.Assert.*;
1111

12-
public class InboundReadQueueTest extends AsyncTestBase {
12+
public class InboundReadQueueTest {
1313

1414
final MessagePassingQueue.Factory factory = MessagePassingQueue.SPSC;
1515

vertx-core/src/test/java/io/vertx/tests/concurrent/MessagePassingQueueTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
package io.vertx.tests.concurrent;
1212

1313
import io.vertx.core.streams.impl.MessagePassingQueue;
14-
import io.vertx.test.core.AsyncTestBase;
1514
import junit.framework.AssertionFailedError;
15+
import org.junit.After;
16+
import org.junit.Before;
1617
import org.junit.Test;
1718

1819
import java.util.ArrayList;
@@ -24,11 +25,12 @@
2425
import java.util.stream.IntStream;
2526

2627
import static io.vertx.core.streams.impl.MessagePassingQueue.*;
28+
import static org.junit.Assert.*;
2729

2830
/**
2931
* @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
3032
*/
31-
public class MessagePassingQueueTest extends AsyncTestBase {
33+
public class MessagePassingQueueTest {
3234

3335
private List<Integer> output = Collections.synchronizedList(new ArrayList<>());
3436
private MessagePassingQueue.MpSc<Integer> queue;
@@ -44,15 +46,13 @@ private int producerAdd(Integer element) {
4446
return res;
4547
}
4648

47-
@Override
48-
public void setUp() throws Exception {
49-
super.setUp();
50-
disableThreadChecks();
49+
@Before
50+
public void setUp() {
5151
output = Collections.synchronizedList(new ArrayList<>());
5252
}
5353

54-
@Override
55-
protected void tearDown() throws Exception {
54+
@After
55+
public void tearDown() {
5656
queue = null;
5757
}
5858

@@ -211,7 +211,7 @@ public void testReentrantWritable1() {
211211
try {
212212
thread.join();
213213
} catch (InterruptedException e) {
214-
fail(e);
214+
throw new RuntimeException(e);
215215
}
216216
return true;
217217
default:
@@ -236,7 +236,7 @@ public void testReentrantWritable2() {
236236
try {
237237
thread.join();
238238
} catch (InterruptedException e) {
239-
fail(e);
239+
throw new RuntimeException(e);
240240
}
241241
return true;
242242
default:
@@ -263,7 +263,7 @@ public void testReentrantWritable3() {
263263
try {
264264
thread.join();
265265
} catch (InterruptedException e) {
266-
fail(e);
266+
throw new RuntimeException(e);
267267
}
268268
return true;
269269
case 1:

vertx-core/src/test/java/io/vertx/tests/file/FileCacheTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
import io.vertx.core.VertxException;
1414
import io.vertx.core.file.impl.FileCache;
15-
import io.vertx.test.core.VertxTestBase;
1615
import org.junit.Test;
1716

1817
import java.io.ByteArrayInputStream;
@@ -21,7 +20,9 @@
2120
import java.nio.file.Files;
2221
import java.nio.file.StandardOpenOption;
2322

24-
public class FileCacheTest extends VertxTestBase {
23+
import static org.junit.Assert.*;
24+
25+
public class FileCacheTest {
2526

2627
@Test
2728
public void testMutateCacheContentOnly() throws IOException {

0 commit comments

Comments
 (0)