Project

General

Profile

« Previous | Next » 

Revision fe43cd3b

Added by Andreas Müller over 8 years ago

Implement taggedTitle for taxon base #5229

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
34 34
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
35 35
import eu.etaxonomy.cdm.strategy.cache.HTMLTagRules;
36 36
import eu.etaxonomy.cdm.strategy.cache.TagEnum;
37
import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;
37 38
import eu.etaxonomy.cdm.strategy.cache.TaggedText;
38 39

  
39 40
/**
......
126 127
        Assert.assertEquals(subSpeciesNameString + ", " +  referenceTitle, subSpeciesName.getFullTitleCache());
127 128
        //TODO not yet completed
128 129
    }
129
    
130

  
130 131
    @Test
131 132
    public void testGattungsAutonyme() {
132 133
    	BotanicalName botName = BotanicalName.NewInstance(Rank.SECTION_BOTANY());
......
135 136
		botName.setInfraGenericEpithet(strTaraxacum);
136 137
		botName.setAuthorshipCache("Author");
137 138
		Assert.assertFalse(botName.getFullTitleCache().contains("bot."));
138
		//TODO #4288 
139
		//TODO #4288
139 140
		System.out.println(botName.getFullTitleCache());
140 141
    }
141
        
142
    
142

  
143

  
143 144

  
144 145
    /**
145 146
     * Test method for {@link eu.etaxonomy.cdm.strategy.cache.name.NonViralNameDefaultCacheStrategy#getNameCache(eu.etaxonomy.cdm.model.name.NonViralName)}.
......
188 189
        Assert.assertEquals("", "Genus sect. Infragenus", botName.getNameCache());
189 190
        botName.setRank(Rank.SUBSECTION_BOTANY());
190 191
        Assert.assertEquals("", "Genus subsect. Infragenus", botName.getNameCache());
191
        
192

  
192 193
        //zool. specific ranks (we don't have markers here therefore no problem should exist
193 194
        ZoologicalName zooName = ZoologicalName.NewInstance(Rank.SECTION_ZOOLOGY());
194 195
        zooName.setGenusOrUninomial("Genus");
......
196 197
        Assert.assertEquals("", "Genus", zooName.getNameCache());
197 198
        zooName.setRank(Rank.SUBSECTION_ZOOLOGY());
198 199
        Assert.assertEquals("", "Genus", zooName.getNameCache());
199
        
200

  
200 201
    }
201 202

  
202 203
    /**
......
289 290
        Assert.assertEquals("", "Abies alba L. \u00D7 Second parent Mill.", hybridName.getTitleCache());
290 291

  
291 292
    }
292
    
293

  
293 294
    //TODO add more tests when specification is clearer
294 295
    @Test
295 296
    public void testOriginalSpelling() {
......
297 298
    	NonViralName<?> originalName = (NonViralName<?>)speciesName.clone();
298 299
    	originalName.setSpecificEpithet("alpa");
299 300
    	Assert.assertEquals("Preconditions are wrong", "Abies alpa", originalName.getNameCache());
300
    	
301

  
301 302
    	speciesName.addRelationshipFromName(originalName, origSpellingType, null);
302 303
    	Assert.assertEquals("Abies alba 'alpa'", speciesName.getNameCache());
303 304
    	originalName.setGenusOrUninomial("Apies");
304
    	
305

  
305 306
    	speciesName.setNameCache(null, false);
306 307
    	//TODO update cache of current name (species name)
307 308
    	Assert.assertEquals("Abies alba 'Apies alpa'", speciesName.getNameCache());
......
519 520

  
520 521
        //test ordinary infrageneric
521 522
        List<TaggedText> subGenusNameCacheTagged = strategy.getInfraGenusTaggedNameCache(nonViralName);
522
        String subGenusNameCache = NonViralNameDefaultCacheStrategy.createString(subGenusNameCacheTagged);
523
        String subGenusNameCache = TaggedCacheHelper.createString(subGenusNameCacheTagged);
523 524
        assertEquals("Subgenus name should be 'Genus subg. subgenus'.", "Genus subg. subgenus", subGenusNameCache);
524 525
        String subGenusTitle = strategy.getTitleCache(nonViralName);
525 526
        assertEquals("Subgenus name should be 'Genus subg. subgenus Anyauthor'.", "Genus subg. subgenus Anyauthor", subGenusTitle);
......
532 533

  
533 534
        List<TaggedText> aggrNameCacheTagged = strategy.getInfraGenusTaggedNameCache(nonViralName);
534 535

  
535
        String aggrNameCache = strategy.createString(aggrNameCacheTagged);
536
        String aggrNameCache = TaggedCacheHelper.createString(aggrNameCacheTagged);
536 537
        assertEquals("Species aggregate name should be 'Genus myspecies aggr.'.", "Genus myspecies aggr.", aggrNameCache);
537 538
        String aggrNameTitle = strategy.getTitleCache(nonViralName);
538 539
        Assert.assertTrue("Species aggregate should not include author information.", aggrNameTitle.indexOf(author) == -1);
......
549 550

  
550 551

  
551 552
        aggrNameCacheTagged = strategy.getInfraGenusTaggedNameCache(nonViralName);
552
        aggrNameCache = strategy.createString(aggrNameCacheTagged);
553
        aggrNameCache = TaggedCacheHelper.createString(aggrNameCacheTagged);
553 554
        assertEquals("Species aggregate name should be 'Genus (Infragenus) myspecies aggr.'.", "Genus (Infragenus) myspecies aggr.", aggrNameCache);
554 555

  
555 556
        aggrNameTitle = strategy.getTitleCache(nonViralName);
......
565 566
        nonViralName.setSpecificEpithet("myspecies");
566 567
        nonViralName.setInfraGenericEpithet(null);
567 568
        nonViralName.setAuthorshipCache("L.");
568
        
569

  
569 570
        aggrNameCacheTagged = strategy.getTaggedTitle(nonViralName);
570
        aggrNameCache = strategy.createString(aggrNameCacheTagged);
571
        aggrNameCache = TaggedCacheHelper.createString(aggrNameCacheTagged);
571 572
        assertEquals("Species aggregate name should be 'Genus myspecies L.'.", "Genus myspecies L.", aggrNameCache);
572
        
573

  
573 574
    }
574 575

  
575 576
    /**
......
597 598
        //to be continued
598 599

  
599 600
    }
600
    
601

  
601 602
    @Test
602 603
    public void testTitleCacheHtmlTagged(){
603 604
    	HTMLTagRules rules = new HTMLTagRules().addRule(TagEnum.name, "i");
......
610 611
    	Assert.assertEquals("<b><i>Abies alba</i></b> <i>L.</i>", strategy.getTitleCache(speciesName, rules));
611 612
    	rules = new HTMLTagRules().addRule(TagEnum.name, "i").addRule(TagEnum.name, "b").addRule(TagEnum.authors, "b");
612 613
    	Assert.assertEquals("<b><i>Abies alba</i> L.</b>", strategy.getTitleCache(speciesName, rules));
613
    	
614

  
614 615
    }
615
    
616

  
616 617
    @Test //#2888
617 618
    public void testAutonymWithExAuthor(){
618 619
    	BotanicalName name = BotanicalName.NewInstance(Rank.FORM());
......
623 624
    	name.setCombinationAuthorship(combTeam);
624 625
    	Team exCombTeam = Team.NewTitledInstance("Excomb", "Excomb");
625 626
    	name.setExCombinationAuthorship(exCombTeam);
626
    	
627

  
627 628
    	Assert.assertEquals("", "Euphorbia atropurpurea Excomb ex Combauthor f. atropurpurea", name.getTitleCache());
628 629
    }
629 630

  

Also available in: Unified diff