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/DNPropertyDefinitionTest.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java b/opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java
index e392edb..2a23773 100644
--- a/opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java
+++ b/opendj-sdk/opendj-admin/src/test/java/org/opends/server/admin/DNPropertyDefinitionTest.java
@@ -32,18 +32,12 @@
import org.forgerock.opendj.config.ConfigTestCase;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@SuppressWarnings("javadoc")
public class DNPropertyDefinitionTest extends ConfigTestCase {
- @BeforeClass
- public void setUp() throws Exception {
- disableClassValidationForProperties();
- }
-
@DataProvider(name = "baseDN")
public Object[][] createBuilderSetBaseDN() {
return new Object[][] {
@@ -102,7 +96,7 @@
"test-property");
localBuilder.setBaseDN(baseDN);
DNPropertyDefinition propertyDef = localBuilder.getInstance();
- propertyDef.validateValue(DN.valueOf(valueToValidate));
+ propertyDef.validateValue(DN.valueOf(valueToValidate), PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
@Test(dataProvider = "illegalValues", expectedExceptions = IllegalPropertyValueException.class)
@@ -111,7 +105,7 @@
"test-property");
localBuilder.setBaseDN(baseDN);
DNPropertyDefinition propertyDef = localBuilder.getInstance();
- propertyDef.validateValue(DN.valueOf(valueToValidate));
+ propertyDef.validateValue(DN.valueOf(valueToValidate), PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
@Test(dataProvider = "legalValues")
@@ -120,7 +114,7 @@
"test-property");
localBuilder.setBaseDN(baseDN);
DNPropertyDefinition propertyDef = localBuilder.getInstance();
- propertyDef.decodeValue(valueToValidate);
+ propertyDef.decodeValue(valueToValidate, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
@Test(dataProvider = "illegalValues", expectedExceptions = IllegalPropertyValueStringException.class)
@@ -129,6 +123,6 @@
"test-property");
localBuilder.setBaseDN(baseDN);
DNPropertyDefinition propertyDef = localBuilder.getInstance();
- propertyDef.decodeValue(valueToValidate);
+ propertyDef.decodeValue(valueToValidate, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
}
}
--
Gitblit v1.10.0