Merge branch 'bats' of https://github.internet2.edu/docker/midPoint_c…

…ontainer into bats

demo/complex/tests/main.bats

@@ -21,8 +21,8 @@ load ../../../library
     touch $BATS_TMPDIR/not-started
     wait_for_midpoint_start complex_midpoint-server_1 complex_midpoint-data_1
     wait_for_shibboleth_idp_start complex_idp_1
+    wait_for_grouper_ui_start complex_grouper-ui_1
     rm $BATS_TMPDIR/not-started
-# TODO wait for shibboleth, grouper-ui, (also something other?)
 }
 
 @test "040 Check midPoint health" {
@@ -53,19 +53,34 @@ load ../../../library
     add_object users /tmp/test110.xml
     rm /tmp/test110.xml
     search_and_check_object users test110
-# TODO delete user after
+    delete_object_by_name users test110
 }
 
 @test "200 Upload objects" {
     if [ -e $BATS_TMPDIR/not-started ]; then skip 'not started'; fi
     check_health
     pwd >&2
     ./upload-objects
+
     search_and_check_object objectTemplates template-org-course
     search_and_check_object objectTemplates template-org-department
     search_and_check_object objectTemplates template-role-affiliation
     search_and_check_object objectTemplates template-role-generic-group
-# TODO check other objects that were uploaded
+
+    search_and_check_object orgs courses
+    search_and_check_object orgs departments
+
+    search_and_check_object resources "OpenLDAP (directory)"
+    search_and_check_object resources "Grouper SQL/MQ"
+    search_and_check_object resources "SQL SIS courses (sources)"
+    search_and_check_object resources "SQL SIS persons (sources)"
+
+    search_and_check_object roles metarole-affiliation
+    search_and_check_object roles metarole-course
+    search_and_check_object roles metarole-department 
+    search_and_check_object roles metarole-generic-group
+    search_and_check_object roles role-grouper-sysadmin
+    search_and_check_object roles role-ldap-basic
 }
 
 @test "210 Test resource" {
@@ -81,7 +96,7 @@ load ../../../library
 
     add_object tasks midpoint-objects-manual/tasks/task-import-sis-persons.xml
     search_and_check_object tasks "Import from SIS persons"
-    wait_for_task_completion 22c2a3d0-0961-4255-9eec-c550a79aeaaa
+    wait_for_task_completion 22c2a3d0-0961-4255-9eec-c550a79aeaaa 6 10
     assert_task_success 22c2a3d0-0961-4255-9eec-c550a79aeaaa
 
     search_and_check_object users jsmith
@@ -94,10 +109,39 @@ load ../../../library
     search_and_check_object users amorrison
     search_and_check_object users wprice
     search_and_check_object users mroberts
-    # TODO check in LDAP, check assignments etc
+
+    check_ldap_account_by_user_name jsmith complex_directory_1
+    check_ldap_account_by_user_name banderson complex_directory_1
+    check_ldap_account_by_user_name kwhite complex_directory_1
+    check_ldap_account_by_user_name whenderson complex_directory_1
+    check_ldap_account_by_user_name ddavis complex_directory_1
+    check_ldap_account_by_user_name cmorrison complex_directory_1
+    check_ldap_account_by_user_name danderson complex_directory_1
+    check_ldap_account_by_user_name amorrison complex_directory_1
+    check_ldap_account_by_user_name wprice complex_directory_1
+    check_ldap_account_by_user_name mroberts complex_directory_1
+    # TODO check assignments etc
 }
 
+@test "230 Check 'TestUser230' in Midpoint and LDAP" {
+    if [ -e $BATS_TMPDIR/not-started ]; then skip 'not started'; fi
+    check_health
+    echo "<user><name>TestUser230</name><fullName>Test User230</fullName><givenName>Test</givenName><familyName>User230</familyName><credentials><password><value><clearValue>password</clearValue></value></password></credentials></user>" >/tmp/testuser230.xml
+    add_object users /tmp/testuser230.xml
+    rm /tmp/testuser230.xml
+    search_and_check_object users TestUser230
+
+    execute_bulk_action tests/resources/bulk-action/recom-role-grouper-sysadmin.xml
+    execute_bulk_action tests/resources/bulk-action/assign-role-grouper-sysadmin-to-test-user.xml
+
+    check_ldap_account_by_user_name TestUser230 complex_directory_1
+    check_of_ldap_membership TestUser230 sysadmingroup complex_directory_1
+
+    delete_object_by_name users TestUser230
+}
+
+
 @test "999 Clean up" {
-#	skip TEMP
+	skip TEMP
     docker-compose down -v
 }

demo/complex/tests/resources/bulk-action/assign-role-grouper-sysadmin-to-test-user.xml

@@ -0,0 +1,22 @@
+<scext:executeScript xmlns:scext="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3">
+                <s:search xmlns:s="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3"
+   			  xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+			  xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
+			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         		  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+                    <s:type>c:UserType</s:type>
+                    <s:searchFilter>
+                        <q:equal>
+                            <q:path>c:name</q:path>
+                            <q:value>TestUser230</q:value>
+                        </q:equal>
+                    </s:searchFilter>
+                    <s:action>
+                        <s:type>assign</s:type>
+                        <s:parameter>
+                            <s:name>role</s:name>
+							<c:value xsi:type="xsd:string">d48ec05b-fffd-4262-acd3-d9ff63365b62</c:value>
+                        </s:parameter>
+                    </s:action>
+                </s:search>
+            </scext:executeScript>

demo/complex/tests/resources/bulk-action/recom-role-grouper-sysadmin.xml

@@ -0,0 +1,16 @@
+<scext:executeScript xmlns:scext="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3"
+		     xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
+		     xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
+                <s:search xmlns:s="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3">
+                    <s:type>c:RoleType</s:type>
+                    <s:searchFilter>
+                        <q:equal>
+                            <q:path>name</q:path>
+                            <q:value>role-grouper-sysadmin</q:value>
+                        </q:equal>
+                    </s:searchFilter>
+                    <s:action>
+                        <s:type>recompute</s:type>
+                    </s:action>
+                </s:search>
+            </scext:executeScript>

demo/shibboleth/tests/main.bats

@@ -15,8 +15,7 @@ load ../../../library
 
 @test "020 Initialize and start Shibboleth" {
     docker-compose up -d
-    # TODO implement wait_for_shibboleth_start
-    sleep 60
+    wait_for_shibboleth_idp_start shibboleth_idp_1
 }
 
 @test "030 Check health" {