diff options
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorterTest.java')
| -rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorterTest.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorterTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorterTest.java index 2e86c6716f..c913018a18 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorterTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorterTest.java @@ -12,6 +12,9 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.util.Date; + +import org.eclipse.egit.core.synchronize.GitCommitsModelCache.Commit; import org.eclipse.egit.ui.internal.synchronize.model.GitModelBlob; import org.eclipse.egit.ui.internal.synchronize.model.GitModelCache; import org.eclipse.egit.ui.internal.synchronize.model.GitModelCommit; @@ -19,12 +22,11 @@ import org.eclipse.egit.ui.internal.synchronize.model.GitModelTree; import org.eclipse.egit.ui.internal.synchronize.model.GitModelWorkingTree; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jgit.revwalk.MockRevCommit; import org.eclipse.ui.navigator.CommonViewer; import org.junit.Test; /** - * Test for {@link GitChangeSetSorter#compare(Viewer, Object, Object)}. + * Test for {@link GitChangeSetSorter#compare(Viewer, Object, Object)}. */ public class GitChangeSetSorterTest { @@ -370,14 +372,19 @@ public class GitChangeSetSorterTest { /* * Test for commit chronological order */ + @SuppressWarnings("boxing") @Test public void shouldOrderCommitsByCommitDate() { // given Viewer viewer = mock(Viewer.class); GitChangeSetSorter sorter = new GitChangeSetSorter(); GitModelCommit commit1 = mock(GitModelCommit.class); GitModelCommit commit2 = mock(GitModelCommit.class); - when(commit1.getBaseCommit()).thenReturn(new MockRevCommit(100)); - when(commit2.getBaseCommit()).thenReturn(new MockRevCommit(200)); + Commit mockCommit1 = mock(Commit.class); + Commit mockCommit2 = mock(Commit.class); + when(mockCommit1.getCommitDate()).thenReturn(new Date(333333L)); + when(mockCommit2.getCommitDate()).thenReturn(new Date(555555L)); + when(commit1.getCachedCommitObj()).thenReturn(mockCommit1); + when(commit2.getCachedCommitObj()).thenReturn(mockCommit2); // when int actual1 = sorter.compare(viewer, commit1, commit2); |