ISSUES-603 More real-world scenarios tested

authorjapps · Feb 7, 2024 · 4e804b3 · 4e804b3
1 parent bbf2dc3
commit 4e804b3
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 4 deletions.
diff --git a/core/src/main/java/org/jsmart/zerocode/core/logbuilder/ZerocodeCorrelationshipLogger.java b/core/src/main/java/org/jsmart/zerocode/core/logbuilder/ZerocodeCorrelationshipLogger.java
@@ -16,6 +16,7 @@
 import static org.jsmart.zerocode.core.constants.ZeroCodeReportConstants.RESULT_FAIL;
 import static org.jsmart.zerocode.core.constants.ZeroCodeReportConstants.RESULT_PASS;
 import static org.jsmart.zerocode.core.constants.ZeroCodeReportConstants.TEST_STEP_CORRELATION_ID;
+import static org.jsmart.zerocode.core.utils.TokenUtils.getMasksReplaced;
 
 public class ZerocodeCorrelationshipLogger {
     private static final String DISPLAY_DEMARCATION_ = "\n--------- " + TEST_STEP_CORRELATION_ID + " %s ---------";
@@ -139,11 +140,12 @@ public void print() {
         buildResponseDelay();
 
         String customLog = responseLogBuilder.getCustomLog();
+        String assertionsWithMaskRemoved = getMasksReplaced(responseLogBuilder.getAssertion());
         logger.warn(format("%s %s \n*Response delay:%s milli-secs \n%s \n%s \n-done-\n",
                 requestLogBuilder.toString(),
                 responseLogBuilder.toString(),
                 responseDelay,
-                "---------> Expected Response: <----------\n" + responseLogBuilder.getAssertion(),
+                "---------> Expected Response: <----------\n" + assertionsWithMaskRemoved,
                 customLog == null ? "" : "---------> Custom Log: <----------\n" +customLog
                 )
         );

diff --git a/core/src/main/java/org/jsmart/zerocode/core/runner/ZeroCodeMultiStepsScenarioRunnerImpl.java b/core/src/main/java/org/jsmart/zerocode/core/runner/ZeroCodeMultiStepsScenarioRunnerImpl.java
@@ -482,7 +482,7 @@ private String executeApi(String logPrefixRelationshipId,
                         .method(operationName)
                         .request(prettyPrintJson(resolvedRequestJsonMaskApplied));
 
-                executionResult = prettyPrintJson(resolvedRequestJson);
+                executionResult = prettyPrintJson(resolvedRequestJsonMaskApplied);
                 break;
 
             default:
@@ -541,6 +541,8 @@ private int deriveScenarioLoopTimes(ScenarioSpec scenario) {
     private List<FieldAssertionMatcher> compareStepResults(Step thisStep, String actualResult, String expectedResult, String resolvedScenarioState) {
         List<FieldAssertionMatcher> failureResults = new ArrayList<>();
 
+        expectedResult = zeroCodeAssertionsProcessor.fieldMasksRemoved(expectedResult);
+
         // --------------------
         //  Validators (pyrest)
         // --------------------

diff --git a/.../src/test/java/org/jsmart/zerocode/integrationtests/masked/MaskedSecretsInMemoryTest.java b/.../src/test/java/org/jsmart/zerocode/integrationtests/masked/MaskedSecretsInMemoryTest.java
@@ -18,7 +18,12 @@ public class MaskedSecretsInMemoryTest {
     @Test
     @Scenario("integration_test_files/masked/password_or_secrets_masked_in_log_n_console.json")
     public void testSecretPrinted_masked() throws Exception {
-
+    }
+
+    @Test
+    @Scenario("integration_test_files/masked/bearer_token_or_secret_masked_reuse_example_.json")
+    public void testSecretPrintedAssertions_masked() throws Exception {
+
     }
 
 }

diff --git a/...resources/integration_test_files/masked/bearer_token_or_secret_masked_reuse_example_.json b/...resources/integration_test_files/masked/bearer_token_or_secret_masked_reuse_example_.json
@@ -0,0 +1,48 @@
+{
+    "scenarioName": "Masked Secret path as step param",
+    "steps": [
+        {
+            "name": "get_balance_via_secret_token",
+            "url": "/home/accounts/123/balance",
+            "operation": "GET",
+            "request": {
+                "headers": {
+                    "Authorization": "Bearer ${MASKED:token1002003004}",
+                    "request-bank-name": "${MASKED:HSBC}",
+                    "secretCode": "${MASKED:Amazing}"
+                }
+
+            },
+            "assertions": {
+                "status": 200,
+                "body" : {
+                    "balance" : 3900,
+                    "name" : "${$.get_balance_via_secret_token.request.headers.request-bank-name}",
+                    "current" : true
+                }
+            }
+        },
+        {
+            "name": "find_match",
+            "url": "/api/v1/search/persons",
+            "method": "GET",
+            "request": {
+                "queryParams": {
+                    "lang": "${$.get_balance_via_secret_token.request.headers.secretCode}",
+                    "city": "${MASKED:Lon}"
+                }
+            },
+            "verify": {
+                "status": 200,
+                "body": {
+                    "exactMatches": true,
+                    "name": "Mr Bean",
+                    "lang": "${$.get_balance_via_secret_token.request.headers.secretCode}",
+                    "city": "${$.find_match.request.queryParams.city}"
+                }
+            }
+        }
+
+    ]
+}
+
diff --git a/.../resources/integration_test_files/masked/password_or_secrets_masked_in_log_n_console.json b/.../resources/integration_test_files/masked/password_or_secrets_masked_in_log_n_console.json
@@ -9,14 +9,19 @@
                 "queryParams": {
                     "lang": "${MASKED:Amazing}",
                     "city": "Lon"
+                },
+                "body": {
+                    "api_secret" : "${MASKED:pass123}",
+                    "emotion": "${MASKED:Amazing}",
+                    "state": "Amazing"
                 }
             },
             "verify": {
                 "status": 200,
                 "body": {
                     "exactMatches": true,
                     "name": "Mr Bean",
-                    "lang": "Amazing",
+                    "lang": "${$.find_match.request.body.emotion}",
                     "city": "Lon"
                 }
             }

diff --git a/core/src/test/resources/simulators/test_purpose_end_points.json b/core/src/test/resources/simulators/test_purpose_end_points.json
@@ -1,6 +1,19 @@
 {
     "name": "Mock endpoints Simulator - API Stubs",
     "apis": [
+        {
+            "name": "Get My Bank Balance",
+            "operation": "GET",
+            "url": "/home/accounts/123/balance",
+            "response": {
+                "status": 200,
+                "body": {
+                    "balance": 3900,
+                    "name": "HSBC",
+                    "current": true
+                }
+            }
+        },
         {
             "name": "Get Bank Account by Id",
             "operation": "GET",