From bcdc3ae7c0d225c0349d9b42bf88602fef31a95c Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Tue, 10 Jul 2007 13:17:59 +0000
Subject: [PATCH] updates. disable modifyDn testcase as java moddn command is not yet implemented
---
opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml | 20 +++---
opends/tests/functional-tests/testcases/groups/group_lib.xml | 2
opends/tests/functional-tests/testcases/groups/group_virtual_static.xml | 59 +++++++++----------
opends/tests/functional-tests/testcases/groups/group_dynamic.xml | 29 +++++----
opends/tests/functional-tests/testcases/groups/groups.xml | 9 --
opends/tests/functional-tests/testcases/groups/group_static_member.xml | 16 ++--
6 files changed, 67 insertions(+), 68 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/groups/group_dynamic.xml b/opends/tests/functional-tests/testcases/groups/group_dynamic.xml
index 2f6dfbc..af10c23 100644
--- a/opends/tests/functional-tests/testcases/groups/group_dynamic.xml
+++ b/opends/tests/functional-tests/testcases/groups/group_dynamic.xml
@@ -180,7 +180,7 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : newDynamicGroupDn ,
'dsFilter' : 'objectclass=*' ,
- 'expected' : 32 }
+ 'expectedRC' : 32 }
</call>
<!-- ******************** -->
<call function="'CheckIsMemberOf'">
@@ -216,7 +216,7 @@
'dsInstancePswd' : user1Pswd ,
'dsBaseDN' : user1Dn ,
'dsFilter' : 'objectclass=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<!-- ******************** -->
<call function="'CheckIsMemberOf'">
@@ -253,10 +253,10 @@
'dsInstancePswd' : user2Pswd ,
'dsBaseDN' : user2Dn ,
'dsFilter' : 'objectclass=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
- '++++ Check the search return nothing'
+ '++++ Check the search returns nothing'
</message>
<call function="'CheckMatches'">
{ 'string2find' : 'dn' ,
@@ -324,10 +324,10 @@
'dsInstancePswd' : user2AddPswd ,
'dsBaseDN' : user2AddDn ,
'dsFilter' : 'objectclass=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
- '++++ Check the search return nothing'
+ '++++ Check the search returns nothing'
</message>
<call function="'CheckMatches'">
{ 'string2find' : 'dn' ,
@@ -357,7 +357,8 @@
#@TestPostamble
#@TestResult
-->
- <testcase name="'Group: Dynamic: application rename entry that belong to a group'">
+ <!---
+ <testcase name="'Group: Dynamic: application rename entry that belong to a group'">
<sequence>
<call function="'testCase_Preamble'"/>
<message>
@@ -373,7 +374,9 @@
'newRDN' : user2AddRenamed,
'deleteOldRDN' : 1 }
</call>
+-->
<!-- ******************** -->
+<!--
<message>
'++++ %s search itself (should be refused as dynamic group does not have permission)' % user2AddRenamed
</message>
@@ -384,10 +387,10 @@
'dsInstancePswd' : user2AddPswd ,
'dsBaseDN' : user2AddRenamedDn ,
'dsFilter' : 'objectclass=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
- '++++ Check the search return nothing'
+ '++++ Check the search returns nothing'
</message>
<call function="'CheckMatches'">
{ 'string2find' : 'dn' ,
@@ -395,7 +398,9 @@
'nbExpected' : 0
}
</call>
+-->
<!-- ******************** -->
+<!--
<call function="'CheckIsMemberOf'">
{ 'baseDn' : user2AddRenamedDn ,
'string2find' : dynamicGroupDn ,
@@ -405,7 +410,7 @@
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
-
+-->
<!--- Test Case information
#@TestMarker Dynamic Group Tests
@@ -443,7 +448,7 @@
'dsBaseDN' : user2AddDn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'dn',
- 'expected' : 32 }
+ 'expectedRC' : 32 }
</call>
<!-- ******************** -->
<message>
@@ -456,7 +461,7 @@
'dsInstancePswd' : user2AddPswd ,
'dsBaseDN' : user2AddDn ,
'dsFilter' : 'objectclass=*' ,
- 'expected' : 49 }
+ 'expectedRC' : 49 }
</call>
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/groups/group_lib.xml b/opends/tests/functional-tests/testcases/groups/group_lib.xml
index 6b22edc..d880a30 100644
--- a/opends/tests/functional-tests/testcases/groups/group_lib.xml
+++ b/opends/tests/functional-tests/testcases/groups/group_lib.xml
@@ -65,7 +65,7 @@
'dsBaseDN' : baseDn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'isMemberOf',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
diff --git a/opends/tests/functional-tests/testcases/groups/group_static_member.xml b/opends/tests/functional-tests/testcases/groups/group_static_member.xml
index cefc36c..ac959bf 100644
--- a/opends/tests/functional-tests/testcases/groups/group_static_member.xml
+++ b/opends/tests/functional-tests/testcases/groups/group_static_member.xml
@@ -186,7 +186,7 @@
'dsBaseDN' : newStaticGroupDn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'member',
- 'expected' : 32 }
+ 'expectedRC' : 32 }
</call>
<call function="'CheckIsMemberOf'">
{ 'baseDn' : user11Dn ,
@@ -223,7 +223,7 @@
'dsBaseDN' : user11Dn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uid',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<call function="'CheckMatches'">
{ 'string2find' : 'uid' ,
@@ -261,7 +261,7 @@
'dsBaseDN' : user1Dn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uid',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<!-- ******************** -->
<message>
@@ -397,7 +397,7 @@
'dsBaseDN' : user11Dn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uid',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
'++++ Check the search return nothing'
@@ -466,7 +466,7 @@
</script>
<!-- ******************** -->
<message>
- '++++ Check ldapsearch result still return the deleted entry uid as referential integrity plugin is disabled'
+ '++++ Check ldapsearch result still returns the deleted entry uid as referential integrity plugin is disabled'
</message>
<call function="'CheckMatches'">
{ 'string2find' : user11Dn ,
@@ -476,7 +476,7 @@
</call>
<!-- ******************** -->
<message>
- '++++ Check ldapsearch result return 11 entries'
+ '++++ Check ldapsearch result returns 11 entries'
</message>
<call function="'CheckMatches'">
{ 'string2find' : 'member' ,
@@ -567,7 +567,7 @@
</script>
<!-- ******************** -->
<message>
- '++++ Check ldapsearch result should not return the deleted group entry'
+ '++++ Check ldapsearch result should not returns the deleted group entry'
</message>
<call function="'CheckMatches'">
{ 'string2find' : user11Dn ,
@@ -587,7 +587,7 @@
'dsBaseDN' : user11Dn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uid',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
'++++ Check the search returns entry'
diff --git a/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml b/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml
index 732b00e..6b7df38 100644
--- a/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml
+++ b/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml
@@ -184,7 +184,7 @@
'dsBaseDN' : newStaticGroupDn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uniquemember',
- 'expected' : 32 }
+ 'expectedRC' : 32 }
</call>
<call function="'CheckIsMemberOf'">
{ 'baseDn' : user11Dn ,
@@ -221,7 +221,7 @@
'dsBaseDN' : user11Dn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uid',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<call function="'CheckMatches'">
{ 'string2find' : 'uid' ,
@@ -259,7 +259,7 @@
'dsBaseDN' : user1Dn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uid',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
'++++ Check the search return nothing'
@@ -374,7 +374,7 @@
</script>
<!-- ******************** -->
<message>
- '++++ Check ldapsearch result return the new entry uid'
+ '++++ Check ldapsearch result returns the new entry uid'
</message>
<call function="'CheckMatches'">
{ 'string2find' : user11Dn ,
@@ -394,10 +394,10 @@
'dsBaseDN' : user11Dn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uid',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
- '++++ Check the search return nothing'
+ '++++ Check the search returns nothing'
</message>
<call function="'CheckMatches'">
{ 'string2find' : 'dn' ,
@@ -463,7 +463,7 @@
</script>
<!-- ******************** -->
<message>
- '++++ Check ldapsearch result still return the deleted entry uid as referential integrity plugin is disabled'
+ '++++ Check ldapsearch result still returns the deleted entry uid as referential integrity plugin is disabled'
</message>
<call function="'CheckMatches'">
{ 'string2find' : user11Dn ,
@@ -473,7 +473,7 @@
</call>
<!-- ******************** -->
<message>
- '++++ Check ldapsearch result return 11 entries'
+ '++++ Check ldapsearch result returns 11 entries'
</message>
<call function="'CheckMatches'">
{ 'string2find' : 'uniquemember' ,
@@ -564,7 +564,7 @@
</script>
<!-- ******************** -->
<message>
- '++++ Check ldapsearch result should not return the deleted group entry'
+ '++++ Check ldapsearch result should not returns the deleted group entry'
</message>
<call function="'CheckMatches'">
{ 'string2find' : user11Dn ,
@@ -584,7 +584,7 @@
'dsBaseDN' : user11Dn ,
'dsFilter' : 'objectclass=*' ,
'dsAttributes' : 'uid',
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
'++++ Check the search returns entry'
diff --git a/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml b/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml
index 02378e6..b4697aa 100644
--- a/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml
+++ b/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml
@@ -131,7 +131,7 @@
listAttr.append('objectclass:groupOfUniqueNames')
listAttr.append('objectclass:ds-virtual-static-group')
listAttr.append('description:this is the description of %s' % newVirtualStaticGroup)
- listAttr.append('ds-target-group-dn:%s' % virtualStaticGroupDn)
+ listAttr.append('ds-target-group-dn:%s' % dynamicGroupDn)
</script>
<message>
@@ -205,8 +205,16 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : newVirtualStaticGroupDn ,
'dsFilter' : 'objectclass=*' ,
- 'expected' : 32 }
+ 'expectedRC' : 32 }
</call>
+ <!-- ******************** -->
+ <call function="'CheckIsMemberOf'">
+ { 'baseDn' : 'uid=user_02,ou=dynamic,dc=groups,dc=com' ,
+ 'string2find' : newVirtualStaticGroupDn ,
+ 'nbExpected' : 0
+ }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
@@ -235,7 +243,7 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : virtualStaticGroupDn ,
'dsFilter' : 'uniquemember=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<script>
ldapSearchResult=STAXResult[0][1]
@@ -322,10 +330,10 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : virtualStaticGroupDn ,
'dsFilter' : 'uniquemember=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
- '++++ Check the search return the added user'
+ '++++ Check the search returns the added user'
</message>
<call function="'CheckMatches'">
{ 'string2find' : user2AddDn ,
@@ -355,6 +363,7 @@
#@TestPostamble
#@TestResult
-->
+<!--
<testcase name="'Group: Virtual Static: application rename entry that belong to a group'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -371,7 +380,9 @@
'newRDN' : user2AddRenamed,
'deleteOldRDN' : 1 }
</call>
+-->
<!-- ******************** -->
+<!--
<message>
'++++ Application search the new user %s in the virtual static group entry (should be a member)' % user2Add
</message>
@@ -382,10 +393,10 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : virtualStaticGroupDn ,
'dsFilter' : 'uniquemember=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
- '++++ Check the search return the added user'
+ '++++ Check the search returns the added user'
</message>
<call function="'CheckMatches'">
{ 'string2find' : user2AddRenamedDn ,
@@ -393,7 +404,9 @@
'nbExpected' : 1
}
</call>
+-->
<!-- ******************** -->
+<!--
<call function="'CheckIsMemberOf'">
{ 'baseDn' : user2AddRenamedDn ,
'string2find' : virtualStaticGroupDn ,
@@ -403,7 +416,7 @@
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
-
+-->
<!--- Test Case information
#@TestMarker Virtual Static Group Tests
@@ -440,10 +453,10 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : virtualStaticGroupDn ,
'dsFilter' : 'uniquemember=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<message>
- '++++ Check the search return the added user'
+ '++++ Check the search returns the added user'
</message>
<call function="'CheckMatches'">
{ 'string2find' : user2AddDn ,
@@ -498,7 +511,7 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : virtualStaticGroupDn ,
'dsFilter' : 'uniquemember=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<call function="'CheckMatches'">
{ 'string2find' : 'uid=user_03,ou=dynamic,dc=groups,dc=com' ,
@@ -564,7 +577,7 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : virtualStaticGroupDn ,
'dsFilter' : 'uniquemember=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<call function="'CheckMatches'">
{ 'string2find' : 'uid=user_09,ou=static,dc=groups,dc=com' ,
@@ -631,7 +644,7 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : virtualStaticGroupDn ,
'dsFilter' : 'uniquemember=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<call function="'CheckMatches'">
{ 'string2find' : 'uid=user_09,ou=static,dc=groups,dc=com' ,
@@ -682,7 +695,7 @@
'changetype' : 'delete' ,
'attributeName' : 'ds-target-group-dn' ,
'newAttributeValue' : dynamicGroupDn ,
- 'expectedErrorCode' : 65 }
+ 'expectedRC' : 65 }
</call>
<!-- ******************** -->
<message>
@@ -695,27 +708,13 @@
'dsInstancePswd' : applicationPswd ,
'dsBaseDN' : virtualStaticGroupDn ,
'dsFilter' : 'uniquemember=*' ,
- 'expected' : 0 }
+ 'expectedRC' : 0 }
</call>
<call function="'CheckMatches'">
- { 'string2find' : 'uid=user_02,ou=static,dc=groups,dc=com' ,
+ { 'string2find' : 'uid=user_02,ou=dynamic,dc=groups,dc=com' ,
'mainString' : STAXResult[0][1] ,
'nbExpected' : 1 }
</call>
- <!-- ******************** -->
- <message>
- '++++ Application reset ds-target-group-dn attribute to default value %s' % (dynamicGroupDn)
- </message>
- <call function="'modifyAnAttribute'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : applicationDn ,
- 'dsInstancePswd' : applicationPswd ,
- 'DNToModify' : virtualStaticGroupDn ,
- 'changetype' : 'add' ,
- 'attributeName' : 'ds-target-group-dn' ,
- 'newAttributeValue' : dynamicGroupDn }
- </call>
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/groups/groups.xml b/opends/tests/functional-tests/testcases/groups/groups.xml
index 4613355..9f82910 100644
--- a/opends/tests/functional-tests/testcases/groups/groups.xml
+++ b/opends/tests/functional-tests/testcases/groups/groups.xml
@@ -44,12 +44,7 @@
</script>
<call function="'testGroup_Preamble'"/>
-<!--GA
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/groups/mytest.xml' % (TESTS_DIR)"/>
- <call function="'main_mytest'" />
--->
-<!--GA
+
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/testcases/groups/group_static_uniquemember.xml' % (TESTS_DIR)"/>
<call function="'main_staticgroup_uniquemember'" />
@@ -61,7 +56,7 @@
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/testcases/groups/group_dynamic.xml' % (TESTS_DIR)"/>
<call function="'main_dynamicgroup'" />
--->
+
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/testcases/groups/group_virtual_static.xml' % (TESTS_DIR)"/>
<call function="'main_virtualStaticGroup'" />
--
Gitblit v1.10.0