Project

General

Profile

« Previous | Next » 

Revision 05663465

Added by Andreas Müller over 14 years ago

Deleted Keyword class

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
32 32 
import eu.etaxonomy.cdm.model.agent.Team;
33 33 
import eu.etaxonomy.cdm.model.common.Annotation;
34 34 
import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
35 
import eu.etaxonomy.cdm.model.common.Keyword;
36 35 
import eu.etaxonomy.cdm.model.common.LSID;
37 36 
import eu.etaxonomy.cdm.model.common.TimePeriod;
38 37 
import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
......
470 469
471 470 
		person1.addInstitutionalMembership(institution1, period1, "departement1", "role1");
472 471 
		person2.addInstitutionalMembership(institution2, period2, "departement2", "role2");
473
474 
		Keyword keyword1 = Keyword.NewInstance("K1", "K1", "K1");
475 
		person1.addKeyword(keyword1);
476
477 
		Keyword keyword2 = Keyword.NewInstance("K2", "K2", "K2");
478 
		person2.addKeyword(keyword2);
479 472 

  		




  480
  473
  
    
		IMergeStrategy personMergeStrategy = DefaultMergeStrategy.NewInstance(Person.class);


  		




  481
  474
  
    
		personMergeStrategy.invoke(person1, person2);


  		




  482
  475
  
    
		


  		




  483
  476
  
    
		Assert.assertEquals("Number of institutional memberships must be 2", 2, person1.getInstitutionalMemberships().size());


  		




  484
  
  
    
		Assert.assertEquals("Number of keywords must be 2", 2, person1.getKeywords().size());


  		




  485
  477
  
    
		for (InstitutionalMembership institutionalMembership : person1.getInstitutionalMemberships()){


  		




  486
  478
  
    
			Assert.assertSame("Person of institutional memebership must be person1", person1, institutionalMembership.getPerson());


  		




  487
  479
  
    
		}


  		












Also available in:  Unified diff