Cleanup

CDCgov · Nov 26, 2024 · f4df497 · f4df497
1 parent 8805104
commit f4df497
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/automated-staging-test-run.yml b/.github/workflows/automated-staging-test-run.yml
@@ -16,8 +16,7 @@ jobs:
       - name: Run automated tests
         env:
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AUTOMATED_TEST_AZURE_STORAGE_CONNECTION_STRING }}
-          ORG_GRADLE_CONSOLE: plain
-        run: ./gradlew rs-e2e:clean rs-e2e:automatedTest --quiet
+        run: ./gradlew rs-e2e:clean rs-e2e:automatedTest
 
       # - name: Send slack notification on test failure
       #   if: failure()

diff --git a/rs-e2e/build.gradle b/rs-e2e/build.gradle
@@ -38,11 +38,7 @@ task automatedTest(type: Test) {
     include '**/AutomatedTest.*'
 
     testLogging {
-        // events 'failed'
-        exceptionFormat 'full'
-        // showExceptions true
-        // showCauses true
         showStackTraces true
-        // showStandardStreams true
+        exceptionFormat 'full'
     }
 }
diff --git a/rs-e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/rse2e/AutomatedTest.groovy b/rs-e2e/src/test/groovy/gov/hhs/cdc/trustedintermediary/rse2e/AutomatedTest.groovy
@@ -19,7 +19,7 @@ class AutomatedTest extends Specification  {
     AssertionRuleEngine engine
     HapiHL7FileMatcher fileMatcher
     Logger mockLogger = Mock(Logger)
-    List<String> loggedWarnings = []
+    List<String> loggedErrorsAndWarnings = []
 
     def setup() {
         engine = AssertionRuleEngine.getInstance()
@@ -37,7 +37,10 @@ class AutomatedTest extends Specification  {
         TestApplicationContext.injectRegisteredImplementations()
 
         mockLogger.logWarning(_ as String, _ as Object) >> { String msg, Object args ->
-            loggedWarnings << msg
+            loggedErrorsAndWarnings << msg
+        }
+        mockLogger.logError(_ as String, _ as Exception) >> { String msg, Exception e ->
+            loggedErrorsAndWarnings << msg
         }
 
         FileFetcher azureFileFetcher = AzureBlobFileFetcher.getInstance()
@@ -70,9 +73,8 @@ class AutomatedTest extends Specification  {
 
         then:
         rulesToEvaluate.collect { it.name }.isEmpty() //Check whether all the rules in the assertions file have been run
-        0 * mockLogger.logError(_ as String, _ as Exception)
-        if (!loggedWarnings.isEmpty()) {
-            throw new AssertionError("Unexpected warnings were logged:\n- ${loggedWarnings.join('\n- ')}")
+        if (!loggedErrorsAndWarnings.isEmpty()) {
+            throw new AssertionError("Unexpected errors and/or warnings were logged:\n- ${loggedErrorsAndWarnings.join('\n- ')}")
         }
     }
 }