diff options
author | Michael Valenta | 2005-02-08 15:15:14 +0000 |
---|---|---|
committer | Michael Valenta | 2005-02-08 15:15:14 +0000 |
commit | 717dfd70e2a53993a8fa878a0070a3fbb6937cb7 (patch) | |
tree | 1fc06a6d3a8bc7e11e4f9827dc715b6f77954b3d /tests | |
parent | 1276cb359836a4fcfa7b390cdbdb9729ec6e26a5 (diff) | |
download | eclipse.platform.team-717dfd70e2a53993a8fa878a0070a3fbb6937cb7.tar.gz eclipse.platform.team-717dfd70e2a53993a8fa878a0070a3fbb6937cb7.tar.xz eclipse.platform.team-717dfd70e2a53993a8fa878a0070a3fbb6937cb7.zip |
Added resource mapping tests to test suite
Diffstat (limited to 'tests')
3 files changed, 5 insertions, 77 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch index 720efb1f0..f36b11143 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/One CVS Test.launch @@ -9,13 +9,12 @@ <booleanAttribute key="automaticAdd" value="true"/> <booleanAttribute key="includeFragments" value="false"/> <booleanAttribute key="clearws" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.mappings.ResourceMapperTests"/> <stringAttribute key="location1" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/> -<booleanAttribute key="default" value="false"/> -<stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName=testConflictingFolderDeletion"/> +<booleanAttribute key="default" value="true"/> +<stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testConflictingFolderDeletion"/> <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> -<stringAttribute key="extplugins" value="org.eclipse.jdt.doc.isv;org.eclipse.jdt.doc.user;org.eclipse.jdt.source;org.eclipse.pde.doc.user;org.eclipse.pde.source;org.eclipse.platform;org.eclipse.platform.source;org.eclipse.platform.source.win32.win32.x86;org.eclipse.sdk;"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> <stringAttribute key="onePluginID" value=""/> @@ -23,7 +22,6 @@ <stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_CA"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/> -<stringAttribute key="wsproject" value=""/> <booleanAttribute key="askclear" value="false"/> <booleanAttribute key="onePlugin" value="false"/> <booleanAttribute key="includeOptional" value="true"/> diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java index 0df86a5ed..e5b0b3302 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java @@ -12,6 +12,7 @@ package org.eclipse.team.tests.ccvs.core; import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.team.tests.ccvs.core.mappings.ResourceMapperTests; import org.eclipse.team.tests.ccvs.core.provider.AllTestsProvider; import org.eclipse.team.tests.ccvs.core.subscriber.AllTestsTeamSubscriber; import org.eclipse.team.tests.ccvs.ui.AllUITests; @@ -31,6 +32,7 @@ public class AllTests extends EclipseTest { suite.addTest(AllTestsProvider.suite()); suite.addTest(AllTestsTeamSubscriber.suite()); suite.addTest(AllUITests.suite()); + suite.addTest(ResourceMapperTests.suite()); return new CVSUITestSetup(suite); } } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SubscriberTraversalContext.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SubscriberTraversalContext.java deleted file mode 100644 index 483b4cb32..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SubscriberTraversalContext.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.tests.ccvs.core.mappings; - -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.core.resources.*; -import org.eclipse.core.resources.mapping.ResourceMappingContext; -import org.eclipse.core.resources.mapping.ResourceTraversal; -import org.eclipse.core.runtime.*; -import org.eclipse.team.core.subscribers.Subscriber; -import org.eclipse.team.core.synchronize.SyncInfo; -import org.eclipse.team.core.variants.IResourceVariant; -import org.eclipse.team.internal.core.TeamPlugin; - -/** - * A traversal context that uses the remote state of a subscriber. - * It does not refresh the subscriber's state. - */ -public class SubscriberTraversalContext extends ResourceMappingContext { - - Subscriber subscriber; - - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ITraversalContext#contentDiffers(org.eclipse.core.resources.IFile, org.eclipse.core.runtime.IProgressMonitor) - */ - public boolean contentDiffers(IFile file, IProgressMonitor monitor) throws CoreException { - SyncInfo syncInfo = subscriber.getSyncInfo(file); - return syncInfo != null && syncInfo.getKind() != SyncInfo.IN_SYNC; - } - - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ITraversalContext#fetchContents(org.eclipse.core.resources.IFile, org.eclipse.core.runtime.IProgressMonitor) - */ - public IStorage fetchContents(IFile file, IProgressMonitor monitor) throws CoreException { - SyncInfo syncInfo = subscriber.getSyncInfo(file); - IResourceVariant remote = syncInfo.getRemote(); - if (remote == null) - throw new CoreException(new Status(IStatus.ERROR, TeamPlugin.ID, IResourceStatus.RESOURCE_NOT_FOUND, "The remote counterpart of {0} does not exist" + file.getFullPath(), null)); - return remote.getStorage(monitor); - } - - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ITraversalContext#fetchMembers(org.eclipse.core.resources.IContainer, org.eclipse.core.runtime.IProgressMonitor) - */ - public IResource[] fetchMembers(IContainer container, IProgressMonitor monitor) throws CoreException { - return subscriber.members(container); - } - - public void refresh(ResourceTraversal[] traversals, int flags, IProgressMonitor monitor) throws CoreException { - Set result = new HashSet(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; - IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; - result.add(resource); - } - } - subscriber.refresh((IResource[]) result.toArray(new IResource[result.size()]), IResource.DEPTH_INFINITE, monitor); - } - -} |