From f52c6add86d2e2d123cb76a3d8354e31d35523ee Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Feb 2015 13:43:04 +0000
Subject: [PATCH] AutoRefactor: fix String usage
---
opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java | 49 ++++++++++++++++---------------------------------
1 files changed, 16 insertions(+), 33 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
index 41fd3f0..478b41d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/PersistentSearchControlTest.java
@@ -26,6 +26,12 @@
*/
package org.opends.server.controls;
+import static org.assertj.core.api.Assertions.*;
+import static org.opends.server.controls.PersistentSearchChangeType.*;
+import static org.opends.server.protocols.internal.Requests.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.testng.Assert.*;
+
import java.util.*;
import org.forgerock.i18n.LocalizableMessage;
@@ -36,6 +42,7 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
+import org.forgerock.util.Utils;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
@@ -50,12 +57,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import static org.assertj.core.api.Assertions.*;
-import static org.opends.server.controls.PersistentSearchChangeType.*;
-import static org.opends.server.protocols.internal.Requests.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.testng.Assert.*;
-
@SuppressWarnings("javadoc")
public class PersistentSearchControlTest extends ControlsTestCase
{
@@ -151,7 +152,6 @@
{
Set<Integer> keys = exceptedValues.keySet() ;
- Set<PersistentSearchChangeType> returnTypes;
Set<PersistentSearchChangeType> expectedTypes =
new HashSet<PersistentSearchChangeType>(4);
@@ -165,7 +165,7 @@
expectedTypes.add(PersistentSearchChangeType.valueOf(key));
}
}
- returnTypes = PersistentSearchChangeType.intToTypes(i);
+ Set<PersistentSearchChangeType> returnTypes = PersistentSearchChangeType.intToTypes(i);
assertEquals(expectedTypes.size(), returnTypes.size());
for (PersistentSearchChangeType type: expectedTypes)
{
@@ -209,10 +209,9 @@
public void checkTypesToIntTest(Map<Integer, String> exceptedValues)
throws Exception
{
- Set<PersistentSearchChangeType> returnTypes;
for (int i = 1; i <= 15; i++)
{
- returnTypes = PersistentSearchChangeType.intToTypes(i);
+ Set<PersistentSearchChangeType> returnTypes = PersistentSearchChangeType.intToTypes(i);
int ret = PersistentSearchChangeType.changeTypesToInt(returnTypes);
assertEquals(ret, i);
}
@@ -222,24 +221,11 @@
public void checkChangeTypesToStringTest(Map<Integer, String> exceptedValues)
throws Exception
{
- Set<PersistentSearchChangeType> returnTypes;
for (int i = 1; i <= 15; i++)
{
- returnTypes = PersistentSearchChangeType.intToTypes(i);
+ Set<PersistentSearchChangeType> returnTypes = PersistentSearchChangeType.intToTypes(i);
String ret = PersistentSearchChangeType.changeTypesToString(returnTypes);
- String exceptedRet = null ;
- for (PersistentSearchChangeType type : returnTypes)
- {
- if (exceptedRet == null)
- {
- exceptedRet = type.toString();
- }
- else
- {
- exceptedRet = exceptedRet + "|" + type.toString();
- }
- }
- assertEquals(ret, exceptedRet);
+ assertEquals(ret, Utils.joinAsString("|", returnTypes));
}
}
@@ -266,14 +252,11 @@
{
// Test constructor
// CheclPersistentSearchControlTest(Set<PersistentSearchChangeType>
- // changeTypes,
- // boolean changesOnly, boolean returnECs
- Set<PersistentSearchChangeType> returnTypes;
+ // changeTypes, boolean changesOnly, boolean returnECs
for (int i = 1; i <= 15; i++)
{
- returnTypes = PersistentSearchChangeType.intToTypes(i);
- PersistentSearchControl psc = new PersistentSearchControl(returnTypes,
- changesOnly, returnECs);
+ Set<PersistentSearchChangeType> returnTypes = PersistentSearchChangeType.intToTypes(i);
+ PersistentSearchControl psc = new PersistentSearchControl(returnTypes, changesOnly, returnECs);
assertNotNull(psc);
assertEquals(changesOnly, psc.getChangesOnly());
assertEquals(returnECs, psc.getReturnECs());
@@ -287,7 +270,7 @@
// boolean changesOnly, boolean returnECs
for (int i = 1; i <= 15; i++)
{
- returnTypes = PersistentSearchChangeType.intToTypes(i);
+ Set<PersistentSearchChangeType> returnTypes = PersistentSearchChangeType.intToTypes(i);
PersistentSearchControl psc = new PersistentSearchControl(
isCritical, returnTypes, changesOnly, returnECs);
assertNotNull(psc);
@@ -305,7 +288,7 @@
for (int i = 1; i <= 15; i++)
{
bsb.clear();
- returnTypes = PersistentSearchChangeType.intToTypes(i);
+ Set<PersistentSearchChangeType> returnTypes = PersistentSearchChangeType.intToTypes(i);
PersistentSearchControl psc = new PersistentSearchControl(
isCritical, returnTypes, changesOnly, returnECs);
psc.write(writer);
--
Gitblit v1.10.0