From e114a899bbc0df59f5135f195d24797bf6c1b778 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 02 Jan 2014 09:33:43 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1235 : Migrate configuration framework
---
opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java b/opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
index 1196100..398b597 100644
--- a/opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
+++ b/opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DurationPropertyDefinitionTest.java
@@ -31,18 +31,12 @@
import org.forgerock.opendj.admin.meta.RootCfgDefn;
import org.forgerock.opendj.config.ConfigTestCase;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
public class DurationPropertyDefinitionTest extends ConfigTestCase {
- @BeforeClass
- public void setUp() throws Exception {
- disableClassValidationForProperties();
- }
-
@Test
public void testCreateBuilder() {
DurationPropertyDefinition.Builder builder = createTestBuilder();
@@ -130,7 +124,7 @@
DurationPropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(true);
DurationPropertyDefinition def = buildTestDefinition(builder);
- def.decodeValue("unlimited");
+ def.decodeValue("unlimited", PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
@Test(expectedExceptions = IllegalPropertyValueStringException.class)
@@ -138,7 +132,7 @@
DurationPropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(false);
DurationPropertyDefinition def = buildTestDefinition(builder);
- def.decodeValue("unlimited");
+ def.decodeValue("unlimited", PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
@Test(expectedExceptions = IllegalPropertyValueException.class)
@@ -146,7 +140,7 @@
DurationPropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(false);
DurationPropertyDefinition def = buildTestDefinition(builder);
- def.validateValue(-1L);
+ def.validateValue(-1L, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
@DataProvider(name = "validateValueData")
@@ -169,7 +163,7 @@
builder.setUpperLimit(higherLimitInMillis);
builder.setAllowUnlimited(isAllowUnlimited);
DurationPropertyDefinition def = buildTestDefinition(builder);
- def.validateValue(valueInSeconds);
+ def.validateValue(valueInSeconds, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
@DataProvider(name = "illegalValidateValueData")
@@ -191,7 +185,7 @@
builder.setUpperLimit(highLimitInMillis);
builder.setAllowUnlimited(isAllowUnlimited);
DurationPropertyDefinition def = buildTestDefinition(builder);
- def.validateValue(valueInSeconds);
+ def.validateValue(valueInSeconds, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
@DataProvider(name = "encodeValueData")
@@ -310,7 +304,8 @@
builder.setMaximumUnit(DurationUnit.DAYS);
DurationPropertyDefinition def = buildTestDefinition(builder);
- assertThat(def.decodeValue(valueToDecode)).isEqualTo(expectedValue);
+ assertThat(def.decodeValue(valueToDecode, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS)).
+ isEqualTo(expectedValue);
}
@DataProvider(name = "decodeValueDataIllegal")
@@ -343,7 +338,7 @@
builder.setLowerLimit(5L);
builder.setUpperLimit(10L);
DurationPropertyDefinition def = buildTestDefinition(builder);
- def.decodeValue(valueToDecode);
+ def.decodeValue(valueToDecode, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
private DurationPropertyDefinition.Builder createTestBuilder() {
--
Gitblit v1.10.0