[jbosstools-commits] JBoss Tools SVN: r6996 - in trunk: seam/tests/org.jboss.tools.seam.core.test/projects and 13 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Mar 18 15:13:19 EDT 2008
Author: akazakov
Date: 2008-03-18 15:13:19 -0400 (Tue, 18 Mar 2008)
New Revision: 6996
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.classpath
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.project
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.settings/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.settings/org.jboss.tools.seam.core.prefs
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/bin/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/src/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/src/ejbdemo/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.classpath
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.project
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.settings/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.settings/org.jboss.tools.seam.core.prefs
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/bin/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/src/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/src/testdemo/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.classpath
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.project
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.settings/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.settings/org.jboss.tools.seam.core.prefs
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/WebContent/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/bin/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/src/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/src/wardemo/
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/
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/SeamRefactoringAllTests.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.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/SeamEARTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1919 Added JUnitTests
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-18 17:51:50 UTC (rev 6995)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-18 19:13:19 UTC (rev 6996)
@@ -633,6 +633,9 @@
getValue(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER));
prefs.put(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER,
getValue(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER));
+ prefs.put(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER,
+ getValue(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER));
+
try {
prefs.flush();
} catch (BackingStoreException e) {
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.classpath 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.project 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>RefactoringTestProject-ejb</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.seam.core.seambuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.seam.core.seamnature</nature>
+ </natures>
+</projectDescription>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.settings/org.jboss.tools.seam.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.settings/org.jboss.tools.seam.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-ejb/.settings/org.jboss.tools.seam.core.prefs 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,3 @@
+#Tue Mar 18 20:53:15 MSK 2008
+eclipse.preferences.version=1
+seam.parent.project=RefactoringTestProject-war
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.classpath 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.project 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>RefactoringTestProject-test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.seam.core.seambuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.seam.core.seamnature</nature>
+ </natures>
+</projectDescription>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.settings/org.jboss.tools.seam.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.settings/org.jboss.tools.seam.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-test/.settings/org.jboss.tools.seam.core.prefs 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,3 @@
+#Tue Mar 18 20:59:12 MSK 2008
+eclipse.preferences.version=1
+seam.parent.project=RefactoringTestProject-war
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.classpath 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.project 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>RefactoringTestProject-war</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.seam.core.seambuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.seam.core.seamnature</nature>
+ </natures>
+</projectDescription>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.settings/org.jboss.tools.seam.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.settings/org.jboss.tools.seam.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/RefactoringTestProject-war/.settings/org.jboss.tools.seam.core.prefs 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,16 @@
+#Tue Mar 18 20:57:26 MSK 2008
+action.package=ejbdemo
+action.sources=/RefactoringTestProject-ejb/src
+eclipse.preferences.version=1
+model.package=wardemo
+model.sources=/RefactoringTestProject-war/src
+seam.ejb.project=RefactoringTestProject-ejb
+seam.project.connection.profile=DefaultDS
+seam.project.deployment.type=ear
+seam.project.settings.version=1.1
+seam.project.web.root.folder=/RefactoringTestProject-war/WebContent
+seam.runtime.name=jboss-seam-2.0.0.GA
+seam.test.creating=true
+seam.test.project=RefactoringTestProject-test
+test.package=testdemo
+test.sources=/RefactoringTestProject-test/src
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-03-18 17:51:50 UTC (rev 6995)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2008-03-18 19:13:19 UTC (rev 6996)
@@ -16,6 +16,8 @@
import org.jboss.tools.seam.core.test.project.facet.SeamFacetInstallDelegateTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeManagerTest;
+import org.jboss.tools.seam.core.test.refactoring.SeamRefactoringAllTests;
+
/**
* @author V.Kabanovich
*
@@ -34,10 +36,11 @@
suite.addTestSuite(SeamRuntimeManagerTest.class);
suite.addTestSuite(SeamFacetInstallDelegateTest.class);
suite.addTest(SeamValidatorsAllTests.suite());
+ suite.addTest(SeamRefactoringAllTests.suite());
// Seam 2 tests can't run on hudson for now ;(
//suite.addTestSuite(Seam2FacetInstallDelegateTest.class);
-
+
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/SeamEARTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-03-18 17:51:50 UTC (rev 6995)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-03-18 19:13:19 UTC (rev 6996)
@@ -87,27 +87,4 @@
assertNotNull("War project must see component 'authenticator' declared in ejb project", c);
}
-
- public void testRenameProject() throws CoreException {
- getSeamProject(projectWAR);
- ISeamProject seamProjectEJB = getSeamProject(projectEJB);
-
- String parentName = seamProjectEJB.getParentProjectName();
-
- RenameSupport support = RenameSupport.create(JavaCore.create(projectWAR), "newName", RenameSupport.UPDATE_REFERENCES);
-
- Shell parent = WorkbenchUtils.getActiveShell();
- IWorkbenchWindow context = WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow();
- try {
- support.perform(parent, context);
- } catch (InterruptedException e) {
- JUnitUtils.fail("Rename failed", e);
- } catch (InvocationTargetException e) {
- JUnitUtils.fail("Rename failed", e);
- }
- String newParentName = seamProjectEJB.getParentProjectName();
- System.out.println(parentName);
- System.out.println(newParentName);
- assertTrue("", "newName".equals(newParentName));
- }
}
\ No newline at end of file
Added: 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 (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,109 @@
+ /*******************************************************************************
+ * 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.refactoring;
+
+import java.lang.reflect.InvocationTargetException;
+
+import junit.framework.TestCase;
+
+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.preferences.IEclipsePreferences;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.ui.refactoring.RenameSupport;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.jboss.tools.seam.core.ISeamProject;
+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.WorkbenchUtils;
+import org.jboss.tools.test.util.xpl.EditorTestHelper;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class SeamPropertyRefactoringTest extends TestCase {
+ IProject warProject;
+ IProject ejbProject;
+ IProject testProject;
+ ISeamProject seamWarProject;
+ ISeamProject seamEjbProject;
+ ISeamProject seamTestProject;
+
+ public SeamPropertyRefactoringTest() {
+ super("Seam Property Refactoring Tests");
+ }
+
+ protected void setUp() throws Exception {
+ if(warProject==null) {
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("RefactoringTestProject-war");
+ assertNotNull("Can't load RefactoringTestProject-war", project);
+ warProject = project.getProject();
+ warProject.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ EditorTestHelper.joinBackgroundActivities();
+ }
+
+ if(ejbProject==null) {
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("RefactoringTestProject-ejb");
+ assertNotNull("Can't load RefactoringTestProject-ejb", project);
+ ejbProject = project.getProject();
+ ejbProject.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ EditorTestHelper.joinBackgroundActivities();
+ }
+
+ if(testProject==null) {
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("RefactoringTestProject-test");
+ assertNotNull("Can't load RefactoringTestProject-test", project);
+ testProject = project.getProject();
+ testProject.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ EditorTestHelper.joinBackgroundActivities();
+ }
+
+ if(seamWarProject==null) {
+ seamWarProject = SeamCorePlugin.getSeamProject(warProject, true);
+ assertNotNull("Seam WAR project is null", seamWarProject);
+ EditorTestHelper.joinBackgroundActivities();
+ }
+
+ if(seamEjbProject==null) {
+ seamEjbProject = SeamCorePlugin.getSeamProject(ejbProject, true);
+ assertNotNull("Seam EJB project is null", seamEjbProject);
+ EditorTestHelper.joinBackgroundActivities();
+ }
+
+ if(seamTestProject==null) {
+ seamTestProject = SeamCorePlugin.getSeamProject(testProject, true);
+ assertNotNull("Seam test project is null", seamTestProject);
+ EditorTestHelper.joinBackgroundActivities();
+ }
+ }
+
+ public void testWarProjectRename() throws CoreException {
+ RenameSupport support = RenameSupport.create(JavaCore.create(warProject), "NewWarProjectName", RenameSupport.UPDATE_REFERENCES);
+
+ Shell parent = WorkbenchUtils.getActiveShell();
+ IWorkbenchWindow context = WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow();
+ try {
+ support.perform(parent, context);
+ } catch (InterruptedException e) {
+ JUnitUtils.fail("Rename failed", e);
+ } catch (InvocationTargetException e) {
+ JUnitUtils.fail("Rename failed", e);
+ }
+ EditorTestHelper.joinBackgroundActivities();
+ String newParentName = seamEjbProject.getParentProjectName();
+ assertEquals("NewWarProjectName", newParentName);
+ }
+}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java 2008-03-18 19:13:19 UTC (rev 6996)
@@ -0,0 +1,31 @@
+ /*******************************************************************************
+ * 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.refactoring;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class SeamRefactoringAllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamPropertyRefactoringTest.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.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java 2008-03-18 17:51:50 UTC (rev 6995)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java 2008-03-18 19:13:19 UTC (rev 6996)
@@ -125,5 +125,6 @@
assertEquals("Test project property is not set", pref.get(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, ""), PROJECT_NAME);
assertEquals("Test package name property is not set", pref.get(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, ""), TEST_PACKAGE_NAME);
assertEquals("Test source folder property is not set", pref.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, ""), "/" + PROJECT_NAME + "/src");
+ assertEquals("View folder property is not set", pref.get(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, ""), "/" + PROJECT_NAME);
}
}
\ No newline at end of file
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-03-18 17:51:50 UTC (rev 6995)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-03-18 19:13:19 UTC (rev 6996)
@@ -10,52 +10,63 @@
******************************************************************************/
package org.jboss.tools.test.util;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
import org.eclipse.core.resources.IProject;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
/**
* @author eskimo
*
*/
public class ProjectImportTestSetup extends TestSetup {
-
- private String bundleName = "";
- private String projectPath = "";
- private String projectName = "";
-
+
+ private String bundleName;
+ private String[] projectPaths;
+ private String[] projectNames;
+
/**
* @param test
*/
- public ProjectImportTestSetup(Test test,
- String bundleName, String projectPath, String projectName) {
+ public ProjectImportTestSetup(Test test, String bundleName, String projectPath, String projectName) {
super(test);
this.bundleName = bundleName;
- this.projectPath = projectPath;
- this.projectName = projectName;
+ this.projectPaths = new String[]{projectPath};
+ this.projectNames = new String[]{projectName};
}
+ public ProjectImportTestSetup(Test test, String bundleName, String[] projectPaths, String[] projectNames) {
+ super(test);
+ this.bundleName = bundleName;
+ this.projectPaths = projectPaths;
+ this.projectNames = projectNames;
+ }
+
public IProject importProject() throws Exception {
- IProject importedPrj = null;
- EditorTestHelper.joinBackgroundActivities();
- importedPrj = (IProject)ResourcesUtils.importProject(bundleName, projectPath);
- EditorTestHelper.joinBackgroundActivities();
- return importedPrj;
+ return importProjects()[0];
+ }
+
+ public IProject[] importProjects() throws Exception {
+ IProject[] projects = new IProject[projectPaths.length];
+ for (int i = 0; i < projectPaths.length; i++) {
+ EditorTestHelper.joinBackgroundActivities();
+ projects[i] = (IProject)ResourcesUtils.importProject(bundleName, projectPaths[i]);
+ EditorTestHelper.joinBackgroundActivities();
+ }
+ return projects;
}
@Override
protected void setUp() throws Exception {
- importProject();
+ importProjects();
}
@Override
protected void tearDown() throws Exception {
- ResourcesUtils.deleteProject(projectName);
- EditorTestHelper.joinBackgroundActivities();
+ for (int i = 0; i < projectNames.length; i++) {
+ ResourcesUtils.deleteProject(projectNames[i]);
+ EditorTestHelper.joinBackgroundActivities();
+ }
}
-
-
-
-}
+}
\ No newline at end of file
More information about the jbosstools-commits
mailing list