From afe88363f70903f207a25edab27e7adcb9fc66e0 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:24 +0000
Subject: [PATCH] OPENDJ-3089 Fix calls to server Schema methods that are not available in SDK Schema
---
opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
index febb750..fa6808c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/GenericSchemaTestCase.java
@@ -29,8 +29,6 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
-import org.forgerock.opendj.ldap.schema.NameForm;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
@@ -39,6 +37,7 @@
import org.opends.server.types.LDIFImportConfig;
import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.util.LDIFReader;
+import org.opends.server.util.SchemaUtils;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -111,10 +110,10 @@
{
for (ByteString v : a)
{
- AttributeType at = DirectoryServer.getSchema().parseAttributeType(v.toString());
- if (! isNumericOID(at.getOID()))
+ String oid = SchemaUtils.parseAttributeTypeOID(v.toString());
+ if (! isNumericOID(oid))
{
- invalidOIDs.add(at.getNameOrOID());
+ invalidOIDs.add(oid);
}
}
}
@@ -141,10 +140,10 @@
{
for (ByteString v : a)
{
- ObjectClass oc = DirectoryServer.getSchema().parseObjectClass(v.toString());
- if (! isNumericOID(oc.getOID()))
+ String oid = SchemaUtils.parseObjectClassOID(v.toString());
+ if (! isNumericOID(oid))
{
- invalidOIDs.add(oc.getNameOrOID());
+ invalidOIDs.add(oid);
}
}
}
@@ -170,10 +169,10 @@
{
for (ByteString v : a)
{
- NameForm nf = DirectoryServer.getSchema().parseNameForm(v.toString());
- if (! isNumericOID(nf.getOID()))
+ String oid = SchemaUtils.parseNameFormOID(v.toString());
+ if (! isNumericOID(oid))
{
- invalidOIDs.add(nf.getNameOrOID());
+ invalidOIDs.add(oid);
}
}
}
--
Gitblit v1.10.0