From 8dca37f29a6cf1e32f889647e173b537ffe7a33b Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Jul 2016 12:59:59 +0000
Subject: [PATCH] SchemaBackend.java: Removed checks already performed in SchemaBuilder
---
opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 c7cb419..78e8cbd 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
@@ -1041,7 +1041,7 @@
String attrName = "name";
assertTrue(DirectoryServer.getSchema().hasAttributeType(attrName));
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertTrue(DirectoryServer.getSchema().hasAttributeType(attrName));
}
@@ -1180,7 +1180,7 @@
String attrName = "testremoveattributetypereferencedbydcr";
assertFalse(DirectoryServer.getSchema().hasAttributeType(attrName));
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertTrue(DirectoryServer.getSchema().hasAttributeType(attrName));
}
@@ -1223,7 +1223,7 @@
String attrName = "testremoveatrefbymruat";
assertFalse(DirectoryServer.getSchema().hasAttributeType(attrName));
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertMatchingRuleUseExistsWithName(matchingRule, "testremoveatrefbymrumru");
@@ -1761,7 +1761,7 @@
String ocName = "person";
assertTrue(DirectoryServer.getSchema().hasObjectClass(ocName));
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertTrue(DirectoryServer.getSchema().hasObjectClass(ocName));
}
@@ -1810,7 +1810,7 @@
assertFalse(DirectoryServer.getSchema().hasObjectClass(ocName));
runModify(argsPermissive(), addOCThenNF, SUCCESS);
- runModify(argsPermissive(), deleteOC, UNWILLING_TO_PERFORM);
+ runModify(argsPermissive(), deleteOC, CONSTRAINT_VIOLATION);
assertTrue(DirectoryServer.getSchema().hasObjectClass(ocName));
}
finally
@@ -1853,7 +1853,7 @@
String ocName = "testremoveobjectclassreferencedbydcr";
assertFalse(DirectoryServer.getSchema().hasObjectClass(ocName));
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertTrue(DirectoryServer.getSchema().hasObjectClass(ocName));
}
@@ -2397,7 +2397,7 @@
String nameFormName = "testremovenameformreferencedbydsrnf";
assertFalse(DirectoryServer.getSchema().hasNameForm(nameFormName));
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertTrue(DirectoryServer.getSchema().hasNameForm(nameFormName));
}
@@ -3658,7 +3658,7 @@
int ruleID = 999007;
assertSchemaHasDITStructureRule(ruleID, false);
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertSchemaHasDITStructureRule(ruleID, true);
ldif = toLdif(
--
Gitblit v1.10.0