diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2019-11-02 19:26:42 +0100 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2019-11-03 10:10:16 +0100 |
| commit | 64f2407f19330d182728feeaf3d2c1a4092a2051 (patch) | |
| tree | 9635bb1b3d01b0de8733d3c2a9bb38f8092f5709 /org.eclipse.jgit.test/src | |
| parent | b29e9bd1cb252577c1b8118861830cffcf15fd27 (diff) | |
| download | jgit-64f2407f19330d182728feeaf3d2c1a4092a2051.tar.gz jgit-64f2407f19330d182728feeaf3d2c1a4092a2051.zip | |
WorkingTreeModifiedEvent: must be fired explicitly after merge
A merge may write files to the working tree. After a successful
merge one must fire a WorkingTreeModifiedEvent explicitly if
getModifiedFiles() is not empty.
Also, any touched files must be reported by the
WorkingTreeModifiedEvent fired by DirCacheCheckout.checkout().
Bug: 552636
Change-Id: I5fab8279ed8be8a4ae34cddfa726836b9277aea6
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit.test/src')
| -rw-r--r-- | org.eclipse.jgit.test/src/org/eclipse/jgit/events/ChangeRecorder.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/org.eclipse.jgit.test/src/org/eclipse/jgit/events/ChangeRecorder.java b/org.eclipse.jgit.test/src/org/eclipse/jgit/events/ChangeRecorder.java index 228df35c76..e1f6b12258 100644 --- a/org.eclipse.jgit.test/src/org/eclipse/jgit/events/ChangeRecorder.java +++ b/org.eclipse.jgit.test/src/org/eclipse/jgit/events/ChangeRecorder.java @@ -43,7 +43,6 @@ package org.eclipse.jgit.events; -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import java.util.Arrays; @@ -99,10 +98,12 @@ public class ChangeRecorder implements WorkingTreeModifiedListener { Arrays.sort(expectedModified); Arrays.sort(actuallyDeleted); Arrays.sort(expectedDeleted); - assertArrayEquals("Unexpected modifications reported", expectedModified, - actuallyModified); - assertArrayEquals("Unexpected deletions reported", expectedDeleted, - actuallyDeleted); + assertEquals("Unexpected modifications reported", + Arrays.toString(expectedModified), + Arrays.toString(actuallyModified)); + assertEquals("Unexpected deletions reported", + Arrays.toString(expectedDeleted), + Arrays.toString(actuallyDeleted)); reset(); } } |