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/backends/SchemaBackendTestCase.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
index 5984473..f4ae6ab 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
@@ -17,6 +17,7 @@
package org.opends.server.backends;
import static org.forgerock.opendj.ldap.ResultCode.*;
+import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
@@ -138,10 +139,10 @@
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- assertTrue(schemaEntry.hasAttribute(getAttributeType("attributetypes")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("objectclasses")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("ldapsyntaxes")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("matchingrules")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeTypesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getObjectClassesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getLDAPSyntaxesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getMatchingRulesAttributeType()));
}
/**
@@ -178,20 +179,20 @@
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- assertTrue(schemaEntry.hasAttribute(getAttributeType("attributetypes")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("objectclasses")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("ldapsyntaxes")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("matchingrules")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeTypesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getObjectClassesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getLDAPSyntaxesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getMatchingRulesAttributeType()));
schemaDN = DN.valueOf("cn=subschema");
schemaEntry = schemaBackend.getSchemaEntry(schemaDN, false);
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- assertTrue(schemaEntry.hasAttribute(getAttributeType("attributetypes")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("objectclasses")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("ldapsyntaxes")));
- assertTrue(schemaEntry.hasAttribute(getAttributeType("matchingrules")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeTypesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getObjectClassesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getLDAPSyntaxesAttributeType()));
+ assertTrue(schemaEntry.hasAttribute(getMatchingRulesAttributeType()));
}
/**
@@ -370,10 +371,10 @@
throws Exception
{
DN schemaDN = DN.valueOf("cn=schema");
- AttributeType a = DirectoryServer.getAttributeType("attributetypes");
- AttributeType o = DirectoryServer.getAttributeType("objectclasses");
- AttributeType m = DirectoryServer.getAttributeType("matchingrules");
- AttributeType s = DirectoryServer.getAttributeType("ldapsyntaxes");
+ AttributeType a = getAttributeTypesAttributeType();
+ AttributeType o = getObjectClassesAttributeType();
+ AttributeType m = getMatchingRulesAttributeType();
+ AttributeType s = getLDAPSyntaxesAttributeType();
assertFalse(schemaBackend.showAllAttributes());
Entry schemaEntry = schemaBackend.getSchemaEntry(schemaDN, false);
@@ -4478,10 +4479,10 @@
Entry schemaEntry = DirectoryServer.getEntry(DN.valueOf("cn=schema"));
assertNotNull(schemaEntry);
- AttributeType cnType = DirectoryServer.getAttributeType("creatorsname");
- AttributeType ctType = DirectoryServer.getAttributeType("createtimestamp");
- AttributeType mnType = DirectoryServer.getAttributeType("modifiersname");
- AttributeType mtType = DirectoryServer.getAttributeType("modifytimestamp");
+ AttributeType cnType = getCreatorsNameAttributeType();
+ AttributeType ctType = getCreateTimestampAttributeType();
+ AttributeType mnType = getModifiersNameAttributeType();
+ AttributeType mtType = getModifyTimestampAttributeType();
assertTrue(schemaEntry.hasAttribute(cnType));
assertTrue(schemaEntry.hasAttribute(ctType));
--
Gitblit v1.10.0