Revision 45528416
Added by Katja Luther almost 15 years ago
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonomicTreeTest.java | ||
---|---|---|
40 | 40 |
import eu.etaxonomy.cdm.model.name.Rank; |
41 | 41 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
42 | 42 |
import eu.etaxonomy.cdm.model.name.ZoologicalName; |
43 |
import eu.etaxonomy.cdm.model.reference.Book; |
|
44 |
import eu.etaxonomy.cdm.model.reference.Journal; |
|
43 |
//import eu.etaxonomy.cdm.model.reference.Book;
|
|
44 |
//import eu.etaxonomy.cdm.model.reference.Journal;
|
|
45 | 45 |
import eu.etaxonomy.cdm.model.reference.ReferenceBase; |
46 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
|
46 | 47 |
|
47 | 48 |
/** |
48 | 49 |
* @author a.mueller |
... | ... | |
63 | 64 |
private static TaxonNameBase<?,?> taxonName2; |
64 | 65 |
private static ReferenceBase ref1; |
65 | 66 |
private static ReferenceBase ref2; |
67 |
private ReferenceFactory refFactory; |
|
66 | 68 |
|
67 | 69 |
|
68 | 70 |
|
... | ... | |
86 | 88 |
@Before |
87 | 89 |
public void setUp() throws Exception { |
88 | 90 |
viewName1 = "Greuther, 1993"; |
91 |
refFactory = ReferenceFactory.newInstance(); |
|
89 | 92 |
taxonomicView1 = TaxonomicTree.NewInstance(viewName1); |
90 | 93 |
taxonName1 = BotanicalName.NewInstance(Rank.SPECIES()); |
91 | 94 |
taxonName1 = ZoologicalName.NewInstance(Rank.SPECIES()); |
92 |
ref1 = Journal.NewInstance();
|
|
93 |
ref2 = Journal.NewInstance();
|
|
95 |
ref1 = refFactory.newJournal();
|
|
96 |
ref2 = refFactory.newJournal();
|
|
94 | 97 |
taxon1 = Taxon.NewInstance(taxonName1, ref1); |
95 | 98 |
taxon2 = Taxon.NewInstance(taxonName2, ref2); |
96 | 99 |
|
... | ... | |
330 | 333 |
BotanicalName name = BotanicalName.NewInstance(Rank.GENUS()); |
331 | 334 |
name.setTitleCache("A dummy name"); |
332 | 335 |
result.add(name); |
333 |
ReferenceBase ref = Book.NewInstance();
|
|
336 |
ReferenceBase ref = refFactory.newBook();
|
|
334 | 337 |
ref.setTitleCache("A dummy book"); |
335 | 338 |
result.add(ref); |
336 | 339 |
|
Also available in: Unified diff
merging branches/cdmlib/2.2 [7345:7377] to trunk
see also:
https://dev.e-taxonomy.eu/trac/changeset?new=branches%2Fcdmlib%2F2.2%407377&old=branches%2Fcdmlib%2F2.2%407345