UtilTest fix

This commit is contained in:
irengrig
2011-06-06 17:08:26 +04:00
parent 76d59d2739
commit b095f82d3a
@@ -123,6 +123,17 @@ public class UtilTest extends TestCase {
multiCheck = new MultiCheck();
multiCheck.assertEquals(0, newChange.line0);
multiCheck.assertEquals(0, newChange.line1);
multiCheck.assertEquals(5, newChange.deleted);
multiCheck.assertEquals(1, newChange.inserted);
multiCheck.flush();
left = new String[]{"y", "y", "y", "a", "2", "a", "b", "*"};
right = new String[]{"x", "a", "b", "@"};
change = Diff.buildChanges(left, right);
newChange = Util.concatEquals(change, left, right);
multiCheck = new MultiCheck();
multiCheck.assertEquals(0, newChange.line0);
multiCheck.assertEquals(0, newChange.line1);
multiCheck.assertEquals(3, newChange.deleted);
multiCheck.assertEquals(1, newChange.inserted);
newChange = newChange.link;
@@ -130,6 +141,11 @@ public class UtilTest extends TestCase {
multiCheck.assertEquals(1, newChange.line1);
multiCheck.assertEquals(2, newChange.deleted);
multiCheck.assertEquals(0, newChange.inserted);
newChange = newChange.link;
multiCheck.assertEquals(7, newChange.line0);
multiCheck.assertEquals(3, newChange.line1);
multiCheck.assertEquals(1, newChange.deleted);
multiCheck.assertEquals(1, newChange.inserted);
multiCheck.assertNull(newChange.link);
multiCheck.flush();
}
@@ -138,15 +154,31 @@ public class UtilTest extends TestCase {
String[] left = new String[]{"i1", "a", "i2", "a", "b"};
String[] right = new String[]{"a", "b"};
Diff.Change change = Diff.buildChanges(left, right);
MultiCheck multiCheck = new MultiCheck();
multiCheck.assertEquals(0, change.line0);
multiCheck.assertEquals(0, change.line1);
multiCheck.assertEquals(3, change.deleted);
multiCheck.assertEquals(0, change.inserted);
multiCheck.assertNull(change.link);
multiCheck.flush();
left = new String[]{"i1", "a", "i2", "a", "b", "*"};
right = new String[]{"a", "b", "$"};
change = Diff.buildChanges(left, right);
assertNotNull(change.link);
assertEquals(2, change.link.deleted);
assertEquals(2, change.link.line0);
Diff.Change newChange = Util.concatEquals(change, left, right);
MultiCheck multiCheck = new MultiCheck();
multiCheck.assertEquals(0, newChange.line0);
multiCheck.assertEquals(0, newChange.line1);
multiCheck.assertEquals(3, newChange.deleted);
multiCheck.assertEquals(0, newChange.inserted);
assertNotNull(newChange.link);
newChange = newChange.link;
multiCheck.assertEquals(5, newChange.line0);
multiCheck.assertEquals(2, newChange.line1);
multiCheck.assertEquals(1, newChange.deleted);
multiCheck.assertEquals(1, newChange.inserted);
multiCheck.assertNull(newChange.link);
multiCheck.flush();
}