From 9314d4add5ffbc40b21347539a0e503964dae207 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 18 Jan 2014 00:58:42 +0000
Subject: [PATCH] Simplify config framework exception hierarchy by removing and pulling up the following exceptions:

---
 opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java
index 1481182..f114d8e 100644
--- a/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java
+++ b/opendj-sdk/opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java
@@ -97,7 +97,7 @@
         propertyDef.validateValue(DN.valueOf(valueToValidate), PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
     }
 
-    @Test(dataProvider = "illegalValues", expectedExceptions = IllegalPropertyValueException.class)
+    @Test(dataProvider = "illegalValues", expectedExceptions = PropertyException.class)
     public void testValidateIllegalValues(String baseDN, String valueToValidate) {
         DNPropertyDefinition.Builder localBuilder = DNPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
                 "test-property");
@@ -115,7 +115,7 @@
         propertyDef.decodeValue(valueToValidate, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
     }
 
-    @Test(dataProvider = "illegalValues", expectedExceptions = IllegalPropertyValueStringException.class)
+    @Test(dataProvider = "illegalValues", expectedExceptions = PropertyException.class)
     public void testDecodeIllegalValues(String baseDN, String valueToValidate) {
         DNPropertyDefinition.Builder localBuilder = DNPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
                 "test-property");

--
Gitblit v1.10.0