1 files changed, 14 insertions, 16 deletions
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingPropertiesTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingPropertiesTest.java
index 459c770a..eac8bfb1 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingPropertiesTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingPropertiesTest.java
@@ -21,9 +21,6 @@
 package org.onap.policy.drools.pooling;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.onap.policy.common.utils.properties.SpecPropertyConfiguration.generalize;
-import static org.onap.policy.common.utils.properties.SpecPropertyConfiguration.specialize;
 import static org.onap.policy.drools.pooling.PoolingProperties.ACTIVE_HEARTBEAT_MS;
 import static org.onap.policy.drools.pooling.PoolingProperties.FEATURE_ENABLED;
 import static org.onap.policy.drools.pooling.PoolingProperties.IDENTIFICATION_MS;
@@ -32,6 +29,7 @@ import static org.onap.policy.drools.pooling.PoolingProperties.OFFLINE_AGE_MS;
 import static org.onap.policy.drools.pooling.PoolingProperties.OFFLINE_LIMIT;
 import static org.onap.policy.drools.pooling.PoolingProperties.OFFLINE_PUB_WAIT_MS;
 import static org.onap.policy.drools.pooling.PoolingProperties.POOLING_TOPIC;
+import static org.onap.policy.drools.pooling.PoolingProperties.PREFIX;
 import static org.onap.policy.drools.pooling.PoolingProperties.REACTIVATE_MS;
 import static org.onap.policy.drools.pooling.PoolingProperties.START_HEARTBEAT_MS;
 import java.util.Properties;
@@ -82,12 +80,6 @@ public class PoolingPropertiesTest {
         assertEquals(STD_POOLING_TOPIC, pooling.getPoolingTopic());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testGetPoolingTopic_Generalize() {
-        // shouldn't be able to generalize the topic
-        generalize(POOLING_TOPIC);
-    }
-
     @Test
     public void testGetOfflineLimit() throws PropertyException {
         doTest(OFFLINE_LIMIT, STD_OFFLINE_LIMIT, 1000, xxx -> pooling.getOfflineLimit());
@@ -147,16 +139,10 @@ public class PoolingPropertiesTest {
         assertEquals("special " + propnm, specValue, func.apply(null));
 
         /*
-         * Ensure the property supports generalization - this will throw an exception if
-         * it does not.
-         */
-        assertFalse(propnm.equals(generalize(propnm)));
-
-        /*
          * Without the property - should use the default value.
          */
         plain.remove(specialize(propnm, CONTROLLER));
-        plain.remove(generalize(propnm));
+        plain.remove(propnm);
         pooling = new PoolingProperties(CONTROLLER, plain);
         assertEquals("default " + propnm, dfltValue, func.apply(null));
     }
@@ -183,4 +169,16 @@ public class PoolingPropertiesTest {
 
         return props;
     }
+
+    /**
+     * Embeds a specializer within a property name, after the prefix.
+     * 
+     * @param propnm property name into which it should be embedded
+     * @param spec specializer to be embedded
+     * @return the property name, with the specializer embedded within it
+     */
+    private String specialize(String propnm, String spec) {
+        String suffix = propnm.substring(PREFIX.length());
+        return PREFIX + spec + "." + suffix;
+    }
 }