Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2011-11-23 16:49:54 +0000
committerTomasz Zarna2011-11-23 16:49:54 +0000
commit1d317a8da6b135518fc0f27e059e2d38a94760f8 (patch)
tree9d482d8a972f45a982ebacf13fbe330be5929a71 /tests/org.eclipse.team.tests.cvs.core
parent951477fe0d9d1aa4bbfcabd936d0d7641c6f712a (diff)
downloadeclipse.platform.team-1d317a8da6b135518fc0f27e059e2d38a94760f8.tar.gz
eclipse.platform.team-1d317a8da6b135518fc0f27e059e2d38a94760f8.tar.xz
eclipse.platform.team-1d317a8da6b135518fc0f27e059e2d38a94760f8.zip
bug 364561: test failures due to unexpected outgoing changesv20111123-1649
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
index af5744621..57337af13 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,14 +39,16 @@ import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
import org.eclipse.team.internal.ccvs.core.ICVSFile;
import org.eclipse.team.internal.ccvs.core.ICVSFolder;
import org.eclipse.team.internal.ccvs.core.client.Command;
-import org.eclipse.team.internal.ccvs.core.client.Session;
-import org.eclipse.team.internal.ccvs.core.client.Update;
import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
+import org.eclipse.team.internal.ccvs.core.client.Session;
+import org.eclipse.team.internal.ccvs.core.client.Update;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
import org.eclipse.team.internal.ccvs.core.util.Util;
+import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
/*
@@ -603,17 +605,22 @@ public class CVSProviderTest extends EclipseTest {
}
+ private void setOnlyLookAtTimestamps(boolean b) {
+ CVSUIPlugin.getPlugin().getPreferenceStore().setValue(ICVSUIConstants.PREF_CONSIDER_CONTENTS, !b);
+ }
+
public void testUpdateWithNoChange() throws TeamException, CoreException {
IProject project = createProject(new String[] { "a.txt"});
setContentsAndEnsureModified(project.getFile("a.txt"), "contents");
commitProject(project);
+ setOnlyLookAtTimestamps(true);
// set the contents to the same value but ensure the local timestamp is different
setContentsAndEnsureModified(project.getFile("a.txt"), "contents");
// Update and ensure file timestamp is what is was before out edit
updateProject(project, null, false);
Date modDate = CVSWorkspaceRoot.getCVSFileFor(project.getFile("a.txt")).getSyncInfo().getTimeStamp();
assertEquals("Timestamp was not properly reset", modDate, CVSWorkspaceRoot.getCVSFileFor(project.getFile("a.txt")).getTimeStamp());
-
+ setOnlyLookAtTimestamps(false);
}
public void testBinaryAddition() throws CoreException {

Back to the top