From 45359adc09ac1d9e48206c549e667ed6965c7cd3 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 28 May 2007 15:31:13 +0000
Subject: [PATCH] Fix the following issues:
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/PropertySetTest.java | 76 +++++++++++++------------------------
1 files changed, 27 insertions(+), 49 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/PropertySetTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/PropertySetTest.java
index 007a896..5633837 100755
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/PropertySetTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/PropertySetTest.java
@@ -140,16 +140,6 @@
}
/**
- * Tests basic property set creation with a string
- * property provider
- */
- @Test
- public void testCreate1() {
- PropertySet ps = createTestPropertySet(StringPropertyProvider.DEFAULT_PROVIDER);
- assertNotNull(ps);
- }
-
- /**
* Tests setting and getting property values
* @param pd PropertyDefinition for which values are set and gotten
* @param values property values to test
@@ -229,9 +219,9 @@
PropertySet ps = createTestPropertySet();
Property<T> p = ps.getProperty(pd);
SortedSet<T> ss = p.getDefaultValues();
- assertTrue(ss.size() == expected.size());
+ assertEquals(ss.size(), expected.size());
for (T v : expected) {
- ss.contains(v);
+ assertTrue(ss.contains(v), "does not contain " + v);
}
}
@@ -282,9 +272,9 @@
// before setting any values, the effective data
// is supposed to just be the defaults
Set<T> ev1 = p.getEffectiveValues();
- assertTrue(ev1.size() == expectedDefaults.size());
+ assertEquals(ev1.size(), expectedDefaults.size());
for(T v : ev1) {
- assertTrue(expectedDefaults.contains(v));
+ assertTrue(expectedDefaults.contains(v), "does not contain " + v);
}
// now set some data and make sure the effective
@@ -292,9 +282,9 @@
ps.setPropertyValues(pd, newValues);
Set<T> ev2 = p.getEffectiveValues();
- assertTrue(ev2.size() == newValues.size());
+ assertEquals(ev2.size(), newValues.size());
for(T v : ev2) {
- assertTrue(newValues.contains(v));
+ assertTrue(newValues.contains(v), "does not contain " + v);
}
}
@@ -391,21 +381,27 @@
}
private PropertySet createTestPropertySet(PropertyProvider pp) {
- return PropertySet.create(
- new TestManagedObjectDefinition<ConfigurationClient, Configuration>("test-mod",null),
- pp,
- new InheritedDefaultValueProvider() {
- public ManagedObjectPath getManagedObjectPath() {
- System.out.println("getManagedObjectPath");
- return null;
- }
- public Collection<?> getDefaultPropertyValues(ManagedObjectPath path, String propertyName) throws OperationsException {
- System.out.println("getDefPrV path=" + path + " pn=" + propertyName);
- return null;
- }
- },
- new HashSet<PropertyException>()
- );
+ ManagedObjectDefinition<?, ?> d = new TestManagedObjectDefinition<ConfigurationClient, Configuration>("test-mod", null);
+ PropertySet ps = new PropertySet();
+ for (PropertyDefinition<?> pd : d.getPropertyDefinitions()) {
+ addProperty(ps, pd, pp);
+ }
+ return ps;
+ }
+
+ private <T> void addProperty(PropertySet ps, PropertyDefinition<T> pd, PropertyProvider pp) {
+ Collection<T> defaultValues = new LinkedList<T>();
+ DefaultBehaviorProvider<T> dbp = pd.getDefaultBehaviorProvider();
+ if (dbp instanceof DefinedDefaultBehaviorProvider) {
+ DefinedDefaultBehaviorProvider<T> ddbp = (DefinedDefaultBehaviorProvider<T>) dbp;
+ Collection<String> stringValues = ddbp.getDefaultValues();
+ for (String sv : stringValues) {
+ defaultValues.add(pd.decodeValue(sv));
+ }
+ }
+
+ Collection<T> activeValues = pp.getPropertyValues(pd);
+ ps.addProperty(pd, defaultValues, activeValues);
}
private class TestManagedObjectDefinition<C extends ConfigurationClient,S extends Configuration> extends
@@ -476,23 +472,5 @@
return createTestPropertySet(PropertyProvider.DEFAULT_PROVIDER);
}
- private PropertySet createTestPropertySet(StringPropertyProvider pp) {
- return PropertySet.create(
- new TestManagedObjectDefinition<ConfigurationClient, Configuration>("test-mod", null),
- pp,
- new InheritedDefaultValueProvider() {
- public ManagedObjectPath getManagedObjectPath() {
- System.out.println("getManagedObjectPath");
- return null;
- }
- public Collection<?> getDefaultPropertyValues(ManagedObjectPath path, String propertyName) throws OperationsException {
- System.out.println("getDefPrV path=" + path + " pn=" + propertyName);
- return null;
- }
- },
- new HashSet<PropertyException>()
- );
- }
-
}
--
Gitblit v1.10.0