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

steverao · web-flow · commit 3b15791d49c7 · 2024-02-20T19:01:02.000+02:00
diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
@@ -57,7 +57,7 @@ protected Map<String, String> getExtraEnv() {
   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 @@ void startTarget(int jdk) {
   }
 
   @AfterEach
-  void cleanup() throws IOException {
+  void reset() throws IOException {
     client
         .newCall(
             new Request.Builder()
@@ -107,7 +107,7 @@ void stopTarget() {
   }
 
   @AfterAll
-  static void cleanupSpec() {
+  static void cleanup() {
     backend.stop();
   }
 
diff --git a/examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java b/examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java
@@ -62,7 +62,7 @@ protected Map<String, String> getExtraEnv() {
   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 @@ private GenericContainer<?> buildTargetContainer(String agentPath, String extens
   }
 
   @AfterEach
-  void cleanup() throws IOException {
+  void reset() throws IOException {
     client
         .newCall(
             new Request.Builder()
@@ -134,7 +134,7 @@ void stopTarget() {
   }
 
   @AfterAll
-  static void cleanupSpec() {
+  static void cleanup() {
     backend.stop();
   }
 
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java
@@ -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();
   }
 
diff --git a/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java b/instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java
@@ -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();
   }
diff --git a/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java b/instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java
@@ -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();
   }
diff --git a/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java b/instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java
@@ -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();
   }
diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Test.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Test.java
@@ -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);
diff --git a/instrumentation/rxjava/rxjava-2.0/library/src/test/java/RxJava2SubscriptionTest.java b/instrumentation/rxjava/rxjava-2.0/library/src/test/java/RxJava2SubscriptionTest.java
@@ -22,7 +22,7 @@ protected InstrumentationExtension testing() {
   }
 
   @BeforeAll
-  public static void setupSpec() {
+  public static void setup() {
     tracingAssembly.enable();
   }
 }
diff --git a/instrumentation/rxjava/rxjava-2.0/library/src/test/java/RxJava2Test.java b/instrumentation/rxjava/rxjava-2.0/library/src/test/java/RxJava2Test.java
@@ -22,7 +22,7 @@ protected InstrumentationExtension testing() {
   }
 
   @BeforeAll
-  public void setupSpec() {
+  public void setup() {
     tracingAssembly.enable();
   }
 }
diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3SubscriptionTest.java
@@ -23,7 +23,7 @@ protected InstrumentationExtension testing() {
   static TracingAssembly tracingAssembly = TracingAssembly.create();
 
   @BeforeAll
-  public static void setupSpec() {
+  public static void setup() {
     tracingAssembly.enable();
   }
 }
diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java
@@ -22,7 +22,7 @@ protected InstrumentationExtension testing() {
   }
 
   @BeforeAll
-  public void setupSpec() {
+  public void setup() {
     tracingAssembly.enable();
   }
 }
diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3SubscriptionTest.java
@@ -23,7 +23,7 @@ protected InstrumentationExtension testing() {
   static TracingAssembly tracingAssembly = TracingAssembly.create();
 
   @BeforeAll
-  public static void setupSpec() {
+  public static void setup() {
     tracingAssembly.enable();
   }
 }
diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java
@@ -22,7 +22,7 @@ protected InstrumentationExtension testing() {
   }
 
   @BeforeAll
-  public void setupSpec() {
+  public void setup() {
     tracingAssembly.enable();
   }
 }
diff --git a/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java b/instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java
@@ -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();
   }
 
diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java
@@ -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 @@ static void setupSpec() throws Exception {
   }
 
   @AfterAll
-  static void cleanupSpec() {
+  static void cleanup() {
     redis.close();
     client.close();
     redisServer.stop();

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,11 @@ public abstract class AbstractAws2ClientRecordHttpErrorTest {`
`51`	`51`	`protected static List<String> httpErrorMessages = new ArrayList<>();`
`52`	`52`
`53`	`53`	`@BeforeAll`
`54`		`- public static void setupSpec() {`
	`54`	`+ public static void setup() {`
`55`	`55`	`server.start();`
`56`	`56`	`}`
`57`	`57`
`58`		`- public static void cleanupSpec() {`
	`58`	`+ public static void cleanup() {`
`59`	`59`	`server.stop();`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ protected InstrumentationExtension testing() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@BeforeAll`
`25`		`- public static void setupSpec() {`
	`25`	`+ public static void setup() {`
`26`	`26`	`tracingAssembly.enable();`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected InstrumentationExtension testing() {`
`23`	`23`	`static TracingAssembly tracingAssembly = TracingAssembly.create();`
`24`	`24`
`25`	`25`	`@BeforeAll`
`26`		`- public static void setupSpec() {`
	`26`	`+ public static void setup() {`
`27`	`27`	`tracingAssembly.enable();`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@ public class SparkJavaBasedTest {`
`32`	`32`	`static WebClient client;`
`33`	`33`
`34`	`34`	`@BeforeAll`
`35`		`- static void setupSpec() {`
	`35`	`+ static void setup() {`
`36`	`36`	`port = PortUtils.findOpenPort();`
`37`	`37`	`TestSparkJavaApplication.initSpark(port);`
`38`	`38`	`client = WebClient.of("http://localhost:" + port);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@AfterAll`
`42`		`- static void cleanupSpec() {`
	`42`	`+ static void cleanup() {`
`43`	`43`	`Spark.stop();`
`44`	`44`	`}`
`45`	`45`