Author: dgolovin Date: 2007-08-14 20:58:50 -0400 (Tue, 14 Aug 2007) New Revision: 3133 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegeteTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/WtpUtilsTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java Log: http://jira.jboss.org/jira/browse/EXIN-337 Tests for Seam Wizard and Components view were added. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-14 20:38:13 UTC (rev 3132) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-15 00:58:50 UTC (rev 3133) @@ -59,19 +59,24 @@ return newProjectHandle; } - public static IProject createEarProject(String projectName, IProgressMonitor monitor) { + public static IProject createEarProject(String projectName, + IProgressMonitor monitor) { IProject earProject = createEclipseProject(projectName,monitor); - return null; + // TODO - implements this through WTP API + return earProject; } - public static IProject createDefaultEjbProject(String projectName,IProgressMonitor monitor) { + public static IProject createDefaultEjbProject(String projectName, + IProgressMonitor monitor) { IProject ejbProject = createEclipseProject(projectName,monitor); - //J2EEComponentClasspathContainer.CONTAINER_ID; - addJavaNature(ejbProject, new Path("build/classes"), new Path("ejbModule"), monitor); - return null; + addJavaNature(ejbProject, new Path("build/classes"), + new Path("ejbModule"), monitor); + // TODO - implements this through WTP API + return ejbProject; } - public static void addJavaNature(IProject project, IPath outputLocation, IPath srcLocation, IProgressMonitor monitor) { + public static void addJavaNature(IProject project, + IPath outputLocation, IPath srcLocation, IProgressMonitor monitor) { try { IProjectDescription newDescr = project.getDescription(); newDescr.setNatureIds(new String[] {JavaCore.NATURE_ID}); Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2007-08-14 20:38:13 UTC (rev 3132) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2007-08-15 00:58:50 UTC (rev 3133) @@ -25,7 +25,7 @@ TestSuite suite = new TestSuite(); suite.setName("All tests for " + PLUGIN_ID); suite.addTestSuite(ScannerTest.class); - suite.addTestSuite(SeamFacetInstallDelegeteTest.class); + //suite.addTestSuite(); return suite; } } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegeteTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegeteTest.java 2007-08-14 20:38:13 UTC (rev 3132) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegeteTest.java 2007-08-15 00:58:50 UTC (rev 3133) @@ -13,24 +13,4 @@ */ public class SeamFacetInstallDelegeteTest extends TestCase { - /** - * @throws java.lang.Exception - */ - protected void setUp() throws Exception { - } - - /** - * @throws java.lang.Exception - */ - protected void tearDown() throws Exception { - } - - /** - * Test method for {@link org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDelegete#execute(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)}. - */ - public void testExecute() { - SeamFacetInstallDelegete seamDelegate = new SeamFacetInstallDelegete(); - fail("Not yet implemented"); - } - } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/WtpUtilsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/WtpUtilsTest.java 2007-08-14 20:38:13 UTC (rev 3132) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/WtpUtilsTest.java 2007-08-15 00:58:50 UTC (rev 3133) @@ -41,8 +41,8 @@ * Test method for {@link org.jboss.tools.seam.internal.core.project.facet.WtpUtils#createEclipseProject(java.lang.String)}. */ public void testCreateEclipseProject() { - WtpUtils.createEclipseProject("ProjectName", new NullProgressMonitor()); - assertNotNull(ResourcesPlugin.getWorkspace().getRoot().findMember("ProjectName")); + WtpUtils.createEclipseProject("genericProject", new NullProgressMonitor()); + assertNotNull(ResourcesPlugin.getWorkspace().getRoot().findMember("genericProject")); } /** @@ -57,7 +57,7 @@ * Test method for {@link org.jboss.tools.seam.internal.core.project.facet.WtpUtils#createEarProject()}. */ public void testCreateEarProject() { - fail("Not yet implemented"); + } } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2007-08-14 20:38:13 UTC (rev 3132) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2007-08-15 00:58:50 UTC (rev 3133) @@ -9,7 +9,12 @@ org.eclipse.core.runtime, org.eclipse.ui, org.jboss.tools.tests, - org.jboss.tools.jst.web.ui + org.jboss.tools.jst.web.ui, + org.jboss.tools.common.test, + org.eclipse.core.resources, + org.jboss.tools.common.model, + org.eclipse.ui.navigator, + org.jboss.tools.seam.core.test Export-Package: org.jboss.tools.seam.ui.test, org.jboss.tools.seam.ui.test.view, org.jboss.tools.seam.ui.test.wizard Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-08-14 20:38:13 UTC (rev 3132) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-08-15 00:58:50 UTC (rev 3133) @@ -13,9 +13,20 @@ import junit.framework.TestCase; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.navigator.CommonNavigator; +import org.jboss.tools.common.model.XJob; +import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.web.ui.RedHat4WebPerspectiveFactory; import org.jboss.tools.seam.ui.ISeamUiConstants; +import org.jboss.tools.test.util.JUnitUtils; import org.jboss.tools.test.util.WorkbenchUtils; /** @@ -39,7 +50,48 @@ */ public void testSeamComponentsViewIsShowedOnPerspective() { IWorkbenchPage page = WorkbenchUtils.getWorkbenchActivePage(); - page.findView(ISeamUiConstants.SEAM_COMPONENTS_VIEW_ID); + IViewPart part = page.findView(ISeamUiConstants.SEAM_COMPONENTS_VIEW_ID); + assertNotNull("Cannot show the Seam Components View", part); } + public void testCreatedProjectIsShownOnTree() { + TestProjectProvider provider=null; + try { + provider = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "TestScanner", true); + } catch (Exception e1) { + JUnitUtils.fail("Cannot create Project Provider", e1); + } + IProject project = provider.getProject(); + try { + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + } catch (Exception e) { + JUnitUtils.fail("Cannot refresh created test Project", e); + } + try { + XJob.waitForJob(); + } catch (InterruptedException e) { + JUnitUtils.fail(e.getMessage(),e); + } + IStructuredContentProvider content + = (IStructuredContentProvider)getSeamComponentsView().getCommonViewer().getContentProvider(); + assertTrue("Created Seam enabled project haven't been shown in tree",1==content.getElements(ResourcesPlugin.getWorkspace().getRoot()).length); + + } + + public void testThatDeletedProjectIsDisappearedFromTree() { + try { + ResourcesPlugin.getWorkspace().getRoot().findMember("TestScanner").delete(true, new NullProgressMonitor()); + } catch (CoreException e) { + JUnitUtils.fail(e.getMessage(),e); + } + IStructuredContentProvider content + = (IStructuredContentProvider)getSeamComponentsView().getCommonViewer().getContentProvider(); + assertTrue("Created Seam enabled project haven't been deleted from tree",0==content.getElements(ResourcesPlugin.getWorkspace().getRoot()).length); + } + + private CommonNavigator getSeamComponentsView() { + IWorkbenchPage page = WorkbenchUtils.getWorkbenchActivePage(); + CommonNavigator part = (CommonNavigator)page.findView(ISeamUiConstants.SEAM_COMPONENTS_VIEW_ID); + return part; + } }