Browse Source

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

Steve Rao 1 year ago
parent
commit
3b15791d49
15 changed files with 28 additions and 28 deletions
  1. 3 3
      examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
  2. 3 3
      examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java
  3. 2 2
      instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientRecordHttpErrorTest.java
  4. 3 3
      instrumentation/jedis/jedis-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisClientTest.java
  5. 3 3
      instrumentation/jedis/jedis-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v3_0/Jedis30ClientTest.java
  6. 3 3
      instrumentation/jedis/jedis-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/Jedis40ClientTest.java
  7. 1 1
      instrumentation/okhttp/okhttp-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttp2Test.java
  8. 1 1
      instrumentation/rxjava/rxjava-2.0/library/src/test/java/RxJava2SubscriptionTest.java
  9. 1 1
      instrumentation/rxjava/rxjava-2.0/library/src/test/java/RxJava2Test.java
  10. 1 1
      instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3SubscriptionTest.java
  11. 1 1
      instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java
  12. 1 1
      instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3SubscriptionTest.java
  13. 1 1
      instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java
  14. 2 2
      instrumentation/spark-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/sparkjava/SparkJavaBasedTest.java
  15. 2 2
      instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java

+ 3 - 3
examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java

@@ -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();
   }
 

+ 3 - 3
examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java

@@ -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();
   }
 

+ 2 - 2
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();
   }
 

+ 3 - 3
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();
   }

+ 3 - 3
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();
   }

+ 3 - 3
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();
   }

+ 1 - 1
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);

+ 1 - 1
instrumentation/rxjava/rxjava-2.0/library/src/test/java/RxJava2SubscriptionTest.java

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

+ 1 - 1
instrumentation/rxjava/rxjava-2.0/library/src/test/java/RxJava2Test.java

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

+ 1 - 1
instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3SubscriptionTest.java

@@ -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();
   }
 }

+ 1 - 1
instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java

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

+ 1 - 1
instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3SubscriptionTest.java

@@ -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();
   }
 }

+ 1 - 1
instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java

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

+ 2 - 2
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();
   }
 

+ 2 - 2
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 @@ class VertxRedisClientTest {
   }
 
   @AfterAll
-  static void cleanupSpec() {
+  static void cleanup() {
     redis.close();
     client.close();
     redisServer.stop();