public void ObjectRepositoryMergeChunkChangeResolveConflictOnlyOnce(Page page, string resolvedValue)
{
// Arrange
var path = RepositoryFixture.GetAvailableFolderPath();
Field mergeBaseNode = page.Fields[0], branchNode = page.Fields[1], headNode = page.Fields[2];
// Act
var sut = new ObjectRepositoryPropertyChange(path, _nameProperty, CreateChunk(mergeBaseNode), CreateChunk(branchNode), CreateChunk(headNode));
sut.Resolve(resolvedValue);
Assert.Throws <GitObjectDbException>(() => sut.Resolve(resolvedValue));
}
public void ObjectRepositoryMergeChunkChangeResolveConflict(Page page, string resolvedValue)
{
// Arrange
var path = RepositoryFixture.GetAvailableFolderPath();
Field mergeBaseNode = page.Fields[0], branchNode = page.Fields[1], headNode = page.Fields[2];
// Act
var sut = new ObjectRepositoryPropertyChange(path, _nameProperty, CreateChunk(mergeBaseNode), CreateChunk(branchNode), CreateChunk(headNode));
sut.Resolve(resolvedValue);
// Assert
Assert.That(sut.WasInConflict, Is.True);
Assert.That(sut.IsInConflict, Is.False);
Assert.That(sut.MergeValue, Is.SameAs(resolvedValue));
}
