Update of /cvsroot/hibernate/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30826/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml
Modified Files:
Hbm2HbmXmlTest.java ClassFullAttribute.hbm.xml
Log Message:
HBX-594 Use database table comments when generating hbm.xml
Index: Hbm2HbmXmlTest.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Hbm2HbmXmlTest.java 26 Jan 2006 12:07:39 -0000 1.1
+++ Hbm2HbmXmlTest.java 14 Feb 2006 10:11:54 -0000 1.2
@@ -15,8 +15,10 @@
import org.dom4j.Attribute;
import org.dom4j.Document;
+import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
+import org.dom4j.Node;
import org.dom4j.XPath;
import org.dom4j.io.SAXReader;
import org.hibernate.mapping.PersistentClass;
@@ -119,6 +121,50 @@
}
+ public void testComments() throws DocumentException {
+ File outputXml = new File(getOutputDir().getAbsolutePath() + "/org/hibernate/tool/hbm2x/hbm2hbmxml/ClassFullAttribute.hbm.xml");
+ assertFileAndExists(outputXml);
+
+ SAXReader xmlReader = this.getSAXReader();
+
+ Document document = xmlReader.read(outputXml);
+ Element root = document.getRootElement();
+
+ XPath xpath = DocumentHelper.createXPath("//hibernate-mapping/class/comment");
+ List list = xpath.selectNodes(document);
+ assertEquals("Expected to get one comment element", 1, list.size());
+ Node node = (Node) list.get(0);
+ assertEquals(node.getText(),"A comment for ClassFullAttribute");
+
+ xpath = DocumentHelper.createXPath("//hibernate-mapping/class/property/column/comment");
+ list = xpath.selectNodes(document);
+ assertEquals("Expected to get one comment element", 1, list.size());
+ node = (Node) list.get(0);
+ assertEquals(node.getText(),"columnd comment");
+
+
+ }
+
+ public void testNoComments() throws DocumentException {
+ File outputXml = new File(getOutputDir().getAbsolutePath() + "/org/hibernate/tool/hbm2x/hbm2hbmxml/Basic.hbm.xml");
+ assertFileAndExists(outputXml);
+
+ SAXReader xmlReader = this.getSAXReader();
+
+ Document document = xmlReader.read(outputXml);
+ Element root = document.getRootElement();
+
+ XPath xpath = DocumentHelper.createXPath("//hibernate-mapping/class/comment");
+ List list = xpath.selectNodes(document);
+ assertEquals("Expected to get no comment element", list.size(), 0);
+
+ xpath = DocumentHelper.createXPath("//hibernate-mapping/class/property/column/comment");
+ list = xpath.selectNodes(document);
+ assertEquals("Expected to get no comment element", 0, list.size());
+
+
+ }
+
/**
* Special test for external Global settings were generated.
* Test Access and Cacade setting but they are default values
Index: ClassFullAttribute.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/ClassFullAttribute.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ClassFullAttribute.hbm.xml 27 Sep 2005 07:35:45 -0000 1.1
+++ ClassFullAttribute.hbm.xml 14 Feb 2006 10:11:54 -0000 1.2
@@ -28,7 +28,7 @@
persister="org.hibernate.tool.hbm2x.hbm2hbmxml.mypersister"
rowid="rowid"
>
-
+ <comment>A comment for ClassFullAttribute</comment>
<id name="basicId"
length="10"
type="string"
@@ -54,7 +54,9 @@
<property name="columnDetails"
type="string"
>
- <column name="columnd" length="200" not-null="true" sql-type="varchar(200)" unique="true" />
+ <column name="columnd" length="200" not-null="true" sql-type="varchar(200)" unique="true" >
+ <comment>columnd comment</comment>
+ </column>
</property>
<property name="vitualValue"
|
