Project

General

Profile

« Previous | Next » 

Revision 6cfc0581

Added by Andreas Müller over 2 years ago

ref #9755 update cultivarName->cultivarEpithet

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/TaxonNameDefaultCacheStrategyTest.java
288 288

  
289 289
        //cultivar
290 290
        speciesName.setRank(Rank.CULTIVAR());
291
        speciesName.setCultivarName("Cultus");
291
        speciesName.setCultivarEpithet("Cultus");
292 292
        Assert.assertEquals("Abies alba 'Cultus'", strategy.getTitleCache(speciesName));
293 293

  
294 294
        speciesName.setBinomHybrid(true);
......
301 301
        //cultivar group
302 302
        speciesName.setRank(Rank.CULTIVARGROUP());
303 303
        Assert.assertEquals("Abies Group", strategy.getTitleCache(speciesName)); //not sure if this is correct for an empty group field
304
        speciesName.setCultivarGroup("Cultus Group");
304
        speciesName.setCultivarGroupEpithet("Cultus Group");
305 305
        Assert.assertEquals("Abies Cultus Group", strategy.getTitleCache(speciesName));
306 306

  
307
        speciesName.setCultivarGroup("Cultus Gruppe");
307
        speciesName.setCultivarGroupEpithet("Cultus Gruppe");
308 308
        Assert.assertEquals("Abies Cultus Gruppe", strategy.getTitleCache(speciesName));
309
        speciesName.setCultivarGroup("Cultus Gp");
309
        speciesName.setCultivarGroupEpithet("Cultus Gp");
310 310
        Assert.assertEquals("Abies Cultus Gp", strategy.getTitleCache(speciesName));
311
        speciesName.setCultivarGroup("Gruppo Cultus");
311
        speciesName.setCultivarGroupEpithet("Gruppo Cultus");
312 312
        Assert.assertEquals("Abies Gruppo Cultus", strategy.getTitleCache(speciesName));
313
        speciesName.setCultivarGroup("Druppo Cultus");
313
        speciesName.setCultivarGroupEpithet("Druppo Cultus");
314 314
        Assert.assertEquals("Abies Druppo Cultus Group", strategy.getTitleCache(speciesName));
315 315

  
316 316
        //grex
317 317
        speciesName.setRank(Rank.GREX());
318
        speciesName.setCultivarGroup("Lovely");
318
        speciesName.setCultivarGroupEpithet("Lovely");
319 319
        Assert.assertEquals("Abies Lovely grex", strategy.getTitleCache(speciesName));
320 320

  
321 321
        //graft chimaera
......
323 323
        //either formula (like hybrids) concatenated by ' + ' (Art. 24.2)
324 324
        speciesName.setRank(Rank.GRAFTCHIMAERA());
325 325
        speciesName.setGenusOrUninomial("Laburnocytisus");
326
        speciesName.setCultivarName("Adamii");
326
        speciesName.setCultivarEpithet("Adamii");
327 327

  
328 328
        Assert.assertEquals("+ Laburnocytisus 'Adamii'", strategy.getTitleCache(speciesName));
329 329
    }

Also available in: Unified diff