Author: vyemialyanchyk Date: 2010-11-24 14:41:40 -0500 (Wed, 24 Nov 2010) New Revision: 26890 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java Log: https://jira.jboss.org/browse/JBIDE-7708 - fixed; https://jira.jboss.org/browse/JBIDE-7709 - partially fixed Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch 2010-11-24 19:41:40 UTC (rev 26890) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> +<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> +<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> +<listAttribute key="org.hibernate.tools.exporters"> +<listEntry value="org.hibernate.tools.hbm2java"/> +<listEntry value="org.hibernate.tools.hbm2hbmxml"/> +<listEntry value="org.hibernate.tools.hbm2dao"/> +<listEntry value="org.hibernate.tools.hbmtemplate"/> +<listEntry value="org.hibernate.tools.hbm2cfgxml"/> +<listEntry value="org.hibernate.tools.hbm2doc"/> +<listEntry value="org.hibernate.tools.hbm2ddl"/> +<listEntry value="org.hibernate.tools.query"/> +</listAttribute> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> +<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> +<mapEntry key="outputFileName" value="asdf.txt"/> +<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_external"/> +<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> +</mapAttribute> +<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_external"/> +<stringAttribute key="org.hibernate.tools.package" value="hsql"/> +<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> +<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> +<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/> +<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch 2010-11-24 19:41:40 UTC (rev 26890) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> +<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> +<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> +<listAttribute key="org.hibernate.tools.exporters"> +<listEntry value="org.hibernate.tools.hbm2java"/> +<listEntry value="org.hibernate.tools.hbm2hbmxml"/> +<listEntry value="org.hibernate.tools.hbm2dao"/> +<listEntry value="org.hibernate.tools.hbmtemplate"/> +<listEntry value="org.hibernate.tools.hbm2cfgxml"/> +<listEntry value="org.hibernate.tools.hbm2doc"/> +<listEntry value="org.hibernate.tools.hbm2ddl"/> +<listEntry value="org.hibernate.tools.query"/> +</listAttribute> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> +<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> +<mapEntry key="outputFileName" value="asdf.txt"/> +<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_internal"/> +<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> +</mapAttribute> +<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_internal"/> +<stringAttribute key="org.hibernate.tools.package" value="hsql"/> +<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> +<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> +<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="false"/> +<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-24 18:46:42 UTC (rev 26889) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-24 19:41:40 UTC (rev 26890) @@ -10,9 +10,14 @@ ******************************************************************************/ package org.hibernate.eclipse.console.test; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Comparator; + import org.eclipse.core.externaltools.internal.IExternalToolConstants; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; @@ -25,12 +30,18 @@ import org.hibernate.console.KnownConfigurations; import org.hibernate.eclipse.console.EclipseLaunchConsoleConfigurationPreferences; import org.hibernate.eclipse.console.test.project.LaunchConfigTestProject2; +import org.hibernate.eclipse.console.test.utils.ResourceReadUtils; import junit.framework.TestCase; /** * Execute codegeneration launch configuration in external process, * to check the generation is successful. + * Execute codegeneration launch configuration in internal process, + * to check the generation is successful. + * Compare generated results - should be the same. + * Currently both tests are fail, should be success + * when JBIDE-7441 be fixed. * * @author Vitali Yemialyanchyk */ @@ -128,7 +139,152 @@ } assertTrue(nTest > 0); } + + public void testExecute2LaunchConfigs_External_and_Internal() { + // + ILaunchConfiguration launchConfig = null; + ILaunchConfigurationWorkingCopy launchConfigWC = null; + IFolder testFolderAllExportersExternal = null; + IFolder testFolderAllExportersInternal = null; + int nTest = -1; + // + testFolderAllExportersExternal = project.getTestFolderAllExportersExternal(); + nTest = -1; + try { + nTest = testFolderAllExportersExternal.members().length; + } catch (CoreException e) { + } + assertEquals(0, nTest); + // + final String fileNameCodeGenExtern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN; + launchConfig = loadLaunchConfigFromFile(fileNameCodeGenExtern); + launchConfigWC = null; + try { + launchConfigWC = launchConfig.getWorkingCopy(); + } catch (CoreException e) { + } + assertNotNull(launchConfigWC); + launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false); + DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE); + nTest = -1; + try { + nTest = testFolderAllExportersExternal.members().length; + } catch (CoreException e) { + } + assertTrue(nTest > 0); + // + testFolderAllExportersInternal = project.getTestFolderAllExportersInternal(); + nTest = -1; + try { + nTest = testFolderAllExportersInternal.members().length; + } catch (CoreException e) { + } + assertEquals(0, nTest); + // + final String fileNameCodeGenIntern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN; + launchConfig = loadLaunchConfigFromFile(fileNameCodeGenIntern); + launchConfigWC = null; + try { + launchConfigWC = launchConfig.getWorkingCopy(); + } catch (CoreException e) { + } + assertNotNull(launchConfigWC); + launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false); + DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE); + nTest = -1; + try { + nTest = testFolderAllExportersInternal.members().length; + } catch (CoreException e) { + } + assertTrue(nTest > 0); + // + boolean res = compareFolders(testFolderAllExportersExternal, testFolderAllExportersInternal); + assertTrue(res); + } + protected class ResComparator implements Comparator<IResource> { + @Override + public int compare(IResource o1, IResource o2) { + return o1.getName().compareTo(o2.getName()); + } + } + + public boolean compareFiles(IFile testFile1, IFile testFile2) { + boolean res = false; + InputStream is1 = null, is2 = null; + try { + is1 = testFile1.getContents(); + } catch (CoreException e) { + } + try { + is2 = testFile2.getContents(); + } catch (CoreException e) { + } + if (is1 == null || is2 == null) { + res = is1 == is2; + if (!res) { + res = false; + } + return res; + } + String str1 = ResourceReadUtils.readStream(is1); + String str2 = ResourceReadUtils.readStream(is2); + if (str1 == null || str2 == null) { + res = str1 == str2; + if (!res) { + res = false; + } + return res; + } + res = 0 == str1.compareTo(str2); + if (!res) { + res = false; + } + return res; + } + + public boolean compareFolders(IFolder testFolder1, IFolder testFolder2) { + boolean res = false; + IResource[] res1 = null, res2 = null; + try { + res1 = testFolder1.members(); + } catch (CoreException e) { + } + try { + res2 = testFolder2.members(); + } catch (CoreException e) { + } + if (res1 == null || res2 == null) { + return res1 == res2; + } + if (res1.length != res2.length) { + return res; + } + final ResComparator cmp = new ResComparator(); + Arrays.sort(res1, cmp); + Arrays.sort(res2, cmp); + res = true; + for (int i = 0; res && i < res1.length; i++) { + if (0 != res1[i].getName().compareTo(res2[i].getName())) { + res = false; + } + if (res1[i].getType() != res2[i].getType()) { + res = false; + } + if (res && ((IResource.FOLDER & res1[i].getType()) == IResource.FOLDER)) { + IFolder tf1 = (IFolder)res1[i]; + IFolder tf2 = (IFolder)res2[i]; + res = compareFolders(tf1, tf2); + } + //if (res && ((IResource.FILE & res1[i].getType()) == IResource.FILE)) { + // IFile tf1 = (IFile)res1[i]; + // IFile tf2 = (IFile)res2[i]; + // res = compareFiles(tf1, tf2); + //} + } + return res; + } + protected LaunchConfigTestProject2 getProject() { return this.project; } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-24 18:46:42 UTC (rev 26889) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-24 19:41:40 UTC (rev 26890) @@ -40,12 +40,16 @@ public class LaunchConfigTestProject2 extends TestProject { public static final String TEST_TMP_OUT_FOLDER = "temp_test_out_folder"; //$NON-NLS-1$ + public static final String TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL = "temp_test_out_folder_all_exporters_external"; //$NON-NLS-1$ + public static final String TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL = "temp_test_out_folder_all_exporters_internal"; //$NON-NLS-1$ public static final String META_INF_FOLDER = "src/META-INF".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String PROJECT_PATH = "res/project2/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String RESOURCE_SRC_PATH = "res/project2/src/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String RESOURCE_LIB_PATH = "res/project2/lib/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String HIBERNATE_PLUGIN_LIB_PATH = "lib"; //$NON-NLS-1$ + public static final String LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN = "testLaunchCfg_all_exporters_external.launch"; //$NON-NLS-1$ + public static final String LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN = "testLaunchCfg_all_exporters_internal.launch"; //$NON-NLS-1$ public static final String LAUNCH_CODE_GEN_TEST_FILE_EXTERN = "testLaunchCfg_external.launch"; //$NON-NLS-1$ public static final String LAUNCH_CODE_GEN_TEST_FILE_INTERN = "testLaunchCfg_internal.launch"; //$NON-NLS-1$ public static final String LAUNCH_CONSOLE_CONFIG_TEST_FILE = "LaunchConfigTestProject2.launch"; //$NON-NLS-1$ @@ -77,7 +81,13 @@ super.buildProject(); IPackageFragmentRoot tst = createFolder(TEST_TMP_OUT_FOLDER); tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null); + tst = createFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL); + tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null); + tst = createFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL); + tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null); // + importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN); + importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN); importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_EXTERN); importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_INTERN); importFileToProject(LAUNCH_CONSOLE_CONFIG_TEST_FILE); @@ -103,6 +113,14 @@ public IFolder getTestFolder() { return project.getFolder(TEST_TMP_OUT_FOLDER); } + + public IFolder getTestFolderAllExportersExternal() { + return project.getFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL); + } + + public IFolder getTestFolderAllExportersInternal() { + return project.getFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL); + } public boolean setupSourceTestFolder() throws IOException, CoreException { ArrayList<String> foldersList = new ArrayList<String>();