From 62b1b9b8e485048089a5bf379ba34ef95ad0ae2f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 21 Dec 2015 15:02:46 +0000
Subject: [PATCH] Remove unused import
---
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java | 4 ++--
opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java | 21 ++-------------------
opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java | 5 +----
3 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
index 7f96c56..457ab36 100644
--- a/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
@@ -36,7 +36,6 @@
import org.forgerock.opendj.ldap.AuthorizationException;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.ConnectionFactory;
-import org.forgerock.opendj.ldap.Connections;
import org.forgerock.opendj.ldap.ConstraintViolationException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.DecodeException;
@@ -81,13 +80,10 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-/**
- * This class defines a set of tests for the Adapters.class.
- */
+/** This class defines a set of tests for the Adapters.class. */
@SuppressWarnings("javadoc")
@Test(sequential=true)
public class AdaptersTestCase extends DirectoryServerTestCase {
-
private static final String USER_0_DN_STRING = "uid=user.0,o=test";
/**
@@ -207,9 +203,7 @@
connection.close();
}
- /**
- * Clean up data at the end of tests.
- */
+ /** Clean up data at the end of tests. */
@AfterClass
public void shutDownEmbeddedServerServer() throws Exception {
// Delete all added entries but user.3 which is already removed in one test
@@ -471,7 +465,6 @@
@Test(dataProvider = "rootConnectionFactories")
public void testAdapterSearchRequestWithNoResults(final ConnectionFactory factory)
throws Exception {
-
final SearchRequest request =
Requests.newSearchRequest("o=test", SearchScope.WHOLE_SUBTREE,
"(uid=unknown)").addControl(
@@ -496,7 +489,6 @@
expectedExceptions = EntryNotFoundException.class)
public void testAdapterSearchSingleEntryWithNoResults(final ConnectionFactory factory)
throws Exception {
-
final Connection connection = factory.getConnection();
try {
connection.searchSingleEntry(Requests.newSearchRequest("o=test",
@@ -674,7 +666,6 @@
"uid=user.2, o=test", SearchScope.BASE_OBJECT, "(uid=user.2)"));
assertThat(srEntry.getAttribute("mail").firstValueAsString()).isEqualTo(
"modified@example.com");
-
}
/**
@@ -685,7 +676,6 @@
*/
@Test(dataProvider = "rootConnectionFactories")
public void testAdapterUsePermissiveModifyRequest(final ConnectionFactory factory) throws LdapException {
-
final ModifyRequest changeRequest =
Requests.newModifyRequest("uid=user.2, o=test").addControl(
PermissiveModifyRequestControl.newControl(true)).addModification(
@@ -750,7 +740,6 @@
Requests.newModifyDNRequest("uid=user.test,o=test", "uid=user.4")
.setDeleteOldRDN(true);
connection.modifyDN(changeRequest);
-
}
/**
@@ -816,7 +805,6 @@
expectedExceptions = AuthorizationException.class)
public void testAdapterAsAnonymousCannotPerformDeleteRequest(final ConnectionFactory factory)
throws LdapException {
-
final DeleteRequest deleteRequest =
Requests.newDeleteRequest("uid=user.2,o=test");
@@ -838,7 +826,6 @@
expectedExceptions = AuthorizationException.class)
public void testAdapterAsAnonymousCannotPerformAddRequest(final ConnectionFactory factory)
throws LdapException {
-
// @formatter:off
final AddRequest addRequest = Requests.newAddRequest(
"dn: sn=scarter,o=test",
@@ -865,7 +852,6 @@
expectedExceptions = AuthorizationException.class)
public void testAdapterAsAnonymousCannotPerformModifyDNRequest(final ConnectionFactory factory)
throws LdapException {
-
final Connection connection = factory.getConnection();
final ModifyDNRequest changeRequest =
@@ -889,7 +875,6 @@
expectedExceptions = LdapException.class)
public void testAdapterAsAnonymousCannotPerformModifyRequest(final ConnectionFactory factory)
throws LdapException {
-
final ModifyRequest changeRequest =
Requests.newModifyRequest("uid=user.2,o=test").addControl(
PreReadRequestControl.newControl(true, "mail")).addModification(
@@ -911,7 +896,6 @@
@Test(dataProvider = "anonymousConnectionFactories")
public void testAdapterAsAnonymousPerformsCompareRequest(final ConnectionFactory factory)
throws LdapException {
-
final CompareRequest compareRequest =
Requests.newCompareRequest(USER_0_DN_STRING, "uid", "user.0");
@@ -933,7 +917,6 @@
@Test(dataProvider = "anonymousConnectionFactories")
public void testAdapterAsAnonymousPerformsSearchRequest(final ConnectionFactory factory)
throws Exception {
-
final SearchRequest request =
Requests.newSearchRequest("o=test", SearchScope.WHOLE_SUBTREE,
"(uid=user.1)");
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java
index 4344c90..7cdc953 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/DirectoryServerTestCase.java
@@ -33,7 +33,6 @@
import org.testng.annotations.AfterClass;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.testng.ForgeRockTestCase;
-import org.opends.server.replication.ReplicationTestCase;
import java.util.ArrayList;
import java.util.Collections;
@@ -65,13 +64,11 @@
TestCaseUtils.unsupressOutput();
}
- //
// This is all a HACK to reduce the amount of memory that's consumed.
//
// This could be a problem if a subclass references a @DataProvider in
// a super-class that provides static parameters, i.e. the parameters are
// not regenerated for each invocation of the DataProvider.
- //
/** A list of all parameters that were generated by a @DataProvider
* and passed to a test method of this class. TestListener helps us
@@ -137,7 +134,7 @@
*/
@AfterClass(alwaysRun = true)
public void nullMemberVariablesAfterTest2() {
- Class<?> cls = this.getClass();
+ Class<?> cls = getClass();
// Iterate through all of the fields in all subclasses of
// DirectoryServerTestCase, but not DirectoryServerTestCase itself.
while (DirectoryServerTestCase.class.isAssignableFrom(cls) &&
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
index b6c1c4d..45162a4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java
@@ -53,12 +53,12 @@
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+@SuppressWarnings("javadoc")
@Test(groups = { "precommit", "pluggablebackend" }, sequential = true)
public class StateTest extends DirectoryServerTestCase
{
@@ -77,7 +77,7 @@
@BeforeMethod
public void setUp() throws Exception
{
- indexTreeName = new TreeName("index-base-dn", "index-index-id-" + UUID.randomUUID().toString());
+ indexTreeName = new TreeName("index-base-dn", "index-index-id-" + UUID.randomUUID());
ServerContext serverContext = mock(ServerContext.class);
when(serverContext.getMemoryQuota()).thenReturn(new MemoryQuota());
--
Gitblit v1.10.0