[330516] Fix failures in JUnits org.eclipse.jst.jee.model.tests.JEE6ModelTest and org.eclipse.jst.jee.model.ejb.tests.EjbAnnotationReaderTest
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationReaderTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationReaderTest.java
index 420878c..57d8a66 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationReaderTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationReaderTest.java
@@ -7,7 +7,7 @@
* it only in accordance with the terms of the license agreement you entered
* into with SAP.
*
- * $Id: EjbAnnotationReaderTest.java,v 1.6 2009/08/07 19:43:09 canderson Exp $
+ * $Id: EjbAnnotationReaderTest.java,v 1.7 2010/11/23 14:01:47 jsholl Exp $
***********************************************************************/
package org.eclipse.jst.jee.model.ejb.tests;
@@ -44,6 +44,7 @@
import org.eclipse.jst.jee.model.tests.SynchronousModelChangedListener;
import org.eclipse.jst.jee.model.tests.TestUtils;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.tests.ProjectUtility;
/**
* @author Kiril Mitov k.mitov@sap.com
@@ -114,6 +115,7 @@
@Override
protected void setUp() throws Exception {
+ ProjectUtility.deleteAllProjects();
setUpProject();
super.setUp();
fixture = new EJBAnnotationReader(facetedProject, clientProject);
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java
index 38f9e69..460ec62 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java
@@ -68,6 +68,7 @@
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
@@ -378,6 +379,7 @@
dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
FacetDataModelMap map = (FacetDataModelMap) dataModel
.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
+ map.remove(IModuleConstants.JST_JAVA);
map.add(setupJavaInstallAction(projName,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.EJB_CONTENT_FOLDER)));
dataModel.getDefaultOperation().execute( new NullProgressMonitor(), null);
IProject ejbProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
@@ -403,6 +405,7 @@
dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
FacetDataModelMap map = (FacetDataModelMap) dataModel
.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
+ map.remove(IModuleConstants.JST_JAVA);
map.add(setupJavaInstallAction(projName,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.APP_CLIENT_CONTENT_FOLDER)));
dataModel.getDefaultOperation().execute( new NullProgressMonitor(), null);
IProject webProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
@@ -415,6 +418,9 @@
IProjectFacetVersion facetVersion = facet.getVersion(versionString); //$NON-NLS-1$
addVersionProperties(dataModel, projName, facetVersion,IJ2EEFacetInstallDataModelProperties.JCA);
dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
+ FacetDataModelMap map = (FacetDataModelMap) dataModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
+ map.remove(IModuleConstants.JST_JAVA);
+ map.add(setupJavaInstallAction(projName,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.JCA_CONTENT_FOLDER)));
dataModel.getDefaultOperation().execute( new NullProgressMonitor(), null);
IProject connectorProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
return connectorProj;
@@ -422,8 +428,8 @@
protected IDataModel setupJavaInstallAction(String aProjectName, String srcFolder) {
IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProjectName);
- String jVersion = "6.0";
- dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, jVersion); //$NON-NLS-1$
+ String jVersion = "1.6";
+ dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, jVersion);
dm.setStringProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, srcFolder); //$NON-NLS-1$
return dm;
}
