JBoss Tools SVN: r5581 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-01-10 08:15:28 -0500 (Thu, 10 Jan 2008)
New Revision: 5581
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureAddTest.java
Removed:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1571
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import junit.framework.TestCase;
+
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class CloaseAllEditorsTest extends TestCase {
+
+ public void testCloseAllEditors(){
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ }
+
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/CloaseAllEditorsTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,15 +1,20 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
-import java.util.Enumeration;
-
-import junit.framework.AssertionFailedError;
import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestFailure;
import junit.framework.TestResult;
import junit.framework.TestSuite;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IPackageFragment;
@@ -21,6 +26,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.hibernate.eclipse.console.HibernateConsolePerspectiveFactory;
public class HibernateAllMappingTests extends TestCase {
@@ -38,9 +44,6 @@
super.setUp();
this.project = MappingTestProject.getTestProject();
- //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllPerspectives(false, true);
-
-
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective(
PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId("org.eclipse.ui.resourcePerspective"));
@@ -54,8 +57,14 @@
packageExplorer.selectAndReveal(project.getIJavaProject());
+ PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().setPerspective(
+ PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(HibernateConsolePerspectiveFactory.ID_CONSOLE_PERSPECTIVE));
+
+
waitForJobs();
runTestsAfterSetup();
+ ProjectUtil.createConsoleCFG();
}
private void runTestsAfterSetup() {
@@ -139,16 +148,16 @@
}
public void testEachPackWithTestSet() throws JavaModelException {
- /*if (result.failureCount() > 0 || result.errorCount() > 0){
- // we have failed tests after setup
- fail("One or more setup test failed.");
- }*/
+ /*
+ * (1) All test runs show as one
+ * Comment this and uncomment (2) if you want to see each test run independent
+ */
TestSuite suite = TestSet.getTests();
IPackageFragmentRoot[] roots = project.getIJavaProject().getAllPackageFragmentRoots();
for (int i = 0; i < roots.length; i++) {
if (roots[i].getClass() != PackageFragmentRoot.class) continue;
PackageFragmentRoot packageFragmentRoot = (PackageFragmentRoot) roots[i];
- IJavaElement[] els = packageFragmentRoot.getChildren();//.getCompilationUnits();
+ IJavaElement[] els = packageFragmentRoot.getChildren();
for (int j = 0; j < els.length; j++) {
IJavaElement javaElement = els[j];
if (javaElement instanceof IPackageFragment){
@@ -156,6 +165,12 @@
// use packages only with compilation units
if (pack.getCompilationUnits().length == 0) continue;
+ /*
+ * (2) Each test run shows independent
+ * Comment this and uncomment (1) if you want to see all test runs as one
+ * TestSuite suite = TestSet.getTests();
+ */
+
activePackage = pack;
//==============================
//run all tests for package
@@ -166,10 +181,13 @@
}
//==============================
}
- }
+ waitForJobs();
+ delay(15000);
+ }
+
}
waitForJobs();
- //delay(2000);
+ delay(10000);
}
/**
Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateMappingTests.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,133 +0,0 @@
-package org.hibernate.eclipse.console.test.mappingproject;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.ui.IPackagesViewPart;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-public class HibernateMappingTests extends TestCase {
-
- private MappingTestProject project;
-
- public HibernateMappingTests(String name) {
- super(name);
- }
-
- private TestResult result = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- this.project = MappingTestProject.getTestProject();
-
- //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllPerspectives(false, true);
-
-
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective(
- PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId("org.eclipse.ui.resourcePerspective"));
-
- IPackagesViewPart packageExplorer = null;
- try {
- packageExplorer = (IPackagesViewPart) PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage().showView(JavaUI.ID_PACKAGES);
- } catch (PartInitException e) {
- throw new RuntimeException(e);
- }
-
- packageExplorer.selectAndReveal(project.getIJavaProject());
-
- waitForJobs();
- delay(2000);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#run(junit.framework.TestResult)
- */
- @Override
- public void run(TestResult result) {
- this.result = result;
- super.run(result);
-
- }
-
- public void tearDown() throws Exception {
- waitForJobs();
- this.project.deleteIProject();
- waitForJobs();
- super.tearDown();
- }
-
-
- /**
- * Process UI input but do not return for the specified time interval.
- *
- * @param waitTimeMillis
- * the number of milliseconds
- */
- protected void delay(long waitTimeMillis) {
- Display display = Display.getCurrent();
-
- // If this is the UI thread,
- // then process input.
- if (display != null) {
- long endTimeMillis = System.currentTimeMillis() + waitTimeMillis;
- while (System.currentTimeMillis() < endTimeMillis) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- display.update();
- }
-
- // Otherwise, perform a simple sleep.
- else {
- try {
- Thread.sleep(waitTimeMillis);
- } catch (InterruptedException e) {
- // Ignored.
- }
- }
- }
-
- /**
- * Wait until all background tasks are complete.
- */
- public void waitForJobs() {
- while (Platform.getJobManager().currentJob() != null)
- delay(1000);
- }
-
- protected MappingTestProject getProject() {
- return this.project;
- }
-
- public void testRunTestSet() {
- TestSuite suite = TestSet.getTests();
- //is waytForJob() necessary between each test?
- //suite.run(result);
- for (int i = 0; i < suite.testCount(); i++) {
- Test test = suite.testAt(i);
- test.run(result);
- /*if (result.failureCount() > 0){
- fail("Test " + test.getClass().getName() + " failed.");
- }
- if (result.errorCount() > 0){
- fail("Test " + test.getClass().getName() + " has errors.");
- }*/
- waitForJobs();
- delay(20000);
- }
- if (result.failureCount() > 0){
- fail("One or more test failed.");
- }
- if (result.errorCount() > 0){
- fail("One or more test has error(s).");
- }
- }
-}
-
\ No newline at end of file
Copied: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureAddTest.java (from rev 5484, trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureTest.java)
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureAddTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureAddTest.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.jdt.core.IJavaProject;
+import org.hibernate.eclipse.console.utils.ProjectUtils;
+import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HibernateNatureAddTest extends TestCase {
+ public void testEnableHibernateNature() throws BackingStoreException, CoreException {
+ MappingTestProject project = MappingTestProject.getTestProject();
+ IJavaProject prj = project.getIJavaProject();
+ IScopeContext scope = new ProjectScope(prj.getProject() );
+ //fail("HibernateNatureAdd testfail");
+ Preferences node = scope.getNode("org.hibernate.eclipse.console");
+
+ node.putBoolean("hibernate3.enabled", true );
+ node.put("default.configuration", "testcfg" );
+ node.flush();
+
+ ProjectUtils.addProjectNature(prj.getProject(), "org.hibernate.eclipse.console.hibernateNature", new NullProgressMonitor() );
+ //ProjectUtils.removeProjectNature(prj.getProject(), "org.hibernate.eclipse.console.hibernateNature", new NullProgressMonitor() );
+ }
+}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateNatureRemoveTest.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
import junit.framework.TestCase;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
import java.io.File;
@@ -35,6 +45,8 @@
*/
public class MappingTestProject{
+ public static final String SRC_FOLDER = "src";
+
private static MappingTestProject singleton= null;
private static final Path JRE_CONTAINER = new Path("org.eclipse.jdt.launching.JRE_CONTAINER");
@@ -99,7 +111,7 @@
throw new RuntimeException("Folder " + RESOURCE_PATH + " does not found!");
IPackageFragmentRoot sourceFolder = buildSourceFolder(project, javaProject);
- recursiveCopyFiles(resourceFolder, (IFolder) sourceFolder.getResource());
+ recursiveCopyFiles(resourceFolder, (IFolder) sourceFolder.getResource());
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
}
@@ -185,7 +197,7 @@
private IPackageFragmentRoot buildSourceFolder(IProject project,
IJavaProject javaProject) throws CoreException {
- IFolder folder = project.getFolder("src");
+ IFolder folder = project.getFolder(SRC_FOLDER);
if (!folder.exists()){
folder.create(false, true, null);
IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder);
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
import junit.framework.TestCase;
@@ -17,6 +27,7 @@
/**
* @author Dmitry Geraskov
+ * @deprecated - never used
* just to test that our external Unit tests work right with MappingTestProject
*/
public class OpenJavaEditors extends TestCase {
@@ -40,7 +51,7 @@
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(input, JavaUI.ID_CU_EDITOR );
} catch (PartInitException e) {
fail("Error opening CompilationUnit: " + e.getMessage());
- }
+ }
}
}
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,14 +1,25 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
-import java.util.Iterator;
-
import org.apache.tools.ant.filters.StringInputStream;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
+import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
+import org.hibernate.eclipse.console.wizards.ConsoleConfigurationCreationWizard;
import org.hibernate.mapping.PersistentClass;
/**
@@ -23,9 +34,7 @@
.append("\"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd\">\n");
private static final StringBuilder XML_CFG_START = new StringBuilder("<hibernate-configuration>\n")
- .append("<session-factory>\n")
- .append("<property name=\"hibernate.dialect\">\n")
- .append("org.hibernate.dialect.SQLServerDialect</property>\n");
+ .append("<session-factory>\n");
private static final StringBuilder XML_CFG_END = new StringBuilder("</session-factory>\n")
.append("</hibernate-configuration>\n");
@@ -33,6 +42,8 @@
public static final String CFG_FILE_NAME = "hibernate.cfg.xml";
+ public static final String ConsoleCFGName = "testConfigName";
+
public static void customizeCFGFileForPack(IPackageFragment pack) throws CoreException{
IFolder srcFolder = (IFolder) pack.getParent().getResource();
IFile iFile = srcFolder.getFile(CFG_FILE_NAME);
@@ -77,5 +88,21 @@
return persClass.getEntityName() != null ? persClass.getEntityName() : persClass.getClassName();
}
}
+
+ public static void createConsoleCFG() throws CoreException{
+ new ConsoleConfigurationCreationWizard2().run();
+ }
+
+ private static class ConsoleConfigurationCreationWizard2 extends ConsoleConfigurationCreationWizard{
+
+ public void run() throws CoreException {
+ IPath cfgFilePath = new Path(MappingTestProject.PROJECT_NAME + "/" +
+ MappingTestProject.SRC_FOLDER + "/" + ProjectUtil.CFG_FILE_NAME);
+ createConsoleConfiguration(null, null, ConsoleCFGName, ConsoleConfigurationPreferences.ConfigurationMode.CORE,
+ MappingTestProject.PROJECT_NAME, true, "",
+ null, cfgFilePath, new Path[0], new Path[0], "", "", new NullProgressMonitor());
+ }
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
import junit.framework.TestSuite;
@@ -28,11 +38,12 @@
}
private static void addPackTests(TestSuite suite){
-
+ suite.addTestSuite( OpenSourceFileTest.class );
+ suite.addTestSuite( OpenMappingFileTest.class );
}
private static void addTestsPackTearDown(TestSuite suite){
- //suite.addTestSuite( CloaseAllEditorsTest.class );
+ suite.addTestSuite( CloaseAllEditorsTest.class );
}
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.hibernate.eclipse.console.test.mappingproject;
import junit.framework.TestSuite;
@@ -9,7 +20,7 @@
public class TestSetAfterSetup {
public static TestSuite getTests(){
TestSuite suite = new TestSuite("Test for MappingTestProject" );
- //suite.addTestSuite( HibernateNatureAddTest.class );
+ suite.addTestSuite( HibernateNatureAddTest.class );
//suite.addTestSuite( CreateConsoleConfigTest.class );
return suite;
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
import junit.framework.TestSuite;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java 2008-01-10 13:11:06 UTC (rev 5580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java 2008-01-10 13:15:28 UTC (rev 5581)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
import junit.framework.TestCase;
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5580 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-01-10 08:11:06 -0500 (Thu, 10 Jan 2008)
New Revision: 5580
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1594
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2008-01-10 13:11:06 UTC (rev 5580)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import junit.framework.TestCase;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.KnownConfigurations;
+import org.hibernate.eclipse.console.actions.OpenMappingAction;
+import org.hibernate.eclipse.console.actions.OpenSourceAction;
+import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapter;
+import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter;
+import org.hibernate.mapping.PersistentClass;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class OpenMappingFileTest extends TestCase {
+ public void testOpenMappingFileTest(){
+ KnownConfigurations knownConfigurations = KnownConfigurations.getInstance();
+ final ConsoleConfiguration consCFG = knownConfigurations.find(CreateConsoleConfigTest.ConsoleCFGName);
+ assertNotNull(consCFG);
+ consCFG.reset();
+ Object[] configs = new ConsoleConfigurationWorkbenchAdapter().getChildren(consCFG);
+ assertTrue(configs[0] instanceof Configuration);
+ Object[] persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]);
+ if (persClasses.length > 0){
+ for (int i = 0; i < persClasses.length; i++) {
+ assertTrue(persClasses[0] instanceof PersistentClass);
+ PersistentClass persClass = (PersistentClass) persClasses[i];
+ OpenMappingAction.run(persClass, consCFG);
+ }
+ }
+ //close all editors
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2008-01-10 13:11:06 UTC (rev 5580)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.KnownConfigurations;
+import org.hibernate.console.execution.ExecutionContext;
+import org.hibernate.eclipse.console.actions.OpenFileActionUtils;
+import org.hibernate.eclipse.console.actions.OpenSourceAction;
+import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapter;
+import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter;
+import org.hibernate.mapping.PersistentClass;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class OpenSourceFileTest extends TestCase {
+
+ public void testOpenSourceFileTest(){
+ //fail("test fail");
+ KnownConfigurations knownConfigurations = KnownConfigurations.getInstance();
+ final ConsoleConfiguration consCFG = knownConfigurations.find(CreateConsoleConfigTest.ConsoleCFGName);
+ assertNotNull(consCFG);
+ consCFG.reset();
+ Object[] configs = new ConsoleConfigurationWorkbenchAdapter().getChildren(consCFG);
+ assertTrue(configs[0] instanceof Configuration);
+ Object[] persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]);
+ if (persClasses.length > 0){
+ for (int i = 0; i < persClasses.length; i++) {
+ assertTrue(persClasses[0] instanceof PersistentClass);
+ PersistentClass persClass = (PersistentClass) persClasses[i];
+ new OpenSourceAction().run(persClass, MappingTestProject.getTestProject().getIJavaProject(),
+ ProjectUtil.getPersistentClassName(persClass));
+ }
+ }
+ //close all editors
+ }
+
+
+
+}
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5579 - branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-01-10 08:06:25 -0500 (Thu, 10 Jan 2008)
New Revision: 5579
Modified:
branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java
Log:
new constants added
Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-01-10 13:01:08 UTC (rev 5578)
+++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-01-10 13:06:25 UTC (rev 5579)
@@ -161,4 +161,8 @@
/** HTML_ATTR_VALIGN_MIDDLE_VALUE */
public static final String HTML_ATTR_VALIGN_MIDDLE_VALUE = "middle";
+
+ /** HTML_TYPE_ATTR_BUTTON_VALUE */
+ public static final String HTML_TYPE_ATTR_BUTTON_VALUE = "button";
+
}
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5578 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test: jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-01-10 08:01:08 -0500 (Thu, 10 Jan 2008)
New Revision: 5578
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1562, junit tests was adjusted, was added VpeTest setup class which allows correctly import-remove test project from workspace(only once for each test suite, not for every test case).Some code was refactored.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-01-10 13:01:02 UTC (rev 5577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-01-10 13:01:08 UTC (rev 5578)
@@ -13,9 +13,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import java.util.ArrayList;
+import java.util.List;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1484Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
+import org.jboss.tools.vpe.ui.test.beans.ImportBean;
/**
* Class for testing all RichFaces components
@@ -34,9 +38,15 @@
suite.addTestSuite(JsfJbide1467Test.class);
suite.addTestSuite(JsfJbide1501Test.class);
suite.addTestSuite(JBIDE1484Test.class);
- //cleanUpTests();
// $JUnit-END$
- return suite;
+ //added by Max Areshkau
+ //add here projects which should be imported for junit tests
+ List<ImportBean> projectToImport = new ArrayList<ImportBean>();
+ ImportBean importBean = new ImportBean();
+ importBean.setImportProjectName("jsfTest");
+ importBean.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
+
+ return new VpeTestSetup(suite,projectToImport);
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java 2008-01-10 13:01:02 UTC (rev 5577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java 2008-01-10 13:01:08 UTC (rev 5578)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test;
+import org.eclipse.core.resources.IFile;
+import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
/**
@@ -21,10 +23,11 @@
public class JsfComponentTest extends VpeTest {
// import project name
- private static final String IMPORT_PROJECT_NAME = "jsfTest";
+ public static final String IMPORT_PROJECT_NAME = "jsfTest";
public JsfComponentTest(String name) {
- super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ super(name);
+ setCheckWarning(false);
}
/*
@@ -32,99 +35,99 @@
*/
public void testCommandButton() throws Throwable {
- performTestForJsfComponent("components/commandButton.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/commandButton.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testCommandLink() throws Throwable {
- performTestForJsfComponent("components/commandLink.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/commandLink.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testDataTable() throws Throwable {
- performTestForJsfComponent("components/dataTable.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/dataTable.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testForm() throws Throwable {
- performTestForJsfComponent("components/form.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/form.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testGraphicImage() throws Throwable {
- performTestForJsfComponent("components/graphicImage.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/graphicImage.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testInputHidden() throws Throwable {
- performTestForJsfComponent("components/inputHidden.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/inputHidden.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testInputSecret() throws Throwable {
- performTestForJsfComponent("components/inputSecret.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/inputSecret.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testInputText() throws Throwable {
- performTestForJsfComponent("components/inputText.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/inputText.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testInputTextArea() throws Throwable {
- performTestForJsfComponent("components/inputTextArea.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/inputTextArea.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testMessage() throws Throwable {
- performTestForJsfComponent("components/message.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/message.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testMessages() throws Throwable {
- performTestForJsfComponent("components/messages.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/messages.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testOutputFormat() throws Throwable {
- performTestForJsfComponent("components/outputFormat.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/outputFormat.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testOutputLabel() throws Throwable {
- performTestForJsfComponent("components/outputLabel.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/outputLabel.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testOutputLink() throws Throwable {
- performTestForJsfComponent("components/outputLink.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/outputLink.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testOutputText() throws Throwable {
- performTestForJsfComponent("components/outputText.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/outputText.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testPanelGrid() throws Throwable {
- performTestForJsfComponent("components/panelGrid.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/panelGrid.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testPanelGroup() throws Throwable {
- performTestForJsfComponent("components/panelGroup.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/panelGroup.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectBooleanCheckbox() throws Throwable {
- performTestForJsfComponent("components/selectBooleanCheckbox.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectBooleanCheckbox.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectManyCheckbox() throws Throwable {
- performTestForJsfComponent("components/selectManyCheckbox.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectManyCheckbox.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectManyListbox() throws Throwable {
- performTestForJsfComponent("components/selectManyListbox.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectManyListbox.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectManyMenu() throws Throwable {
- performTestForJsfComponent("components/selectManyMenu.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectManyMenu.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectOneListbox() throws Throwable {
- performTestForJsfComponent("components/selectOneListbox.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectOneListbox.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectOneMenu() throws Throwable {
- performTestForJsfComponent("components/selectOneMenu.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectOneMenu.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectOneRadio() throws Throwable {
- performTestForJsfComponent("components/selectOneRadio.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectOneRadio.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
/*
@@ -132,82 +135,82 @@
*/
public void testActionListener() throws Throwable {
- performTestForJsfComponent("components/actionListener.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/actionListener.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testAttribute() throws Throwable {
- performTestForJsfComponent("components/attribute.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/attribute.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testConvertDateTime() throws Throwable {
- performTestForJsfComponent("components/convertDateTime.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/convertDateTime.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testConvertNumber() throws Throwable {
- performTestForJsfComponent("components/convertNumber.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/convertNumber.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testConverter() throws Throwable {
- performTestForJsfComponent("components/converter.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/converter.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testFacet() throws Throwable {
- performTestForJsfComponent("components/facet.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/facet.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testLoadBundle() throws Throwable {
- performTestForJsfComponent("components/loadBundle.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/loadBundle.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testParam() throws Throwable {
- performTestForJsfComponent("components/param.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/param.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testPhaseListener() throws Throwable {
- performTestForJsfComponent("components/phaseListener.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/phaseListener.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectItem() throws Throwable {
- performTestForJsfComponent("components/selectItem.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectItem.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSelectItems() throws Throwable {
- performTestForJsfComponent("components/selectItems.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/selectItems.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSetPropertyActionListener() throws Throwable {
- performTestForJsfComponent("components/setPropertyActionListener.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/setPropertyActionListener.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testSubview() throws Throwable {
- performTestForJsfComponent("components/subview.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/subview.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testValidateDoubleRange() throws Throwable {
- performTestForJsfComponent("components/validateDoubleRange.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/validateDoubleRange.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testValidateLength() throws Throwable {
- performTestForJsfComponent("components/validateLength.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/validateLength.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testValidateLongRange() throws Throwable {
- performTestForJsfComponent("components/validateLongRange.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/validateLongRange.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testValidator() throws Throwable {
- performTestForJsfComponent("components/validator.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/validator.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testValueChangeListener() throws Throwable {
- performTestForJsfComponent("components/valueChangeListener.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/valueChangeListener.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testVerbatim() throws Throwable {
- performTestForJsfComponent("components/verbatim.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/verbatim.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testView() throws Throwable {
- performTestForJsfComponent("components/view.jsp"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/view.jsp",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-01-10 13:01:02 UTC (rev 5577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-01-10 13:01:08 UTC (rev 5578)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -32,13 +31,13 @@
*/
public class JBIDE1484Test extends VpeTest {
- private static final String IMPORT_PROJECT_NAME = "jsfTest";
+ public static final String IMPORT_PROJECT_NAME = "jsfTest";
private static final String TEST_PAGE_NAME = "JBIDE/1484/JBIDE-1484.jsp";
public JBIDE1484Test(String name) {
- super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ super(name);
}
//test method for JBIDE 1484
@@ -50,7 +49,7 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(
- TEST_PAGE_NAME, getImportProjectName());
+ TEST_PAGE_NAME, IMPORT_PROJECT_NAME);
assertNotNull("Could not open specified file " + file.getFullPath(),
file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-01-10 13:01:02 UTC (rev 5577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-01-10 13:01:08 UTC (rev 5578)
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -40,10 +39,10 @@
// import project name
- private static final String IMPORT_PROJECT_NAME = "jsfTest";
+ public static final String IMPORT_PROJECT_NAME = "jsfTest";
public JsfJbide1467Test(String name) {
- super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ super(name);
}
/*
@@ -71,7 +70,7 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(
- "JBIDE/1467/JBIDE-1467.jsp", getImportProjectName());
+ "JBIDE/1467/JBIDE-1467.jsp", IMPORT_PROJECT_NAME);
assertNotNull("Could not open specified file " + file.getFullPath(),
file);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-01-10 13:01:02 UTC (rev 5577)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-01-10 13:01:08 UTC (rev 5578)
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -35,10 +34,10 @@
*/
public class JsfJbide1501Test extends VpeTest {
- private static final String IMPORT_PROJECT_NAME = "jsfTest";
+ public static final String IMPORT_PROJECT_NAME = "jsfTest";
public JsfJbide1501Test(String name) {
- super(name, IMPORT_PROJECT_NAME, JsfTestPlugin.getPluginResourcePath());
+ super(name);
}
/**
@@ -75,7 +74,7 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(
- "JBIDE/1501/JBIDE-1501_multiple.jsp", getImportProjectName());
+ "JBIDE/1501/JBIDE-1501_multiple.jsp", IMPORT_PROJECT_NAME);
IEditorInput input = new FileEditorInput(file);
@@ -116,7 +115,7 @@
// get test page path
file = (IFile) TestUtil.getComponentPath(
- "JBIDE/1501/JBIDE-1501_size.jsp", getImportProjectName());
+ "JBIDE/1501/JBIDE-1501_size.jsp", IMPORT_PROJECT_NAME);
input = new FileEditorInput(file);
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5577 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-01-10 08:01:02 -0500 (Thu, 10 Jan 2008)
New Revision: 5577
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1562, junit tests was adjusted, was added VpeTest setup class which allows correctly import-remove test project from workspace(only once for each test suite, not for every test case).Some code was refactored.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-10 13:00:56 UTC (rev 5576)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsAllTests.java 2008-01-10 13:01:02 UTC (rev 5577)
@@ -1,5 +1,11 @@
package org.jboss.tools.jsf.vpe.facelets.test;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.vpe.ui.test.VpeTestSetup;
+import org.jboss.tools.vpe.ui.test.beans.ImportBean;
+
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -13,7 +19,12 @@
suite.addTestSuite(FaceletsComponentTest.class);
// $JUnit-END$
- return suite;
+ List<ImportBean> importProjects = new ArrayList<ImportBean>();
+ ImportBean importBean = new ImportBean();
+ importBean.setImportProjectName(FaceletsComponentTest.IMPORT_PROJECT_NAME);
+ importBean.setImportProjectPath(FaceletsTestPlugin.getPluginResourcePath());
+ importProjects.add(importBean);
+ return new VpeTestSetup(suite,importProjects);
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-10 13:00:56 UTC (rev 5576)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-01-10 13:01:02 UTC (rev 5577)
@@ -33,15 +33,14 @@
public class FaceletsComponentTest extends VpeTest {
// import project name
- private static final String IMPORT_PROJECT_NAME = "faceletsTest";
+ public static final String IMPORT_PROJECT_NAME = "faceletsTest";
public FaceletsComponentTest(String name) {
- super(name, IMPORT_PROJECT_NAME, FaceletsTestPlugin
- .getPluginResourcePath());
+ super(name);
}
public void testDebug() throws Throwable {
- performTestForJsfComponent("components/debug.xhtml"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/debug.xhtml",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
public void testDefine() throws Throwable {
@@ -51,7 +50,7 @@
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(
- "components/define.xhtml", getImportProjectName());
+ "components/define.xhtml", IMPORT_PROJECT_NAME);
assertNotNull("Could not open specified file " + file.getFullPath(),
file);
@@ -102,7 +101,7 @@
}
public void testInsert() throws Throwable {
- performTestForJsfComponent("components/insert.xhtml"); // $NON-NLS-1$
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath("components/insert.xhtml",IMPORT_PROJECT_NAME)); // $NON-NLS-1$
}
}
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5576 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test: src/org/jboss/tools/vpe/ui/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-01-10 08:00:56 -0500 (Thu, 10 Jan 2008)
New Revision: 5576
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/beans/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/beans/ImportBean.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1562, junit tests was adjusted, was added VpeTest setup class which allows correctly import-remove test project from workspace(only once for each test suite, not for every test case).Some code was refactored.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF 2008-01-10 10:29:54 UTC (rev 5575)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/META-INF/MANIFEST.MF 2008-01-10 13:00:56 UTC (rev 5576)
@@ -18,4 +18,5 @@
org.mozilla.xpcom
Eclipse-LazyStart: true
Bundle-ClassPath: .
-Export-Package: org.jboss.tools.vpe.ui.test
+Export-Package: org.jboss.tools.vpe.ui.test,
+ org.jboss.tools.vpe.ui.test.beans
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2008-01-10 10:29:54 UTC (rev 5575)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2008-01-10 13:00:56 UTC (rev 5576)
@@ -11,15 +11,13 @@
package org.jboss.tools.vpe.ui.test;
-import java.io.File;
-
import junit.framework.TestCase;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
@@ -50,24 +48,14 @@
private Boolean checkWarning;
/**
- * Contains project name with information for testing
- */
- private String importProjectName;
-
- /**
- * Contains plugin resource path
- */
- private String pluginResourcePath;
- /**
*
* @param name
* @param importProjectName
*/
- public VpeTest(String name, String importProjectName,String pluginResourcePath) {
+ public VpeTest(String name) {
super(name);
- setImportProjectName(importProjectName);
- setPluginResourcePath(pluginResourcePath);
+
}
/**
* Perform pre-test initialization.
@@ -79,13 +67,9 @@
protected void setUp() throws Exception {
super.setUp();
- closeEditors();
- if (ResourcesPlugin.getWorkspace().getRoot().findMember(getImportProjectName()) == null) {
- closeEditors();
- TestUtil.importProjectIntoWorkspace((getPluginResourcePath()
- + File.separator+getImportProjectName()),getImportProjectName());
- }
+
Platform.addLogListener(this);
+
closeEditors();
}
/**
@@ -101,7 +85,6 @@
closeEditors();
- TestUtil.removeProject(getImportProjectName());
Platform.removeLogListener(this);
}
@@ -165,22 +148,24 @@
* @throws PartInitException
* @throws Throwable
*/
- protected void performTestForJsfComponent(String componentPage)
+ protected void performTestForVpeComponent(IFile componentPage)
throws PartInitException, Throwable {
TestUtil.waitForJobs();
setException(null);
- IFile file = (IFile) TestUtil.getComponentPath(componentPage,getImportProjectName());
- IEditorInput input = new FileEditorInput(file);
+// IFile file = (IFile) TestUtil.getComponentPath(componentPage,getImportProjectName());
+ IEditorInput input = new FileEditorInput(componentPage);
TestUtil.waitForJobs();
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.openEditor(input, EDITOR_ID, true);
-
+
+ assertNotNull(editor);
+
TestUtil.waitForJobs();
- TestUtil.delay(3000);
+ TestUtil.delay(1000);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.closeAllEditors(true);
@@ -207,7 +192,7 @@
// wait for jobs
TestUtil.waitForJobs();
// // wait full initialization of vpe
- TestUtil.delay(3000);
+ TestUtil.delay(100);
return part;
@@ -236,29 +221,5 @@
protected void setCheckWarning(Boolean checkWarning) {
this.checkWarning = checkWarning;
}
- /**
- * @return the importProjectName
- */
- protected String getImportProjectName() {
- return importProjectName;
- }
- /**
- * @param importProjectName the importProjectName to set
- */
- protected void setImportProjectName(String importProjectName) {
- this.importProjectName = importProjectName;
- }
- /**
- * @return the pluginResourcePath
- */
- protected String getPluginResourcePath() {
- return pluginResourcePath;
- }
- /**
- * @param pluginResourcePath the pluginResourcePath to set
- */
- protected void setPluginResourcePath(String pluginResourcePath) {
- this.pluginResourcePath = pluginResourcePath;
- }
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTestSetup.java 2008-01-10 13:00:56 UTC (rev 5576)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+* 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.vpe.ui.test;
+
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.vpe.ui.test.beans.ImportBean;
+
+import junit.extensions.TestSetup;
+import junit.framework.TestSuite;
+
+/**
+ * @author Max Areshkau
+ *
+ * Class for setup-tear down junit tests(import project
+ * into workspace and remove project from workspace)
+ */
+public class VpeTestSetup extends TestSetup {
+
+ /**
+ * Contains test project names, which will be imported
+ * in setUp method and removed in tear down method
+ */
+ private List<ImportBean> testProjectNames;
+
+ public VpeTestSetup(TestSuite test, List<ImportBean> testProjectNames) {
+ super(test);
+ setTestProjects(testProjectNames);
+ }
+
+ /* (non-Javadoc)
+ * @see junit.extensions.TestSetup#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ for (ImportBean importBean : getTestProjects()) {
+ if (ResourcesPlugin.getWorkspace().getRoot().findMember(importBean.getImportProjectName()) == null) {
+ TestUtil.importProjectIntoWorkspace((importBean.getImportProjectPath()
+ + File.separator+importBean.getImportProjectName()),importBean.getImportProjectName());
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see junit.extensions.TestSetup#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception {
+
+ for(ImportBean importBean:getTestProjects()) {
+ TestUtil.removeProject(importBean.getImportProjectName());
+ }
+ super.tearDown();
+ }
+
+ /**
+ * @return the testProjectNames
+ */
+ private List<ImportBean> getTestProjects() {
+ return testProjectNames;
+ }
+
+ /**
+ * @param testProjectNames the testProjectNames to set
+ */
+ private void setTestProjects(List<ImportBean> testProjectNames) {
+ this.testProjectNames = testProjectNames;
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/beans/ImportBean.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/beans/ImportBean.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/beans/ImportBean.java 2008-01-10 13:00:56 UTC (rev 5576)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+* 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.vpe.ui.test.beans;
+
+/**
+ * @author Max Areshkau
+ *
+ * Contains information about projects which should be imported
+ */
+public class ImportBean {
+ /**
+ * Contains import project Name
+ */
+ private String importProjectName;
+ /**
+ * Contains import project path
+ */
+ private String importProjectPath;
+ /**
+ * @return the importProjectName
+ */
+ public String getImportProjectName() {
+ return importProjectName;
+ }
+ /**
+ * @param importProjectName the importProjectName to set
+ */
+ public void setImportProjectName(String importProjectName) {
+ this.importProjectName = importProjectName;
+ }
+ /**
+ * @return the importProjectPath
+ */
+ public String getImportProjectPath() {
+ return importProjectPath;
+ }
+ /**
+ * @param importProjectPath the importProjectPath to set
+ */
+ public void setImportProjectPath(String importProjectPath) {
+ this.importProjectPath = importProjectPath;
+ }
+
+}
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5574 - trunk/core/util/packaging-convert.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-01-10 04:49:35 -0500 (Thu, 10 Jan 2008)
New Revision: 5574
Modified:
trunk/core/util/packaging-convert/
trunk/core/util/packaging-convert/build.xml
Log:
updated bin ignore and build.xml
Property changes on: trunk/core/util/packaging-convert
___________________________________________________________________
Name: svn:ignore
+ bin
build
packaging-convert.zip
packaging-converter.jar
Modified: trunk/core/util/packaging-convert/build.xml
===================================================================
--- trunk/core/util/packaging-convert/build.xml 2008-01-10 01:07:39 UTC (rev 5573)
+++ trunk/core/util/packaging-convert/build.xml 2008-01-10 09:49:35 UTC (rev 5574)
@@ -25,7 +25,13 @@
</target>
-<target name="build" depends="compile"/>
+<target name="build" depends="compile">
+ <zip destfile="packaging-convert.zip" basedir=".." whenempty="fail">
+ <include name="packaging-convert/lib/*.jar"/>
+ <include name="packaging-convert/*.jar"/>
+ <include name="packaging-convert/README.TXT"/>
+ </zip>
+</target>
<target name="convert" depends="build">
<property name="packaging-path" value="/home/marshall/Workspaces/jbosside/pojp/.packaging"/>
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5573 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-09 20:07:39 -0500 (Wed, 09 Jan 2008)
New Revision: 5573
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/build.properties
Log:
include new tests in build
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF 2008-01-10 01:07:35 UTC (rev 5572)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF 2008-01-10 01:07:39 UTC (rev 5573)
@@ -12,3 +12,4 @@
org.junit,
org.jboss.tools.vpe
Eclipse-LazyStart: true
+Bundle-ClassPath: vpe-seam-test.jar
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/build.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/build.properties 2008-01-10 01:07:35 UTC (rev 5572)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/build.properties 2008-01-10 01:07:39 UTC (rev 5573)
@@ -1,4 +1,13 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .
+ vpe-seam-test.jar,\
+ resources/
+jars.compile.order = vpe-seam-test.jar
+source.vpe-seam-test.jar = src/
+output.vpe-seam-test.jar = bin/
+src.includes = src/,\
+ resources/,\
+ build.properties,\
+ META-INF/,\
+ .project,\
+ .classpath
+source.vpe-seam-test.jar = src/
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5572 - trunk/tests/features/org.jboss.tools.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-09 20:07:35 -0500 (Wed, 09 Jan 2008)
New Revision: 5572
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
include new tests in build
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-01-09 23:55:43 UTC (rev 5571)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-01-10 01:07:35 UTC (rev 5572)
@@ -281,8 +281,7 @@
id="org.jboss.tools.jst.web.ui.test"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
<plugin
id="org.jboss.tools.seam.core.test"
@@ -319,8 +318,7 @@
id="org.jboss.tools.jsf.vpe.facelets.test"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
<plugin
id="org.jboss.tools.jsf.vpe.jsf.test"
@@ -332,7 +330,6 @@
id="org.jboss.tools.jsf.vpe.seam.test"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
</feature>
18 years, 3 months
- 1
- 0
JBoss Tools SVN: r5571 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-09 18:55:43 -0500 (Wed, 09 Jan 2008)
New Revision: 5571
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
Log:
Fix compilation error
HibernateNatureAddTest class is missing
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01-09 21:32:32 UTC (rev 5570)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-01-09 23:55:43 UTC (rev 5571)
@@ -9,7 +9,7 @@
public class TestSetAfterSetup {
public static TestSuite getTests(){
TestSuite suite = new TestSuite("Test for MappingTestProject" );
- suite.addTestSuite( HibernateNatureAddTest.class );
+ //suite.addTestSuite( HibernateNatureAddTest.class );
//suite.addTestSuite( CreateConsoleConfigTest.class );
return suite;
}
18 years, 3 months
- 1
- 0