Set<String> entriesInCommon; difference = runWithPathFilter(leftTree, rightTree, "points/points.1", "points/points.2"); onlyOnLeft = difference.entriesOnlyOnLeft().keySet(); onlyOnRight = difference.entriesOnlyOnRight().keySet(); assertEquals(set("points/points.1", "points/points.2"), entriesInCommon); difference = runWithPathFilter(leftTree, rightTree, "lines/lines.1", "badFilter"); onlyOnLeft = difference.entriesOnlyOnLeft().keySet(); onlyOnRight = difference.entriesOnlyOnRight().keySet();
Set<String> entriesInCommon; difference = runWithPathFilter(leftTree, rightTree, "points/points.1", "points/points.2"); onlyOnLeft = difference.entriesOnlyOnLeft().keySet(); onlyOnRight = difference.entriesOnlyOnRight().keySet(); assertEquals(set("points/points.1", "points/points.2"), entriesInCommon); difference = runWithPathFilter(leftTree, rightTree, "lines/lines.1", "badFilter"); onlyOnLeft = difference.entriesOnlyOnLeft().keySet(); onlyOnRight = difference.entriesOnlyOnRight().keySet();
@Test public void testPathFilteringSingleFeature() { leftTree = createHeadTree(// repoTree("roads", "a1", null, 2), // repoTree("roads/highways", "a2", "d1", 1)// ); rightTree = createStageHeadTree(// repoTree("roads", "a11", null, 1), // deleted 1 feature repoTree("roads/highways", "a21", "d1", 3)// added 2 features ); MapDifference<String, NodeRef> difference; Set<String> onlyOnLeft; Set<String> onlyOnRight; difference = runWithPathFilter(leftTree, rightTree, "roads/roads.1"); onlyOnLeft = difference.entriesOnlyOnLeft().keySet(); onlyOnRight = difference.entriesOnlyOnRight().keySet(); assertEquals(set(), onlyOnLeft); assertEquals(set("roads/highways/highways.1", "roads/highways/highways.2"), onlyOnRight); assertEquals(set("roads/highways/highways.0", "roads/roads.0"), difference.entriesInCommon().keySet()); }
@Test public void testPathFilteringDeletedTreeButCommitSingleChange() { leftTree = createHeadTree(// repoTree("roads", "a1", null, 1), // repoTree("highways", "a2", "d1", 2)// ); rightTree = createStageHeadTree(// repoTree("roads", "a1", null, 1) // deleted highways ); MapDifference<String, NodeRef> difference; Set<String> onlyOnNewTree; Set<String> onlyStaged; difference = runWithPathFilter(leftTree, rightTree, "highways/highways.1"); onlyOnNewTree = difference.entriesOnlyOnLeft().keySet(); onlyStaged = difference.entriesOnlyOnRight().keySet(); Set<String> differing = difference.entriesDiffering().keySet(); Set<String> inCommon = difference.entriesInCommon().keySet(); assertEquals(set("roads", "roads/roads.0"), inCommon); assertEquals(set("highways", "highways/highways.0"), onlyOnNewTree); assertEquals(set(), differing); assertEquals(set(), onlyStaged); }
@Test public void testPathFilteringSingleFeature() { leftTree = createHeadTree(// repoTree("roads", "a1", null, 2), // repoTree("roads/highways", "a2", "d1", 1)// ); rightTree = createStageHeadTree(// repoTree("roads", "a11", null, 1), // deleted 1 feature repoTree("roads/highways", "a21", "d1", 3)// added 2 features ); MapDifference<String, NodeRef> difference; Set<String> onlyOnLeft; Set<String> onlyOnRight; difference = runWithPathFilter(leftTree, rightTree, "roads/roads.1"); onlyOnLeft = difference.entriesOnlyOnLeft().keySet(); onlyOnRight = difference.entriesOnlyOnRight().keySet(); assertEquals(set(), onlyOnLeft); assertEquals(set("roads/highways/highways.1", "roads/highways/highways.2"), onlyOnRight); assertEquals(set("roads/highways/highways.0", "roads/roads.0"), difference.entriesInCommon().keySet()); }
@Test public void testPathFilteringDeletedTreeButCommitSingleChange() { leftTree = createHeadTree(// repoTree("roads", "a1", null, 1), // repoTree("highways", "a2", "d1", 2)// ); rightTree = createStageHeadTree(// repoTree("roads", "a1", null, 1) // deleted highways ); MapDifference<String, NodeRef> difference; Set<String> onlyOnNewTree; Set<String> onlyStaged; difference = runWithPathFilter(leftTree, rightTree, "highways/highways.1"); onlyOnNewTree = difference.entriesOnlyOnLeft().keySet(); onlyStaged = difference.entriesOnlyOnRight().keySet(); Set<String> differing = difference.entriesDiffering().keySet(); Set<String> inCommon = difference.entriesInCommon().keySet(); assertEquals(set("roads", "roads/roads.0"), inCommon); assertEquals(set("highways", "highways/highways.0"), onlyOnNewTree); assertEquals(set(), differing); assertEquals(set(), onlyStaged); }
Set<String> entriesInCommon; difference = runWithPathFilter(leftTree, rightTree, "roads"); onlyOnLeft = difference.entriesOnlyOnLeft().keySet(); onlyOnRight = difference.entriesOnlyOnRight().keySet();
Set<String> entriesInCommon; difference = runWithPathFilter(leftTree, rightTree, "roads"); onlyOnLeft = difference.entriesOnlyOnLeft().keySet(); onlyOnRight = difference.entriesOnlyOnRight().keySet();