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/model/media/MediaTest.java
127 127
			Assert.assertEquals("Only meda representation must have same MimeType as mediaRepresentation1", mediaRepresentation1.getMimeType(), mediaClone.getRepresentations().iterator().next().getMimeType());
128 128
			Assert.assertTrue("Rights must contain rights1", mediaClone.getRights().contains(rights1));
129 129
		
130
			Assert.assertTrue("Clone must have a default language title", mediaClone.getTitle().containsKey(Language.DEFAULT()));
131
			Assert.assertSame("Title must be the same", languageString2, mediaClone.getTitle().get(Language.DEFAULT()) );
130
			Assert.assertTrue("Clone must have a default language title", mediaClone.getAllTitles().containsKey(Language.DEFAULT()));
131
			Assert.assertSame("Title must be the same", languageString2, mediaClone.getAllTitles().get(Language.DEFAULT()) );
132 132
			
133 133
		} catch (CloneNotSupportedException e) {
134 134
			Assert.fail("Media must be cloneable");
......
182 182
	 */
183 183
	@Test
184 184
	public void testAddTitle() {
185
		Assert.assertSame("Title must be the same", languageString2, media1.getTitle().get(Language.DEFAULT()) );
185
		Assert.assertSame("Title must be the same", languageString2, media1.getAllTitles().get(Language.DEFAULT()) );
186 186
	}
187 187

  
188 188
	/**
......
190 190
	 */
191 191
	@Test
192 192
	public void testRemoveTitle() {
193
		Assert.assertSame("Title must be the same", languageString2, media1.getTitle().get(Language.DEFAULT()) );
193
		Assert.assertSame("Title must be the same", languageString2, media1.getAllTitles().get(Language.DEFAULT()) );
194 194
		media1.removeTitle(Language.GERMAN());
195
		Assert.assertEquals("Number of titles must be 1", 1, media1.getTitle().size());
195
		Assert.assertEquals("Number of titles must be 1", 1, media1.getAllTitles().size());
196 196
		media1.removeTitle(Language.DEFAULT());
197
		Assert.assertEquals("Number of titles must be 0", 0, media1.getTitle().size());
198
		Assert.assertFalse("Title must not contain languageString2", languageString2.equals(media1.getTitle().get(Language.DEFAULT())));
197
		Assert.assertEquals("Number of titles must be 0", 0, media1.getAllTitles().size());
198
		Assert.assertFalse("Title must not contain languageString2", languageString2.equals(media1.getAllTitles().get(Language.DEFAULT())));
199 199
	}
200 200

  
201 201
	/**
......
264 264
	@Test
265 265
	public void testfindBestMatchingRepresentation() {
266 266
		String[] mimetypes = {".*"};
267
		Assert.assertEquals(mediaRepresentation1, media1.findBestMatchingRepresentation(100, 100, 100, mimetypes));
268
		Assert.assertEquals(mediaRepresentation2, media1.findBestMatchingRepresentation(1000, 100, 100, mimetypes));
267
		Assert.assertEquals(mediaRepresentation1, MediaUtils.findBestMatchingRepresentation(media1, 100, 100, 100, mimetypes));
268
		Assert.assertEquals(mediaRepresentation2, MediaUtils.findBestMatchingRepresentation(media1,1000, 100, 100, mimetypes));
269 269
	
270 270
	}
271 271
}

Also available in: Unified diff