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/server/AggregationServerTest.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
index ba2116f..c6a7604 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
@@ -42,9 +42,8 @@
import org.forgerock.opendj.config.AdminTestCase;
import org.forgerock.opendj.config.AdministratorAction;
import org.forgerock.opendj.config.AggregationPropertyDefinition;
-import org.forgerock.opendj.config.IllegalPropertyValueStringException;
-import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.PropertyException;
+import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.TestCfg;
import org.forgerock.opendj.config.TestChildCfg;
@@ -307,11 +306,9 @@
ServerManagedObjectDecodingException de = (ServerManagedObjectDecodingException) e.getCause();
assertThat(de.getCauses()).hasSize(1);
PropertyException propertyException = de.getCauses().iterator().next();
- assertThat(propertyException).isInstanceOf(IllegalPropertyValueStringException.class);
- IllegalPropertyValueStringException pe = (IllegalPropertyValueStringException) propertyException;
- assertEquals(pe.getPropertyDefinition(), TestChildCfgDefn.getInstance()
+ assertThat(propertyException).isInstanceOf(PropertyException.class);
+ assertEquals(propertyException.getPropertyDefinition(), TestChildCfgDefn.getInstance()
.getAggregationPropertyPropertyDefinition());
- assertEquals(pe.getIllegalValueString(), "cn=LDAP Connection Handler, cn=bad rdn, cn=config");
}
}
--
Gitblit v1.10.0