From 88994ae71cef6e28e11767fe2a46692bcec459ff Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:13 +0000
Subject: [PATCH] OPENDJ-2987 Fix SchemaBackendTestCase test failures
---
opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 7b63784..6dcc564 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
@@ -1039,7 +1039,7 @@
String attrName = "uid";
assertTrue(DirectoryServer.getSchema().hasAttributeType(attrName));
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertTrue(DirectoryServer.getSchema().hasAttributeType(attrName));
}
@@ -1342,7 +1342,7 @@
String ocName = "testaddobjectclassmultipleconflicts";
assertFalse(DirectoryServer.getSchema().hasObjectClass(ocName));
- runModify(argsNotPermissive(), ldif, UNWILLING_TO_PERFORM);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
assertFalse(DirectoryServer.getSchema().hasObjectClass(ocName));
}
@@ -1422,7 +1422,7 @@
"'testAddOCUndefinedSuperior' SUP undefined STRUCTURAL " +
"MUST cn X-ORIGIN 'SchemaBackendTestCase' )");
- runModify(argsNotPermissive(), ldif, INVALID_ATTRIBUTE_SYNTAX);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
}
/**
@@ -1524,7 +1524,7 @@
"'testAddOCUndefinedRequired' SUP top STRUCTURAL " +
"MUST undefined X-ORIGIN 'SchemaBackendTestCase' )");
- runModify(argsNotPermissive(), ldif, INVALID_ATTRIBUTE_SYNTAX);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
}
/**
@@ -1547,7 +1547,7 @@
"MUST ( cn $ xxxundefinedxxx ) " +
"X-ORIGIN 'SchemaBackendTestCase' )");
- runModify(argsNotPermissive(), ldif, INVALID_ATTRIBUTE_SYNTAX);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
}
/**
@@ -1568,7 +1568,7 @@
"'testAddOCUndefinedOptional' SUP top STRUCTURAL " +
"MAY undefined X-ORIGIN 'SchemaBackendTestCase' )");
- runModify(argsNotPermissive(), ldif, INVALID_ATTRIBUTE_SYNTAX);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
}
/**
@@ -1591,7 +1591,7 @@
"MAY ( cn $ xxxundefinedxxx ) " +
"X-ORIGIN 'SchemaBackendTestCase' )");
- runModify(argsNotPermissive(), ldif, INVALID_ATTRIBUTE_SYNTAX);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
}
/**
@@ -1612,7 +1612,7 @@
"'testAddAbstractOCWithNonAbstractSuperior' SUP person " +
"ABSTRACT MAY description X-ORIGIN 'SchemaBackendTestCase' )");
- runModify(argsNotPermissive(), ldif, INVALID_ATTRIBUTE_SYNTAX);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
}
/**
@@ -1633,7 +1633,7 @@
"'testAddAuxiliaryOCWithStructuralSuperior' SUP person " +
"AUXILIARY MAY description X-ORIGIN 'SchemaBackendTestCase' )");
- runModify(argsNotPermissive(), ldif, INVALID_ATTRIBUTE_SYNTAX);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
}
/**
@@ -1654,7 +1654,7 @@
"'testAddStructuralOCWithAuxiliarySuperior' SUP posixAccount " +
"STRUCTURAL MAY description X-ORIGIN 'SchemaBackendTestCase' )");
- runModify(argsNotPermissive(), ldif, INVALID_ATTRIBUTE_SYNTAX);
+ runModify(argsNotPermissive(), ldif, CONSTRAINT_VIOLATION);
}
/**
--
Gitblit v1.10.0