From 81f1d65e0ca7e4542a597db4f28e65f84dbbcd47 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 03 Aug 2009 09:29:27 +0000
Subject: [PATCH] Front port of 2.0 tests to the trunk
---
opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml b/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
index 38a462f..646990c 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2008 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="main_indexes" />
@@ -643,12 +643,11 @@
class indexTest:
"Describes an index test with indexed attribute, filter to test with \
and expected behaviour"
- def __init__(self, attribute,testName,filter,expectedValue,countEntries,isIndexed):
+ def __init__(self, attribute,testName,filter,expectedValue,isIndexed):
self.attribute = attribute
self.name = testName
self.filter = filter
self.rc = expectedValue
- self.count = countEntries
self.isIndexed=re.compile(r'[\r\n]').sub('',isIndexed)
self.status='fail'
@@ -663,9 +662,6 @@
def getRC(self):
return self.rc
-
- def getCount(self):
- return self.count
def getSearchString(self):
if self.isIndexed.startswith('NOT'):
@@ -684,7 +680,6 @@
description += 'test:: attribute=[%s]\n' % self.attribute
description += 'test:: filter=[%s]\n' % self.filter
description += 'test:: rc=[%s]\n' % self.rc
- description += 'test:: count=[%s]\n' % self.count
description += 'test:: indexed=[%s]\n' % self.isIndexed
return description
@@ -697,7 +692,7 @@
else:
testLine = line.split(' ')
indexTests.append(indexTest(testLine[0], testLine[1], testLine[2],
- testLine[3], testLine[4], testLine[5]))
+ testLine[3], testLine[4]))
f.close()
indexTestNumber=0
@@ -731,7 +726,6 @@
'dsBaseDN' : 'ou=People,dc=example,%s' \
% DIRECTORY_INSTANCE_SFX ,
'dsFilter' : '%s' % test.getFilter(),
- 'extraParams' : '--countEntries' ,
'attributes' : 'debugsearchindex',
'expectedRC' : 'noCheck'
}
@@ -755,15 +749,6 @@
% (test.desc(), searchReturnCode, searchResultString, srt,
test.getSearchString())
</message>
-
- <call function="'searchString'">
- {
- 'expectedString' : '# Total number of matching entries: %s' % test.getCount() ,
- 'returnString' : searchResultString ,
- 'expectedRC' : 0
- }
- </call>
-
<tcstatus result="test.getStatus()" />
<call function="'testCase_Postamble'" />
<script>
--
Gitblit v1.10.0