Revision da39aca0
Added by Andreas Müller about 7 years ago
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeByNameComparatorTest.java | ||
---|---|---|
18 | 18 |
|
19 | 19 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
20 | 20 |
import eu.etaxonomy.cdm.model.name.Rank; |
21 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
|
21 | 22 |
import eu.etaxonomy.cdm.model.reference.Reference; |
22 | 23 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
23 | 24 |
|
... | ... | |
29 | 30 |
public class TaxonNodeByNameComparatorTest { |
30 | 31 |
|
31 | 32 |
private static final Logger logger = Logger.getLogger(TaxonNodeByNameComparatorTest.class); |
32 |
|
|
33 |
|
|
33 |
|
|
34 |
|
|
34 | 35 |
/** |
35 | 36 |
* test method for {@link TaxonNodeByNameComparator#compare(eu.etaxonomy.cdm.model.taxon.TaxonNode |
36 | 37 |
* , eu.etaxonomy.cdm.model.taxon.TaxonNode) } |
... | ... | |
42 | 43 |
|
43 | 44 |
Reference sec = ReferenceFactory.newBook(); |
44 | 45 |
|
45 |
BotanicalName botname_1 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
46 |
BotanicalName botname_1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
46 | 47 |
String nameCache_1 = "Epilobium \u00D7aschersonianum Hausskn."; |
47 | 48 |
botname_1.setNameCache(nameCache_1, true); |
48 | 49 |
Taxon taxon_1 = Taxon.NewInstance(botname_1, sec); |
49 | 50 |
|
50 |
BotanicalName botname_2 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
51 |
BotanicalName botname_2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
51 | 52 |
String nameCache_2 = "\u00D7Epilobium \u00D7angustifolium"; |
52 | 53 |
botname_2.setNameCache(nameCache_2, true); |
53 | 54 |
Taxon taxon_2 = Taxon.NewInstance(botname_2, sec); |
54 | 55 |
|
55 |
BotanicalName botname_3 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
56 |
BotanicalName botname_3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
56 | 57 |
String nameCache_3 = "Epilobium lamyi"; |
57 | 58 |
botname_3.setNameCache(nameCache_3, true); |
58 | 59 |
Taxon taxon_3 = Taxon.NewInstance(botname_3, sec); |
59 | 60 |
|
60 |
BotanicalName botname_4 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
61 |
BotanicalName botname_4 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
61 | 62 |
String nameCache_4 = "Epilobium tournefortii"; |
62 | 63 |
botname_4.setNameCache(nameCache_4, true); |
63 | 64 |
Taxon taxon_4 = Taxon.NewInstance(botname_4, sec); |
... | ... | |
110 | 111 |
|
111 | 112 |
Reference sec = ReferenceFactory.newBook(); |
112 | 113 |
|
113 |
BotanicalName botname_1 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
114 |
BotanicalName botname_1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
114 | 115 |
String nameCache_1 = "Epilobium \u00D7aschersonianum Hausskn."; |
115 | 116 |
botname_1.setNameCache(nameCache_1, true); |
116 | 117 |
Taxon taxon_1 = Taxon.NewInstance(botname_1, sec); |
117 | 118 |
|
118 |
BotanicalName botname_2 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
119 |
BotanicalName botname_2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
119 | 120 |
String nameCache_2 = "\u00D7Epilobium \u00D7angustifolium"; |
120 | 121 |
botname_2.setNameCache(nameCache_2, true); |
121 | 122 |
Taxon taxon_2 = Taxon.NewInstance(botname_2, sec); |
... | ... | |
137 | 138 |
Assert.assertTrue(taxonNodeByNameComparator.compare(node1, node2) > 0); |
138 | 139 |
|
139 | 140 |
} |
140 |
|
|
141 |
|
|
141 | 142 |
/** |
142 | 143 |
* test method for {@link TaxonNodeByNameComparator#compare(eu.etaxonomy.cdm.model.taxon.TaxonNode |
143 | 144 |
* , eu.etaxonomy.cdm.model.taxon.TaxonNode) } |
... | ... | |
149 | 150 |
|
150 | 151 |
Reference sec = ReferenceFactory.newBook(); |
151 | 152 |
|
152 |
BotanicalName botname_1 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
153 |
BotanicalName botname_1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
153 | 154 |
String nameCache_1 = "Epilobium \u00D7aschersonianum Hausskn."; |
154 | 155 |
botname_1.setNameCache(nameCache_1, true); |
155 | 156 |
Taxon taxon_1 = Taxon.NewInstance(botname_1, sec); |
156 | 157 |
|
157 |
BotanicalName botname_2 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
158 |
BotanicalName botname_2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
158 | 159 |
String nameCache_2 = "\u00D7Epilobium \u00D7angustifolium"; |
159 | 160 |
botname_2.setNameCache(nameCache_2, true); |
160 | 161 |
Taxon taxon_2 = Taxon.NewInstance(botname_2, sec); |
161 | 162 |
|
162 |
BotanicalName botname_3 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
163 |
BotanicalName botname_3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
163 | 164 |
String nameCache_3 = "Epilobium lamyi"; |
164 | 165 |
botname_3.setNameCache(nameCache_3, true); |
165 | 166 |
Taxon taxon_3 = Taxon.NewInstance(botname_3, sec); |
166 | 167 |
|
167 |
BotanicalName botname_4 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
168 |
BotanicalName botname_4 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
168 | 169 |
String nameCache_4 = "Epilobium tournefortii"; |
169 | 170 |
botname_4.setNameCache(nameCache_4, true); |
170 | 171 |
Taxon taxon_4 = Taxon.NewInstance(botname_4, sec); |
171 |
|
|
172 |
BotanicalName botname_5 = BotanicalName.NewInstance(Rank.SPECIES());
|
|
172 |
|
|
173 |
BotanicalName botname_5 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
173 | 174 |
String nameCache_5= "Epilobium hirsutum L."; |
174 | 175 |
botname_5.setNameCache(nameCache_5, true); |
175 | 176 |
Taxon taxon_5 = Taxon.NewInstance(botname_5, sec); |
... | ... | |
180 | 181 |
node2.addChildTaxon(taxon_4, sec, null); |
181 | 182 |
|
182 | 183 |
classification.getChildNodes(); |
183 |
|
|
184 |
|
|
184 | 185 |
ArrayList<TaxonNode> taxonNodes = new ArrayList<TaxonNode>(); |
185 | 186 |
taxonNodes.addAll(classification.getChildNodes()); |
186 | 187 |
|
187 | 188 |
// order using default settings |
188 | 189 |
TaxonNaturalComparator taxonNodeComparator = new TaxonNaturalComparator(); |
189 | 190 |
// Collections.sort(taxonNodes, taxonNodeComparator); |
190 |
|
|
191 |
|
|
191 | 192 |
int i = 0; |
192 | 193 |
logger.debug("order using default settings"); |
193 | 194 |
logger.debug(((BotanicalName)taxonNodes.get(i).getTaxon().getName()).getNameCache()); |
... | ... | |
198 | 199 |
Assert.assertEquals(nameCache_3, ((BotanicalName)taxonNodes.get(i).getTaxon().getName()).getNameCache()); |
199 | 200 |
logger.debug(((BotanicalName)taxonNodes.get(i++).getTaxon().getName()).getNameCache()); |
200 | 201 |
Assert.assertEquals(nameCache_4, ((BotanicalName)taxonNodes.get(i).getTaxon().getName()).getNameCache()); |
201 |
|
|
202 |
|
|
202 | 203 |
TaxonNode result = classification.addChildTaxon(taxon_5, 2, null, null); |
203 | 204 |
Assert.assertTrue(result.getSortIndex() == 2); |
204 |
|
|
205 |
|
|
205 | 206 |
i = 0; |
206 |
|
|
207 |
|
|
207 | 208 |
logger.debug(((BotanicalName)classification.getChildNodes().get(i).getTaxon().getName()).getNameCache()); |
208 | 209 |
Assert.assertEquals(nameCache_1, ((BotanicalName)classification.getChildNodes().get(i).getTaxon().getName()).getNameCache()); |
209 | 210 |
logger.debug(((BotanicalName)classification.getChildNodes().get(i++).getTaxon().getName()).getNameCache()); |
... | ... | |
214 | 215 |
Assert.assertEquals(nameCache_3, ((BotanicalName)classification.getChildNodes().get(i).getTaxon().getName()).getNameCache()); |
215 | 216 |
|
216 | 217 |
} |
217 |
|
|
218 |
|
|
218 | 219 |
|
219 | 220 |
} |
Also available in: Unified diff
ref #6365 merge static methods from BotanicaName to TaxonNameBase