[313421] Fixes Web 3.0 Annotation Tests to use java facet version 6 instead of 5. Added fix for wrong ListenerAnnotation.
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractTest.java index 415925a..468233f 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractTest.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractTest.java
@@ -297,16 +297,16 @@ } public static IFacetedProject createWebProject(String projectName) throws Exception { - return createWebProject(projectName, IJ2EEFacetConstants.DYNAMIC_WEB_25); + return createWebProject(projectName, IJ2EEFacetConstants.DYNAMIC_WEB_25, JavaFacetUtils.JAVA_50); } - public static IFacetedProject createWebProject(String projectName, Object web_version) throws Exception { + public static IFacetedProject createWebProject(String projectName, Object web_version, IProjectFacetVersion java_version) throws Exception { IDataModel dm = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider()); dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName); //$NON-NLS-1$ FacetDataModelMap facetDataModelMap = (FacetDataModelMap) dm .getProperty("IFacetProjectCreationDataModelProperties.FACET_DM_MAP"); IDataModel javaFacetDataModel = facetDataModelMap.getFacetDataModel(J2EEProjectUtilities.JAVA); - javaFacetDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaFacetUtils.JAVA_50); + javaFacetDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION, java_version); IDataModel ejbFacetDataModel = facetDataModelMap.getFacetDataModel(IJ2EEFacetConstants.DYNAMIC_WEB); ejbFacetDataModel.setProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, true); ejbFacetDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION, web_version);
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/web/tests/Web3AnnotationReaderTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/web/tests/Web3AnnotationReaderTest.java index dfbb93a..7d27643 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/web/tests/Web3AnnotationReaderTest.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/web/tests/Web3AnnotationReaderTest.java
@@ -23,6 +23,7 @@ import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jst.common.project.facet.JavaFacetUtils; import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.jst.javaee.core.RunAs; import org.eclipse.jst.javaee.core.SecurityRole; @@ -60,7 +61,7 @@ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(Web3AnnotationReaderTest.class.getSimpleName()); if (!project.exists()) { - IFacetedProject facetedProject = AbstractTest.createWebProject(Web3AnnotationReaderTest.class.getSimpleName(), IJ2EEFacetConstants.DYNAMIC_WEB_30); + IFacetedProject facetedProject = AbstractTest.createWebProject(Web3AnnotationReaderTest.class.getSimpleName(), IJ2EEFacetConstants.DYNAMIC_WEB_30, JavaFacetUtils.JAVA_60); createProjectContent(facetedProject.getProject()); } } @@ -193,7 +194,7 @@ // @Tets public void testListener() throws Exception { final String content = "package com.sap;" + "import javax.annotation.Resource;import javax.ejb.EJB;" - + "@WebServletContextListener public class testListener {" + + "@WebListener public class testListener {" + "@EJB private Comparable comp; @EJB public void setComparable(Comparable comp){};" + "@Resource private Comparable comp2; @Resource public void setComparable2(Comparable comp){} }"; IFile file = facetedProject.getProject().getFile("src/com/sap/testListener.java"); @@ -280,7 +281,7 @@ + " shareable = false, type = java.lang.Comparable.class, " + " authenticationType = AuthenticationType.APPLICATION, description = \"description\")," + "@Resource(name = \"withDefaults\", type = java.lang.Comparable.class), @Resource(name = \"invalidNoType\") })" - + "@WebServletContextListener public class testResourcesOnListener {}"; + + "@WebListener public class testResourcesOnListener {}"; IFile file = facetedProject.getProject().getFile("src/com/sap/testResourcesOnListener.java"); saveFileAndUpdate(file, content);