Author: akazakov Date: 2008-04-07 11:20:39 -0400 (Mon, 07 Apr 2008) New Revision: 7385 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 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/SeamValidatorsAllTests.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-1950 Added JUnitTests Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-04-07 14:38:21 UTC (rev 7384) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-04-07 15:20:39 UTC (rev 7385) @@ -273,7 +273,7 @@ </validator> </extension> - <!--extension + <extension point="org.eclipse.wst.validation.validator" id="SeamProjectPropertyValidator" name="Seam Project Property Validator"> @@ -288,7 +288,7 @@ fullBuild="true" /> </validator> - </extension--> + </extension> <extension id="seamProblem" 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 2008-04-07 14:38:21 UTC (rev 7384) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2008-04-07 15:20:39 UTC (rev 7385) @@ -28,15 +28,15 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.setName("All tests for " + PLUGIN_ID); - suite.addTestSuite(ScannerTest.class); - suite.addTestSuite(SerializationTest.class); - suite.addTestSuite(SeamBigProjectTest.class); - suite.addTestSuite(SeamEARTest.class); - suite.addTestSuite(SeamRuntimeListConverterTest.class); - suite.addTestSuite(SeamRuntimeManagerTest.class); - suite.addTestSuite(SeamFacetInstallDelegateTest.class); +// suite.addTestSuite(ScannerTest.class); +// suite.addTestSuite(SerializationTest.class); +// suite.addTestSuite(SeamBigProjectTest.class); +// suite.addTestSuite(SeamEARTest.class); +// suite.addTestSuite(SeamRuntimeListConverterTest.class); +// suite.addTestSuite(SeamRuntimeManagerTest.class); +// suite.addTestSuite(SeamFacetInstallDelegateTest.class); suite.addTest(SeamValidatorsAllTests.suite()); - suite.addTest(SeamRefactoringAllTests.suite()); +// suite.addTest(SeamRefactoringAllTests.suite()); // Seam 2 tests can't run on hudson for now ;( //suite.addTestSuite(Seam2FacetInstallDelegateTest.class); Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java 2008-04-07 15:20:39 UTC (rev 7385) @@ -0,0 +1,79 @@ + /******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.core.test; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.test.util.xpl.EditorTestHelper; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * @author Alexey Kazakov + */ +public class SeamProjectPropertyValidatorTest extends AbstractResourceMarkerTest { + + IProject warProject; + IProject ejbProject; + IProject testProject; + + public SeamProjectPropertyValidatorTest() { + super("Seam Project Property Validator Tests"); + } + + protected void setUp() throws Exception { + if(warProject==null) { + warProject = ProjectImportTestSetup.loadProject("RefactoringTestProject-war"); + ejbProject = ProjectImportTestSetup.loadProject("RefactoringTestProject-ejb"); + testProject = ProjectImportTestSetup.loadProject("RefactoringTestProject-test"); + + // Change properties of the seam project + IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(ejbProject); + pref.put(ISeamFacetDataModelProperties.SEAM_PARENT_PROJECT, "invalidParentProjectName"); + pref.flush(); + pref = SeamCorePlugin.getSeamPreferences(testProject); + pref.put(ISeamFacetDataModelProperties.SEAM_PARENT_PROJECT, "invalidParentProjectName"); + pref.flush(); + pref = SeamCorePlugin.getSeamPreferences(warProject); + pref.put(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, "invalidRuntimeName"); + pref.put(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, "invalidEjbProjectName"); + pref.put(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, "invalidWebFolderPath"); + pref.put(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, "invalidModelSrcFolderPath"); + pref.put(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "invalid model package name"); + pref.put(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, "invalidSessionBeanSrcFolderPath"); + pref.put(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "invalid session bean package name"); + pref.put(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, "invalidTestProjectName"); + pref.put(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, "invalidTestSrcFolderPath"); + pref.put(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "invalid test package name"); + pref.put(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "invalidConnectionName"); + pref.flush(); + + // Force validation. + warProject.getFolder("newFolder").create(true, true, null); + ejbProject.getFolder("newFolder").create(true, true, null); + testProject.getFolder("newFolder").create(true, true, null); + + EditorTestHelper.joinBackgroundActivities(); + } + } + + public void testProjectNameValidation() throws CoreException { + IEclipsePreferences pref = SeamCorePlugin.getSeamPreferences(ejbProject); + System.out.println(pref.get(ISeamFacetDataModelProperties.SEAM_PARENT_PROJECT, "---")); + assertMarkerIsCreated(ejbProject, null, "invalidParentProjectName", -1); + assertMarkerIsCreated(testProject, null, "invalidParentProjectName", -1); + assertMarkerIsCreated(warProject, null, "invalidEjbProjectName", -1); + assertMarkerIsCreated(warProject, null, "invalidTestProjectName", -1); + } +} \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java 2008-04-07 14:38:21 UTC (rev 7384) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java 2008-04-07 15:20:39 UTC (rev 7385) @@ -10,21 +10,24 @@ ******************************************************************************/ package org.jboss.tools.seam.core.test; -import org.jboss.tools.test.util.ProjectImportTestSetup; - import junit.framework.Test; import junit.framework.TestSuite; +import org.jboss.tools.test.util.ProjectImportTestSetup; + /** * @author eskimo * */ public class SeamValidatorsAllTests { - + public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamValidatorsTest.class),"org.jboss.tools.seam.core.test","projects/SeamWebWarTestProject","SeamWebWarTestProject")); +// suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamValidatorsTest.class),"org.jboss.tools.seam.core.test","projects/SeamWebWarTestProject","SeamWebWarTestProject")); + suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamProjectPropertyValidatorTest.class), + "org.jboss.tools.seam.core.test", + new String[]{"projects/RefactoringTestProject-war", "projects/RefactoringTestProject-ejb", "projects/RefactoringTestProject-test"}, + new String[]{"RefactoringTestProject-war", "RefactoringTestProject-ejb", "RefactoringTestProject-test"})); return suite; } - -} +} \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-04-07 14:38:21 UTC (rev 7384) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-04-07 15:20:39 UTC (rev 7385) @@ -14,7 +14,6 @@ import java.util.Set; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; @@ -43,6 +42,10 @@ super("Seam Validator Tests"); } + public SeamValidatorsTest(String name) { + super(name); + } + protected void setUp() throws Exception { IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("SeamWebWarTestProject"); if(project == null) { @@ -827,54 +830,6 @@ } } - private int getMarkersNumber(IFile file){ - try{ - IMarker[] markers = file.findMarkers(null, true, IResource.DEPTH_INFINITE); - for(int i=0;i<markers.length;i++){ - System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE, "")); - } - return markers.length; - - }catch(CoreException ex){ - JUnitUtils.fail("Error in getting problem markers", ex); - } - return -1; - } - - private String[] getMarkersMessage(IFile file){ - String[] messages = new String[1]; - messages[0]=""; - try{ - IMarker[] markers = file.findMarkers(null, true, IResource.DEPTH_INFINITE); - messages = new String[markers.length]; - - for(int i=0;i<markers.length;i++){ - System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE, "")); - messages[i] = markers[i].getAttribute(IMarker.MESSAGE, ""); - } - }catch(CoreException ex){ - JUnitUtils.fail("Error in getting problem markers", ex); - } - return messages; - } - - private int[] getMarkersNumbersOfLine(IFile file){ - int[] numbers = new int[1]; - numbers[0]=0; - try{ - IMarker[] markers = file.findMarkers(null, true, IResource.DEPTH_INFINITE); - numbers = new int[markers.length]; - - for(int i=0;i<markers.length;i++){ - System.out.println("Marker line number - "+markers[i].getAttribute(IMarker.LINE_NUMBER, 0)); - numbers[i] = markers[i].getAttribute(IMarker.LINE_NUMBER, 0); - } - }catch(CoreException ex){ - JUnitUtils.fail("Error in getting problem markers", ex); - } - return numbers; - } - private void refreshProject(IProject project){ waitForJob(); } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-04-07 14:38:21 UTC (rev 7384) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-04-07 15:20:39 UTC (rev 7385) @@ -17,7 +17,6 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -54,6 +53,7 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.test.util.JUnitUtils; +import org.jboss.tools.test.util.ProjectImportTestSetup; import org.jboss.tools.test.util.WorkbenchUtils; import org.jboss.tools.test.util.xpl.EditorTestHelper; @@ -89,13 +89,13 @@ protected void setUp() throws Exception { if(warProject==null) { - warProject = loadProject(warProjectName); + warProject = ProjectImportTestSetup.loadProject(warProjectName); } if(ejbProject==null) { - ejbProject = loadProject(ejbProjectName);; + ejbProject = ProjectImportTestSetup.loadProject(ejbProjectName);; } if(testProject==null) { - testProject = loadProject(testProjectName); + testProject = ProjectImportTestSetup.loadProject(testProjectName); } if(seamWarProject==null) { seamWarProject = loadSeamProject(warProject); @@ -108,15 +108,6 @@ } } - private IProject loadProject(String projectName) throws CoreException { - IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember(projectName); - assertNotNull("Can't load " + projectName, project); - IProject result = project.getProject(); - result.build(IncrementalProjectBuilder.FULL_BUILD, null); - EditorTestHelper.joinBackgroundActivities(); - return result; - } - private ISeamProject loadSeamProject(IProject project) throws CoreException { ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true); assertNotNull("Seam project for " + project.getName() + " is null", seamProject);