From ebe87711fa4fde6aa64e52ee0a879147fa7918f3 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 13 Aug 2009 13:18:06 +0000
Subject: [PATCH] Fix clu/dbtest and backends/restore tests
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml | 5 +++--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml | 39 ++++++++++++++++-----------------------
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml | 11 +----------
3 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
index 0d6f1f8..d8c79e5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
@@ -51,8 +51,9 @@
<call function="'common_setup'">
{
'quickStart' : False ,
- 'startServer' : False ,
- 'loadData' : False ,
+ 'startServer' : True ,
+ 'loadData' : True ,
+ 'ldifFile' : '%s/backends/backend_start.ldif' % remote.data ,
'stopServer' : False
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
index d830e23..6e3ac70 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
@@ -60,16 +60,7 @@
</script>
<call function="'testGroup_Preamble'"/>
-
- <!---
- Links between tests:
- - clu_ldapsearch_checkbehavior add a new suffix
- - clu_ldapdelete_checkbehavior remove one entry under dc=com
- - clu_rebuild-index_checkbehavior add a new index
- - clu_make-ldif_checkbehavior import new data
- => this has an impact on clu_rebuild-index_checkbehavior,
- clu_verify-index_checkbehavior and clu_dbtest_checkbehavior
- -->
+
<script>
suiteList = []
suiteList.append('clu_ldapsearch_checkoptions')
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
index e2ffaa1..016c7a8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
@@ -155,21 +155,14 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'dc=com dc_com 1048'
+ 'expectedString' : 'dc=com dc_com 1048'
}
</call>
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'dc=mycom dc_mycom 11'
- }
- </call>
-
- <call function="'checktestString'">
- {
- 'returnString' : returnString ,
- 'expectedString' : 'Total: 2'
+ 'expectedString' : 'Total: 1'
}
</call>
@@ -229,8 +222,8 @@
</call>
<script>
- msg1 = 'st.equality Index'
- msg2 = 'dc_com_st.equality true'
+ msg1 = 'mail.substring Index'
+ msg2 = 'dc_com_mail.substring true'
</script>
<call function="'checktestString'">
@@ -243,7 +236,7 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'Total: 20'
+ 'expectedString' : 'Total: 19'
}
</call>
@@ -316,7 +309,7 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'Total: 24'
+ 'expectedString' : 'Total: 23'
}
</call>
@@ -385,7 +378,7 @@
<message>
'dbtest: dump database container for backend userRoot, \
- baseDN dc=com, database st.equality, minSize 176, maxSize 184'
+ baseDN dc=com, database mail.substring, minSize 176, maxSize 184'
</message>
<call function="'dbtestWithScript'">
@@ -393,9 +386,9 @@
'subcommand' : 'dump-database-container' ,
'dsBaseDN' : 'dc=com' ,
'dsBackendID' : DIRECTORY_INSTANCE_BE ,
- 'dsDatabaseName' : 'st.equality' ,
- 'dsMinDataSize' : 176 ,
- 'dsMaxDataSize' : 184
+ 'dsDatabaseName' : 'mail.substring' ,
+ 'dsMinDataSize' : 30 ,
+ 'dsMaxDataSize' : 90
}
</call>
@@ -406,13 +399,13 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'Total Records: 6'
+ 'expectedString' : 'Total Records: 231'
}
</call>
<message>
'dbtest: dump database container for backend userRoot, \
- baseDN dc=com, database st.equality, minKey wv, maxKey wy'
+ baseDN dc=com, database mail.substring, minKey wv, maxKey wy'
</message>
<call function="'dbtestWithScript'">
@@ -420,9 +413,9 @@
'subcommand' : 'dump-database-container' ,
'dsBaseDN' : 'dc=com' ,
'dsBackendID' : DIRECTORY_INSTANCE_BE ,
- 'dsDatabaseName' : 'st.equality' ,
- 'dsMinKeyValue' : 'wv' ,
- 'dsMaxKeyValue' : 'wy'
+ 'dsDatabaseName' : 'mail.substring' ,
+ 'dsMinKeyValue' : '888@ex' ,
+ 'dsMaxKeyValue' : '90@exa'
}
</call>
@@ -433,7 +426,7 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'Total Records: 2'
+ 'expectedString' : 'Total Records: 26'
}
</call>
--
Gitblit v1.10.0