Merge pull request DataDog#6919 from DataDog/bbujon/fix-test-names

Fix test names to be unique
galadrielcik · Apr 16, 2024 · b0d5222 · b0d5222
2 parents 3052df4 + c44251d
commit b0d5222
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/dd-java-agent/instrumentation/javax-naming/src/test/groovy/DirContextCallSiteTest.groovy b/dd-java-agent/instrumentation/javax-naming/src/test/groovy/DirContextCallSiteTest.groovy
@@ -18,7 +18,7 @@ class DirContextCallSiteTest extends AgentTestRunner {
   }
 
 
-  def 'test search(String, String, SearchControls)'() {
+  def 'test search(String, String, SearchControls) using #suiteBuilderName'() {
     setup:
     final name = 'name'
     final filter = 'filter'
@@ -38,12 +38,10 @@ class DirContextCallSiteTest extends AgentTestRunner {
     0 * _
 
     where:
-    _ | suiteBuilder
-    _ | { InitialDirContext ctx -> new TestDirContextSuite(ctx) }
-    _ | { InitialDirContext ctx -> new TestInitialDirContextSuite(ctx) }
+    [suiteBuilderName, suiteBuilder] << suiteBuilders()
   }
 
-  def 'test search(Name, String, SearchControls)'() {
+  def 'test search(Name, String, SearchControls) using #suiteBuilderName'() {
     setup:
     final name = Mock(Name)
     final filter = 'filter'
@@ -63,12 +61,10 @@ class DirContextCallSiteTest extends AgentTestRunner {
     0 * _
 
     where:
-    _ | suiteBuilder
-    _ | { InitialDirContext ctx -> new TestDirContextSuite(ctx) }
-    _ | { InitialDirContext ctx -> new TestInitialDirContextSuite(ctx) }
+    [suiteBuilderName, suiteBuilder] << suiteBuilders()
   }
 
-  def 'test search(String, String, Object[], SearchControls)'() {
+  def 'test search(String, String, Object[], SearchControls) using #suiteBuilderName'() {
     setup:
     final name = 'name'
     final filter = 'filter'
@@ -89,12 +85,10 @@ class DirContextCallSiteTest extends AgentTestRunner {
     0 * _
 
     where:
-    _ | suiteBuilder
-    _ | { InitialDirContext ctx -> new TestDirContextSuite(ctx) }
-    _ | { InitialDirContext ctx -> new TestInitialDirContextSuite(ctx) }
+    [suiteBuilderName, suiteBuilder] << suiteBuilders()
   }
 
-  def 'test search(Name, String, Object[], SearchControls)'() {
+  def 'test search(Name, String, Object[], SearchControls) using #suiteBuilderName'() {
     setup:
     final name = Mock(Name)
     final filter = 'filter'
@@ -115,8 +109,13 @@ class DirContextCallSiteTest extends AgentTestRunner {
     0 * _
 
     where:
-    _ | suiteBuilder
-    _ | { InitialDirContext ctx -> new TestDirContextSuite(ctx) }
-    _ | { InitialDirContext ctx -> new TestInitialDirContextSuite(ctx) }
+    [suiteBuilderName, suiteBuilder] << suiteBuilders()
+  }
+
+  static Object[][] suiteBuilders() {
+    [
+      ['TestDirContextSuite', TestDirContextSuite::new],
+      ['TestInitialDirContextSuite', TestInitialDirContextSuite::new]
+    ]
   }
 }