Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-05-28 00:00:03 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Work in progress for PSD metadata support:"

Browse Source 
This reverts commit b5f6c96583.
This commit is contained in:
Erlend Hamnaberg
2009-11-11 21:47:31 +01:00
parent e8a4cc048c
commit 27553dc47a
9 changed files with 44 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java
+5 -22
View File
@@ -36,7 +36,6 @@ import org.jmock.core.Stub;
import javax.imageio.*;
import javax.imageio.event.IIOReadProgressListener;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.stream.ImageInputStream;
@@ -1321,9 +1320,7 @@ public abstract class ImageReaderAbstractTestCase<T extends ImageReader> extends
assertEquals(type.getColorModel(), result.getColorModel());
// The following logically tests
// assertEquals(type.getSampleModel(), result.getSampleModel());
// but SampleModel does not have a proper equals method.
// assertEquals(type.getSampleModel(), result.getSampleModel());
SampleModel expectedModel = type.getSampleModel();
SampleModel resultModel = result.getSampleModel();
@@ -1338,6 +1335,10 @@ public abstract class ImageReaderAbstractTestCase<T extends ImageReader> extends
}
}
// public void testSetDestinationTypeIllegal() throws IOException {
// throw new UnsupportedOperationException("Method testSetDestinationTypeIllegal not implemented"); // TODO: Implement
// }
//
// public void testSetDestinationBands() throws IOException {
// throw new UnsupportedOperationException("Method testSetDestinationBands not implemented"); // TODO: Implement
// }
@@ -1346,24 +1347,6 @@ public abstract class ImageReaderAbstractTestCase<T extends ImageReader> extends
// throw new UnsupportedOperationException("Method testSetDestinationBands not implemented"); // TODO: Implement
// }
public void testProviderAndMetadataFormatNamesMatch() throws IOException {
ImageReaderSpi provider = createProvider();
ImageReader reader = createReader();
reader.setInput(getTestData().get(0).getInputStream());
IIOMetadata imageMetadata = reader.getImageMetadata(0);
if (imageMetadata != null) {
assertEquals(provider.getNativeImageMetadataFormatName(), imageMetadata.getNativeMetadataFormatName());
}
IIOMetadata streamMetadata = reader.getStreamMetadata();
if (streamMetadata != null) {
assertEquals(provider.getNativeStreamMetadataFormatName(), streamMetadata.getNativeMetadataFormatName());
}
}
protected URL getClassLoaderResource(final String pName) {
return getClass().getResource(pName);
}