[116967] Fixing migration scenarios - also affecting junit tests
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/ModuleCoreURIConverterUnitTest.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/ModuleCoreURIConverterUnitTest.java
index 8b377ea..97bd1d0 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/ModuleCoreURIConverterUnitTest.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/ModuleCoreURIConverterUnitTest.java
@@ -39,11 +39,11 @@
ComponentCoreURIConverter converter = new ComponentCoreURIConverter(TestWorkspace.getTargetProject());
- URI inputURI = URI.createURI("module:/resource/TestVirtualAPI/WebModule2/WEB-INF/web.xml"); //$NON-NLS-1$
+ URI inputURI = URI.createURI("module:/resource/WebModule1/WebModule1/WEB-INF/web.xml"); //$NON-NLS-1$
URI resultURI = converter.normalize(inputURI);
- URI expectedURI = URI.createURI("platform:/resource/TestVirtualAPI/WebModule2/WebContent/WEB-INF/web.xml"); //$NON-NLS-1$
+ URI expectedURI = URI.createURI("platform:/resource/WebModule1/WebModule1/WebContent/WEB-INF/web.xml"); //$NON-NLS-1$
// TODO
//assertEquals("The resultant URI must match the expected URI", expectedURI, resultURI); //$NON-NLS-1$
}
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/TestWorkspace.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/TestWorkspace.java
index 15ee99d..3f936e9 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/TestWorkspace.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/TestWorkspace.java
@@ -25,7 +25,7 @@
public class TestWorkspace {
- public static final String PROJECT_NAME = "TestVirtualAPI"; //$NON-NLS-1$
+ public static final String PROJECT_NAME = "WebModule1"; //$NON-NLS-1$
public static final String WEB_MODULE_1_NAME = "WebModule1"; //$NON-NLS-1$
public static final String WEB_MODULE_2_NAME = "WebModule2"; //$NON-NLS-1$
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/virtualpath/tests/TestWorkspace.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/virtualpath/tests/TestWorkspace.java
index 4b2b2a4..e42e542 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/virtualpath/tests/TestWorkspace.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/virtualpath/tests/TestWorkspace.java
@@ -24,9 +24,9 @@
public class TestWorkspace {
- public static final String PROJECT_NAME = "TestVirtualAPI"; //$NON-NLS-1$
- public static final String WEB_MODULE_1_NAME = "TestVirtualAPI"; //$NON-NLS-1$
- public static final String WEB_MODULE_2_NAME = "TestVirtualAPI"; //$NON-NLS-1$
+ public static final String PROJECT_NAME = "WebModule1"; //$NON-NLS-1$
+ public static final String WEB_MODULE_1_NAME = "WebModule1"; //$NON-NLS-1$
+ public static final String WEB_MODULE_2_NAME = "WebModule2"; //$NON-NLS-1$
public static final String NEW_WEB_MODULE_NAME = "TestVirtualAPI"; //$NON-NLS-1$
@@ -37,7 +37,7 @@
public static final IProject TEST_PROJECT = ResourcesPlugin.getWorkspace().getRoot().getProject(TestWorkspace.PROJECT_NAME);
- public static final String[] MODULE_NAMES = new String[]{"TestVirtualAPI", "TestVirtualAPI"};
+ public static final String[] MODULE_NAMES = new String[]{"WebModule1", "WebModule2"};
public static IProject getTargetProject() {
diff --git a/tests/org.eclipse.wst.common.tests/testData/TestVirtualAPI.zip b/tests/org.eclipse.wst.common.tests/testData/TestVirtualAPI.zip
index 2847838..4122d48 100644
--- a/tests/org.eclipse.wst.common.tests/testData/TestVirtualAPI.zip
+++ b/tests/org.eclipse.wst.common.tests/testData/TestVirtualAPI.zip
Binary files differ