cleanup

Author: sezen-datadog

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy

@@ -124,12 +124,12 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
 
     when:
     setUpTest()
-    appSecConfigService.init()
+    appSecConfigService.init(wafBuilder)
     then:
     1 * config.getAppSecRulesFile() >> (p as String)
 
     when:
-    appSecConfigService.maybeSubscribeConfigPolling()
+    appSecConfigService.maybeSubscribeConfigPolling(wafBuilder)
 
     then:
     2 * config.getAppSecActivation() >> ProductActivation.ENABLED_INACTIVE
@@ -185,7 +185,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     setup:
     setUpTest()
     appSecConfigService.init(wafBuilder)
-    appSecConfigService.maybeSubscribeConfigPolling()
+    appSecConfigService.maybeSubscribeConfigPolling(wafBuilder)
 
     expect:
     AppSecConfigService.TransactionalAppSecModuleConfigurer configurer = appSecConfigService.createAppSecModuleConfigurer()
@@ -239,7 +239,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
 
     then:
     1 * subconfigListener.onNewSubconfig({ CurrentAppSecConfig casc -> casc.ddConfig != null }, _)
-    AppSecSystem.active == true
+    AppSecSystem.active
   }
 
   void 'provides updated configuration to waf subscription'() {
@@ -353,7 +353,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     listeners.savedConfEndListener.onConfigurationEnd()
 
     then:
-    AppSecSystem.active == false
+    !AppSecSystem.active
 
     when: 'switch back to enabled'
     listeners.savedFeaturesListener.accept('asm_features_activation',
@@ -362,7 +362,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     listeners.savedConfEndListener.onConfigurationEnd()
 
     then: 'it is enabled again'
-    AppSecSystem.active == true
+    AppSecSystem.active
 
     when: 'asm are not set'
     listeners.savedFeaturesListener.accept('asm_features_activation',
@@ -371,7 +371,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     listeners.savedConfEndListener.onConfigurationEnd()
 
     then: 'it is disabled (<not set> == false)'
-    AppSecSystem.active == false
+    !AppSecSystem.active
 
     when: 'switch back to enabled'
     listeners.savedFeaturesListener.accept('asm_features_activation',
@@ -380,7 +380,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     listeners.savedConfEndListener.onConfigurationEnd()
 
     then: 'it is enabled again'
-    AppSecSystem.active == true
+    AppSecSystem.active
 
     when: 'asm features are not set'
     listeners.savedFeaturesListener.accept('asm_features_activation',
@@ -389,7 +389,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     listeners.savedConfEndListener.onConfigurationEnd()
 
     then: 'it is disabled (<not set> == false)'
-    AppSecSystem.active == false
+    !AppSecSystem.active
 
     cleanup:
     AppSecSystem.active = true
@@ -474,8 +474,8 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
       mergedUpdateConfig = casc.mergedUpdateConfig
     }
     mergedUpdateConfig.numberOfRules == 0
-    mergedUpdateConfig.rawConfig['rules_override'].isEmpty() == false
-    mergedAsmData.mergedData.rules.isEmpty() == false
+    !mergedUpdateConfig.rawConfig['rules_override'].isEmpty()
+    !mergedAsmData.mergedData.rules.isEmpty()
 
     when:
     listeners.savedConfChangesListener.accept('asm_dd config', null, null)
@@ -491,8 +491,8 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     }
 
     mergedUpdateConfig.numberOfRules > 0
-    mergedUpdateConfig.rawConfig['rules_override'].isEmpty() == true
-    mergedAsmData.mergedData.rules.isEmpty() == true
+    mergedUpdateConfig.rawConfig['rules_override'].isEmpty()
+    mergedAsmData.mergedData.rules.isEmpty()
   }
 
   void 'stopping appsec unsubscribes from the poller'() {