From 026e3e427926d1de7ff1e6697c4c9634b6b80cd1 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 26 Apr 2016 13:01:17 +0000
Subject: [PATCH] OPENDJ-2797 Switch server classes to SDK MatchingRuleUse class
---
opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 f88b042..6d12435 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
@@ -28,6 +28,7 @@
import java.io.File;
import java.io.InputStream;
import java.io.PrintStream;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -60,7 +61,7 @@
import org.opends.server.types.LDIFExportConfig;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.LDIFImportResult;
-import org.opends.server.types.MatchingRuleUse;
+import org.forgerock.opendj.ldap.schema.MatchingRuleUse;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.SearchFilter;
import org.opends.server.util.CollectionUtils;
@@ -3845,7 +3846,10 @@
private void assertSchemaDoesNotHaveMatchingRuleUse(MatchingRule matchingRule)
{
- assertFalse(DirectoryServer.getSchema().getMatchingRuleUses().containsKey(matchingRule));
+ for (MatchingRuleUse matchingRuleUse : DirectoryServer.getSchema().getMatchingRuleUses())
+ {
+ assertFalse(matchingRuleUse.getMatchingRule().equals(matchingRule));
+ }
}
/**
@@ -3958,12 +3962,8 @@
"X-ORIGIN 'SchemaBackendTestCase' )");
assertSchemaDoesNotHaveMatchingRuleUse(matchingRule);
-
assertEquals(runModify(argsNotPermissive(), ldif, System.err), 0);
-
- MatchingRuleUse mru =
- DirectoryServer.getSchema().getMatchingRuleUse(matchingRule);
- assertNull(mru);
+ assertSchemaDoesNotHaveMatchingRuleUse(matchingRule);
}
/**
--
Gitblit v1.10.0