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/IntegerPropertyDefinitionTest.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java
index 0ad3c1d..10412c1 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java
@@ -95,7 +95,7 @@
propertyDef.decodeValue("unlimited", PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
- @Test(expectedExceptions = IllegalPropertyValueStringException.class)
+ @Test(expectedExceptions = PropertyException.class)
public void testIsAllowUnlimitedFalse() {
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(false);
@@ -103,7 +103,7 @@
propertyDef.decodeValue("unlimited", PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
- @Test(expectedExceptions = IllegalPropertyValueException.class)
+ @Test(expectedExceptions = PropertyException.class)
public void testIsAllowUnlimitedInteger() {
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(false);
@@ -145,7 +145,7 @@
}
@Test(dataProvider = "illegalValidateValueData", expectedExceptions = { AssertionError.class,
- NullPointerException.class, IllegalPropertyValueException.class })
+ NullPointerException.class, PropertyException.class })
public void testValidateValueIllegal(Integer low, Integer high, boolean allowUnlimited, Integer value) {
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setLowerLimit(low);
@@ -181,7 +181,7 @@
}
@SuppressWarnings("unused")
- public Boolean visitUnknown(PropertyDefinition<?> d, Void o) throws UnknownPropertyDefinitionException {
+ public Boolean visitUnknown(PropertyDefinition<?> d, Void o) throws PropertyException {
return false;
}
};
--
Gitblit v1.10.0