(no commit message)

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java
index b7b104841af3e1794e4a5894c2cdd67e1e896816..b5456b1ecad9258c811094f1fc6cac5e5229185e 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java
@@ -35,11 +35,13 @@ import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
 import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.agent.Contact;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.AnnotationType;\r
+import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;\r
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
@@ -370,15 +372,17 @@ public class TestDatabase {
                        Feature featureAnatomy = Feature.ANATOMY(); \r
                        \r
                        TextData textData = TextData.NewInstance();\r
-                       textData.addAnnotation(Annotation.NewInstance(null, null));\r
+                       Annotation annotation = Annotation.NewInstance(null, null);\r
+                       textData.addAnnotation(annotation);\r
                        \r
                        assertNotNull(textData.getAnnotations().iterator().next().getAnnotatedObj());\r
-                       \r
+                       CdmBase obj = textData.getAnnotations().iterator().next();\r
                        textData.setFeature(featureAnatomy);\r
                        \r
                        taxonDescription.addElement(textData);\r
-\r
+                       //taxon.addAnnotation(annotation);\r
                        appCtr.getTaxonService().save(taxon);\r
+                       appCtr.getAnnotationService().save((Annotation)obj);\r
                        \r
                        conversation.commit(false);\r
                        // end of creation phase\r
@@ -391,8 +395,11 @@ public class TestDatabase {
                        DescriptionBase loadedDescription = appCtr.getDescriptionService().load(taxonDescriptionUuid);\r
                        \r
                        TextData descriptionElement = (TextData) loadedDescription.getElements().iterator().next();\r
-               \r
-                       Annotation annotation = descriptionElement.getAnnotations().iterator().next();\r
+                       descriptionElement = (TextData)HibernateProxyHelper.deproxy(descriptionElement);\r
+                       annotation = descriptionElement.getAnnotations().iterator().next();\r
+\r
+                       annotation = (Annotation)appCtr.getAnnotationService().load(annotation.getUuid());\r
+                       //System.out.println(((Taxon)annotation.getAnnotatedObj()).getTitleCache());\r
                        \r
                        // this should not be null\r
                        assertNotNull(annotation.getAnnotatedObj());\r