Merge pull request #184 from luck3y/CLOUD-3509

CLOUD-3509 correct misspelling / typo of keystore

Author: luck3y

tests/features/basic.feature

@@ -176,7 +176,7 @@ Feature: Common EAP tests
        | JGROUPS_PING_PROTOCOL                        | dns.DNS_PING                            |
        | OPENSHIFT_DNS_PING_SERVICE_NAME              | ping-service                            |
        | JGROUPS_CLUSTER_PASSWORD                     | P@ssw0rd                                |
-    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keysore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
+    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keystore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
 
   @redhat-sso-7-tech-preview/sso-cd-openshift @redhat-sso-7/sso73-openshift
   Scenario: Check jgroups encryption issues a warning when using ASYM_ENCRYPT with JGROUPS_ENCRYPT_NAME defined
@@ -187,7 +187,7 @@ Feature: Common EAP tests
        | JGROUPS_PING_PROTOCOL                        | dns.DNS_PING                            |
        | OPENSHIFT_DNS_PING_SERVICE_NAME              | ping-service                            |
        | JGROUPS_CLUSTER_PASSWORD                     | P@ssw0rd                                |
-    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keysore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
+    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keystore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
 
   @redhat-sso-7-tech-preview/sso-cd-openshift @redhat-sso-7/sso73-openshift
   Scenario: Check jgroups encryption issues a warning when using ASYM_ENCRYPT with JGROUPS_ENCRYPT_PASSWORD defined
@@ -198,7 +198,7 @@ Feature: Common EAP tests
        | JGROUPS_PING_PROTOCOL                        | dns.DNS_PING                            |
        | OPENSHIFT_DNS_PING_SERVICE_NAME              | ping-service                            |
        | JGROUPS_CLUSTER_PASSWORD                     | P@ssw0rd                                |
-    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keysore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
+    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keystore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
 
   @redhat-sso-7-tech-preview/sso-cd-openshift @redhat-sso-7/sso73-openshift
   Scenario: Check jgroups encryption issues a warning when using ASYM_ENCRYPT with JGROUPS_ENCRYPT_KEYSTORE_DIR defined
@@ -209,7 +209,7 @@ Feature: Common EAP tests
        | JGROUPS_PING_PROTOCOL                        | dns.DNS_PING                            |
        | OPENSHIFT_DNS_PING_SERVICE_NAME              | ping-service                            |
        | JGROUPS_CLUSTER_PASSWORD                     | P@ssw0rd                                |
-    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keysore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
+    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keystore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
 
   @redhat-sso-7-tech-preview/sso-cd-openshift @redhat-sso-7/sso73-openshift
   Scenario: Check jgroups encryption issues a warning when using ASYM_ENCRYPT with JGROUPS_ENCRYPT_KEYSTORE file defined
@@ -220,7 +220,7 @@ Feature: Common EAP tests
        | JGROUPS_PING_PROTOCOL                        | dns.DNS_PING                            |
        | OPENSHIFT_DNS_PING_SERVICE_NAME              | ping-service                            |
        | JGROUPS_CLUSTER_PASSWORD                     | P@ssw0rd                                |
-    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keysore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
+    Then container log should contain WARN Detected partial JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keystore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
   # CD doesn't have these any more
   @ignore @jboss-eap-7-tech-preview
   Scenario: No duplicate module jars

tests/features/jgroups.feature

@@ -154,7 +154,7 @@ Scenario: Verify configuration jgroups deprecated ASYM_ENCRYPT, kubernetes.KUBE_
        | JGROUPS_ENCRYPT_PROTOCOL                     | ASYM_ENCRYPT          |
        | JGROUPS_CLUSTER_PASSWORD                     | P@assw0rd             |
     Then container log should contain WFLYSRV0025:
-     And container log should contain WARN Detected missing JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keysore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
+     And container log should contain WARN Detected missing JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keystore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()='protocol'][@type='kubernetes.KUBE_PING']
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()='protocol'][@type='org.jgroups.protocols.ASYM_ENCRYPT']
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()='auth-protocol'][@type='AUTH']
@@ -188,7 +188,7 @@ Scenario: Verify configuration jgroups deprecated ASYM_ENCRYPT, dns.DNS_PING pin
        | JGROUPS_CLUSTER_PASSWORD                     | P@assw0rd                              |
        | JGROUPS_PING_PROTOCOL                        | dns.DNS_PING                           |
     Then container log should contain WFLYSRV0025:
-     And container log should contain WARN Detected missing JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keysore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
+     And container log should contain WARN Detected missing JGroups encryption configuration, the communication within the cluster will be encrypted using a deprecated version of ASYM_ENCRYPT protocol. You need to set all of these variables to configure ASYM_ENCRYPT using the Elytron keystore: JGROUPS_ENCRYPT_SECRET, JGROUPS_ENCRYPT_NAME, JGROUPS_ENCRYPT_PASSWORD, JGROUPS_ENCRYPT_KEYSTORE.
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()='protocol'][@type='dns.DNS_PING']
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()='protocol'][@type='org.jgroups.protocols.ASYM_ENCRYPT']
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 2 elements on XPath //*[local-name()='auth-protocol'][@type='AUTH']
@@ -289,4 +289,4 @@ Scenario: Verify configuration jgroups non-deprecated ASYM_ENCRYPT, dns.DNS_PING
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value keystore.jks on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store']/@name
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value mykeystorepass on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name='keystore.jks']/*[local-name()='credential-reference']/@clear-text
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value keystore.jks on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name='keystore.jks']/*[local-name()='file']/@path
-     And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value jboss.server.config.dir on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name='keystore.jks']/*[local-name()='file']/@relative-to
+     And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value jboss.server.config.dir on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name='keystore.jks']/*[local-name()='file']/@relative-to