fix: with usage in tests

Author: daniel-mohedano

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/CodecModuleTest.groovy

@@ -290,10 +290,10 @@ class CodecModuleTest extends IastModuleImplTestBase {
     then:
     final helloTainted = to.get(hello)
     helloTainted.ranges.length == 1
-    helloTainted.ranges.first().with {
-      assert it.source.origin == (byte) 0
-      assert it.source.name == 'name1'
-      assert it.source.value == 'Hello'
+    with(helloTainted.ranges.first()) {
+      it.source.origin == (byte) 0
+      it.source.name == 'name1'
+      it.source.value == 'Hello'
     }
 
     when:
@@ -303,10 +303,10 @@ class CodecModuleTest extends IastModuleImplTestBase {
     then:
     final worldTainted = to.get(world)
     worldTainted.ranges.length == 1
-    worldTainted.ranges.first().with {
-      assert it.source.origin == (byte) 1
-      assert it.source.name == 'name2'
-      assert it.source.value == 'World!'
+    with(worldTainted.ranges.first()) {
+      it.source.origin == (byte) 1
+      it.source.name == 'name2'
+      it.source.value == 'World!'
     }
   }
 

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/iast/IastPostProcessorFactoryTest.groovy

@@ -76,10 +76,10 @@ class IastPostProcessorFactoryTest extends DDSpecification {
     final metrics = collector.drain()
     assert metrics.size() == 1
     // one method has ben instrumented
-    metrics.first().with {
-      assert it.metric == IastMetric.INSTRUMENTED_SINK
-      assert it.tags == ['vulnerability_type:SQL_INJECTION']
-      assert it.value == 1L
+    with(metrics.first()) {
+      it.metric == IastMetric.INSTRUMENTED_SINK
+      it.tags == ['vulnerability_type:SQL_INJECTION']
+      it.value == 1L
     }
 
     when: 'the advice is used'

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/event/data/UnionDataBundleSpecification.groovy

@@ -26,15 +26,15 @@ class UnionDataBundleSpecification extends Specification {
     expect:
     assert it.hasNext() == true
 
-    it.next().with { e ->
-      assert e.key == KnownAddresses.REQUEST_URI_RAW
-      assert e.value == '/'
+    with(it.next()) { e ->
+      e.key == KnownAddresses.REQUEST_URI_RAW
+      e.value == '/'
     }
 
     assert it.hasNext() == true
-    it.next().with { e ->
-      assert e.key == KnownAddresses.REQUEST_SCHEME
-      assert e.value == 'http'
+    with(it.next()) { e ->
+      e.key == KnownAddresses.REQUEST_SCHEME
+      e.value == 'http'
     }
 
     assert it.hasNext() == false

dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/AIGuardSmokeTest.groovy

@@ -74,13 +74,13 @@ class AIGuardSmokeTest extends AbstractAppSecServerSmokeTest {
     assert span.meta.get('ai_guard.target') == 'prompt'
     final messages = span.metaStruct.get('ai_guard').messages as List<Map<String, Object>>
     assert messages.size() == 2
-    messages[0].with {
-      assert role == 'system'
-      assert content == 'You are a beautiful AI'
+    with(messages[0]) {
+      role == 'system'
+      content == 'You are a beautiful AI'
     }
-    messages[1].with {
-      assert role == 'user'
-      assert content != null
+    with(messages[1]) {
+      role == 'user'
+      content != null
     }
 
     where: