Author: rob.stryker(a)jboss.com Date: 2010-06-08 07:47:56 -0400 (Tue, 08 Jun 2010) New Revision: 22625 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/project/facet/JBossWSProjectFacetTest.java Log: JBIDE-6345 - two small changes to facets, use constants in test cases Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2010-06-08 11:29:46 UTC (rev 22624) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2010-06-08 11:47:56 UTC (rev 22625) @@ -25,6 +25,7 @@ org.eclipse.jst.j2ee, org.eclipse.text, org.eclipse.jdt.core.manipulation, - org.jboss.tools.common.el.core + org.jboss.tools.common.el.core, + org.eclipse.jst.common.project.facet.core;bundle-version="1.4.1" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2010-06-08 11:29:46 UTC (rev 22624) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2010-06-08 11:47:56 UTC (rev 22625) @@ -4,9 +4,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.List; -import java.util.Set; import junit.framework.TestCase; @@ -19,6 +17,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; @@ -66,7 +65,7 @@ seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam"); seamFacetVersion = seamFacet.getVersion("1.2"); - javaVersion = ProjectFacetsManager.getProjectFacet("jst.java").getVersion("5.0"); + javaVersion = JavaFacet.JAVA_50; dynamicWebVersion = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.5"); javaFacesVersion = ProjectFacetsManager.getProjectFacet("jst.jsf").getVersion("1.2"); Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2010-06-08 11:29:46 UTC (rev 22624) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2010-06-08 11:47:56 UTC (rev 22625) @@ -29,7 +29,8 @@ org.eclipse.jdt.core, org.eclipse.ui.console, org.eclipse.jface.text, - org.jboss.ide.eclipse.as.classpath.core + org.jboss.ide.eclipse.as.classpath.core, + org.eclipse.jst.common.project.facet.core;bundle-version="1.4.1" Bundle-ActivationPolicy: lazy Bundle-ClassPath: ws-core-test.jar Export-Package: org.jboss.tools.ws.core.test, Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/project/facet/JBossWSProjectFacetTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/project/facet/JBossWSProjectFacetTest.java 2010-06-08 11:29:46 UTC (rev 22624) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/project/facet/JBossWSProjectFacetTest.java 2010-06-08 11:47:56 UTC (rev 22625) @@ -6,6 +6,7 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; @@ -29,7 +30,7 @@ } public void testWSFacet() throws CoreException{ - wsProj.installProjectFacet(ProjectFacetsManager.getProjectFacet("jst.java").getVersion("5.0"), null, null); + wsProj.installProjectFacet(JavaFacet.JAVA_50, null, null); wsProj.installProjectFacet(ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.5"), null, null); wsProj.installProjectFacet(wsVersion, null, null); assertTrue(wsProj.hasProjectFacet(wsFacet));