adapt tests

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

Author: holgerfriedrich

bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java

@@ -17,6 +17,7 @@
 import static org.hamcrest.core.IsIterableContaining.hasItems;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -129,30 +130,29 @@ public void assertGetConfigAsEnumWrongValue() {
         assertThat(configClass.enumField, is(ConfigClass.MyEnum.UNKNOWN));
     }
 
-    /**
-     * TODO check why this is wanted
-     * 
-     * @Test
-     *       public void assertConfigAllowsNullValues() {
-     *       Configuration configuration = new Configuration();
-     *       configuration.put("stringField", null);
-     *       configuration.put("anotherField", null);
-     * 
-     *       // ensure conversions are null-tolerant and don't throw exceptions
-     *       Map<String, @Nullable Object> props = configuration.getProperties();
-     *       Set<String> keys = configuration.keySet();
-     *       List<Object> values = new ArrayList<>(configuration.values());
-     * 
-     *       // ensure copies, not views
-     *       configuration.put("stringField", "someValue");
-     *       configuration.put("additionalField", "");
-     *       assertThat(props.get("stringField"), is(nullValue()));
-     *       assertThat(values.getFirst(), is(nullValue()));
-     *       assertThat(values.get(1), is(nullValue()));
-     *       assertThat(values.size(), is(2));
-     *       assertThat(keys.size(), is(2));
-     *       }
-     */
+    @Test
+    public void assertConfigAllowsNullValues() {
+        Configuration configuration = new Configuration();
+        configuration.put("stringField", null);
+        configuration.put("anotherField", null);
+
+        // ensure conversions are null-tolerant and don't throw exceptions
+        Map<String, Object> props = configuration.getProperties();
+        Set<String> keys = configuration.keySet();
+        List<Object> values = new ArrayList<>(configuration.values());
+
+        // ensure copies, not views
+        configuration.put("stringField", "someValue");
+        configuration.put("additionalField", "");
+        // ATTENTION, breaking change: the following assertions are no longer valid
+        // assertThat(props.get("stringField"), is(nullValue()));
+        // assertThat(values.getFirst(), is(nullValue()));
+        // assertThat(values.get(1), is(nullValue()));
+        // assertThat(values.size(), is(2));
+        // assertThat(keys.size(), is(2));
+        assertThat(values.size(), is(0));
+        assertThat(keys.size(), is(0));
+    }
 
     @Test
     public void assertPropertiesCanBeRemoved() {
@@ -176,20 +176,6 @@ public void assertPropertiesCanBeRemoved() {
         assertThat(configuration.get("intField"), is(nullValue()));
     }
 
-    /**
-     * TODO check why this is wanted
-     * 
-     * @Test
-     *       public void assertToStringHandlesNullValuesGracefully() {
-     *       Map<String, Object> properties = new HashMap<>();
-     *       properties.put("stringField", null);
-     * 
-     *       Configuration configuration = new Configuration(properties);
-     *       String res = configuration.toString();
-     *       assertThat(res.contains("type=?"), is(true));
-     *       }
-     */
-
     @Test
     public void assertNormalizationInSetProperties() {
         Map<String, Object> properties = new HashMap<>();