Project

General

Profile

« Previous | Next » 

Revision 87d4d2bb

Added by Katja Luther over 14 years ago

View differences:

cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/MediaMetaDataTest.java
24 24
import org.junit.Ignore;
25 25
import org.junit.Test;
26 26

  
27
import eu.etaxonomy.cdm.common.MediaMetaData.ImageMetaData;
27
import eu.etaxonomy.cdm.common.mediaMetaData.MediaMetaData;
28
import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;
29
import eu.etaxonomy.cdm.common.mediaMetaData.MetaDataFactory;
30
import eu.etaxonomy.cdm.common.mediaMetaData.MimeType;
28 31

  
29 32
/**
30 33
 * @author n.hoffmann
......
68 71
	@Test
69 72
	public void readImageInfoFromFile() {
70 73
		File imageFile = new File("./src/test/resources/images/OregonScientificDS6639-DSC_0307-small.jpg");
71
		ImageMetaData imageMetaData = new ImageMetaData();
72
		imageMetaData = MediaMetaData.readImageMetaData(imageFile, imageMetaData);
74
		MetaDataFactory metaFactory = MetaDataFactory.getInstance();
75
		ImageMetaData imageMetaData = (ImageMetaData) metaFactory.readMediaData(imageFile.toURI(), MimeType.JPEG);
76
		//imageMetaData.readFrom(imageFile);
73 77
		
74 78
		assertImageInfo(imageMetaData);		
79
		imageFile = new File("./src/test/resources/images/OregonScientificDS6639-DSC_0307-small.tif");
80
		
81
		 imageMetaData = (ImageMetaData) metaFactory.readMediaData(imageFile.toURI(), MimeType.IMAGE);
82
		 assertTiffInfo(imageMetaData);		
75 83
	}
76 84
	
77 85
	@Ignore
......
81 89
			//TODO make ready for windows
82 90
			URL imageUrl = new URL("file://" + new File("").getAbsolutePath()+ "/src/test/resources/images/OregonScientificDS6639-DSC_0307-small.jpg");
83 91
			
84
			ImageMetaData imageMetaData = new ImageMetaData();
85
			imageMetaData = MediaMetaData.readImageMetaData(imageUrl, imageMetaData);
92
			MetaDataFactory metaFactory = MetaDataFactory.getInstance();
93
			ImageMetaData imageMetaData = (ImageMetaData) metaFactory.readMediaData(CdmUtils.string2Uri(imageUrl.toString()), MimeType.JPEG);
94
			//imageMetaData.readImageMetaData(imageUrl);
86 95
			
87 96
			assertImageInfo(imageMetaData);		
88 97
			
......
99 108
		Assert.assertEquals("image/jpeg", imageMetaData.getMimeType());
100 109
		
101 110
	}
111
	
112
	private void assertTiffInfo (ImageMetaData imageMetaData){
113
		
114
		Assert.assertEquals(24, imageMetaData.getBitPerPixel());
115
		Assert.assertEquals("TIFF Tag-based Image File Format", imageMetaData.getFormatName());
116
		Assert.assertEquals(300, imageMetaData.getWidth());
117
		Assert.assertEquals(225, imageMetaData.getHeight());
118
		Assert.assertEquals("image/tiff", imageMetaData.getMimeType());
119
	}
102 120
}

Also available in: Unified diff