Merge pull request #81 from alechenninger/79-sort-output-yaml-isolate…

…-never Fixes #79: Sort output yaml when isolate is 'never'
alechenninger · Jan 25, 2017 · 114a676 · 114a676
2 parents 6c3a551 + 5426a5f
commit 114a676
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 1 deletion.
diff --git a/bin/src/io/github/alechenninger/monarch/yaml/YamlDataFormat.java b/bin/src/io/github/alechenninger/monarch/yaml/YamlDataFormat.java
@@ -270,7 +270,7 @@ static class NeverIsolateUpdates implements UpdateStrategy {
     @Override
     public String getUpdate(YamlSourceData data, Map<String, Object> update) {
       return BEGIN_MONARCH_MANAGED + '\n' +
-          (update.isEmpty() ? "" : yaml.dump(update).trim() + '\n') +
+          (update.isEmpty() ? "" : yaml.dump(new TreeMap<>(update)).trim() + '\n') +
           END_MONARCH_MANAGED;
     }
   }

diff --git a/bin/test/io/github/alechenninger/monarch/YamlDataFormatTest.groovy b/bin/test/io/github/alechenninger/monarch/YamlDataFormatTest.groovy
@@ -60,5 +60,60 @@ class YamlDataFormatTest {
       assert 1 == updated.count('unmanaged')
       assert ['unmanaged': 456] == yaml.load(updated)
     }
+
+    @Test
+    void shouldSortOutput() {
+      ByteArrayOutputStream out = new ByteArrayOutputStream();
+      parser.newSourceData().writeUpdate([
+          'xyz': 1,
+          'abc': 2,
+          'a': 3,
+          'fgh': 4,
+          'cde': 5,
+          'lmnop': 6
+      ], out)
+
+      assert new String(out.toByteArray()).contains('''a: 3
+abc: 2
+cde: 5
+fgh: 4
+lmnop: 6
+xyz: 1''')
+    }
+  }
+
+  static class WithIsolateAlways {
+    def fs = Jimfs.newFileSystem()
+    def parser = new YamlDataFormat(new YamlConfiguration() {
+      YamlConfiguration.Isolate updateIsolation() { YamlConfiguration.Isolate.ALWAYS }
+    })
+
+    @Test(expected = MonarchException.class)
+    void shouldNotAllowUpdatesToUnmanagedKeys() {
+      def sourcePath = fs.getPath('/source.yaml')
+      Files.write(sourcePath, 'unmanaged: 123'.bytes)
+      parser.parseData(Files.newInputStream(sourcePath))
+          .writeUpdate(['unmanaged': 456], Files.newOutputStream(sourcePath))
+    }
+
+    @Test
+    void shouldSortOutput() {
+      ByteArrayOutputStream out = new ByteArrayOutputStream();
+      parser.newSourceData().writeUpdate([
+          'xyz': 1,
+          'abc': 2,
+          'a': 3,
+          'fgh': 4,
+          'cde': 5,
+          'lmnop': 6
+      ], out)
+
+      assert new String(out.toByteArray()).contains('''a: 3
+abc: 2
+cde: 5
+fgh: 4
+lmnop: 6
+xyz: 1''')
+    }
   }
 }