From e3acbc5e70b15dc5ca1134cd0ae4501b424d160f Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 15 Jun 2007 08:18:40 +0000
Subject: [PATCH] Partial fix for issue 1426: improve support for required admin actions.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java
index a350eba..fc547d7 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java
@@ -30,9 +30,9 @@
import static org.testng.Assert.*;
import org.opends.server.admin.std.meta.RootCfgDefn;
-import org.testng.annotations.*;
-
-import java.util.EnumSet;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
/**
* EnumPropertyDefinition Tester.
@@ -61,10 +61,7 @@
*/
@Test
public void testBuildInstance() {
- EnumPropertyDefinition epd = builder.buildInstance(
- RootCfgDefn.getInstance(), "test-property",
- EnumSet.noneOf(PropertyOption.class),
- new UndefinedDefaultBehaviorProvider<TestEnum>());
+ EnumPropertyDefinition epd = builder.getInstance();
assertEquals(epd.getEnumClass(), TestEnum.class);
}
@@ -77,9 +74,7 @@
EnumPropertyDefinition.Builder<TestEnum> localBuilder =
EnumPropertyDefinition.createBuilder(
RootCfgDefn.getInstance(), "test-property");
- localBuilder.buildInstance(RootCfgDefn.getInstance(), "test-property",
- EnumSet.noneOf(PropertyOption.class),
- new UndefinedDefaultBehaviorProvider<TestEnum>());
+ localBuilder.getInstance();
}
/**
@@ -100,10 +95,7 @@
*/
@Test(dataProvider = "decodeValueData")
public void testDecodeValue(String value, TestEnum expectedValue) {
- EnumPropertyDefinition epd = builder.buildInstance(
- RootCfgDefn.getInstance(), "test-property",
- EnumSet.noneOf(PropertyOption.class),
- new UndefinedDefaultBehaviorProvider<TestEnum>());
+ EnumPropertyDefinition epd = builder.getInstance();
assertEquals(epd.decodeValue(value), expectedValue);
}
@@ -127,10 +119,7 @@
expectedExceptions = {AssertionError.class,
IllegalPropertyValueStringException.class} )
public void testDecodeValue2(String value) {
- EnumPropertyDefinition epd = builder.buildInstance(
- RootCfgDefn.getInstance(), "test-property",
- EnumSet.noneOf(PropertyOption.class),
- new UndefinedDefaultBehaviorProvider<TestEnum>());
+ EnumPropertyDefinition epd = builder.getInstance();
epd.decodeValue(value);
}
@@ -139,10 +128,7 @@
*/
@Test
public void testNormalizeValue() {
- EnumPropertyDefinition<TestEnum> epd = builder.buildInstance(
- RootCfgDefn.getInstance(), "test-property",
- EnumSet.noneOf(PropertyOption.class),
- new UndefinedDefaultBehaviorProvider<TestEnum>());
+ EnumPropertyDefinition<TestEnum> epd = builder.getInstance();
assertEquals(epd.normalizeValue(TestEnum.ONE), "one");
}
@@ -151,10 +137,7 @@
*/
@Test
public void testValidateValue() {
- EnumPropertyDefinition<TestEnum> epd = builder.buildInstance(
- RootCfgDefn.getInstance(), "test-property",
- EnumSet.noneOf(PropertyOption.class),
- new UndefinedDefaultBehaviorProvider<TestEnum>());
+ EnumPropertyDefinition<TestEnum> epd = builder.getInstance();
epd.validateValue(TestEnum.ONE);
}
--
Gitblit v1.10.0