From 3043e29e69d862a5a88a499366eb20faf2f58b2f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 11 May 2016 14:24:59 +0000
Subject: [PATCH] Fix tests after replacing CommonSchemaElements.getPrimaryName()
---
opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java | 5 ++---
opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java | 34 ----------------------------------
2 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
index c0612c5..a11267d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestCommonSchemaElements.java
@@ -658,40 +658,6 @@
Assert.assertEquals(d.getOID(), "1.2.3");
}
-
-
- /**
- * Check that the {@link CommonSchemaElements#getPrimaryName()}
- * method returns <code>null</code> when there is no primary name.
- *
- * @throws Exception
- * If the test failed unexpectedly.
- */
- @Test
- public final void testGetPrimaryNameDefault() throws Exception {
- SchemaDefinitionBuilder builder = getBuilder(null, "1.2.3");
- CommonSchemaElements d = builder.getInstance();
- Assert.assertNull(d.getNameOrOID());
- }
-
-
-
- /**
- * Check that the {@link CommonSchemaElements#getPrimaryName()}
- * method.
- *
- * @throws Exception
- * If the test failed unexpectedly.
- */
- @Test
- public final void testGetPrimaryName() throws Exception {
- SchemaDefinitionBuilder builder = getBuilder("testType", "1.2.3");
- CommonSchemaElements d = builder.getInstance();
- Assert.assertEquals(d.getNameOrOID(), "testType");
- }
-
-
-
/**
* Check that the {@link CommonSchemaElements#getSchemaFile()}
* method returns <code>null</code> when there is no schema file.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
index 3341094..8fd9d63 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestObjectClass.java
@@ -16,8 +16,6 @@
*/
package org.opends.server.types;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -27,6 +25,7 @@
import java.util.Map;
import java.util.Set;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.forgerock.util.Utils;
import org.opends.server.core.DirectoryServer;
@@ -371,7 +370,7 @@
ObjectClass type = new ObjectClass(definition, null, null, "1.2.3", null,
null, null, null, null, false, null);
- Assert.assertNull(type.getNameOrOID());
+ Assert.assertEquals(type.getNameOrOID(), "1.2.3");
}
--
Gitblit v1.10.0