1 files changed, 31 insertions, 50 deletions
diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/BeanConfiguratorTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/BeanConfiguratorTest.java
index 07e0795f..7da4eccd 100644
--- a/utils/src/test/java/org/onap/policy/common/utils/properties/BeanConfiguratorTest.java
+++ b/utils/src/test/java/org/onap/policy/common/utils/properties/BeanConfiguratorTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP - Common Modules
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,6 +80,10 @@ public class BeanConfiguratorTest {
 
     @Test
     public void testConfigureFromProperties() throws PropertyException {
+        testStringValueNoDefault();
+    }
+
+    private void testStringValueNoDefault() throws PropertyException {
         props.setProperty(THE_VALUE, STRING_VALUE);
         PlainStringConfig cfg = new PlainStringConfig();
 
@@ -177,11 +181,7 @@ public class BeanConfiguratorTest {
 
     @Test
     public void testSetValueObjectFieldProperties_FieldSet() throws PropertyException {
-        props.setProperty(THE_VALUE, STRING_VALUE);
-        PlainStringConfig cfg = new PlainStringConfig();
-        beancfg.configureFromProperties(cfg, props);
-
-        assertEquals(STRING_VALUE, cfg.value);
+        testStringValueNoDefault();
     }
 
     @Test
@@ -500,11 +500,7 @@ public class BeanConfiguratorTest {
 
     @Test
     public void testGetStringValue() throws PropertyException {
-        props.setProperty(THE_VALUE, STRING_VALUE);
-        PlainStringConfig cfg = new PlainStringConfig();
-        beancfg.configureFromProperties(cfg, props);
-
-        assertEquals(STRING_VALUE, cfg.value);
+        testStringValueNoDefault();
     }
 
     @Test
@@ -721,12 +717,7 @@ public class BeanConfiguratorTest {
 
     @Test
     public void testGetPropValue_Prop_NoDefault() throws PropertyException {
-        props.setProperty(THE_VALUE, STRING_VALUE);
-
-        PlainStringConfig cfg = new PlainStringConfig();
-        beancfg.configureFromProperties(cfg, props);
-
-        assertEquals(STRING_VALUE, cfg.value);
+        testStringValueNoDefault();
     }
 
     @Test
@@ -960,18 +951,8 @@ public class BeanConfiguratorTest {
 
     @Test(expected = PropertyInvalidException.class)
     public void testCheckDefaultValue_Empty_EmptyOk_Invalid() throws PropertyException {
-        class Config {
-
-            @Property(name = THE_VALUE, defaultValue = "", accept = "empty")
-            private long value;
-
-            @SuppressWarnings("unused")
-            public void setValue(long value) {
-                this.value = value;
-            }
-        }
 
-        beancfg.configureFromProperties(new Config(), props);
+        beancfg.configureFromProperties(new PrimLongDefaultBlankAcceptEmptyConfig(), props);
     }
 
     @Test
@@ -1005,18 +986,8 @@ public class BeanConfiguratorTest {
 
     @Test(expected = PropertyMissingException.class)
     public void testIsEmptyOkPropertyString_False() throws PropertyException {
-        class Config {
-
-            @Property(name = THE_VALUE, defaultValue = "", accept = "")
-            private long value;
 
-            @SuppressWarnings("unused")
-            public void setValue(long value) {
-                this.value = value;
-            }
-        }
-
-        beancfg.configureFromProperties(new Config(), props);
+        beancfg.configureFromProperties(new PrimLongDefaultBlankAcceptBlankConfig(), props);
     }
 
     @Test
@@ -1040,18 +1011,8 @@ public class BeanConfiguratorTest {
 
     @Test(expected = PropertyMissingException.class)
     public void testIsEmptyOkProperty_False() throws PropertyException {
-        class Config {
-
-            @Property(name = THE_VALUE, defaultValue = "", accept = "")
-            private long value;
-
-            @SuppressWarnings("unused")
-            public void setValue(long value) {
-                this.value = value;
-            }
-        }
 
-        beancfg.configureFromProperties(new Config(), props);
+        beancfg.configureFromProperties(new PrimLongDefaultBlankAcceptBlankConfig(), props);
     }
 
     @Test
@@ -1420,6 +1381,26 @@ public class BeanConfiguratorTest {
         }
     }
 
+    class PrimLongDefaultBlankAcceptEmptyConfig {
+
+        @Property(name = THE_VALUE, defaultValue = "", accept = "empty")
+        private long value;
+
+        public void setValue(long value) {
+            this.value = value;
+        }
+    }
+
+    class PrimLongDefaultBlankAcceptBlankConfig {
+
+        @Property(name = THE_VALUE, defaultValue = "", accept = "")
+        private long value;
+
+        public void setValue(long value) {
+            this.value = value;
+        }
+    }
+
     /**
      * This is just used as a mix-in to ensure that the configuration ignores interfaces.
      */