[113621] reaction to deployable changes: committed for JL
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/BaseVirtualTest.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/BaseVirtualTest.java
index 37ed3ce..5d0cb6c 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/BaseVirtualTest.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/BaseVirtualTest.java
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
@@ -30,13 +30,13 @@
protected IVirtualComponent component;
protected IVirtualFolder webInfFolder;
- protected IFolder realWebInfFolder;
+ protected IContainer realWebInfFolder;
protected IVirtualFolder deletemeVirtualFolder;
- protected IFolder deletemeFolder;
+ protected IContainer deletemeFolder;
protected IVirtualFolder testdataFolder;
- protected IFolder realTestdataFolder;
+ protected IContainer realTestdataFolder;
@@ -54,7 +54,7 @@
realWebInfFolder = TEST_PROJECT.getFolder(WEBINF_FOLDER_REAL_PATH);
- component = ComponentCore.createComponent(TEST_PROJECT, TestWorkspace.WEB_MODULE_1_NAME);
+ component = ComponentCore.createComponent(TEST_PROJECT);
IVirtualFolder rootFolder = component.getRootFolder();
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/IVirtualFolderAPITest.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/IVirtualFolderAPITest.java
index 0e5087c..4743def 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/IVirtualFolderAPITest.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/IVirtualFolderAPITest.java
@@ -12,7 +12,7 @@
import junit.framework.TestCase;
-import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -41,13 +41,10 @@
private IVirtualComponent component;
private IVirtualFolder webInfFolder;
- private IFolder realWebInfFolder;
+ private IContainer realWebInfFolder;
private IVirtualFolder deletemeVirtualFolder;
- private IFolder deletemeFolder;
-
- private IVirtualFolder testdataFolder;
- private IFolder realTestdataFolder;
+ private IContainer deletemeFolder;
public IVirtualFolderAPITest(String name) {
super(name);
@@ -59,13 +56,13 @@
realWebInfFolder = TEST_PROJECT.getFolder(WEBINF_FOLDER_REAL_PATH);
- component = ComponentCore.createComponent(TEST_PROJECT, TestWorkspace.WEB_MODULE_1_NAME);
+ component = ComponentCore.createComponent(TEST_PROJECT);
IVirtualFolder rootFolder = component.getRootFolder();
webInfFolder = rootFolder.getFolder(WEBINF_FOLDER_RUNTIME_PATH);
- testdataFolder = rootFolder.getFolder(TESTDATA_FOLDER_RUNTIME_PATH);
- realTestdataFolder = TEST_PROJECT.getFolder(TESTDATA_FOLDER_REAL_PATH);
+ rootFolder.getFolder(TESTDATA_FOLDER_RUNTIME_PATH);
+ TEST_PROJECT.getFolder(TESTDATA_FOLDER_REAL_PATH);
deletemeVirtualFolder = rootFolder.getFolder(DELETEME_PATH);
deletemeVirtualFolder.create(IVirtualResource.FORCE, null);
@@ -94,29 +91,29 @@
}
public void testGetUnderlyingFolders() {
- IFolder[] deletemeFolder = deletemeVirtualFolder.getUnderlyingFolders();
- assertEquals(deletemeFolder.length==1,true);
+ IContainer[] aDeletemeFolder = deletemeVirtualFolder.getUnderlyingFolders();
+ assertEquals(aDeletemeFolder.length==1,true);
}
public void testGetUnderlyingResources() {
- IResource[] deletemeFolder = ((IVirtualResource)deletemeVirtualFolder).getUnderlyingResources();
- assertEquals(deletemeFolder.length==1,true);
+ IResource[] aDeletemeFolder = ((IVirtualResource)deletemeVirtualFolder).getUnderlyingResources();
+ assertEquals(aDeletemeFolder.length==1,true);
}
public void testGetVirtualComponentFromResource() {
- IResource deletemeFolder = ((IVirtualResource)deletemeVirtualFolder).getUnderlyingResources()[0];
- IVirtualComponent comp = (IVirtualComponent)deletemeFolder.getAdapter(IVirtualComponent.class);
+ IResource aDeletemeFolder = ((IVirtualResource)deletemeVirtualFolder).getUnderlyingResources()[0];
+ IVirtualComponent comp = (IVirtualComponent)aDeletemeFolder.getAdapter(IVirtualComponent.class);
assertEquals(comp.getName(),TestWorkspace.PROJECT_NAME);
}
public void testGetUnderlyingFolder() {
- IFolder deletemeFolder = deletemeVirtualFolder.getUnderlyingFolder();
- assertNotNull(deletemeFolder);
+ IContainer aDeletemeFolder = deletemeVirtualFolder.getUnderlyingFolder();
+ assertNotNull(aDeletemeFolder);
}
public void testGetUnderlyingResource() {
- IResource deletemeFolder = ((IVirtualResource)deletemeVirtualFolder).getUnderlyingResource();
- assertNotNull(deletemeFolder);
+ IResource aDeletemeFolder = ((IVirtualResource)deletemeVirtualFolder).getUnderlyingResource();
+ assertNotNull(aDeletemeFolder);
}
public void testGetWorkspaceRelativePath() {
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/virtualpath/tests/IVirtualFolderAPITest.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/virtualpath/tests/IVirtualFolderAPITest.java
index c0bc936..7dfab72 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/virtualpath/tests/IVirtualFolderAPITest.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/virtualpath/tests/IVirtualFolderAPITest.java
@@ -14,7 +14,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -26,7 +26,7 @@
public static final String TEST_FOLDER_NAME = "WEB-INF"; //$NON-NLS-1$
- public static final IPath WEBCONTENT_FOLDER_REAL_PATH = new Path("/WebModule1/WebContent/");
+ public static final IPath WEBCONTENT_FOLDER_REAL_PATH = new Path("/WebModule1/WebContent/"); //$NON-NLS-1$
public static final IPath WEBINF_FOLDER_REAL_PATH = WEBCONTENT_FOLDER_REAL_PATH.append(TEST_FOLDER_NAME); //$NON-NLS-1$ //$NON-NLS-2$
public static final IPath WEBINF_FOLDER_RUNTIME_PATH = new Path("/"+TEST_FOLDER_NAME); //$NON-NLS-1$
@@ -51,7 +51,7 @@
//virtualParent = ComponentCore.createComponent(TestWorkspace.TEST_PROJECT, TestWorkspace.WEB_MODULE_1_NAME);
- IVirtualComponent component = ComponentCore.createComponent(TestWorkspace.TEST_PROJECT, TestWorkspace.WEB_MODULE_1_NAME);
+ IVirtualComponent component = ComponentCore.createComponent(TestWorkspace.TEST_PROJECT);
IVirtualFolder rootFolder = component.getRootFolder();
virtualParent = rootFolder;
@@ -76,21 +76,21 @@
public void testGetUnderlyingFolder() {
- IFolder underlyingResource = ((IVirtualFolder)targetExistingVirtualResource).getUnderlyingFolder();
- IFolder expectedPlatformResource = TestWorkspace.TEST_PROJECT.getFolder(WEBINF_FOLDER_RUNTIME_PATH);
- assertEquals("The underlying resource should be " +expectedPlatformResource.getProjectRelativePath(), expectedPlatformResource, underlyingResource);
+ IContainer underlyingResource = ((IVirtualFolder)targetExistingVirtualResource).getUnderlyingFolder();
+ IContainer expectedPlatformResource = TestWorkspace.TEST_PROJECT.getFolder(WEBINF_FOLDER_RUNTIME_PATH);
+ assertEquals("The underlying resource should be " +expectedPlatformResource.getProjectRelativePath(), expectedPlatformResource, underlyingResource); //$NON-NLS-1$
}
public void testGetUnderlyingFolders() {
- IFolder[] underlyingResources = ((IVirtualFolder)targetVirtualContainer).getUnderlyingFolders();
- assertEquals("There should be two folders mapped to root", 2, underlyingResources.length);
+ IContainer[] underlyingResources = ((IVirtualFolder)targetVirtualContainer).getUnderlyingFolders();
+ assertEquals("There should be two folders mapped to root", 2, underlyingResources.length); //$NON-NLS-1$
Set underlyingResourcesSet = new HashSet(Arrays.asList(underlyingResources));
Set expectedUnderlyingResourcesSet = new HashSet();
expectedUnderlyingResourcesSet.add(TestWorkspace.TEST_PROJECT.getFolder(TESTDATA_FOLDER_REAL_PATH));
expectedUnderlyingResourcesSet.add(TestWorkspace.TEST_PROJECT.getFolder(WEBCONTENT_FOLDER_REAL_PATH));
- assertEquals("Expecting two folders mapped to root." +expectedUnderlyingResourcesSet, underlyingResourcesSet);
+ assertEquals("Expecting two folders mapped to root." +expectedUnderlyingResourcesSet, underlyingResourcesSet); //$NON-NLS-1$
}