From 97eaa897d7f912266710fa43d21a4d36de27de41 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Jan 2016 15:01:26 +0000
Subject: [PATCH] *Test*.java: Changed client code from DirectoryServer.getAttributeTypeOrNull() to DirectoryServer.getAttributeType()
---
opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java | 54 +++++++++++++++++-------------------------------------
1 files changed, 17 insertions(+), 37 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 fcde89b..6ee5cb2 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
@@ -27,6 +27,7 @@
package org.opends.server.backends;
import static org.opends.server.TestCaseUtils.*;
+import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.internal.Requests.*;
import static org.opends.server.util.StaticUtils.*;
@@ -122,17 +123,10 @@
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- AttributeType t = DirectoryServer.getAttributeTypeOrNull("attributetypes");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("objectclasses");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("ldapsyntaxes");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("matchingrules");
- assertTrue(schemaEntry.hasAttribute(t));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("attributetypes")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("objectclasses")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("ldapsyntaxes")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("matchingrules")));
}
/**
@@ -169,34 +163,20 @@
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- AttributeType t = DirectoryServer.getAttributeTypeOrNull("attributetypes");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("objectclasses");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("ldapsyntaxes");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("matchingrules");
- assertTrue(schemaEntry.hasAttribute(t));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("attributetypes")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("objectclasses")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("ldapsyntaxes")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("matchingrules")));
schemaDN = DN.valueOf("cn=subschema");
schemaEntry = schemaBackend.getSchemaEntry(schemaDN, false);
assertNotNull(schemaEntry);
assertEquals(schemaEntry.getName(), schemaDN);
- t = DirectoryServer.getAttributeTypeOrNull("attributetypes");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("objectclasses");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("ldapsyntaxes");
- assertTrue(schemaEntry.hasAttribute(t));
-
- t = DirectoryServer.getAttributeTypeOrNull("matchingrules");
- assertTrue(schemaEntry.hasAttribute(t));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("attributetypes")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("objectclasses")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("ldapsyntaxes")));
+ assertTrue(schemaEntry.hasAttribute(getAttributeType("matchingrules")));
}
/**
@@ -376,10 +356,10 @@
throws Exception
{
DN schemaDN = DN.valueOf("cn=schema");
- AttributeType a = DirectoryServer.getAttributeTypeOrNull("attributetypes");
- AttributeType o = DirectoryServer.getAttributeTypeOrNull("objectclasses");
- AttributeType m = DirectoryServer.getAttributeTypeOrNull("matchingrules");
- AttributeType s = DirectoryServer.getAttributeTypeOrNull("ldapsyntaxes");
+ AttributeType a = DirectoryServer.getAttributeType("attributetypes");
+ AttributeType o = DirectoryServer.getAttributeType("objectclasses");
+ AttributeType m = DirectoryServer.getAttributeType("matchingrules");
+ AttributeType s = DirectoryServer.getAttributeType("ldapsyntaxes");
assertFalse(schemaBackend.showAllAttributes());
Entry schemaEntry = schemaBackend.getSchemaEntry(schemaDN, false);
--
Gitblit v1.10.0