Modified UT method name from Spock to Java (#10601)

This commit is contained in:
Steve Rao 2024-02-21 01:01:02 +08:00 committed by GitHub
parent f8788dd2bc
commit 3b15791d49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 28 additions and 28 deletions

View File

@ -57,7 +57,7 @@ abstract class SmokeTest {
private static GenericContainer backend;
@BeforeAll
static void setupSpec() {
static void setup() {
backend =
new GenericContainer<>(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20221127.3559314891")
@ -92,7 +92,7 @@ abstract class SmokeTest {
}
@AfterEach
void cleanup() throws IOException {
void reset() throws IOException {
client
.newCall(
new Request.Builder()
@ -107,7 +107,7 @@ abstract class SmokeTest {
}
@AfterAll
static void cleanupSpec() {
static void cleanup() {
backend.stop();
}

View File

@ -62,7 +62,7 @@ abstract class IntegrationTest {
private static GenericContainer backend;
@BeforeAll
static void setupSpec() {
static void setup() {
backend =
new GenericContainer<>(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20221127.3559314891")
@ -119,7 +119,7 @@ abstract class IntegrationTest {
}
@AfterEach
void cleanup() throws IOException {
void reset() throws IOException {
client
.newCall(
new Request.Builder()
@ -134,7 +134,7 @@ abstract class IntegrationTest {
}
@AfterAll
static void cleanupSpec() {
static void cleanup() {
backend.stop();
}

View File

@ -51,11 +51,11 @@ public abstract class AbstractAws2ClientRecordHttpErrorTest {
protected static List<String> httpErrorMessages = new ArrayList<>();
@BeforeAll
public static void setupSpec() {
public static void setup() {
server.start();
}
public static void cleanupSpec() {
public static void cleanup() {
server.stop();
}

View File

@ -32,19 +32,19 @@ class JedisClientTest {
static Jedis jedis;
@BeforeAll
static void setupSpec() {
static void setup() {
redisServer.start();
port = redisServer.getMappedPort(6379);
jedis = new Jedis("localhost", port);
}
@AfterAll
static void cleanupSpec() {
static void cleanup() {
redisServer.stop();
}
@BeforeEach
void setup() {
void reset() {
jedis.flushAll();
testing.clearData();
}

View File

@ -35,20 +35,20 @@ class Jedis30ClientTest {
static Jedis jedis;
@BeforeAll
static void setupSpec() {
static void setup() {
redisServer.start();
port = redisServer.getMappedPort(6379);
jedis = new Jedis("localhost", port);
}
@AfterAll
static void cleanupSpec() {
static void cleanup() {
redisServer.stop();
jedis.close();
}
@BeforeEach
void setup() {
void reset() {
jedis.flushAll();
testing.clearData();
}

View File

@ -33,20 +33,20 @@ class Jedis40ClientTest {
static Jedis jedis;
@BeforeAll
static void setupSpec() {
static void setup() {
redisServer.start();
port = redisServer.getMappedPort(6379);
jedis = new Jedis("localhost", port);
}
@AfterAll
static void cleanupSpec() {
static void cleanup() {
redisServer.stop();
jedis.close();
}
@BeforeEach
void setup() {
void reset() {
jedis.flushAll();
testing.clearData();
}

View File

@ -37,7 +37,7 @@ public class OkHttp2Test extends AbstractHttpClientTest<Request> {
private static final OkHttpClient clientWithReadTimeout = new OkHttpClient();
@BeforeAll
void setupSpec() {
void setup() {
client.setConnectTimeout(CONNECTION_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
clientWithReadTimeout.setConnectTimeout(CONNECTION_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
clientWithReadTimeout.setReadTimeout(READ_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);

View File

@ -22,7 +22,7 @@ public class RxJava2SubscriptionTest extends AbstractRxJava2SubscriptionTest {
}
@BeforeAll
public static void setupSpec() {
public static void setup() {
tracingAssembly.enable();
}
}

View File

@ -22,7 +22,7 @@ public class RxJava2Test extends AbstractRxJava2Test {
}
@BeforeAll
public void setupSpec() {
public void setup() {
tracingAssembly.enable();
}
}

View File

@ -23,7 +23,7 @@ public class RxJava3SubscriptionTest extends AbstractRxJava3SubscriptionTest {
static TracingAssembly tracingAssembly = TracingAssembly.create();
@BeforeAll
public static void setupSpec() {
public static void setup() {
tracingAssembly.enable();
}
}

View File

@ -22,7 +22,7 @@ public class RxJava3Test extends AbstractRxJava3Test {
}
@BeforeAll
public void setupSpec() {
public void setup() {
tracingAssembly.enable();
}
}

View File

@ -23,7 +23,7 @@ public class RxJava3SubscriptionTest extends AbstractRxJava3SubscriptionTest {
static TracingAssembly tracingAssembly = TracingAssembly.create();
@BeforeAll
public static void setupSpec() {
public static void setup() {
tracingAssembly.enable();
}
}

View File

@ -22,7 +22,7 @@ public class RxJava3Test extends AbstractRxJava3Test {
}
@BeforeAll
public void setupSpec() {
public void setup() {
tracingAssembly.enable();
}
}

View File

@ -32,14 +32,14 @@ public class SparkJavaBasedTest {
static WebClient client;
@BeforeAll
static void setupSpec() {
static void setup() {
port = PortUtils.findOpenPort();
TestSparkJavaApplication.initSpark(port);
client = WebClient.of("http://localhost:" + port);
}
@AfterAll
static void cleanupSpec() {
static void cleanup() {
Spark.stop();
}

View File

@ -39,7 +39,7 @@ class VertxRedisClientTest {
private static RedisAPI redis;
@BeforeAll
static void setupSpec() throws Exception {
static void setup() throws Exception {
redisServer.start();
port = redisServer.getMappedPort(6379);
@ -51,7 +51,7 @@ class VertxRedisClientTest {
}
@AfterAll
static void cleanupSpec() {
static void cleanup() {
redis.close();
client.close();
redisServer.stop();