Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-07-05 11:09:24 +0000
committerAndrey Loskutov2015-07-05 11:35:00 +0000
commit1ee4d55e8cc771bdc7dbf28c0961a16cff896f1b (patch)
tree132481ebf89975f7250fff94cd470b7f90b0694e /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test
parent533219a1af9020c4de2c5a6c2fb0f4c035c592b9 (diff)
downloadegit-1ee4d55e8cc771bdc7dbf28c0961a16cff896f1b.tar.gz
egit-1ee4d55e8cc771bdc7dbf28c0961a16cff896f1b.tar.xz
egit-1ee4d55e8cc771bdc7dbf28c0961a16cff896f1b.zip
Test stability: don't use Calender.roll()
If seconds overflow, minutes will not be updated Change-Id: I602e61f553c869f33333024fa797553a9d1c5359 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java
index acd81f938..01d186e5a 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/ReplaceActionsTest.java
@@ -69,13 +69,14 @@ public class ReplaceActionsTest extends LocalRepositoryTestCase {
Git git = new Git(repo);
Calendar cal = Calendar.getInstance();
+ long time = cal.getTime().getTime();
PersonIdent sideCommitter = new PersonIdent("Side Committer",
- "side@example.org", cal.getTime().getTime(), 0);
+ "side@example.org", time, 0);
// Make sure commit time stamps are different, otherwise the order in
// the dialog is not stable
- cal.roll(Calendar.SECOND, 2);
+ time += 5000;
PersonIdent masterCommitter = new PersonIdent("Master Committer",
- "master@example.org", cal.getTime().getTime(), 0);
+ "master@example.org", time, 0);
git.checkout().setCreateBranch(true).setName("side").call();
touch(PROJ1, "folder/test.txt", "side");

Back to the top