From 3d4c0acccda6e62b23f248d75c1cc6721fc20bdf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:51:21 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer.getAttributeType(String)

---
 opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
index 7adc484..a38f4dc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
@@ -29,13 +29,14 @@
 import org.forgerock.opendj.ldap.ResultCode;
 import org.forgerock.opendj.ldap.SearchScope;
 import org.opends.server.TestCaseUtils;
-import org.opends.server.core.DirectoryServer;
 import org.opends.server.protocols.internal.InternalSearchOperation;
 import org.opends.server.protocols.internal.SearchRequest;
 import org.opends.server.protocols.ldap.LDAPControl;
 import org.opends.server.protocols.ldap.LDAPResultCode;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.types.*;
+import org.opends.server.types.Control;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.SearchResultEntry;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -51,11 +52,6 @@
 public class VLVControlTestCase
     extends ControlsTestCase
 {
-  /** The givenName attribute type. */
-  private AttributeType givenNameType;
-  /** The sn attribute type. */
-  private AttributeType snType;
-
   /** The DN for "Aaccf Johnson". */
   private DN aaccfJohnsonDN;
   /** The DN for "Aaron Zimmerman". */
@@ -88,12 +84,6 @@
   {
     TestCaseUtils.startServer();
 
-    givenNameType = DirectoryServer.getAttributeType("givenname");
-    assertNotNull(givenNameType);
-
-    snType = DirectoryServer.getAttributeType("sn");
-    assertNotNull(snType);
-
     aaccfJohnsonDN    = DN.valueOf("uid=aaccf.johnson,dc=example,dc=com");
     aaronZimmermanDN  = DN.valueOf("uid=aaron.zimmerman,dc=example,dc=com");
     albertSmithDN     = DN.valueOf("uid=albert.smith,dc=example,dc=com");

--
Gitblit v1.10.0