From a94c41b1759c23f849376a5f5448bc6e819f1c11 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-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java
index 5ddbf3a..7d07292 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java
@@ -32,10 +32,9 @@
import java.util.TreeSet;
import org.forgerock.opendj.config.AdminTestCase;
-import org.forgerock.opendj.config.IllegalPropertyValueStringException;
+import org.forgerock.opendj.config.PropertyException;
import org.forgerock.opendj.config.LDAPProfile;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
-import org.forgerock.opendj.config.PropertyException;
import org.forgerock.opendj.config.TestCfg;
import org.forgerock.opendj.config.TestChildCfgClient;
import org.forgerock.opendj.config.TestChildCfgDefn;
@@ -248,11 +247,10 @@
Assert.assertEquals(causes.size(), 1);
Throwable cause = causes.iterator().next();
- if (cause instanceof IllegalPropertyValueStringException) {
- IllegalPropertyValueStringException pe = (IllegalPropertyValueStringException) cause;
+ if (cause instanceof PropertyException) {
+ PropertyException pe = (PropertyException) cause;
Assert.assertEquals(pe.getPropertyDefinition(), TestChildCfgDefn.getInstance()
.getAggregationPropertyPropertyDefinition());
- Assert.assertEquals(pe.getIllegalValueString(), "cn=LDAP Connection Handler, cn=bad rdn, cn=config");
} else {
// Got an unexpected cause.
throw e;
--
Gitblit v1.10.0