Author: dmaliarevich Date: 2009-02-23 12:01:26 -0500 (Mon, 23 Feb 2009) New Revision: 13731 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/ Removed: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-3793, resource folder was moves from vpe.test to vpe.ui.test, test suite was updated with import project declaration. Copied: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources (from rev 13675, trunk/vpe/tests/org.jboss.tools.vpe.test/resources) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2009-02-23 17:00:44 UTC (rev 13730) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2009-02-23 17:01:26 UTC (rev 13731) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.test; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.tests.ImportBean; import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest; import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest; @@ -21,11 +25,21 @@ * */ public class VpeUiTests { - + public static final String IMPORT_PROJECT_NAME = "TestProject"; //$NON-NLS-1$ public static Test suite(){ TestSuite suite = new TestSuite("UI Tests for vpe"); //$NON-NLS-1$ suite.addTestSuite(VpeResourcesDialogTest.class); suite.addTestSuite(VpeEditorPreferencesPageTest.class); - return suite; + + /* + * Add projects that will be used in junit tests. + */ + List<ImportBean> projectToImport = new ArrayList<ImportBean>(); + ImportBean importBean = new ImportBean(); + importBean.setImportProjectName(VpeUiTests.IMPORT_PROJECT_NAME); + importBean.setImportProjectPath(VPETestPlugin.getPluginResourcePath()); + projectToImport.add(importBean); + + return new VpeTestSetup(suite, projectToImport); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2009-02-23 17:00:44 UTC (rev 13730) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/dialog/VpeResourcesDialogTest.java 2009-02-23 17:01:26 UTC (rev 13731) @@ -12,70 +12,30 @@ import java.util.Properties; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.swt.widgets.Shell; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryDialog; import org.jboss.tools.common.model.ui.wizards.query.IQueryDialog; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ProjectImportTestSetup; -import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.vpe.resref.VpeResourcesDialog; import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.vpe.ui.test.VpeUiTests; -import junit.framework.TestCase; - -public class VpeResourcesDialogTest extends TestCase { +public class VpeResourcesDialogTest extends VpeTest { - private final String BUNDLE_NAME = "org.jboss.tools.vpe.test"; //$NON-NLS-1$ - private final String PROJECT_PATH = "resources/TestProject"; //$NON-NLS-1$ - private final String PROJECT_NAME = "TestProject"; //$NON-NLS-1$ private final String FILE_NAME = "hello.jsp"; //$NON-NLS-1$ - private IProject project; - - @Override - protected void setUp() throws Exception { - super.setUp(); - project = (IProject) ResourcesPlugin.getWorkspace().getRoot() - .findMember(PROJECT_NAME); - if (project == null) { - ProjectImportTestSetup setup = new ProjectImportTestSetup(this, - BUNDLE_NAME, PROJECT_PATH, PROJECT_NAME); - project = setup.importProject(); - } - this.project = project.getProject(); - - JobUtils.waitForIdle(); + public VpeResourcesDialogTest(String name) { + super(name); } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - try { - JobUtils.waitForIdle(); - if (project != null) { - project.close(new NullProgressMonitor()); - project.delete(true, new NullProgressMonitor()); - project = null; - JobUtils.waitForIdle(); - } - } finally { - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - } - } - public void testVpeResourcesDialogOpen() throws Throwable { - IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME, - PROJECT_NAME); + VpeUiTests.IMPORT_PROJECT_NAME); assertNotNull("Specified file does not exist: fileName = " + FILE_NAME //$NON-NLS-1$ - + "; projectName = " + PROJECT_NAME, file); //$NON-NLS-1$ + + "; projectName = " + VpeUiTests.IMPORT_PROJECT_NAME, file); //$NON-NLS-1$ VpeResourcesDialog dialog = new VpeResourcesDialog(); Properties p = new Properties();