From 3d0d220b76c7218b8fe92b8bddf99424696dbd46 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 24 Sep 2015 14:19:50 +0000
Subject: [PATCH] OPENDJ-1857 LDIF changerecord parsing should be less case sensitive
---
opendj-server-legacy/src/test/java/org/opends/server/types/AttributeTypeTest.java | 59 +++++++++++++++++++++++++++++
opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java | 3 -
2 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
index 5e915ad..36c644a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
@@ -449,9 +449,8 @@
if (o instanceof CommonSchemaElements) {
CommonSchemaElements other = (CommonSchemaElements) o;
- return getNameOrOID().equals(other.getNameOrOID());
+ return lowerName.equals(other.lowerName);
}
-
return false;
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeTypeTest.java b/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeTypeTest.java
new file mode 100644
index 0000000..d0e5e11
--- /dev/null
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/AttributeTypeTest.java
@@ -0,0 +1,59 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * Copyright 2015 ForgeRock AS
+ */
+package org.opends.server.types;
+
+import static org.opends.server.core.DirectoryServer.*;
+
+import org.opends.server.DirectoryServerTestCase;
+import org.opends.server.TestCaseUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/** Test for AttributeType */
+public class AttributeTypeTest extends DirectoryServerTestCase
+{
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ TestCaseUtils.startFakeServer();
+ }
+
+ @AfterClass
+ public void tearDown() throws Exception
+ {
+ TestCaseUtils.shutdownFakeServer();
+ }
+
+ @Test
+ public void defaultAttributeTypesWithDifferentCaseEquals()
+ {
+ AttributeType attrType = getDefaultAttributeType("displayName");
+ AttributeType attrType2 = getDefaultAttributeType("displayname");
+ Assert.assertNotSame(attrType, attrType2);
+ Assert.assertEquals(attrType, attrType2);
+ }
+}
--
Gitblit v1.10.0