|
|
@ -95,7 +95,7 @@ public class DiffCommandTest extends RepositoryTestCase { |
|
|
|
+ "\\ No newline at end of file\n" |
|
|
|
+ "\\ No newline at end of file\n" |
|
|
|
+ "+folder change\n" |
|
|
|
+ "+folder change\n" |
|
|
|
+ "\\ No newline at end of file\n"; |
|
|
|
+ "\\ No newline at end of file\n"; |
|
|
|
assertEquals(expected.toString(), actual); |
|
|
|
assertEquals(expected, actual); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -130,7 +130,7 @@ public class DiffCommandTest extends RepositoryTestCase { |
|
|
|
+ "@@ -0,0 +1 @@\n" |
|
|
|
+ "@@ -0,0 +1 @@\n" |
|
|
|
+ "+folder\n" |
|
|
|
+ "+folder\n" |
|
|
|
+ "\\ No newline at end of file\n"; |
|
|
|
+ "\\ No newline at end of file\n"; |
|
|
|
assertEquals(expected.toString(), actual); |
|
|
|
assertEquals(expected, actual); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -179,7 +179,7 @@ public class DiffCommandTest extends RepositoryTestCase { |
|
|
|
+ "\\ No newline at end of file\n" |
|
|
|
+ "\\ No newline at end of file\n" |
|
|
|
+ "+folder change\n" |
|
|
|
+ "+folder change\n" |
|
|
|
+ "\\ No newline at end of file\n"; |
|
|
|
+ "\\ No newline at end of file\n"; |
|
|
|
assertEquals(expected.toString(), actual); |
|
|
|
assertEquals(expected, actual); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -201,7 +201,7 @@ public class DiffCommandTest extends RepositoryTestCase { |
|
|
|
+ "+++ new/test.txt\n" + "@@ -1 +1 @@\n" + "-test\n" |
|
|
|
+ "+++ new/test.txt\n" + "@@ -1 +1 @@\n" + "-test\n" |
|
|
|
+ "\\ No newline at end of file\n" + "+test change\n" |
|
|
|
+ "\\ No newline at end of file\n" + "+test change\n" |
|
|
|
+ "\\ No newline at end of file\n"; |
|
|
|
+ "\\ No newline at end of file\n"; |
|
|
|
assertEquals(expected.toString(), actual); |
|
|
|
assertEquals(expected, actual); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -223,7 +223,7 @@ public class DiffCommandTest extends RepositoryTestCase { |
|
|
|
+ "index f55b5c9..c5ec8fd 100644\n" + "--- a/test.txt\n" |
|
|
|
+ "index f55b5c9..c5ec8fd 100644\n" + "--- a/test.txt\n" |
|
|
|
+ "+++ b/test.txt\n" + "@@ -4,3 +4,3 @@\n" + " 3\n" + "-4\n" |
|
|
|
+ "+++ b/test.txt\n" + "@@ -4,3 +4,3 @@\n" + " 3\n" + "-4\n" |
|
|
|
+ "+4a\n" + " 5\n"; |
|
|
|
+ "+4a\n" + " 5\n"; |
|
|
|
assertEquals(expected.toString(), actual); |
|
|
|
assertEquals(expected, actual); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|