Author: vyemialyanchyk Date: 2010-10-06 13:40:56 -0400 (Wed, 06 Oct 2010) New Revision: 25530 Added: branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenPropsInternal.hibernate.properties Modified: branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test1.xml branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test2.xml branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java Log: https://jira.jboss.org/browse/JBIDE-7274 - fixed in Beta1 branch Modified: branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test1.xml =================================================================== --- branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test1.xml 2010-10-06 17:38:15 UTC (rev 25529) +++ branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test1.xml 2010-10-06 17:40:56 UTC (rev 25530) @@ -1,13 +1,18 @@ <project name="CodeGen" default="hibernateAntCodeGeneration"> <property name="build.dir" location="reslocation/test"/> - <property name="hibernatePropFile" value="${java.io.tmpdir}${ant.project.name}-hibernate.properties"/> - <target name="generateHibernatePropeties"> - <echo file="${hibernatePropFile}">hibernate.connection.driver_class=driverClass -hibernate.connection.password=passw -hibernate.connection.url=url -hibernate.connection.username=username -hibernate.dialect=testDialect</echo> - </target> + <property name="hibernate.connection.driver_class" value="driverClass"/> + <property name="hibernate.connection.password" value="passw"/> + <property name="hibernate.connection.url" value="url"/> + <property name="hibernate.connection.username" value="username"/> + <property name="hibernate.dialect" value="testDialect"/> + <property name="hibernatePropFile" value="${java.io.tmpdir}${ant.project.name}-hibernate.properties"/> + <target name="generateHibernatePropeties"> + <echo file="${hibernatePropFile}">hibernate.connection.driver_class=${hibernate.connection.driver_class} +hibernate.connection.password=${hibernate.connection.password} +hibernate.connection.url=${hibernate.connection.url} +hibernate.connection.username=${hibernate.connection.username} +hibernate.dialect=${hibernate.dialect}</echo> + </target> <path id="toolslib"/> <target name="hibernateAntCodeGeneration" depends="generateHibernatePropeties"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> Modified: branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test2.xml =================================================================== --- branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test2.xml 2010-10-06 17:38:15 UTC (rev 25529) +++ branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenInternalProps_test2.xml 2010-10-06 17:40:56 UTC (rev 25530) @@ -1,13 +1,18 @@ <project name="CodeGen" default="hibernateAntCodeGeneration"> <property name="build.dir" location="reslocation/test"/> - <property name="hibernatePropFile" value="${java.io.tmpdir}${ant.project.name}-hibernate.properties"/> - <target name="generateHibernatePropeties"> - <echo file="${hibernatePropFile}">hibernate.connection.driver_class=driverClass -hibernate.connection.password=passw -hibernate.connection.url=url -hibernate.connection.username=username -hibernate.dialect=testDialect</echo> - </target> + <property name="hibernate.connection.driver_class" value="driverClass"/> + <property name="hibernate.connection.password" value="passw"/> + <property name="hibernate.connection.url" value="url"/> + <property name="hibernate.connection.username" value="username"/> + <property name="hibernate.dialect" value="testDialect"/> + <property name="hibernatePropFile" value="${java.io.tmpdir}${ant.project.name}-hibernate.properties"/> + <target name="generateHibernatePropeties"> + <echo file="${hibernatePropFile}">hibernate.connection.driver_class=${hibernate.connection.driver_class} +hibernate.connection.password=${hibernate.connection.password} +hibernate.connection.url=${hibernate.connection.url} +hibernate.connection.username=${hibernate.connection.username} +hibernate.dialect=${hibernate.dialect}</echo> + </target> <path id="toolslib"/> <target name="hibernateAntCodeGeneration" depends="generateHibernatePropeties"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> Added: branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenPropsInternal.hibernate.properties =================================================================== --- branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenPropsInternal.hibernate.properties (rev 0) +++ branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenPropsInternal.hibernate.properties 2010-10-06 17:40:56 UTC (rev 25530) @@ -0,0 +1,5 @@ +hibernate.connection.driver_class=${hibernate.connection.driver_class} +hibernate.connection.password=${hibernate.connection.password} +hibernate.connection.url=${hibernate.connection.url} +hibernate.connection.username=${hibernate.connection.username} +hibernate.dialect=${hibernate.dialect} \ No newline at end of file Modified: branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-10-06 17:38:15 UTC (rev 25529) +++ branches/jbosstools-3.2.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-10-06 17:40:56 UTC (rev 25530) @@ -390,7 +390,7 @@ String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); codeGen = updatePaths(codeGen); String sample = getSample("AntCodeGenInternalProps_test1.xml"); //$NON-NLS-1$ - String sampleProperties = getSample("AntCodeGenProps.hibernate.properties"); //$NON-NLS-1$ + String sampleProperties = getSample("AntCodeGenPropsInternal.hibernate.properties"); //$NON-NLS-1$ assertEquals(sample, codeGen); assertEquals(sampleProperties.trim(), codeGenProperties); } @@ -403,7 +403,7 @@ String codeGenProperties = codeGenFactory.getPropFileContentPreSave(); codeGen = updatePaths(codeGen); String sample = getSample("AntCodeGenInternalProps_test2.xml"); //$NON-NLS-1$ - String sampleProperties = getSample("AntCodeGenProps.hibernate.properties"); //$NON-NLS-1$ + String sampleProperties = getSample("AntCodeGenPropsInternal.hibernate.properties"); //$NON-NLS-1$ assertEquals(sample, codeGen); assertEquals(sampleProperties.trim(), codeGenProperties); }