public void TestConflictWithMeta()
{
MergeTreeResult conflicts = new MergeTreeResult();
MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
FileConflict fileConflict =
BuildMergeTreeResult.CreateFileConflict("/foo/bar.c");
FileConflict fileConflictMeta =
BuildMergeTreeResult.CreateFileConflict("/foo/bar.c.meta");
conflicts.FileConflicts.Add(fileConflict);
conflicts.FileConflicts.Add(fileConflictMeta);
UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
IncomingChangesTree.BuildIncomingChangeCategories(
conflicts,
new GetConflictResolutionMock(),
rootMountPointWithPath));
IncomingChangeInfo conflictChangeInfo = FindChangeInfo.FromFileConflict(
fileConflict, tree);
Assert.IsNotNull(
conflictChangeInfo,
"ChangeInfo not found");
Assert.IsNotNull(
tree.GetMetaChange(conflictChangeInfo),
"Meta change should not be null");
}
public void TestChangedMovedWithMeta()
{
MergeTreeResult conflicts = new MergeTreeResult();
MountPointWithPath rootMountPointWithPath = BuildRootMountPointWithPath();
FileConflict fileConflict =
BuildMergeTreeResult.CreateFileConflict("/foo/var.c");
FileConflict fileConflictMeta =
BuildMergeTreeResult.CreateFileConflict("/foo/var.c.meta");
Difference difference =
BuildMergeTreeResult.CreateMovedDifference("/foo/bar.c", "/foo/var.c");
Difference differenceMeta =
BuildMergeTreeResult.CreateMovedDifference("/foo/bar.c.meta", "/foo/var.c.meta");
conflicts.FilesModifiedOnSource.Add(fileConflict);
conflicts.FilesModifiedOnSource.Add(fileConflictMeta);
conflicts.MovesToApply.Add(difference);
conflicts.MovesToApply.Add(differenceMeta);
UnityIncomingChangesTree tree = UnityIncomingChangesTree.BuildIncomingChangeCategories(
IncomingChangesTree.BuildIncomingChangeCategories(
conflicts,
new GetConflictResolutionMock(),
rootMountPointWithPath));
IncomingChangeInfo fileChangeInfo = FindChangeInfo.FromFileConflict(
fileConflict, tree);
IncomingChangeInfo differenceChangeInfo = FindChangeInfo.FromDifference(
difference, tree);
Assert.IsNotNull(
fileChangeInfo,
"FileConflict not found");
Assert.IsNotNull(
differenceChangeInfo,
"Difference not found");
Assert.IsNotNull(
tree.GetMetaChange(fileChangeInfo),
"Meta change for file conflict not should be null");
Assert.IsNotNull(
tree.GetMetaChange(differenceChangeInfo),
"Meta change for difference not should be null");
}
