fix tests

DataDog · Jul 1, 2024 · d85b192 · d85b192
1 parent 6aba63c
commit d85b192
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/...sts/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy b/...sts/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy
@@ -258,15 +258,16 @@ class SpringBootSmokeTest extends AbstractAppSecServerSmokeTest {
     waitForTraceCount(1)
 
     then:
+    def rootSpans = this.rootSpans.toList()
     rootSpans.size() == 1
-    rootSpans.each {
-      assert it.meta.get('appsec.blocked') == null, 'appsec.blocked is set'
-      assert it.meta.get('_dd.appsec.json') != null, '_dd.appsec.json is not set'
-    }
+    def rootSpan = rootSpans[0]
+    assert rootSpan.meta.get('appsec.blocked') == null, 'appsec.blocked is set'
+    assert rootSpan.meta.get('_dd.appsec.json') != null, '_dd.appsec.json is not set'
     def trigger
-    rootSpans[0].triggers.each {
-      if (it['rule']['id'] == '__test_sqli_stacktrace_on_query') {
-        trigger = it
+    for (t in rootSpan.triggers) {
+      if (t['rule']['id'] == '__test_sqli_stacktrace_on_query') {
+        trigger = t
+        break
       }
     }
     assert trigger != null, 'test trigger not found'
@@ -291,15 +292,16 @@ class SpringBootSmokeTest extends AbstractAppSecServerSmokeTest {
     waitForTraceCount(1)
 
     then:
+    def rootSpans = this.rootSpans.toList()
     rootSpans.size() == 1
-    rootSpans.each {
-      assert it.meta.get('appsec.blocked') == 'true', 'appsec.blocked is not set'
-      assert it.meta.get('_dd.appsec.json') != null, '_dd.appsec.json is not set'
-    }
+    def rootSpan = rootSpans[0]
+    assert rootSpan.meta.get('appsec.blocked') == 'true', 'appsec.blocked is not set'
+    assert rootSpan.meta.get('_dd.appsec.json') != null, '_dd.appsec.json is not set'
     def trigger = null
-    rootSpans[0].triggers.each {
-      if (it['rule']['id'] == '__test_sqli_block_on_header') {
-        trigger = it
+    for (t in rootSpan.triggers) {
+      if (t['rule']['id'] == '__test_sqli_block_on_header') {
+        trigger = t
+        break
       }
     }
     assert trigger != null, 'test trigger not found'