[jbosstools-commits] JBoss Tools SVN: r21122 - in branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test: src/org/hibernate/eclipse/console/test and 3 other directories.

Author: vyemialyanchyk Date: 2010-03-29 13:26:42 -0400 (Mon, 29 Mar 2010) New Revision: 21122 Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/QueryParametersTest.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HbmExportExceptionTest.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/Utils.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - update Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2010-03-29 17:26:42 UTC (rev 21122) @@ -45,6 +45,7 @@ org.eclipse.jdt.ui, org.eclipse.core.runtime, org.eclipse.ui.ide, + org.hibernate.mediator, org.hibernate.eclipse, org.hibernate.eclipse.mapper, org.eclipse.jface.text, Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -12,8 +12,8 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.console.QueryPage; -import org.hibernate.console.preferences.ConsoleConfigurationPreferences; -import org.hibernate.console.stubs.HibernateConsoleRuntimeException; +import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences; +import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException; import org.osgi.framework.Bundle; import org.w3c.dom.Element; Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -11,7 +11,7 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.console.KnownConfigurationsAdapter; -import org.hibernate.console.preferences.ConsoleConfigurationPreferences; +import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences; import org.w3c.dom.Element; public class KnownConfigurationsTest extends TestCase { Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/QueryParametersTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/QueryParametersTest.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/QueryParametersTest.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -6,10 +6,10 @@ import junit.framework.TestCase; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.ConsoleQueryParameter; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.QueryInputModel; import org.hibernate.eclipse.console.test.ConsoleConfigurationTest.TestConsoleConfigurationPreferences; +import org.hibernate.mediator.ConsoleQueryParameter; +import org.hibernate.mediator.QueryInputModel; public class QueryParametersTest extends TestCase { Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HbmExportExceptionTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HbmExportExceptionTest.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HbmExportExceptionTest.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -27,15 +27,14 @@ import org.eclipse.osgi.util.NLS; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.ConfigurationStub; import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.test.project.ConfigurableTestProject; import org.hibernate.eclipse.console.test.utils.ConsoleConfigUtils; -import org.hibernate.tool.hbm2x.ArtifactCollector; -import org.hibernate.tool.hbm2x.ExporterException; -import org.hibernate.tool.hbm2x.HibernateMappingExporter; -import org.hibernate.tool.hbm2x.HibernateMappingGlobalSettings; -import org.hibernate.tool.hbm2x.pojo.POJOClass; +import org.hibernate.mediator.stubs.ArtifactCollectorStub; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.HibernateMappingExporterStub; +import org.hibernate.mediator.stubs.HibernateMappingGlobalSettingsStub; +import org.hibernate.mediator.stubs.POJOClassStub; /** * @author Dmitry Geraskov @@ -91,19 +90,19 @@ } } - HibernateMappingGlobalSettings hmgs = new HibernateMappingGlobalSettings(); + HibernateMappingGlobalSettingsStub hmgs = HibernateMappingGlobalSettingsStub.newInstance(); ConfigurationStub.IExporterNewOutputDir nod = new ConfigurationStub.IExporterNewOutputDir() { - public File getNewOutputDir(POJOClass element, File outputdir4FileNew) { + public File getNewOutputDir(POJOClassStub element, File outputdir4FileNew) { return outputdir4FileNew; } }; - HibernateMappingExporter hce = config.createHibernateMappingExporter(getSrcFolder(), nod); + HibernateMappingExporterStub hce = config.createHibernateMappingExporter(getSrcFolder(), nod); hce.setGlobalSettings(hmgs); try { hce.start(); - ArtifactCollector collector = hce.getArtifactCollector(); + ArtifactCollectorStub collector = hce.getArtifactCollector(); collector.formatFiles(); try {//build generated configuration @@ -122,8 +121,13 @@ new Object[] { ConsoleConfigUtils.CFG_FILE_NAME, testPackage.getPath(), e.getMessage() } ); fail(out); } - } catch (ExporterException e){ - throw (Exception)e.getCause(); + } catch (RuntimeException e) { + // TODO: RuntimeException ? - find correct solution + if (e.getClass().getName().contains("ExporterException")) { //$NON-NLS-1$ + throw (Exception)e.getCause(); + } else { + throw e; + } } } catch (Exception e){ String newMessage = "\nPackage " + testPackage.getElementName() + ":"; //$NON-NLS-1$ //$NON-NLS-2$ Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -22,12 +22,12 @@ import org.eclipse.ui.PlatformUI; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.ConfigurationStub; -import org.hibernate.console.stubs.PersistentClassStub; import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.test.utils.Utils; import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.PersistentClassStub; import org.jboss.tools.hibernate.ui.view.OpenDiagramActionDelegate; /** Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -25,9 +25,6 @@ import org.eclipse.ui.PlatformUI; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.ConfigurationStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; import org.hibernate.eclipse.console.actions.OpenMappingAction; import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.test.utils.Utils; @@ -35,6 +32,9 @@ import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.PersistentClassWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.PropertyWorkbenchAdapter; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; /** * @author Dmitry Geraskov Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -25,10 +25,6 @@ import org.eclipse.ui.PlatformUI; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.ConfigurationStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; import org.hibernate.eclipse.console.actions.OpenSourceAction; import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.test.utils.Utils; @@ -36,6 +32,10 @@ import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.PersistentClassWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.PropertyWorkbenchAdapter; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; /** * @author Dmitry Geraskov Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/Utils.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/Utils.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/Utils.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -19,9 +19,9 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.internal.ErrorEditorPart; import org.eclipse.ui.texteditor.ITextEditor; -import org.hibernate.console.stubs.PersistentClassStub; import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.utils.OpenMappingUtils; +import org.hibernate.mediator.stubs.PersistentClassStub; /** * @author Dmitry Geraskov Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-03-29 17:23:44 UTC (rev 21121) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-03-29 17:26:42 UTC (rev 21122) @@ -35,12 +35,12 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.apt.core.internal.JarClassLoader; -import org.hibernate.console.ConsoleConfigClassLoader; -import org.hibernate.console.execution.DefaultExecutionContext; -import org.hibernate.console.execution.ExecutionContext; -import org.hibernate.console.stubs.util.ReflectHelper; import org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin; import org.hibernate.eclipse.console.test.utils.GarbageCollectionUtil; +import org.hibernate.mediator.ConsoleConfigClassLoader; +import org.hibernate.mediator.execution.DefaultExecutionContext; +import org.hibernate.mediator.execution.ExecutionContext; +import org.hibernate.mediator.stubs.util.ReflectHelper; import junit.framework.TestCase;