From fd7593078cddbed63a8c68bc8f6352283a3fb849 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 18 Jun 2018 14:40:05 -0400 Subject: Add setXxx methods for @Property annotation We'll be modifying the PropertyConfiguration class so that, instead of directly setting values in private fields, it will use public setXxx methods. Consequently, we have to add the setXxx methods to the PropertyConfiguration subclasses so that they're available when the superclass is modified policy/common. Change-Id: Idff9942eabec182670cbb427b960f6308a2ca30c Issue-ID: POLICY-906 Signed-off-by: Jim Hahn --- .../drools/util/FeatureEnabledCheckerTest.java | 47 +++++----------------- 1 file changed, 9 insertions(+), 38 deletions(-) (limited to 'policy-core/src/test') diff --git a/policy-core/src/test/java/org/onap/policy/drools/util/FeatureEnabledCheckerTest.java b/policy-core/src/test/java/org/onap/policy/drools/util/FeatureEnabledCheckerTest.java index 3bb135fe..cd79592f 100644 --- a/policy-core/src/test/java/org/onap/policy/drools/util/FeatureEnabledCheckerTest.java +++ b/policy-core/src/test/java/org/onap/policy/drools/util/FeatureEnabledCheckerTest.java @@ -22,64 +22,35 @@ package org.onap.policy.drools.util; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.onap.policy.common.utils.properties.SpecPropertyConfiguration.generalize; -import static org.onap.policy.common.utils.properties.SpecPropertyConfiguration.specialize; import java.util.Properties; import org.junit.Test; -import org.onap.policy.drools.util.FeatureEnabledChecker; public class FeatureEnabledCheckerTest { - private static final String PROP_NAME = "enable.{?.}it"; - - private static final String SPEC = "my.specializer"; + private static final String PROP_NAME = "enable.it"; @Test public void test() { - assertFalse(check(null, null)); - assertTrue(check(null, true)); - assertFalse(check(null, false)); - - assertTrue(check(true, null)); - assertTrue(check(true, true)); - assertFalse(check(true, false)); - - assertFalse(check(false, null)); - assertTrue(check(false, true)); - assertFalse(check(false, false)); - } - - @Test(expected = IllegalArgumentException.class) - public void test_ArgEx() { - - // check case where there's an exception in the property - Properties props = new Properties(); - props.setProperty(generalize(PROP_NAME), "invalid-boolean"); - - assertFalse(FeatureEnabledChecker.isFeatureEnabled(props, SPEC, PROP_NAME)); + assertFalse(check(null)); + assertTrue(check(true)); + assertFalse(check(false)); } /** * Adds properties, as specified, and checks if the feature is enabled. * - * @param wantGen value to assign to the generalized property, or - * {@code null} to leave it unset - * @param wantSpec value to assign to the specialized property, or + * @param want value to assign to the specialized property, or * {@code null} to leave it unset * @return {@code true} if the feature is enabled, {@code false} otherwise */ - public boolean check(Boolean wantGen, Boolean wantSpec) { + public boolean check(Boolean want) { Properties props = new Properties(); - if (wantGen != null) { - props.setProperty(generalize(PROP_NAME), wantGen.toString()); - } - - if (wantSpec != null) { - props.setProperty(specialize(PROP_NAME, SPEC), wantSpec.toString()); + if (want != null) { + props.setProperty(PROP_NAME, want.toString()); } - return FeatureEnabledChecker.isFeatureEnabled(props, SPEC, PROP_NAME); + return FeatureEnabledChecker.isFeatureEnabled(props, PROP_NAME); } } -- cgit 1.2.3-korg