From f2d766b61ce6265f8b1e23fc60d7b801bca5999d Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 05 Jul 2010 09:29:05 +0000
Subject: [PATCH] Update DSML and Security/Pwd_validator tests
---
opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml | 8 +-
opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/genericIssues/ref-importIssue-4178-presenceIndexSearchMissing.4178.issue | 2
opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res | 6
opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res | 152 +++++++++++++++++++-------------------
opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/search.ldif | 12 --
opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml | 2
6 files changed, 88 insertions(+), 94 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/search.ldif b/opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/search.ldif
index 661c109..b96b630 100755
--- a/opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/search.ldif
+++ b/opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/search.ldif
@@ -4484,7 +4484,7 @@
dn: cn=\+Pat Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Sear
ch, o=IMC, c=US
cn: Pat Bakers
-cn: \+Pat Bakers
+cn: +Pat Bakers
sn: Bakers
givenName: Pat
objectClass: top
@@ -4500,7 +4500,7 @@
dn: cn=Pat\, Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Sear
ch, o=IMC, c=US
cn: Pat Bakers
-cn: Pat\, Bakers
+cn: Pat, Bakers
sn: Bakers
givenName: Pat
objectClass: top
@@ -4516,7 +4516,7 @@
dn: cn=\"Pat Bakers\", ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Se
arch, o=IMC, c=US
cn: Pat Bakers
-cn: \"Pat Bakers\"
+cn: "Pat Bakers"
sn: Bakers
givenName: Pat
objectClass: top
@@ -15190,42 +15190,36 @@
objectClass: top
objectClass: person
cn: Ac#illes
-cn: Ac\#illes
sn: Smith
dn: cn=Mars\\Ares, ou=Syntaxes, ou=Search, o=IMC, c=US
objectClass: top
objectClass: person
cn: Mars\Ares
-cn: Mars\\Ares
sn: Smith
dn: cn=Rome\<Athens, ou=Syntaxes, ou=Search, o=IMC, c=US
objectClass: top
objectClass: person
cn: Rome<Athens
-cn: Rome\<Athens
sn: Smith
dn: cn=Athens\>Rome, ou=Syntaxes, ou=Search, o=IMC, c=US
objectClass: top
objectClass: person
cn: Athens>Rome
-cn: Athens\>Rome
sn: Smith
dn: cn=Perse\;phone, ou=Syntaxes, ou=Search, o=IMC, c=US
objectClass: top
objectClass: person
cn: Perse;phone
-cn: Perse\;phone
sn: Smith
dn: cn=Time\=Money, ou=Syntaxes, ou=Search, o=IMC, c=US
objectClass: top
objectClass: person
cn: Time=Money
-cn: Time\=Money
sn: Smith
dn: cn="Easy Come, Easy Go", ou=Syntaxes, ou=Search, o=IMC, c=US
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res
index 5ce6aba..bf0bb11 100755
--- a/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res
+++ b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res
@@ -1646,7 +1646,7 @@
<searchResultEntry dn='cn=\+Pat Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
<attr name='cn'>
<value>Pat Bakers</value>
- <value>\+Pat Bakers</value>
+ <value>+Pat Bakers</value>
</attr>
<attr name='sn'>
<value>Bakers</value>
@@ -1676,7 +1676,7 @@
<searchResultEntry dn='cn=Pat\, Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
<attr name='cn'>
<value>Pat Bakers</value>
- <value>Pat\, Bakers</value>
+ <value>Pat, Bakers</value>
</attr>
<attr name='sn'>
<value>Bakers</value>
@@ -1706,7 +1706,7 @@
<searchResultEntry dn='cn=\"Pat Bakers\", ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
<attr name='cn'>
<value>Pat Bakers</value>
- <value>\"Pat Bakers\"</value>
+ <value>"Pat Bakers"</value>
</attr>
<attr name='sn'>
<value>Bakers</value>
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res
index d9d41e3..29fde0f 100755
--- a/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res
+++ b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res
@@ -19,244 +19,244 @@
xmlns='urn:oasis:names:tc:DSML:2:0:core'
>
<searchResponse>
- <searchResultEntry dn='cn=Nicholas Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
- <attr name='cn'>
+ <searchResultEntry dn="cn=Nicholas Bakers,ou=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US">
+ <attr name="cn">
<value>Nicholas Bakers</value>
</attr>
- <attr name='sn'>
+ <attr name="sn">
<value>Bakers</value>
</attr>
- <attr name='givenName'>
+ <attr name="givenName">
<value>Nicholas</value>
</attr>
- <attr name='objectClass'>
+ <attr name="objectClass">
<value>top</value>
<value>person</value>
<value>organizationalperson</value>
<value>inetorgperson</value>
</attr>
- <attr name='telephoneNumber'>
+ <attr name="telephoneNumber">
<value>+1 408 827 0113</value>
</attr>
- <attr name='mail'>
+ <attr name="mail">
<value>Nicholas.Bakers@dirconnect2.org</value>
</attr>
- <attr name='title'>
+ <attr name="title">
<value>Accountant</value>
</attr>
- <attr name='employeeNumber'>
+ <attr name="employeeNumber">
<value>1100144</value>
</attr>
</searchResultEntry>
- <searchResultEntry dn='cn=Oprah Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
- <attr name='cn'>
+ <searchResultEntry dn="cn=Oprah Bakers,ou=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US">
+ <attr name="cn">
<value>Oprah Bakers</value>
</attr>
- <attr name='sn'>
+ <attr name="sn">
<value>Bakers</value>
</attr>
- <attr name='givenName'>
+ <attr name="givenName">
<value>Oprah</value>
</attr>
- <attr name='objectClass'>
+ <attr name="objectClass">
<value>top</value>
<value>person</value>
<value>organizationalperson</value>
<value>inetorgperson</value>
</attr>
- <attr name='telephoneNumber'>
+ <attr name="telephoneNumber">
<value>+1 408 827 0114</value>
</attr>
- <attr name='mail'>
+ <attr name="mail">
<value>Oprah.Bakers@dirconnect2.org</value>
</attr>
- <attr name='title'>
+ <attr name="title">
<value>Lawyer</value>
</attr>
- <attr name='employeeNumber'>
+ <attr name="employeeNumber">
<value>1100145</value>
</attr>
</searchResultEntry>
- <searchResultEntry dn='cn=Pat Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
- <attr name='cn'>
+ <searchResultEntry dn="cn=Pat Bakers,ou=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US">
+ <attr name="cn">
<value>Pat Bakers</value>
</attr>
- <attr name='sn'>
+ <attr name="sn">
<value>Bakers</value>
</attr>
- <attr name='givenName'>
+ <attr name="givenName">
<value>Pat</value>
</attr>
- <attr name='objectClass'>
+ <attr name="objectClass">
<value>top</value>
<value>person</value>
<value>organizationalperson</value>
<value>inetorgperson</value>
</attr>
- <attr name='telephoneNumber'>
+ <attr name="telephoneNumber">
<value>+1 408 827 0115</value>
</attr>
- <attr name='mail'>
+ <attr name="mail">
<value>Pat.Bakers@dirconnect2.org</value>
</attr>
- <attr name='title'>
+ <attr name="title">
<value>Accountant</value>
</attr>
- <attr name='employeeNumber'>
+ <attr name="employeeNumber">
<value>1100146</value>
</attr>
</searchResultEntry>
- <searchResultEntry dn='cn=\+Pat Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
- <attr name='cn'>
+ <searchResultEntry dn="cn=\+Pat Bakers,ou=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US">
+ <attr name="cn">
<value>Pat Bakers</value>
- <value>\+Pat Bakers</value>
+ <value>+Pat Bakers</value>
</attr>
- <attr name='sn'>
+ <attr name="sn">
<value>Bakers</value>
</attr>
- <attr name='givenName'>
+ <attr name="givenName">
<value>Pat</value>
</attr>
- <attr name='objectClass'>
+ <attr name="objectClass">
<value>top</value>
<value>person</value>
<value>organizationalperson</value>
<value>inetorgperson</value>
</attr>
- <attr name='telephoneNumber'>
+ <attr name="telephoneNumber">
<value>+1 408 827 0115</value>
</attr>
- <attr name='mail'>
+ <attr name="mail">
<value>Pat.Bakers@dirconnect2.org</value>
</attr>
- <attr name='title'>
+ <attr name="title">
<value>Accountant</value>
</attr>
- <attr name='employeeNumber'>
+ <attr name="employeeNumber">
<value>1100146</value>
</attr>
</searchResultEntry>
- <searchResultEntry dn='cn=Pat\, Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
- <attr name='cn'>
+ <searchResultEntry dn="cn=Pat\, Bakers,ou=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US">
+ <attr name="cn">
<value>Pat Bakers</value>
- <value>Pat\, Bakers</value>
+ <value>Pat, Bakers</value>
</attr>
- <attr name='sn'>
+ <attr name="sn">
<value>Bakers</value>
</attr>
- <attr name='givenName'>
+ <attr name="givenName">
<value>Pat</value>
</attr>
- <attr name='objectClass'>
+ <attr name="objectClass">
<value>top</value>
<value>person</value>
<value>organizationalperson</value>
<value>inetorgperson</value>
</attr>
- <attr name='telephoneNumber'>
+ <attr name="telephoneNumber">
<value>+1 408 827 0115</value>
</attr>
- <attr name='mail'>
+ <attr name="mail">
<value>Pat.Bakers@dirconnect2.org</value>
</attr>
- <attr name='title'>
+ <attr name="title">
<value>Accountant</value>
</attr>
- <attr name='employeeNumber'>
+ <attr name="employeeNumber">
<value>1100146</value>
</attr>
</searchResultEntry>
- <searchResultEntry dn='cn=\"Pat Bakers\", ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
- <attr name='cn'>
+ <searchResultEntry dn="cn=\"Pat Bakers\",ou=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US">
+ <attr name="cn">
<value>Pat Bakers</value>
- <value>\"Pat Bakers\"</value>
+ <value>"Pat Bakers"</value>
</attr>
- <attr name='sn'>
+ <attr name="sn">
<value>Bakers</value>
</attr>
- <attr name='givenName'>
+ <attr name="givenName">
<value>Pat</value>
</attr>
- <attr name='objectClass'>
+ <attr name="objectClass">
<value>top</value>
<value>person</value>
<value>organizationalperson</value>
<value>inetorgperson</value>
</attr>
- <attr name='telephoneNumber'>
+ <attr name="telephoneNumber">
<value>+1 408 827 0115</value>
</attr>
- <attr name='mail'>
+ <attr name="mail">
<value>Pat.Bakers@dirconnect2.org</value>
</attr>
- <attr name='title'>
+ <attr name="title">
<value>Accountant</value>
</attr>
- <attr name='employeeNumber'>
+ <attr name="employeeNumber">
<value>1100146</value>
</attr>
</searchResultEntry>
- <searchResultEntry dn='cn=Patrick Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
- <attr name='cn'>
+ <searchResultEntry dn="cn=Patrick Bakers,ou=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US">
+ <attr name="cn">
<value>Patrick Bakers</value>
</attr>
- <attr name='sn'>
+ <attr name="sn">
<value>Bakers</value>
</attr>
- <attr name='givenName'>
+ <attr name="givenName">
<value>Patrick</value>
</attr>
- <attr name='objectClass'>
+ <attr name="objectClass">
<value>top</value>
<value>person</value>
<value>organizationalperson</value>
<value>inetorgperson</value>
</attr>
- <attr name='telephoneNumber'>
+ <attr name="telephoneNumber">
<value>+1 408 827 0116</value>
</attr>
- <attr name='mail'>
+ <attr name="mail">
<value>Patrick.Bakers@dirconnect2.org</value>
</attr>
- <attr name='title'>
+ <attr name="title">
<value>Lawyer</value>
</attr>
- <attr name='employeeNumber'>
+ <attr name="employeeNumber">
<value>1100147</value>
</attr>
</searchResultEntry>
- <searchResultEntry dn='cn=Paul Bakers, ou=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US'>
- <attr name='cn'>
+ <searchResultEntry dn="cn=Paul Bakers,ou=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US">
+ <attr name="cn">
<value>Paul Bakers</value>
</attr>
- <attr name='sn'>
+ <attr name="sn">
<value>Bakers</value>
</attr>
- <attr name='givenName'>
+ <attr name="givenName">
<value>Paul</value>
</attr>
- <attr name='objectClass'>
+ <attr name="objectClass">
<value>top</value>
<value>person</value>
<value>organizationalperson</value>
<value>inetorgperson</value>
</attr>
- <attr name='telephoneNumber'>
+ <attr name="telephoneNumber">
<value>+1 408 827 0117</value>
</attr>
- <attr name='mail'>
+ <attr name="mail">
<value>Paul.Bakers@dirconnect2.org</value>
</attr>
- <attr name='title'>
+ <attr name="title">
<value>Clerk</value>
</attr>
- <attr name='employeeNumber'>
+ <attr name="employeeNumber">
<value>1100148</value>
</attr>
</searchResultEntry>
<searchResultDone>
- <resultCode code='0' descr='success'/>
+ <resultCode code="0" descr="success"/>
</searchResultDone>
</searchResponse>
</batchResponse>
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/genericIssues/ref-importIssue-4178-presenceIndexSearchMissing.4178.issue b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/genericIssues/ref-importIssue-4178-presenceIndexSearchMissing.4178.issue
index 8e6903f..9df5a82 100644
--- a/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/genericIssues/ref-importIssue-4178-presenceIndexSearchMissing.4178.issue
+++ b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/genericIssues/ref-importIssue-4178-presenceIndexSearchMissing.4178.issue
@@ -4,4 +4,4 @@
Content-Type: text/xml
Connection: close
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><batchResponse xmlns="urn:oasis:names:tc:DSML:2:0:core"><searchResponse><searchResultDone><resultCode code="0"/></searchResultDone></searchResponse></batchResponse></SOAP-ENV:Body></SOAP-ENV:Envelope+>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><batchResponse xmlns="urn:oasis:names:tc:DSML:2:0:core"><searchResponse><searchResultDone><resultCode code="0"/></searchResultDone></searchResponse></batchResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
index 5fc3fd9..a601715 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
@@ -236,7 +236,7 @@
'A log rotation has been done. The new rotation file is "%s" (size = %s) ' % (newlogName,newlogSize)
</message>
- <if expr="int(newlogSize) < 4100 and int(newlogSize) > 3900" >
+ <if expr="int(newlogSize) < 4100 and int(newlogSize) > 3800" >
<sequence>
<message>
'SUCCESS. The rotation based on size limit is successfull. The file "%s" (size = %s) ' % (newlogName,newlogSize)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
index 7f4d223..c5ca9a0 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
@@ -243,7 +243,7 @@
#@TestIssue none
#@TestPurpose New password with 1 letter change, invalid 2
#@TestPreamble none
- #@TestStep user modifying pwd with 1 letter change RC 49
+ #@TestStep user modifying pwd with 1 letter change RC 53
#@TestStep user binding with new password RC 49
#@TestPostamble none
#@TestResult Success if all tests are PASS.
@@ -266,7 +266,7 @@
'dsAuthzID' : 'dn:uid=kvaughan, %s' % basedn ,
'dsNewPassword' : 'probery' ,
'dsCurrentPassword' : 'brobery' ,
- 'expectedRC' : 49 }
+ 'expectedRC' : 53 }
</call>
<message>
@@ -295,7 +295,7 @@
#@TestIssue none
#@TestPurpose New password with 2 letters change, invalid
#@TestPreamble none
- #@TestStep user modifying pwd with 2 letter change RC 49
+ #@TestStep user modifying pwd with 2 letter change RC 53
#@TestStep user binding with new password RC 49
#@TestPostamble none
#@TestResult Success if all tests are PASS.
@@ -318,7 +318,7 @@
'dsAuthzID' : 'dn:uid=kvaughan, %s' % basedn ,
'dsNewPassword' : 'phobery' ,
'dsCurrentPassword' : 'brobery' ,
- 'expectedRC' : 49 }
+ 'expectedRC' : 53 }
</call>
<message>
--
Gitblit v1.10.0