Project

General

Profile

« Previous | Next » 

Revision fda879aa

Added by Andreas Müller about 13 years ago

Bugfix for hybrid name caching test. Hybrid sign replaced by \u00d7

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
209 209
	 */
210 210
	@Test
211 211
	public void testHybridNames() {
212
		//Note \u00D7 : hybrid sign (multiplication sign)
212 213
		this.speciesName.setCombinationAuthorTeam(author);
213 214
		Assert.assertEquals(author.getNomenclaturalTitle(), speciesName.getAuthorshipCache());
214 215
		Assert.assertEquals("Should be Abies alba L.", "Abies alba L.", speciesName.getTitleCache());
215 216
		
216 217
		speciesName.setBinomHybrid(true);
217 218
		//Note: This test may fail if aspectj doesn't work correctly
218
		Assert.assertEquals("Should be Abies ?alba L.", "Abies ?alba L.", speciesName.getTitleCache());
219
		Assert.assertEquals("Should be Abies \u00D7alba L.", "Abies \u00D7alba L.", speciesName.getTitleCache());
219 220
		speciesName.setMonomHybrid(true);
220
		Assert.assertEquals("Should be '?Abies ?alba L.'", "?Abies ?alba L.", speciesName.getTitleCache());
221
		Assert.assertEquals("Should be '\u00D7Abies \u00D7alba L.'", "\u00D7Abies \u00D7alba L.", speciesName.getTitleCache());
221 222
		
222 223
		Assert.assertEquals("Should be 'Genus'", "Genus", genusName.getTitleCache());
223 224
		genusName.setMonomHybrid(true);
224
		Assert.assertEquals("Should be '?Genus'", "?Genus", genusName.getTitleCache());
225
		Assert.assertEquals("Should be '\u00D7Genus'", "\u00D7Genus", genusName.getTitleCache());
225 226
	
226 227
		Assert.assertEquals("Should be 'Abies alba subsp. beta'", subSpeciesNameString, subSpeciesName.getTitleCache());
227 228
		subSpeciesName.setTrinomHybrid(true);
228
		Assert.assertEquals("Should be 'Abies alba subsp. ?beta'", "Abies alba subsp. ?beta", subSpeciesName.getTitleCache());
229
		Assert.assertEquals("Should be 'Abies alba subsp. \u00D7beta'", "Abies alba subsp. \u00D7beta", subSpeciesName.getTitleCache());
229 230
		subSpeciesName.setMonomHybrid(true);
230
		Assert.assertEquals("Should be '?Abies alba subsp. ?beta'", "?Abies alba subsp. ?beta", subSpeciesName.getTitleCache());
231
		Assert.assertEquals("Should be '\u00D7Abies alba subsp. \u00D7beta'", "\u00D7Abies alba subsp. \u00D7beta", subSpeciesName.getTitleCache());
231 232
	}
232 233
	
233 234
	@Test

Also available in: Unified diff