From 123bfa9d69636d53e24660b5dbd4c62c6172e257 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 06 Jul 2007 15:30:18 +0000
Subject: [PATCH] WS modification

---
 opends/tests/functional-tests/testcases/aci/aci_target.xml |   66 ++++++++++++--------------------
 1 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opends/tests/functional-tests/testcases/aci/aci_target.xml
index a39bd91..e422c56 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -1057,13 +1057,11 @@
                     'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                     'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                     'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                    'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+                    'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+                    'expectedRC'       : 21
+                  }
                 </call>
     
-                <if expr="RC != 21">
-                    <tcstatus result="'fail'"/>
-                </if>
-    
                 <message>
                    'ACI: Target: Target Equals DN With Keyword self - check aci'
                 </message>
@@ -1127,13 +1125,11 @@
                     'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                     'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                     'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                    'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+                    'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+                    'expectedRC'       : 50
+                }
                 </call>
     
-                <if expr="RC != 50">
-                    <tcstatus result="'fail'"/>
-                </if>
-    
                 <message>
                    'ACI: Target: Target Equals DN Above Entry - check aci'
                 </message>
@@ -1339,13 +1335,11 @@
                   'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+                  'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+                  'expectedRC'       : 21
+                }
               </call>
   
-              <if expr="RC != 21">
-                  <tcstatus result="'fail'"/>
-              </if>
-  
               <message>
                  'ACI: Target: Multiple Targets - check aci'
               </message>
@@ -1410,13 +1404,11 @@
                   'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+                  'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+                  'expectedRC'       : 21
+                }
               </call>
   
-              <if expr="RC != 21">
-                  <tcstatus result="'fail'"/>
-              </if>
-  
               <message>
                  'ACI: Target: Keyword Target Misspelled - check aci'
               </message>
@@ -1481,13 +1473,11 @@
                   'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+                  'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+                  'expectedRC'       : 21
+                }
               </call>
   
-              <if expr="RC != 21">
-                  <tcstatus result="'fail'"/>
-              </if>
-  
               <message>
                  'ACI: Target: Missing leading ldap: - check aci'
               </message>
@@ -1551,13 +1541,11 @@
                   'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
+                  'entryToBeModified'   : '%s/aci/aci_target/%s' % (logsRemoteDataDir,curr_aci_ldif_file) ,
+                  'expectedRC'       : 21
+                }
               </call>
   
-              <if expr="RC != 21">
-                  <tcstatus result="'fail'"/>
-              </if>
-  
               <message>
                  'ACI: Target: With ldap:all - check aci'
               </message>
@@ -1622,7 +1610,7 @@
                     'attributeName'          : 'aci' ,
                     'newAttributeValue'      : curr_aci ,
                     'changetype'             : 'add' , 
-                    'expectedErrorCode'      : '21'}
+                    'expectedRC'             : 21}
               </call>
                 
               <if expr="RC != 0">
@@ -3306,13 +3294,11 @@
                     'dsInstancePort'      : DIRECTORY_INSTANCE_PORT ,
                     'dsInstanceDn'        : 'uid=scarter,ou=People,ou=aci branch,o=ACI Tests,dc=example,dc=com' ,
                     'dsInstancePswd'      : 'sprain' ,
-                    'entryToBeModified'   : '%s/aci/aci_target/mod_entry31a.ldif' % (logsRemoteDataDir) }
+                    'entryToBeModified'   : '%s/aci/aci_target/mod_entry31a.ldif' % (logsRemoteDataDir) ,
+                    'expectedRC'          : 53
+                  }
                 </call>
     
-                <if expr="RC != 53">
-                    <tcstatus result="'fail'"/>
-                </if>
-    
                 <message>
                    'ACI: Target: userdn equals self - modify operational attributes, modify 3'
                 </message>
@@ -3322,13 +3308,11 @@
                     'dsInstancePort'      : DIRECTORY_INSTANCE_PORT ,
                     'dsInstanceDn'        : 'uid=scarter,ou=People,ou=aci branch,o=ACI Tests,dc=example,dc=com' ,
                     'dsInstancePswd'      : 'sprain' ,
-                    'entryToBeModified'   : '%s/aci/aci_target/mod_entry31b.ldif' % (logsRemoteDataDir) }
+                    'entryToBeModified'   : '%s/aci/aci_target/mod_entry31b.ldif' % (logsRemoteDataDir) ,
+                    'expectedRC'          : 53
+                  }
                 </call>
     
-                <if expr="RC != 53">
-                    <tcstatus result="'fail'"/>
-                </if>
-    
                <message>
                    'ACI: Target: userdn equals self - modify operational attributes, modify 4'
                 </message>

--
Gitblit v1.10.0