From dd01fac8f6b2b2023303978731ac15df9654bbe1 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 25 Jun 2010 10:33:00 +0000
Subject: [PATCH] Updates to functional tests
---
/dev/null | 7 ---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml | 18 ++++++++
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml | 19 +++++++++
opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml | 4 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res | 40 ++++++++-----------
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml | 3 +
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml | 8 ++++
7 files changed, 64 insertions(+), 35 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res
index b1d167d..8268718 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res
@@ -1,24 +1,18 @@
-HTTP/1.1 200 OK
-Cache-control: no-cache
-Date: Mon, 01 Jan 2001 12:00:00 GMT
-Accept-Ranges: none
-Server: Sun-Java(tm)-System-Directory/6.2
-Content-Type: text/xml; charset="utf-8"
-Content-Length: 538
+HTTP1.1 200 OK
+Date: Wed, 19 Aug 2009 08:28:06 GMT
+Server: Apache-Coyote/1.1
+Content-Type: text/xml
+Connection: close
-<?xml version='1.0' encoding='UTF-8' ?>
-<soap-env:Envelope
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xmlns:soap-env='http://schemas.xmlsoap.org/soap/envelope/'
- >
-<soap-env:Body>
-<batchResponse
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xmlns='urn:oasis:names:tc:DSML:2:0:core'
- requestID='[attr] element has no child [value] element'
- >
-</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" requestID="[attr] element has no child [value] element">
+ <addResponse>
+ <resultCode code="32"/>
+ <errorMessage>Entry uid=abergin,ou=People,dc=siroe,dc=com cannot be added because its parent entry ou=People,dc=siroe,dc=com does not exist in the server
+ </errorMessage>
+ </addResponse>
+ </batchResponse>
+ </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res.4178.issue b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res.4178.issue
deleted file mode 100644
index 5a5af3f..0000000
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res.4178.issue
+++ /dev/null
@@ -1,7 +0,0 @@
-HTTP1.1 200 OK
-Date: Wed, 19 Aug 2009 08:28:06 GMT
-Server: Apache-Coyote/1.1
-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" requestID="[attr] element has no child [value] element"><addResponse><resultCode code="32"/><errorMessage>Entry uid=abergin,ou=People,dc=siroe,dc=com cannot be added because its parent entry ou=People,dc=siroe,dc=com does not exist in the server</errorMessage></addResponse></batchResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
index e111da4..24046ba 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
@@ -1428,7 +1428,8 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'dsCountEntries' : 'True' ,
'dsBaseDN' : 'ou=people,dc=example,dc=com',
- 'dsFilter' : 'objectClass=*'
+ 'dsFilter' : 'objectClass=*',
+ 'knownIssue' : '6962694'
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
index 76f56a2..ff7ba92 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
@@ -1179,6 +1179,14 @@
}
</call>
+ <if expr="RC != 0">
+ <sequence>
+ <call function="'setKnownIssue'">
+ { 'issueId' : 6962694 }
+ </call>
+ </sequence>
+ </if>
+
</sequence>
<catch exception="'STAXException.*'" typevar="eType" var="eInfo">
@@ -1236,7 +1244,15 @@
'startDS' : 'no'
}
</call>
-
+
+ <if expr="RC != 0">
+ <sequence>
+ <call function="'setKnownIssue'">
+ { 'issueId' : 6962694 }
+ </call>
+ </sequence>
+ </if>
+
</sequence>
<catch exception="'STAXException.*'" typevar="eType" var="eInfo">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
index 4996bbc..f5b3032 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
@@ -1146,6 +1146,10 @@
}
</call>
+ <call function="'setKnownIssue'">
+ { 'issueId' : 6962694 }
+ </call>
+
</sequence>
<catch exception="'STAXException.*'" typevar="eType" var="eInfo">
@@ -1201,6 +1205,10 @@
}
</call>
+ <call function="'setKnownIssue'">
+ { 'issueId' : 6962694 }
+ </call>
+
</sequence>
<catch exception="'STAXException.*'" typevar="eType" var="eInfo">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
index 57250f7..57b825d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -80,6 +80,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'ldifFile' : '%s/tasks/import.ldif' % remote.data,
'append' : ' ',
+ 'startTask' : '0',
'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
@@ -90,7 +91,15 @@
'startDS' : 'False'
}
</call>
-
+
+ <if expr="RC != 0">
+ <sequence>
+ <call function="'setKnownIssue'">
+ { 'issueId' : 6962694 }
+ </call>
+ </sequence>
+ </if>
+
<!-- Delete entries -->
<call function="'DeleteEntry'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
@@ -150,6 +159,14 @@
'startDS' : 'False'
}
</call>
+
+ <if expr="RC != 0">
+ <sequence>
+ <call function="'setKnownIssue'">
+ { 'issueId' : 6962694 }
+ </call>
+ </sequence>
+ </if>
<!-- Delete entries -->
<call function="'DeleteEntry'">
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
index d3abf41..0f422af 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -759,7 +759,7 @@
</function-arg-description>
<function-arg-property name="type" value="integer"/>
</function-arg-def>
- <function-arg-def name="startTask" type="optional" default="'0'">
+ <function-arg-def name="startTask" type="optional">
<function-arg-description>
Optional exclude attributes
</function-arg-description>
@@ -1328,7 +1328,7 @@
</function-arg-description>
<function-arg-property name="type" value="integer"/>
</function-arg-def>
- <function-arg-def name="startTask" type="optional" default="'0'">
+ <function-arg-def name="startTask" type="optional">
<function-arg-description>
Optional exclude attributes
</function-arg-description>
--
Gitblit v1.10.0