Author: vrubezhny Date: 2008-06-25 14:28:11 -0400 (Wed, 25 Jun 2008) New Revision: 8945 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java Log: JUnit TestCases are fixed for New Operations in Seam 2.0 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2008-06-25 17:28:15 UTC (rev 8944) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2008-06-25 18:28:11 UTC (rev 8945) @@ -10,17 +10,12 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.test.wizard; -import java.io.File; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.TestCase; - import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IOperationHistory; import org.eclipse.core.commands.operations.IUndoContext; @@ -35,26 +30,19 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.WorkspaceModifyOperation; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -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; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; -import org.jboss.tools.seam.core.SeamProjectsSet; -import org.jboss.tools.seam.core.project.facet.SeamRuntime; -import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.jboss.tools.seam.core.project.facet.SeamVersion; import org.jboss.tools.seam.core.test.project.facet.AbstractSeamFacetTest; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; -import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider; import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; import org.jboss.tools.seam.ui.wizard.IParameter; import org.jboss.tools.seam.ui.wizard.SeamWizardFactory; @@ -162,7 +150,7 @@ } return null; } - +/* protected File getSeamHomeFolder(String seamRTName) { File seamHome = null; if (AbstractSeamFacetTest.SEAM_1_2_0.equals(seamRTName)) { @@ -174,7 +162,7 @@ return seamHome; } - +*/ protected SeamVersion getSeamRTVersion(String seamRTName) { if (AbstractSeamFacetTest.SEAM_1_2_0.equals(seamRTName)) { return SeamVersion.SEAM_1_2; Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2008-06-25 17:28:15 UTC (rev 8944) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2008-06-25 18:28:11 UTC (rev 8945) @@ -48,7 +48,7 @@ protected void setUp() throws Exception { super.setUp(); - File folder = getSeamHomeFolder(getSeamRTName()); + File folder = getSeamHomeFolder(); assertNotNull("An error occured while getting the SEAM HOME folder for: " + getSeamRTName(), folder); SeamRuntimeManager.getInstance().addRuntime(getSeamRTName(), folder.getAbsolutePath(), getSeamRTVersion(getSeamRTName()), true); Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2008-06-25 17:28:15 UTC (rev 8944) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2008-06-25 18:28:11 UTC (rev 8945) @@ -43,7 +43,7 @@ protected void setUp() throws Exception { super.setUp(); - File folder = getSeamHomeFolder(getSeamRTName()); + File folder = getSeamHomeFolder(); assertNotNull("An error occured while getting the SEAM HOME folder for: " + getSeamRTName(), folder); SeamRuntimeManager.getInstance().addRuntime(getSeamRTName(), folder.getAbsolutePath(), getSeamRTVersion(getSeamRTName()), true); Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java 2008-06-25 17:28:15 UTC (rev 8944) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java 2008-06-25 18:28:11 UTC (rev 8945) @@ -10,14 +10,42 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.test.wizard; +import java.io.File; + +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; +import org.jboss.tools.seam.core.project.facet.SeamVersion; + public class Seam20EARNewOperationTest extends Seam12EARNewOperationTest { + private IProjectFacet seam2Facet; + private IProjectFacetVersion seam2FacetVersion; + public Seam20EARNewOperationTest(String name) { super(name); // TODO Auto-generated constructor stub } @Override + protected void setUp() throws Exception { + assertSeamHomeAvailable(); + + seam2Facet = ProjectFacetsManager.getProjectFacet("jst.seam"); + seam2FacetVersion = seam2Facet.getVersion("2.0"); + + + File folder = getSeamHomeFolder(); + + SeamRuntimeManager.getInstance().addRuntime(SEAM_2_0_0, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true); + SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_2_0_0); + + super.setUp(); + } + + + @Override void setUpSeamProjects() { setUpSeamProject(earProject); } @@ -26,4 +54,16 @@ protected String getSeamRTName() { return AbstractSeamNewOperationTest.SEAM_2_0_0; } + + @Override + protected File getSeamHomeFolder() { + return new File(System.getProperty(SEAM_2_0_HOME), + "E:/Java/JBoss/Seam/jboss-seam-2.0.1.GA"); + } + + @Override + protected IProjectFacetVersion getSeamFacetVersion() { + return seam2FacetVersion; + } + } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java 2008-06-25 17:28:15 UTC (rev 8944) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java 2008-06-25 18:28:11 UTC (rev 8945) @@ -10,13 +10,41 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.test.wizard; +import java.io.File; + +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; +import org.jboss.tools.seam.core.project.facet.SeamVersion; + public class Seam20WARNewOperationTest extends Seam12WARNewOperationTest { + + private IProjectFacet seam2Facet; + private IProjectFacetVersion seam2FacetVersion; + public Seam20WARNewOperationTest(String name) { super(name); // TODO Auto-generated constructor stub } @Override + protected void setUp() throws Exception { + assertSeamHomeAvailable(); + + seam2Facet = ProjectFacetsManager.getProjectFacet("jst.seam"); + seam2FacetVersion = seam2Facet.getVersion("2.0"); + + + File folder = getSeamHomeFolder(); + + SeamRuntimeManager.getInstance().addRuntime(SEAM_2_0_0, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true); + SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_2_0_0); + + super.setUp(); + } + + @Override void setUpSeamProjects() { setUpSeamProject(warProject); } @@ -25,4 +53,16 @@ protected String getSeamRTName() { return AbstractSeamNewOperationTest.SEAM_2_0_0; } + + @Override + protected File getSeamHomeFolder() { + return new File(System.getProperty(SEAM_2_0_HOME), + "E:/Java/JBoss/Seam/jboss-seam-2.0.1.GA"); + } + + @Override + protected IProjectFacetVersion getSeamFacetVersion() { + return seam2FacetVersion; + } + }