@Test public void resolveDiff_shouldReturnSuccessAndChooseLocalIfParentHashcodeNotExist() { SyncObject localObj = getSyncObject(SimpleObjectMother.createInstance(INVALID_UUID, TEST_VALUE)); SyncObject foreignObj = getSyncObject(SimpleObjectMother.createInstance(INVALID_UUID, TEST_VALUE_2)); MergeResult actual = conflictMergeBehaviour.resolveDiff(SyncObject.class, localObj, foreignObj); Assert.assertTrue(actual instanceof MergeSuccess); Assert.assertEquals(MergeMessageEnum.LOCAL_SAVE_MESSAGE, actual.getMessage()); Assert.assertTrue(((MergeSuccess) actual).shouldUpdateLocal()); Assert.assertFalse(((MergeSuccess) actual).shouldUpdateForeign()); }
@Override public MergeResult<SyncObject> resolveDiff(Class<? extends SyncObject> clazz, SyncObject local, SyncObject foreign) { return revolveConflict(local, foreign); }
RestrictConflictMergeBehaviourImpl implements MergeBehaviour<SyncObject> { @Override public MergeResult<SyncObject> resolveDiff(Class<? extends SyncObject> clazz, SyncObject local, SyncObject foreign) { return revolveConflict(local, foreign); } }
RestrictConflictMergeBehaviourImpl implements MergeBehaviour<SyncObject> { @Override public MergeResult<SyncObject> resolveDiff(Class<? extends SyncObject> clazz, SyncObject local, SyncObject foreign) { return revolveConflict(local, foreign); }  }
RestrictConflictMergeBehaviourImpl implements MergeBehaviour<SyncObject> { @Override public MergeResult<SyncObject> resolveDiff(Class<? extends SyncObject> clazz, SyncObject local, SyncObject foreign) { return revolveConflict(local, foreign); }  @Override MergeResult<SyncObject> resolveDiff(Class<? extends SyncObject> clazz, SyncObject local, SyncObject foreign); }
RestrictConflictMergeBehaviourImpl implements MergeBehaviour<SyncObject> { @Override public MergeResult<SyncObject> resolveDiff(Class<? extends SyncObject> clazz, SyncObject local, SyncObject foreign) { return revolveConflict(local, foreign); }  @Override MergeResult<SyncObject> resolveDiff(Class<? extends SyncObject> clazz, SyncObject local, SyncObject foreign);  }