@Test public void testDeleteChangedNodeOther() { RepMembersConflictHandler handler = new RepMembersConflictHandler(); assertSame(ThreeWayConflictHandler.Resolution.IGNORED, handler.deleteChangedNode(mock(NodeBuilder.class), "name", mock(NodeState.class), mock(NodeState.class))); }
@NotNull @Override public Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs, @NotNull NodeState base) { if (isMemberRefType(base)) { return Resolution.OURS; } else { return Resolution.IGNORED; } }
RepMembersConflictHandler implements ThreeWayConflictHandler { @NotNull @Override public Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs, @NotNull NodeState base) { if (isMemberRefType(base)) { return Resolution.OURS; } else { return Resolution.IGNORED; } } }
RepMembersConflictHandler implements ThreeWayConflictHandler { @NotNull @Override public Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs, @NotNull NodeState base) { if (isMemberRefType(base)) { return Resolution.OURS; } else { return Resolution.IGNORED; } }  }
RepMembersConflictHandler implements ThreeWayConflictHandler { @NotNull @Override public Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs, @NotNull NodeState base) { if (isMemberRefType(base)) { return Resolution.OURS; } else { return Resolution.IGNORED; } }  @NotNull @Override Resolution addExistingProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState theirs); @Override @NotNull Resolution changeDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState base); @NotNull @Override Resolution changeChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState theirs, @NotNull PropertyState base); @NotNull @Override Resolution deleteDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState base); @NotNull @Override Resolution deleteChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState theirs,
            @NotNull PropertyState base); @NotNull @Override Resolution addExistingNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState ours,
            @NotNull NodeState theirs); @NotNull @Override Resolution changeDeletedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState ours,
            @NotNull NodeState base); @NotNull @Override Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs,
            @NotNull NodeState base); @NotNull @Override Resolution deleteDeletedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState base); }
RepMembersConflictHandler implements ThreeWayConflictHandler { @NotNull @Override public Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs, @NotNull NodeState base) { if (isMemberRefType(base)) { return Resolution.OURS; } else { return Resolution.IGNORED; } }  @NotNull @Override Resolution addExistingProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState theirs); @Override @NotNull Resolution changeDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState base); @NotNull @Override Resolution changeChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
            @NotNull PropertyState theirs, @NotNull PropertyState base); @NotNull @Override Resolution deleteDeletedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState base); @NotNull @Override Resolution deleteChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState theirs,
            @NotNull PropertyState base); @NotNull @Override Resolution addExistingNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState ours,
            @NotNull NodeState theirs); @NotNull @Override Resolution changeDeletedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState ours,
            @NotNull NodeState base); @NotNull @Override Resolution deleteChangedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState theirs,
            @NotNull NodeState base); @NotNull @Override Resolution deleteDeletedNode(@NotNull NodeBuilder parent, @NotNull String name, @NotNull NodeState base);  }