adding tests for diff3_merge

Author: adam-singer

test/src/diff3_dig_test.dart

@@ -19,6 +19,7 @@ void defineTests() {
       Diff3DigResult diff3DigResult = diff3_dig(a, o, b);
 
       expect(diff3DigResult, isNotNull);
+      expect(diff3DigResult.Conflict, isTrue);
       String expectResultText = """AA
 a
 <<<<<<<<<

test/src/diff3_merge_test.dart

@@ -0,0 +1,75 @@
+library diff3_merge_test;
+
+import "package:unittest/unittest.dart";
+
+import "package:diff/diff.dart";
+
+void defineTests() {
+  group('diff3_merge', () {
+    test('multiline difference', () {
+      // base
+      List<String> o = "AA ZZ 00 M 99".split(" ");
+
+      // ours
+      List<String> a = "AA a b c ZZ new 00 a a M 99".split(" ");
+
+      // theirs
+      List<String> b = "AA a d c ZZ 11 M z z 99".split(" ");
+
+      List<IMergeResultBlock> mergeResultBlocks = diff3_merge(a, o, b, false);
+
+      expect(mergeResultBlocks, isNotNull);
+      expect(mergeResultBlocks.length, equals(5));
+
+      expect(mergeResultBlocks[0], new isInstanceOf<MergeOKResultBlock>());
+      expect((mergeResultBlocks[0] as MergeOKResultBlock).ContentLines.length,
+          equals(1));
+      expect((mergeResultBlocks[0] as MergeOKResultBlock).ContentLines[0],
+          equals("AA"));
+
+      expect(mergeResultBlocks[1], new isInstanceOf<MergeConflictResultBlock>());
+      expect((mergeResultBlocks[1] as MergeConflictResultBlock).LeftIndex,
+          equals(1));
+      expect((mergeResultBlocks[1] as MergeConflictResultBlock).LeftLines,
+          equals(["a", "b", "c"]));
+      expect((mergeResultBlocks[1] as MergeConflictResultBlock).RightIndex,
+          equals(1));
+      expect((mergeResultBlocks[1] as MergeConflictResultBlock).RightLines,
+          equals(["a", "d", "c"]));
+      expect((mergeResultBlocks[1] as MergeConflictResultBlock).OldIndex,
+          equals(1));
+      expect((mergeResultBlocks[1] as MergeConflictResultBlock).OldLines,
+          isEmpty);
+
+      expect(mergeResultBlocks[2], new isInstanceOf<MergeOKResultBlock>());
+      expect((mergeResultBlocks[2] as MergeOKResultBlock).ContentLines.length,
+          equals(1));
+      expect((mergeResultBlocks[2] as MergeOKResultBlock).ContentLines[0],
+          equals("ZZ"));
+
+      expect(mergeResultBlocks[3], new isInstanceOf<MergeConflictResultBlock>());
+      expect((mergeResultBlocks[3] as MergeConflictResultBlock).RightIndex,
+          equals(5));
+      expect((mergeResultBlocks[3] as MergeConflictResultBlock).RightLines,
+          equals(["11"]));
+      expect((mergeResultBlocks[3] as MergeConflictResultBlock).LeftIndex,
+          equals(5));
+      expect((mergeResultBlocks[3] as MergeConflictResultBlock).LeftLines,
+          equals(["new", "00", "a", "a"]));
+      expect((mergeResultBlocks[3] as MergeConflictResultBlock).OldIndex,
+          equals(2));
+      expect((mergeResultBlocks[3] as MergeConflictResultBlock).OldLines,
+             equals(["00"]));
+
+      expect(mergeResultBlocks[4], new isInstanceOf<MergeOKResultBlock>());
+      expect((mergeResultBlocks[4] as MergeOKResultBlock).ContentLines.length,
+          equals(4));
+      expect((mergeResultBlocks[4] as MergeOKResultBlock).ContentLines,
+          equals(["M", "z", "z", "99"]));
+    });
+  });
+}
+
+void main() {
+  defineTests();
+}

test/test_runner.dart

@@ -3,9 +3,11 @@ library test_runner;
 import "src/side_enum_test.dart" as side_enum_test;
 import "src/diff3_set_test.dart" as diff3_set_test;
 import "src/diff3_dig_test.dart" as diff3_dig_test;
+import "src/diff3_merge_test.dart" as diff3_merge_test;
 
 void main() {
   side_enum_test.main();
   diff3_set_test.main();
   diff3_dig_test.main();
+  diff3_merge_test.main();
 }