fix properties mapper and provide unit tests

src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java

@@ -18,6 +18,6 @@ public class PropertiesArrayMapper extends ArrayMapper {
     public static String[] write(String concat) {
         List<String> list = new ArrayList<>();
         write(concat, list::add);
-        return (String[]) list.toArray();
+        return list.toArray(new String[0]);
     }
 }

src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java

@@ -20,15 +20,18 @@ public class PropertiesMapper {
             String key = String.valueOf(entry.getKey());
             Object value = entry.getValue();
 
-            TranslationNode childNode = data.getRootNode().getOrCreateChildren(key);
+            Translation translation = data.getTranslation(key);
-            Translation translation = childNode.getValue();
+
+            if(translation == null) {
+                translation = new Translation();
+            }
 
             String content = value instanceof String[]
                     ? PropertiesArrayMapper.read((String[]) value)
                     : StringUtil.escapeControls(String.valueOf(value), true);
 
             translation.put(locale, content);
-            childNode.setValue(translation);
+            data.setTranslation(key, translation);
         }
     }
 

src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java

@@ -18,9 +18,14 @@ public class SortableProperties extends Properties {
         return this.properties;
     }
 
+    @Override
+    public Object get(Object key) {
+        return this.properties.get(key);
+    }
+
     @Override
     public Set<Object> keySet() {
-        return Collections.unmodifiableSet(new TreeSet<>(super.keySet()));
+        return Collections.unmodifiableSet(this.properties.keySet());
     }
 
     @Override
@@ -32,4 +37,9 @@ public class SortableProperties extends Properties {
     public synchronized Object put(Object key, Object value) {
         return this.properties.put(key, value);
     }
+
+    @Override
+    public String toString() {
+        return this.properties.toString();
+    }
 }

src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java

@@ -0,0 +1,156 @@
+package de.marhali.easyi18n.mapper;
+
+import de.marhali.easyi18n.io.properties.PropertiesArrayMapper;
+import de.marhali.easyi18n.io.properties.PropertiesMapper;
+import de.marhali.easyi18n.io.properties.SortableProperties;
+import de.marhali.easyi18n.model.TranslationData;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.junit.Assert;
+
+import java.util.*;
+
+/**
+ * Unit tests for {@link de.marhali.easyi18n.io.properties.PropertiesMapper}
+ * @author marhali
+ */
+public class PropertiesMapperTest extends AbstractMapperTest {
+
+    @Override
+    public void testNonSorting() {
+        SortableProperties input = new SortableProperties(false);
+        input.setProperty("zulu", "test");
+        input.setProperty("alpha", "test");
+        input.setProperty("bravo", "test");
+
+        TranslationData data = new TranslationData(false, true);
+        PropertiesMapper.read("en", input, data);
+
+        SortableProperties output = new SortableProperties(false);
+        PropertiesMapper.write("en", output, data);
+
+        List<String> expect = Arrays.asList("zulu", "alpha", "bravo");
+        Assert.assertEquals(expect, new ArrayList<>(output.keySet()));
+    }
+
+    @Override
+    public void testSorting() {
+        SortableProperties input = new SortableProperties(true);
+        input.setProperty("zulu", "test");
+        input.setProperty("alpha", "test");
+        input.setProperty("bravo", "test");
+
+        TranslationData data = new TranslationData(true, true);
+        PropertiesMapper.read("en", input, data);
+
+        SortableProperties output = new SortableProperties(true);
+        PropertiesMapper.write("en", output, data);
+
+        List<String> expect = Arrays.asList("alpha", "bravo", "zulu");
+        Assert.assertEquals(expect, new ArrayList<>(output.keySet()));
+    }
+
+    @Override
+    public void testArrays() {
+        TranslationData data = new TranslationData(true, true);
+        data.setTranslation("simple", create(arraySimple));
+        data.setTranslation("escaped", create(arrayEscaped));
+
+        SortableProperties output = new SortableProperties(true);
+        PropertiesMapper.write("en", output, data);
+
+        Assert.assertTrue(output.get("simple") instanceof String[]);
+        Assert.assertEquals(arraySimple, PropertiesArrayMapper.read((String[]) output.get("simple")));
+        Assert.assertTrue(output.get("escaped") instanceof String[]);
+        Assert.assertEquals(arrayEscaped, StringEscapeUtils.unescapeJava(PropertiesArrayMapper.read((String[]) output.get("escaped"))));
+
+        TranslationData input = new TranslationData(true, true);
+        PropertiesMapper.read("en", output, input);
+
+        Assert.assertTrue(PropertiesArrayMapper.isArray(input.getTranslation("simple").get("en")));
+        Assert.assertTrue(PropertiesArrayMapper.isArray(input.getTranslation("escaped").get("en")));
+    }
+
+    @Override
+    public void testSpecialCharacters() {
+        TranslationData data = new TranslationData(true, true);
+        data.setTranslation("chars", create(specialCharacters));
+
+        SortableProperties output = new SortableProperties(true);
+        PropertiesMapper.write("en", output, data);
+
+        Assert.assertEquals(specialCharacters, output.get("chars"));
+
+        TranslationData input = new TranslationData(true, true);
+        PropertiesMapper.read("en", output, input);
+
+        Assert.assertEquals(specialCharacters, StringEscapeUtils.unescapeJava(input.getTranslation("chars").get("en")));
+    }
+
+    @Override
+    public void testNestedKeys() {
+        TranslationData data = new TranslationData(true, true);
+        data.setTranslation("nested.key.sections", create("test"));
+
+        SortableProperties output = new SortableProperties(true);
+        PropertiesMapper.write("en", output, data);
+
+        Assert.assertEquals("test", output.get("nested.key.sections"));
+
+        TranslationData input = new TranslationData(true, true);
+        PropertiesMapper.read("en", output, input);
+
+        Assert.assertTrue(input.getRootNode().getChildren().containsKey("nested"));
+        Assert.assertEquals("test", input.getTranslation("nested.key.sections").get("en"));
+    }
+
+    @Override
+    public void testNonNestedKeys() {
+        TranslationData data = new TranslationData(true, false);
+        data.setTranslation("long.key.with.many.sections", create("test"));
+
+        SortableProperties output = new SortableProperties(true);
+        PropertiesMapper.write("en", output, data);
+
+        Assert.assertNotNull(output.get("long.key.with.many.sections"));
+
+        TranslationData input = new TranslationData(true, false);
+        PropertiesMapper.read("en", output, input);
+
+        Assert.assertEquals("test", input.getRootNode().getChildren()
+                .get("long.key.with.many.sections").getValue().get("en"));
+    }
+
+    @Override
+    public void testLeadingSpace() {
+        TranslationData data = new TranslationData(true, true);
+        data.setTranslation("space", create(leadingSpace));
+
+        SortableProperties output = new SortableProperties(true);
+        PropertiesMapper.write("en", output, data);
+
+        Assert.assertEquals(leadingSpace, output.get("space"));
+
+        TranslationData input = new TranslationData(true, true);
+        PropertiesMapper.read("en", output, input);
+
+        Assert.assertEquals(leadingSpace, input.getTranslation("space").get("en"));
+    }
+
+    @Override
+    public void testNumbers() {
+        TranslationData data = new TranslationData(true, true);
+        data.setTranslation("numbered", create("15000"));
+
+        SortableProperties output = new SortableProperties(true);
+        PropertiesMapper.write("en", output, data);
+
+        Assert.assertEquals(15000, output.get("numbered"));
+
+        SortableProperties input = new SortableProperties(true);
+        input.put("numbered", 143.23);
+        PropertiesMapper.read("en", input, data);
+
+        Assert.assertEquals("143.23", data.getTranslation("numbered").get("en"));
+    }
+}