Project

General

Profile

« Previous | Next » 

Revision 9dc896c9

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase

View differences:

cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java
127 127
import eu.etaxonomy.cdm.model.name.Rank;
128 128
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
129 129
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
130
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
130
import eu.etaxonomy.cdm.model.name.TaxonName;
131 131
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
132 132
import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
133 133
import eu.etaxonomy.cdm.model.occurrence.Collection;
......
347 347
				Rank.class,
348 348
				SpecimenTypeDesignation.class,
349 349
				SpecimenTypeDesignationStatus.class,
350
				TaxonNameBase.class,
350
				TaxonName.class,
351 351
				TypeDesignationBase.class,
352 352
//				ViralName.class,
353 353
//				ZoologicalName.class,
......
465 465
//		SpecimenOrObservationBase spec1 = Specimen.NewInstance();
466 466
//
467 467
//		desc1.addDescribedSpecimenOrObservation(spec1);
468
//		//Taxon taxon = Taxon.NewInstance(taxonNameBase, sec)
468
//		//Taxon taxon = Taxon.NewInstance(taxonName, sec)
469 469
//		spec1.addDescription(desc2);
470 470
//
471 471
//		occurrenceService.save(spec1);
......
492 492
//	@Ignore
493 493
	public void testMergeCdmBaseReferenceAndIdentifiable() throws MergeException {
494 494

  
495
		TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
495
		TaxonName<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
496 496
		name1.setTitleCache("BotanicalName1", true);
497 497

  
498
		TaxonNameBase<?,?> name2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
498
		TaxonName<?,?> name2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
499 499
		name2.setTitleCache("BotanicalName2", true);
500 500

  
501
		TaxonNameBase zooName1 = TaxonNameFactory.NewZoologicalInstance(Rank.SPECIES());
501
		TaxonName zooName1 = TaxonNameFactory.NewZoologicalInstance(Rank.SPECIES());
502 502
		name1.setTitleCache("ZoologicalName1", true);
503 503

  
504 504
		Reference article1 = ReferenceFactory.newArticle();
......
622 622
	@Test
623 623
//	@Ignore
624 624
	public void testMergeTaxonNameAndTaxon() throws MergeException {
625
	    TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
625
	    TaxonName<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
626 626
		name1.setTitleCache("BotanicalName1", true);
627 627

  
628
		TaxonNameBase<?,?> name2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
628
		TaxonName<?,?> name2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
629 629
		name2.setTitleCache("BotanicalName2", true);
630 630

  
631 631
		IBotanicalName name3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
......
869 869
        UUID uuidAbiesAlba = UUID.fromString("6ed56b43-7cca-4c3b-bb90-7576da81c072");
870 870

  
871 871
        // CREATE DATA
872
        TaxonNameBase<?,?> pinusAlba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
872
        TaxonName<?,?> pinusAlba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
873 873
        pinusAlba.setTitleCache("BotanicalName1", true);
874 874
        pinusAlba.setUuid(uuidPinusAlba);
875 875

  
876
        TaxonNameBase<?,?> abiesAlba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
876
        TaxonName<?,?> abiesAlba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
877 877
        abiesAlba.setTitleCache("Abies alba", true);
878 878
        abiesAlba.setUuid(uuidAbiesAlba);
879 879

  
......
893 893
        commitAndStartNewTransaction(null);
894 894

  
895 895
        //MERGE
896
        DefaultMergeStrategy strategy = DefaultMergeStrategy.NewInstance(TaxonNameBase.class);
896
        DefaultMergeStrategy strategy = DefaultMergeStrategy.NewInstance(TaxonName.class);
897 897
        abiesAlba = nameDao.findByUuid(uuidAbiesAlba);
898 898
        pinusAlba = nameDao.findByUuid(uuidPinusAlba);
899 899
        cdmGenericDao.merge(pinusAlba, abiesAlba, strategy);
......
912 912
	@Test
913 913
	public void testReallocatePersonTeam() throws MergeException {
914 914

  
915
	    TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
915
	    TaxonName<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
916 916
		name1.setTitleCache("BotanicalName1", true);
917 917

  
918 918
		IBook book1 = ReferenceFactory.newBook();
......
1241 1241
	//from original testing within class, can be removed if not needed anymore
1242 1242
	private void test() {
1243 1243
		SessionFactoryImpl factory = (SessionFactoryImpl)((CdmGenericDaoImpl)cdmGenericDao).getSession().getSessionFactory();
1244
		Type propType = factory.getReferencedPropertyType(TaxonNameBase.class.getCanonicalName(), "titleCache");
1244
		Type propType = factory.getReferencedPropertyType(TaxonName.class.getCanonicalName(), "titleCache");
1245 1245
		Map<?,?> collMetadata = factory.getAllCollectionMetadata();
1246 1246
		Object roles = factory.getCollectionRolesByEntityParticipant("eu.etaxonomy.cdm.model.name.BotanicalName");
1247 1247
		CollectionPersister collPersister;
1248 1248
		try {
1249
			collPersister = factory.getCollectionPersister(TaxonNameBase.class.getCanonicalName()+".annotations");
1249
			collPersister = factory.getCollectionPersister(TaxonName.class.getCanonicalName()+".annotations");
1250 1250
		} catch (MappingException e) {
1251 1251
			// TODO Auto-generated catch block
1252 1252
			e.printStackTrace();

Also available in: Unified diff