Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add test to show ServiceConfigGuide re-orders ConfigEntries when merging #1059

Merged
merged 1 commit into from
Feb 7, 2025
Merged

add test to show ServiceConfigGuide re-orders ConfigEntries when merging #1059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/test/java/emissary/config/ServiceConfigGuideTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,16 +439,22 @@ void testConstructors() throws IOException {

@Test
void testMerge() throws IOException {
final byte[] configData = ("FOO = \"BAR\"\n" + "FOO = \"BAZ\"\n" + "KEY1 = \"VAL1\"\n").getBytes();
final byte[] configData = ("FOO = \"BAR\"\n" + "FOO = \"CAT\"\n" + "FOO = \"BAZ\"\n" + "KEY1 = \"VAL1\"\n").getBytes();
final ByteArrayInputStream str = new ByteArrayInputStream(configData);
final Configurator c1 = ConfigUtil.getConfigInfo(str);
final byte[] configData2 = ("FOO = \"BAR2\"\n" + "KEY2 = \"VAL2\"\n").getBytes();
final byte[] configData2 = ("FOO = \"BAR2\"\n" + "FOO = \"CAT2\"\n" + "FOO = \"BAZ2\"\n" + "KEY2 = \"VAL2\"\n").getBytes();
final ByteArrayInputStream str2 = new ByteArrayInputStream(configData2);
final Configurator c2 = ConfigUtil.getConfigInfo(str2);

c1.merge(c2);
assertEquals("BAR2", c1.findStringEntry("FOO"), "Newly merged entry is first");
assertEquals(3, c1.findEntries("FOO").size(), "Merge contains union of values");
assertEquals("BAZ2", c1.findStringEntry("FOO"), "Newly merged entry is first");
// #997 -- Would expect the ordering to be [BAR2,CAT2,BAZ2,BAR,CAT,BAZ]
assertEquals("BAZ2", c1.findEntries("FOO").get(0), "Merge contains union of values");
assertEquals("CAT2", c1.findEntries("FOO").get(1), "Merge contains union of values");
assertEquals("BAR2", c1.findEntries("FOO").get(2), "Merge contains union of values");
assertEquals("BAR", c1.findEntries("FOO").get(3), "Merge contains union of values");
assertEquals("CAT", c1.findEntries("FOO").get(4), "Merge contains union of values");
assertEquals("BAZ", c1.findEntries("FOO").get(5), "Merge contains union of values");
assertEquals("VAL1", c1.findStringEntry("KEY1"), "Old value present after merge");
assertEquals("VAL2", c1.findStringEntry("KEY2"), "New value present after merge");
}
Expand Down
Loading