From fc16fecfeb927383ac75728bf8a44adcc7718746 Mon Sep 17 00:00:00 2001
From: maracle6 <45719028+maracle6@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:50:14 -0800
Subject: [PATCH] Update failing test

---
 tests/pega-web-ready-testcases.yaml | 118 ++++++++++++++++++++++------
 1 file changed, 94 insertions(+), 24 deletions(-)

diff --git a/tests/pega-web-ready-testcases.yaml b/tests/pega-web-ready-testcases.yaml
index e3bc5fde..56578e19 100755
--- a/tests/pega-web-ready-testcases.yaml
+++ b/tests/pega-web-ready-testcases.yaml
@@ -1231,6 +1231,100 @@ commandTests:
     exitCode: 0
     excludedOutput: ["prweb.xml is not dockerized properly"]
 
+# Dockerize prweb.xml check with WEB_XML_SNIPPET
+  - name: "Dockerize PRWEB Check with WEB_XML_SNIPPET"
+    envVars:
+    - key: "JDBC_URL"
+      value: "jdbc:postgresql://localhost:5432/pegadb"
+    - key: "JDBC_CLASS"
+      value: "org.postgresql.Driver"
+    - key: "DB_USERNAME"
+      value: "postgres"
+    - key: "DB_PASSWORD"
+      value: "postgres"
+    - key: "PEGA_SEARCH_TYPE"
+      value: "external"
+    - key: "PEGA_SEARCH_URL"
+      value: "http://pega-search"
+    - key: "PEGA_STREAM_URL"
+      value: "http://pega-stream" 
+    - key: "CASSANDRA_CLUSTER"
+      value: "true"
+    - key: "HZ_CLIENT_MODE"
+      value: "true"
+    - key: "HZ_CS_AUTH_USERNAME"
+      value: "hzusername"
+    - key: "HZ_CS_AUTH_PASSWORD"
+      value: "hzpassword"
+    - key: "CASSANDRA_CLIENT_ENCRYPTION"
+      value: "true"
+    - key: "CASSANDRA_CLIENT_ENCRYPTION_STORE_TYPE"
+      value: "JKS"
+    - key: "CASSANDRA_TRUSTSTORE"
+      value: "/fake/path"
+    - key: "CASSANDRA_ASYNC_PROCESSING_ENABLED"
+      value: "true"
+    - key: "CASSANDRA_KEYSPACES_PREFIX"
+      value: "fake_prefix"
+    - key: "CASSANDRA_EXTENDED_TOKEN_AWARE_POLICY"
+      value: "true"
+    - key: "CASSANDRA_LATENCY_AWARE_POLICY"
+      value: "true"
+    - key: "CASSANDRA_CUSTOM_RETRY_POLICY"
+      value: "true"
+    - key: "CASSANDRA_CUSTOM_RETRY_POLICY_ENABLED"
+      value: "false"
+    - key: "CASSANDRA_CUSTOM_RETRY_POLICY_COUNT"
+      value: "2"
+    - key: "CASSANDRA_SPECULATIVE_EXECUTION_POLICY"
+      value: "true"
+    - key: "CASSANDRA_SPECULATIVE_EXECUTION_POLICY_ENABLED"
+      value: "false"
+    - key: "CASSANDRA_SPECULATIVE_EXECUTION_DELAY"
+      value: "50"
+    - key: "CASSANDRA_SPECULATIVE_EXECUTION_MAX_EXECUTIONS"
+      value: "2"
+    - key: "CASSANDRA_CSV_METRICS_ENABLED"
+      value: "true"
+    - key: "CASSANDRA_LOG_METRICS_ENABLED"
+      value: "true"
+    - key: "EXTERNAL_STREAM"
+      value: "true"
+    - key: "SERVICES_STREAM_PROVIDER"
+      value: "KafkaService"
+    - key: "STREAM_BOOTSTRAP_SERVERS"
+      value: "host:9092"
+    - key: "STREAM_SECURITY_PROTOCOL"
+      value: "PLAIN"
+    - key: "STREAM_SASL_MECHANISM"
+      value: "PLAIN"
+    - key: "STREAM_TRUSTSTORE"
+      value: "truststore.jks"
+    - key: "STREAM_TRUSTSTORE_TYPE"
+      value: "jks"
+    - key: "STREAM_KEYSTORE"
+      value: "keystore.jks"
+    - key: "STREAM_KEYSTORE_TYPE"
+      value: "jks"
+    - key: "STREAM_TRUSTSTORE_PASSWORD"
+      value: "fake password"
+    - key: "STREAM_KEYSTORE_PASSWORD"
+      value: "fake password"
+    - key: "STREAM_JAAS_CONFIG"
+      value: "fake config"
+    - key: "STREAM_NAME_PATTERN"
+      value: "pega-{stream.name}"
+    - key: "STREAM_REPLICATION_FACTOR"
+      value: "1"
+    command: "bash"
+    args:
+    - -c
+    - |
+        bash -c './scripts/docker-entrypoint.sh' &&
+        grep -zoc "<resource-env-ref-type>javax.jms.QueueConnectionFactory</resource-env-ref-type>[[:space:]]*</web-app>" /usr/local/tomcat/webapps/prweb/WEB-INF/web.xml
+    exitCode: 0
+    excludedOutput: ["prweb.xml is not dockerized properly"]
+
 # Dockerize prweb.xml check when SSL is enabled for Hazelcast
   - name: "Dockerize PRWEB Check with HZ SSL"
     envVars:
@@ -1371,30 +1465,6 @@ commandTests:
     exitCode: 0
     expectedOutput: ["prweb.xml is not dockerized properly"]
 
-# Verify WEB_XML_SNIPPET
-  - name: "Verify WEB_XML_SNIPPET is inserted"
-    envVars:
-    - key: "JDBC_DRIVER_URI"
-      value: "https://jdbc.postgresql.org/download/postgresql-42.2.0.jar"
-    - key: "JDBC_URL"
-      value: "jdbc:postgresql://localhost:5432/pegadb"
-    - key: "JDBC_CLASS"
-      value: "org.postgresql.Driver"
-    - key: "DB_USERNAME"
-      value: "postgres"
-    - key: "DB_PASSWORD"
-      value: "postgres"   
-    - key: "WEB_XML_SNIPPET"
-      value: <resource-env-ref-type>javax.jms.QueueConnectionFactory</resource-env-ref-type>         
-    command: "bash"
-    args:
-    - -c
-    - |
-        bash -c './scripts/docker-entrypoint.sh' &&
-        grep -zocP "<resource-env-ref-type>javax.jms.QueueConnectionFactory</resource-env-ref-type>[[:space:]]*</web-app>" /usr/local/tomcat/webapps/prweb/WEB-INF/web.xml
-    exitCode: 0
-    expectedOutput: ["1"]
-
 # Verify the run argument for catalina.sh   
   - name: "Verify run argument for catalina.sh"
     envVars: