From 7ddd4a6c4c2fbce71c8071bca380e5c5402e697c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 24 Sep 2015 12:05:10 +0000
Subject: [PATCH] OPENDJ-1857 LDIF changerecord parsing should be less case sensitive
---
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
index d1484d1..8a611ab 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.replication.plugin;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -53,6 +54,7 @@
import static org.opends.server.replication.plugin.EntryHistorical.*;
import static org.opends.server.replication.protocol.OperationContext.*;
import static org.opends.server.util.CollectionUtils.*;
+import static org.opends.server.util.StaticUtils.*;
import static org.testng.Assert.*;
/**
@@ -70,8 +72,8 @@
public class ModifyConflictTest extends ReplicationTestCase
{
private static final String ORGANIZATION = "organization";
- private static final String DISPLAYNAME = "displayname";
- private static final String EMPLOYEENUMBER = "employeenumber";
+ private static final String DISPLAYNAME = "displayName";
+ private static final String EMPLOYEENUMBER = "employeeNumber";
private static final String DESCRIPTION = "description";
private static final String SYNCHIST = "ds-sync-hist";
@@ -1195,9 +1197,8 @@
private void assertContainsOnlyValues(Entry entry, String attrName, String... expectedValues)
{
- List<Attribute> attrs = entry.getAttribute(attrName);
- Attribute attr = attrs.get(0);
- assertEquals(expectedValues.length, attr.size());
+ Attribute attr = entry.getExactAttribute(getAttributeType(toLowerCase(attrName)), Collections.<String> emptySet());
+ assertThat(attr).hasSize(expectedValues.length);
for (String value : expectedValues)
{
attr.contains(ByteString.valueOf(value));
--
Gitblit v1.10.0