infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 01:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8148914: BitDepth.java test fails

Browse Source 
Reviewed-by: bpb, prr
This commit is contained in:
Joe Darcy 2016-02-17 12:47:35 -08:00
parent 6fe8f6f2f5
commit bf048683fc
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
jdk/test/javax/imageio/plugins/shared/BitDepth.java
View File

@ -35,7 +35,11 @@ import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import javax.imageio.ImageIO;
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.ImageWriter;
import javax.imageio.stream.ImageOutputStream;
public class BitDepth {
@ -114,15 +118,15 @@ public class BitDepth {
private int width = 80;
private int height = 80;
private String[] format = { "png", "jpeg", "tif", "bmp", "gif" };
private String[] formats = { "png", "jpeg", "tiff", "bmp", "gif" };
public BitDepth(String[] args) throws IOException {
if (args.length > 0) {
format = args;
formats = args;
}
for (int i = 0; i < format.length; i++) {
testFormat(format[i]);
for (String format : formats) {
testFormat(format);
}
}
@ -130,11 +134,7 @@ public class BitDepth {
boolean allOK = true;
for (int i = 0; i < biRGBTypes.length; i++) {
int type = biRGBTypes[i];
for (int type : biRGBTypes) {
// TODO: remove the following 'if' block after the 8147448 fix
if ( format.toLowerCase().equals("bmp") && (
(type == BufferedImage.TYPE_INT_ARGB ) ||
@ -148,10 +148,12 @@ public class BitDepth {
continue;
}
System.out.println("Testing " + format +
" writer for type " + biTypeNames[type]);
File f = testWriteRGB(format, type);
if (f == null)
continue;
boolean ok = testReadRGB(f);
if (ok) {
f.delete();
@ -159,8 +161,6 @@ public class BitDepth {
allOK = allOK && ok;
}
if (format.equals("png")) {
System.out.println("Testing png writer for black stripe");
boolean ok = testPNGByteBinary();
@ -191,13 +191,22 @@ public class BitDepth {
g.setColor(blue);
g.fillRect(50, 50, 20, 20);
ImageTypeSpecifier spec = new ImageTypeSpecifier(bi);
Iterator<ImageWriter> writers = ImageIO.getImageWriters(spec, format);
File file = new File("BitDepth_" + biTypeNames[type] + "." + format);
try {
ImageIO.write(bi, format, file);
} catch (RuntimeException re) {
System.out.println("Can't write a type "
+ biTypeNames[type] +
" BufferedImage!");
if (!writers.hasNext()) {
System.out.println("\tNo writers available for type " + biTypeNames[type]
+ " BufferedImage!");
} else {
ImageWriter writer = writers.next();
try (ImageOutputStream out = ImageIO.createImageOutputStream(file)) {
writer.setOutput(out);
writer.write(bi);
} catch (Exception e) {
System.out.println("\tCan't write a type " + biTypeNames[type]
+ " BufferedImage!");
return null;
}
}
return file;