Author: vyemialyanchyk Date: 2010-08-10 13:01:01 -0400 (Tue, 10 Aug 2010) New Revision: 24027 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/hibernate.properties trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps.hibernate.properties trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test1.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test2.xml Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/launchcfg/TestConsoleConfigurationPreferences.java Log: https://jira.jboss.org/browse/JBIDE-6620 - fixed Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2010-08-10 16:58:27 UTC (rev 24026) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2010-08-10 17:01:01 UTC (rev 24027) @@ -54,6 +54,8 @@ org.jboss.tools.hibernate.ui, org.eclipse.jdt.apt.core, org.eclipse.debug.ui, + org.eclipse.datatools.connectivity.ui, + org.eclipse.datatools.connectivity, org.eclipse.ui.workbench.texteditor;bundle-version="3.5.0" Bundle-ActivationPolicy: lazy Bundle-Activator: org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/hibernate.properties =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/hibernate.properties (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/src/hibernate.properties 2010-08-10 17:01:01 UTC (rev 24027) @@ -0,0 +1,6 @@ +hibernate.connection.driver_class=111 +hibernate.connection.password=111 +hibernate.connection.url=111 +hibernate.connection.username=111 +hibernate.dialect=111 +hibernate.dialectXXX=111XXX Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps.hibernate.properties =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps.hibernate.properties (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps.hibernate.properties 2010-08-10 17:01:01 UTC (rev 24027) @@ -0,0 +1,5 @@ +hibernate.connection.driver_class=driverClass +hibernate.connection.password=passw +hibernate.connection.url=url +hibernate.connection.username=username +hibernate.dialect=testDialect \ No newline at end of file Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test1.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test1.xml (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test1.xml 2010-08-10 17:01:01 UTC (rev 24027) @@ -0,0 +1,36 @@ +<project name="CodeGen" default="hibernateAntCodeGeneration"> + <property name="build.dir" location="reslocation/test"/> + <path id="toolslib"/> + <target name="hibernateAntCodeGeneration"> + <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> + <hibernatetool destdir="${build.dir}"> + <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="hibernate.properties"/> + <classpath> + <path location="${build.dir}"/> + </classpath> + <hbm2doc> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2doc> + <hbm2cfgxml> + <property key="jdk5" value="false"/> + </hbm2cfgxml> + <hbm2hbmxml> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2hbmxml> + <hbmtemplate> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbmtemplate> + <hbm2java destdir="outputdir/test"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> + <hbm2ddl> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2ddl> + <hbm2dao/> + </hibernatetool> + </target> +</project> \ No newline at end of file Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test2.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test2.xml (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenProps_test2.xml 2010-08-10 17:01:01 UTC (rev 24027) @@ -0,0 +1,16 @@ +<project name="CodeGen" default="hibernateAntCodeGeneration"> + <property name="build.dir" location="reslocation/test"/> + <path id="toolslib"/> + <target name="hibernateAntCodeGeneration"> + <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> + <hibernatetool destdir="${build.dir}"> + <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="hibernate.properties"/> + <classpath> + <path location="${build.dir}"/> + </classpath> + <hbm2java destdir="outputdir/test"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> + </hibernatetool> + </target> +</project> \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml 2010-08-10 16:58:27 UTC (rev 24026) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml 2010-08-10 17:01:01 UTC (rev 24027) @@ -4,7 +4,7 @@ <target name="hibernateAntCodeGeneration"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> <hibernatetool destdir="${build.dir}"> - <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/> + <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" propertyFile="project\src\hibernate.properties" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/> <classpath> <path location="${build.dir}"/> </classpath> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml 2010-08-10 16:58:27 UTC (rev 24026) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml 2010-08-10 17:01:01 UTC (rev 24027) @@ -4,7 +4,7 @@ <target name="hibernateAntCodeGeneration"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> <hibernatetool destdir="${build.dir}"> - <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/> + <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" propertyFile="project\src\hibernate.properties" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/> <classpath> <path location="${build.dir}"/> </classpath> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml 2010-08-10 16:58:27 UTC (rev 24026) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml 2010-08-10 17:01:01 UTC (rev 24027) @@ -4,7 +4,7 @@ <target name="hibernateAntCodeGeneration"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> <hibernatetool destdir="${build.dir}"> - <configuration configurationFile="project\src\hibernate.cfg.xml"/> + <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="project\src\hibernate.properties"/> <classpath> <path location="${build.dir}"/> </classpath> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml 2010-08-10 16:58:27 UTC (rev 24026) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml 2010-08-10 17:01:01 UTC (rev 24027) @@ -4,7 +4,7 @@ <target name="hibernateAntCodeGeneration"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> <hibernatetool destdir="${build.dir}"> - <configuration configurationFile="project\src\hibernate.cfg.xml"/> + <configuration configurationFile="project\src\hibernate.cfg.xml" propertyFile="project\src\hibernate.properties"/> <classpath> <path location="${build.dir}"/> </classpath> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-08-10 16:58:27 UTC (rev 24026) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-08-10 17:01:01 UTC (rev 24027) @@ -22,10 +22,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.datatools.connectivity.IConnectionProfile; +import org.eclipse.datatools.connectivity.internal.ConnectionProfile; import org.eclipse.debug.core.ILaunchConfiguration; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.eclipse.console.ExtensionManager; @@ -58,6 +61,11 @@ final File xmlConfig = new File("project/src/hibernate.cfg.xml"); //$NON-NLS-1$ return xmlConfig; } + + public File getPropertyFile() { + final File propFile = new File("project/src/hibernate.properties"); //$NON-NLS-1$ + return propFile; + } } public class TestConsoleConfigPref2 extends TestConsoleConfigurationPreferences { @@ -108,9 +116,20 @@ } } + public class TestConsoleConfigPref3 extends TestConsoleConfigPref { + public String getConnectionProfileName() { + return "connectionProfileName"; //$NON-NLS-1$ + } + + public String getDialectName() { + return "testDialect"; //$NON-NLS-1$ + } + } + public enum ETestCase { simple, jpa, + properties, nullable, } @@ -129,6 +148,8 @@ pref = new TestConsoleConfigPref(); } else if (testCase == ETestCase.jpa) { pref = new TestConsoleConfigPref2(); + } else if (testCase == ETestCase.properties) { + pref = new TestConsoleConfigPref3(); } return pref; } @@ -140,59 +161,139 @@ public String getResLocation(String path) { return "reslocation/test"; //$NON-NLS-1$ } + + public IConnectionProfile getConnectionProfile(String connProfileName) { + IConnectionProfile profile = null; + if (testCase == ETestCase.properties) { + profile = new ConnectionProfile("testName", null, null) { //$NON-NLS-1$ + public Properties getProperties(String type) { + Properties res = new Properties(); + res.setProperty("org.eclipse.datatools.connectivity.db.URL", "url"); //$NON-NLS-1$ //$NON-NLS-2$ + res.setProperty("org.eclipse.datatools.connectivity.db.username", "username"); //$NON-NLS-1$ //$NON-NLS-2$ + res.setProperty("org.eclipse.datatools.connectivity.db.password", "passw"); //$NON-NLS-1$ //$NON-NLS-2$ + return res; + } + }; + } + return profile; + } + + public String getDriverClass(String connProfileName) { + String driverClass = ""; //$NON-NLS-1$ + if (testCase == ETestCase.properties) { + driverClass = "driverClass"; //$NON-NLS-1$ + } + return driverClass; + } } + + public class CodeGenXMLFactory4Test2 extends CodeGenXMLFactory4Test { + public CodeGenXMLFactory4Test2(ILaunchConfiguration lc, ETestCase testCase) { + super(lc, testCase); + } + public ConsoleConfigurationPreferences getConsoleConfigPreferences(String consoleConfigName) { + return new TestConsoleConfigPref2(); + } + } + public void testCodeGenXMLFactoryRevengAll() { - String codeGen = codeGenXMLFactory(true, true, ETestCase.simple); + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(true, true, ETestCase.simple); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); String specimen = getSample("AntCodeGenReveng_test1.xml"); //$NON-NLS-1$ assertEquals(specimen.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(codeGenProperties.length(), 0); } public void testCodeGenXMLFactoryRevengOne() { - String codeGen = codeGenXMLFactory(true, false, ETestCase.simple); + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(true, false, ETestCase.simple); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); String sample = getSample("AntCodeGenReveng_test2.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(codeGenProperties.length(), 0); } public void testCodeGenXMLFactoryAll() { - String codeGen = codeGenXMLFactory(false, true, ETestCase.simple); + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, true, ETestCase.simple); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); String sample = getSample("AntCodeGen_test1.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(codeGenProperties.length(), 0); } public void testCodeGenXMLFactoryOne() { - String codeGen = codeGenXMLFactory(false, false, ETestCase.simple); + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, false, ETestCase.simple); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); String sample = getSample("AntCodeGen_test2.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(codeGenProperties.length(), 0); } public void testCodeGenXMLFactoryJpaAll() { - String codeGen = codeGenXMLFactory(false, true, ETestCase.jpa); + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, true, ETestCase.jpa); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); codeGen = updatePaths(codeGen); String sample = getSample("AntCodeGenJpa_test1.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(codeGenProperties.length(), 0); } public void testCodeGenXMLFactoryJpaOne() { - String codeGen = codeGenXMLFactory(false, false, ETestCase.jpa); + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, false, ETestCase.jpa); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); codeGen = updatePaths(codeGen); String sample = getSample("AntCodeGenJpa_test2.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(codeGenProperties.length(), 0); } public void testCodeGenXMLFactoryNullableAll() { - String codeGen = codeGenXMLFactory(false, true, ETestCase.nullable); + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, true, ETestCase.nullable); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); codeGen = updatePaths(codeGen); String sample = getSample("AntCodeGenNullable_test1.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(codeGenProperties.length(), 0); } public void testCodeGenXMLFactoryNullableOne() { - String codeGen = codeGenXMLFactory(false, false, ETestCase.nullable); + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, false, ETestCase.nullable); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); codeGen = updatePaths(codeGen); String sample = getSample("AntCodeGenNullable_test2.xml"); //$NON-NLS-1$ assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(codeGenProperties.length(), 0); } + + public void testCodeGenXMLFactoryPropertiesAll() { + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, true, ETestCase.properties); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); + codeGen = updatePaths(codeGen); + String sample = getSample("AntCodeGenProps_test1.xml"); //$NON-NLS-1$ + String sampleProperties = getSample("AntCodeGenProps.hibernate.properties"); //$NON-NLS-1$ + assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(sampleProperties.trim(), codeGenProperties); + } + + public void testCodeGenXMLFactoryPropertiesOne() { + CodeGenXMLFactory codeGenFactory = codeGenXMLFactory(false, false, ETestCase.properties); + String codeGen = codeGenFactory.createCodeGenXML(); + String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); + codeGen = updatePaths(codeGen); + String sample = getSample("AntCodeGenProps_test2.xml"); //$NON-NLS-1$ + String sampleProperties = getSample("AntCodeGenProps.hibernate.properties"); //$NON-NLS-1$ + assertEquals(sample.trim(), codeGen.replaceAll("\n", "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(sampleProperties.trim(), codeGenProperties); + } public String updatePaths(String codeGen) { String repl = ""; //$NON-NLS-1$ @@ -205,7 +306,7 @@ return codeGen.replace(repl + File.separator, ""); //$NON-NLS-1$ } - public String codeGenXMLFactory(boolean reveng, boolean exportersAll, ETestCase testCase) { + public CodeGenXMLFactory codeGenXMLFactory(boolean reveng, boolean exportersAll, ETestCase testCase) { Map<String, ExporterDefinition> exDefinitions = ExtensionManager.findExporterDefinitionsAsMap(); Map<String, Object> testLaunchConfigAttr = new HashMap<String, Object>(); String tmp = "12345678901234567890"; //$NON-NLS-1$ @@ -246,7 +347,7 @@ testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, reveng); TestLaunchConfig testLaunchConfig = new TestLaunchConfig(testLaunchConfigAttr); CodeGenXMLFactory codeGenFactory = new CodeGenXMLFactory4Test(testLaunchConfig, testCase); - return codeGenFactory.createCodeGenXML(); + return codeGenFactory; } public String getSample(String fileName) { Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/launchcfg/TestConsoleConfigurationPreferences.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/launchcfg/TestConsoleConfigurationPreferences.java 2010-08-10 16:58:27 UTC (rev 24026) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/launchcfg/TestConsoleConfigurationPreferences.java 2010-08-10 17:01:01 UTC (rev 24027) @@ -19,6 +19,8 @@ public static final String HIBERNATE_CFG_XML_PATH = "/res/project/src/hibernate.cfg.xml".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ + public static final String HIBERNATE_PROPERTIES_PATH = "/res/project/src/hibernate.properties".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ + public void setName(String name) { Assert.fail(); }