Project

General

Profile

« Previous | Next » 

Revision 2a9da0e5

Added by Katja Luther almost 15 years ago

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java
35 35
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
36 36
import eu.etaxonomy.cdm.database.DbSchemaValidation;
37 37
import eu.etaxonomy.cdm.database.ICdmDataSource;
38
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
39 38
import eu.etaxonomy.cdm.model.agent.AgentBase;
40 39
import eu.etaxonomy.cdm.model.agent.Contact;
41 40
import eu.etaxonomy.cdm.model.agent.Person;
42 41
import eu.etaxonomy.cdm.model.common.Annotation;
43 42
import eu.etaxonomy.cdm.model.common.AnnotationType;
44
import eu.etaxonomy.cdm.model.common.CdmBase;
45 43
import eu.etaxonomy.cdm.model.common.Language;
46 44
import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;
47 45
import eu.etaxonomy.cdm.model.description.CommonTaxonName;
......
372 370
			Feature featureAnatomy = Feature.ANATOMY(); 
373 371
			
374 372
			TextData textData = TextData.NewInstance();
375
			Annotation annotation = Annotation.NewInstance(null, null);
376
			textData.addAnnotation(annotation);
373
			textData.addAnnotation(Annotation.NewInstance(null, null));
377 374
			
378 375
			assertNotNull(textData.getAnnotations().iterator().next().getAnnotatedObj());
379
			CdmBase obj = textData.getAnnotations().iterator().next();
376
			
380 377
			textData.setFeature(featureAnatomy);
381 378
			
382 379
			taxonDescription.addElement(textData);
383
			//taxon.addAnnotation(annotation);
380

  
384 381
			appCtr.getTaxonService().save(taxon);
385
			appCtr.getAnnotationService().save((Annotation)obj);
386 382
			
387 383
			conversation.commit(false);
388 384
			// end of creation phase
......
395 391
			DescriptionBase loadedDescription = appCtr.getDescriptionService().load(taxonDescriptionUuid);
396 392
			
397 393
			TextData descriptionElement = (TextData) loadedDescription.getElements().iterator().next();
398
			descriptionElement = (TextData)HibernateProxyHelper.deproxy(descriptionElement);
399
			annotation = descriptionElement.getAnnotations().iterator().next();
400

  
401
			annotation = (Annotation)appCtr.getAnnotationService().load(annotation.getUuid());
402
			//System.out.println(((Taxon)annotation.getAnnotatedObj()).getTitleCache());
394
		
395
			Annotation annotation = descriptionElement.getAnnotations().iterator().next();
403 396
			
404 397
			// this should not be null
405 398
			assertNotNull(annotation.getAnnotatedObj());

Also available in: Unified diff