support Micronaut 3.x in test which only triggers filter once

agorapulse · Apr 13, 2022 · c4b886b · c4b886b
1 parent 17befa0
commit c4b886b
Showing 1 changed file with 50 additions and 8 deletions.
diff --git a/...aut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/SentryFilterSpec.groovy b/...aut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/SentryFilterSpec.groovy
@@ -25,6 +25,8 @@ import io.sentry.IHub
 import spock.lang.AutoCleanup
 import spock.lang.Specification
 
+import java.util.concurrent.atomic.AtomicInteger
+
 class SentryFilterSpec extends Specification {
 
     @AutoCleanup Gru gru = Gru.create(Http.create(this))
@@ -64,6 +66,11 @@ class SentryFilterSpec extends Specification {
     }
 
     void 'try error message'() {
+        given:
+            AtomicInteger pushCalls = new AtomicInteger()
+            AtomicInteger breadcrumbsCalls = new AtomicInteger()
+            AtomicInteger configureScopeCalls = new AtomicInteger()
+            AtomicInteger popCalls = new AtomicInteger()
         when:
             gru.test {
                 post('/test/parameter')
@@ -74,13 +81,33 @@ class SentryFilterSpec extends Specification {
         then:
             gru.verify()
 
-            2 * hub.pushScope()
-            2 * hub.addBreadcrumb(_)
-            2 * hub.configureScope(_)
-            2 * hub.popScope()
+            _ * hub.pushScope() >> {
+                pushCalls.incrementAndGet()
+            }
+            _ * hub.addBreadcrumb(_)  >> {
+                breadcrumbsCalls.incrementAndGet()
+            }
+            _ * hub.configureScope(_) >> {
+                configureScopeCalls.incrementAndGet()
+            }
+            _ * hub.popScope() >> {
+                popCalls.incrementAndGet()
+            }
+
+        expect:
+            // the filter is only called once for Micronaut 3.x but twice for Micronaut 1.x and 2.x
+            pushCalls.get() in 1..2
+            pushCalls.get() == breadcrumbsCalls.get()
+            pushCalls.get() == configureScopeCalls.get()
+            pushCalls.get() == popCalls.get()
     }
 
     void 'try validation'() {
+        given:
+            AtomicInteger pushCalls = new AtomicInteger()
+            AtomicInteger breadcrumbsCalls = new AtomicInteger()
+            AtomicInteger configureScopeCalls = new AtomicInteger()
+            AtomicInteger popCalls = new AtomicInteger()
         when:
             gru.test {
                 put('/test/validated')
@@ -91,10 +118,25 @@ class SentryFilterSpec extends Specification {
         then:
             gru.verify()
 
-            2 * hub.pushScope()
-            2 * hub.addBreadcrumb(_)
-            2 * hub.configureScope(_)
-            2 * hub.popScope()
+            _ * hub.pushScope() >> {
+                pushCalls.incrementAndGet()
+            }
+            _ * hub.addBreadcrumb(_)  >> {
+                breadcrumbsCalls.incrementAndGet()
+            }
+            _ * hub.configureScope(_) >> {
+                configureScopeCalls.incrementAndGet()
+            }
+            _ * hub.popScope() >> {
+                popCalls.incrementAndGet()
+            }
+
+        expect:
+            // the filter is only called once for Micronaut 3.x but twice for Micronaut 1.x and 2.x
+            pushCalls.get() in 1..2
+            pushCalls.get() == breadcrumbsCalls.get()
+            pushCalls.get() == configureScopeCalls.get()
+            pushCalls.get() == popCalls.get()
     }
 
 }