roles/java - fixup molecule tests

Author: alxgomz

roles/java/molecule/default/tests/test_java.py

@@ -7,55 +7,37 @@
 @pytest.fixture(scope="module")
 def get_ansible_vars(host):
     """Define get_ansible_vars"""
-    java_role = "file=../../vars/main.yml name=java_role"
-    common_vars = "file=../../../common/vars/main.yml name=common_vars"
+    java_role_defaults = "file=../../defaults/main.yml name=java_role"
     common_defaults = "file=../../../common/defaults/main.yml name=common_defaults"
-    group_vars = "file=../../../../group_vars/all.yml name=group_vars"
     ansible_vars = host.ansible(
             "include_vars",
-            java_role
+            java_role_defaults
             )["ansible_facts"]["java_role"]
-    ansible_vars.update(
-            host.ansible(
-                "include_vars", java_role
-                )["ansible_facts"]["java_role"]
-            )
-    ansible_vars.update(
-            host.ansible(
-                "include_vars", common_vars
-                )["ansible_facts"]["common_vars"]
-            )
     ansible_vars.update(
             host.ansible(
                 "include_vars", common_defaults
                 )["ansible_facts"]["common_defaults"]
             )
-    ansible_vars.update(
-            host.ansible(
-                "include_vars",
-                group_vars
-                )["ansible_facts"]["group_vars"]
-            )
     return ansible_vars
 
 
 def test_java_exists(host, get_ansible_vars):
     """Check that java executable exists"""
-    java_version = get_ansible_vars["dependencies_version"]["java"]
+    java_version = get_ansible_vars["java_core"]
     java_bin = host.file("/opt/openjdk-{}/bin/java".format(java_version))
     assert_that(java_bin.exists, True)
 
 
 def test_java_version(host, get_ansible_vars):
     """Check that java version is correct"""
-    java_version = get_ansible_vars["dependencies_version"]["java"]
+    java_version = get_ansible_vars["java_core"]
     cmd = host.run("/opt/openjdk-{}/bin/java -version".format(java_version))
     assert_that(cmd.stderr, contains_string(java_version))
 
 
 def test_java_home(host, get_ansible_vars):
     """Check that JAVA_HOME is environment variable is set"""
-    java_version = get_ansible_vars["dependencies_version"]["java"]
+    java_version = get_ansible_vars["java_core"]
     with host.sudo():
         cmd = host.run(
                 ". {}/setenv.sh && echo $JAVA_HOME".format(
@@ -70,7 +52,7 @@ def test_java_home(host, get_ansible_vars):
 def test_keystore(host, get_ansible_vars):
     """Check the Java keytore is populated with certificate"""
     hostname = host.ansible.get_variables()["inventory_hostname"]
-    java_version = get_ansible_vars["dependencies_version"]["java"]
+    java_version = get_ansible_vars["java_core"]
     java_home = '/opt/openjdk-' + java_version
     keystore = java_home + '/lib/security/keystore/ansible.jceks'
     cmd_tpl = '{}/bin/keytool -list -keystore {} -storepass alfresco -alias {}'
@@ -88,7 +70,7 @@ def test_keystore(host, get_ansible_vars):
 
 def test_keystore_seckey(host, get_ansible_vars):
     """Check the Java keytore is populated with certificate"""
-    java_version = get_ansible_vars["dependencies_version"]["java"]
+    java_version = get_ansible_vars["java_core"]
     java_home = '/opt/openjdk-' + java_version
     keystore = java_home + '/lib/security/keystore/ansible.jceks'
     cmd_tpl = '{}/bin/keytool -keypasswd -keystore {} -storepass alfresco -keypass "{}" -new "{}" -alias test'
@@ -107,7 +89,7 @@ def test_keystore_seckey(host, get_ansible_vars):
 
 def test_truststore(host, get_ansible_vars):
     """Check the Java truststore trusts the CA root signing certificate"""
-    java_version = get_ansible_vars["dependencies_version"]["java"]
+    java_version = get_ansible_vars["java_core"]
     cmd = host.run(
             "/opt/openjdk-{}/bin/keytool -list -cacerts".format(java_version)
             )