From 7e5ca61ac195cb92e37895a83abddc29e98ac78a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 Sep 2013 15:08:23 +0000
Subject: [PATCH] SearchOperation*.java: Change one field from Long to long.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
index f1f606a..853fb8d 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
@@ -957,16 +957,16 @@
}
private InternalSearchOperation searchOnChangelog(String filterString,
- Set<String> attributes, List<Control> controls) throws LDAPException
+ Set<String> attributes, List<Control> controls) throws Exception
{
return connection.processSearch(
- ByteString.valueOf("cn=changelog"),
+ "cn=changelog",
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
0, // Size limit
0, // Time limit
false, // Types only
- LDAPFilter.decode(filterString),
+ filterString,
attributes,
controls,
null);
@@ -2315,9 +2315,9 @@
String filter = "(objectclass=*)";
debugInfo(tn, " Search: " + filter);
InternalSearchOperation op = connection.processSearch(
- ByteString.valueOf("cn=changelog"),
+ "cn=changelog",
SearchScope.WHOLE_SUBTREE,
- LDAPFilter.decode(filter));
+ filter);
// success
assertEquals(op.getResultCode(), ResultCode.SUCCESS, op.getErrorMessage().toString());
@@ -2708,15 +2708,14 @@
"changelog", "lastExternalChangelogCookie");
debugInfo(tn, " Search: " + TEST_ROOT_DN_STRING);
- InternalSearchOperation searchOp =
- connection.processSearch(
- ByteString.valueOf(TEST_ROOT_DN_STRING),
+ InternalSearchOperation searchOp = connection.processSearch(
+ TEST_ROOT_DN_STRING,
SearchScope.BASE_OBJECT,
DereferencePolicy.NEVER_DEREF_ALIASES,
0, // Size limit
0, // Time limit
false, // Types only
- LDAPFilter.decode("(objectclass=*)"),
+ "(objectclass=*)",
attributes,
NO_CONTROL,
null);
@@ -2783,13 +2782,13 @@
throws Exception
{
final InternalSearchOperation searchOp = connection.processSearch(
- ByteString.valueOf(""),
+ "",
SearchScope.BASE_OBJECT,
DereferencePolicy.NEVER_DEREF_ALIASES,
0, // Size limit
0, // Time limit
false, // Types only
- LDAPFilter.decode("(objectclass=*)"),
+ "(objectclass=*)",
attributes,
NO_CONTROL,
null);
@@ -3198,16 +3197,16 @@
private void waitOpResult(Operation operation, ResultCode expectedResult)
throws Exception
{
- int ii=0;
+ int i = 0;
while (operation.getResultCode() == ResultCode.UNDEFINED
|| operation.getResultCode() != expectedResult)
{
sleep(50);
- ii++;
- if (ii>10)
+ i++;
+ if (i > 10)
{
- assertEquals(operation.getResultCode(), expectedResult, operation
- .getErrorMessage().toString());
+ assertEquals(operation.getResultCode(), expectedResult,
+ operation.getErrorMessage().toString());
}
}
}
--
Gitblit v1.10.0