Project

General

Profile

« Previous | Next » 

Revision 892efc69

Added by Andreas Kohlbecker almost 14 years ago

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java
158 158
		subSpeciesName.setBasionymAuthorTeam(basAuthor);
159 159
		subSpeciesName.setExBasionymAuthorTeam(exBasAuthor);
160 160
		assertEquals(subSpeciesNameString, strategy.getNameCache(subSpeciesName));
161
		assertEquals(subSpeciesNameString + " (" + exBasAuthorString + " ex " + basAuthorString + ")" +  " " + exAuthorString + " ex " + authorString  , strategy.getTitleCache(subSpeciesName));
161
		assertEquals(subSpeciesNameString + " (" + basAuthorString + " ex " + exBasAuthorString + ")" +  " " + authorString + " ex " + exAuthorString  , strategy.getTitleCache(subSpeciesName));
162
		
163
		subSpeciesName.setExCombinationAuthorTeam(null);
164
		assertEquals(subSpeciesNameString + " (" + basAuthorString + " ex " + exBasAuthorString + ")" +  " " + authorString , strategy.getTitleCache(subSpeciesName));
165
				
166
		subSpeciesName.setExBasionymAuthorTeam(null);
167
		assertEquals(subSpeciesNameString + " (" + basAuthorString + ")" +  " " + authorString , strategy.getTitleCache(subSpeciesName));
168
			
162 169
		
163 170
		//Autonym
164 171
		subSpeciesName.setInfraSpecificEpithet("alba");
......
169 176
		//changed 2009-09-04
170 177
		assertEquals("Abies alba subsp. alba", strategy.getNameCache(subSpeciesName));
171 178
		assertEquals("Abies alba L. subsp. alba", strategy.getTitleCache(subSpeciesName));
172
	}
179
		
180
		
181
		
182
		}
173 183

  
174 184
	/**
175 185
	 * Test method for {@link eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy#getFullTitleCache(eu.etaxonomy.cdm.model.common.CdmBase)}.
......
192 202
		assertEquals(authorString, strategy.getAuthorshipCache(subSpeciesName));
193 203

  
194 204
		subSpeciesName.setExCombinationAuthorTeam(exAuthor);
195
		assertEquals(exAuthorString + " ex " + authorString  , strategy.getAuthorshipCache(subSpeciesName));
205
		assertEquals(authorString + " ex " + exAuthorString  , strategy.getAuthorshipCache(subSpeciesName));
196 206
		
197 207
		subSpeciesName.setBasionymAuthorTeam(basAuthor);
198
		assertEquals("(" + basAuthorString + ")" +  " " + exAuthorString + " ex " + authorString  , strategy.getAuthorshipCache(subSpeciesName));
208
		assertEquals("(" + basAuthorString + ")" +  " " + authorString + " ex " + exAuthorString  , strategy.getAuthorshipCache(subSpeciesName));
199 209

  
200 210
		subSpeciesName.setExBasionymAuthorTeam(exBasAuthor);
201
		assertEquals("(" + exBasAuthorString + " ex " + basAuthorString + ")" +  " " + exAuthorString + " ex " + authorString  , strategy.getAuthorshipCache(subSpeciesName));
211
		assertEquals("(" + basAuthorString + " ex " + exBasAuthorString + ")" +  " " + authorString + " ex " + exAuthorString  , strategy.getAuthorshipCache(subSpeciesName));
202 212
		
203 213
		assertNull(subSpeciesNameString, strategy.getAuthorshipCache(null));
204 214
	}

Also available in: Unified diff