From a0f943639a6f882ecada0ab9a13f1d1c6f5bcfb0 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 02 Apr 2008 19:09:36 +0000
Subject: [PATCH] Replace CompareFile() method with LdifDiffWithScript() in clu_ldapsearch_checkbehavior testsuite
---
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
index 542a770..8cc2bb7 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
@@ -513,13 +513,18 @@
'outputFile' : 'ldapsearch_simplepagesize_30.out'
}
</call>
-
- <call function="'compareFile'">
+
+ <call function="'LdifDiffWithScript'">
{
- 'outputFile' : 'ldapsearch_simplepagesize_30.out'
+ 'sourceLdif' : '%s/ldapsearch_simplepagesize_30.out' \
+ % DIRECTORY_INSTANCE_DIR ,
+ 'targetLdif' : '%s/clu/ldapsearch_simplepagesize_30.ref' \
+ % logsRemoteDataDir ,
+ 'outputLdif' : '%s/ldapsearch_simplepagesize_30.diff' \
+ % DIRECTORY_INSTANCE_DIR
}
</call>
-
+
<message>
'ldapsearch: check output with simplePageSize of 1'
</message>
@@ -539,11 +544,16 @@
}
</call>
- <call function="'compareFile'">
+ <call function="'LdifDiffWithScript'">
{
- 'outputFile' : 'ldapsearch_simplepagesize_1.out'
+ 'sourceLdif' : '%s/ldapsearch_simplepagesize_1.out' \
+ % DIRECTORY_INSTANCE_DIR ,
+ 'targetLdif' : '%s/clu/ldapsearch_simplepagesize_1.ref' \
+ % logsRemoteDataDir ,
+ 'outputLdif' : '%s/ldapsearch_simplepagesize_1.diff' \
+ % DIRECTORY_INSTANCE_DIR
}
- </call>
+ </call>
<call function="'testCase_Postamble'"/>
@@ -604,10 +614,15 @@
'nbExpected' : 8
}
</call>
-
- <call function="'compareFile'">
+
+ <call function="'LdifDiffWithScript'">
{
- 'outputFile' : 'ldapsearch_filterfile_and_attribute.out'
+ 'sourceLdif' : '%s/ldapsearch_filterfile_and_attribute.out' \
+ % DIRECTORY_INSTANCE_DIR ,
+ 'targetLdif' : '%s/clu/ldapsearch_filterfile_and_attribute.ref'\
+ % logsRemoteDataDir ,
+ 'outputLdif' : '%s/ldapsearch_filterfile_and_attribute.diff' \
+ % DIRECTORY_INSTANCE_DIR
}
</call>
--
Gitblit v1.10.0