Change MIME types to "image/jpeg", unsuppress warning.

This commit is contained in:
akwizgran
2019-01-15 16:49:18 +00:00
parent ebe6b0d4c0
commit 9557afabc6

View File

@@ -47,7 +47,6 @@ public class AttachmentControllerIntegrationTest {
); );
private final MessageId msgId = new MessageId(getRandomId()); private final MessageId msgId = new MessageId(getRandomId());
@SuppressWarnings("ConstantConditions") // not needed for now
private final AttachmentController controller = private final AttachmentController controller =
new AttachmentController(null, dimensions); new AttachmentController(null, dimensions);
@@ -101,7 +100,7 @@ public class AttachmentControllerIntegrationTest {
@Test @Test
public void testUberGif() throws Exception { public void testUberGif() throws Exception {
AttachmentHeader h = new AttachmentHeader(msgId, "image/jpg"); AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
InputStream is = getUrlInputStream(uberGif); InputStream is = getUrlInputStream(uberGif);
Attachment a = new Attachment(is); Attachment a = new Attachment(is);
AttachmentItem item = controller.getAttachmentItem(h, a, true); AttachmentItem item = controller.getAttachmentItem(h, a, true);
@@ -116,7 +115,7 @@ public class AttachmentControllerIntegrationTest {
@Test @Test
public void testLottaPixels() throws Exception { public void testLottaPixels() throws Exception {
AttachmentHeader h = new AttachmentHeader(msgId, "image/jpg"); AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
InputStream is = getUrlInputStream(lottaPixel); InputStream is = getUrlInputStream(lottaPixel);
Attachment a = new Attachment(is); Attachment a = new Attachment(is);
AttachmentItem item = controller.getAttachmentItem(h, a, true); AttachmentItem item = controller.getAttachmentItem(h, a, true);
@@ -131,7 +130,7 @@ public class AttachmentControllerIntegrationTest {
@Test @Test
public void testImageIoCrash() throws Exception { public void testImageIoCrash() throws Exception {
AttachmentHeader h = new AttachmentHeader(msgId, "image/jpg"); AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
InputStream is = getUrlInputStream(imageIoCrash); InputStream is = getUrlInputStream(imageIoCrash);
Attachment a = new Attachment(is); Attachment a = new Attachment(is);
AttachmentItem item = controller.getAttachmentItem(h, a, true); AttachmentItem item = controller.getAttachmentItem(h, a, true);
@@ -146,7 +145,7 @@ public class AttachmentControllerIntegrationTest {
@Test @Test
public void testGimpCrash() throws Exception { public void testGimpCrash() throws Exception {
AttachmentHeader h = new AttachmentHeader(msgId, "image/jpg"); AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
InputStream is = getUrlInputStream(gimpCrash); InputStream is = getUrlInputStream(gimpCrash);
Attachment a = new Attachment(is); Attachment a = new Attachment(is);
AttachmentItem item = controller.getAttachmentItem(h, a, true); AttachmentItem item = controller.getAttachmentItem(h, a, true);
@@ -161,7 +160,7 @@ public class AttachmentControllerIntegrationTest {
@Test @Test
public void testOptiPngAfl() throws Exception { public void testOptiPngAfl() throws Exception {
AttachmentHeader h = new AttachmentHeader(msgId, "image/jpg"); AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
InputStream is = getUrlInputStream(optiPngAfl); InputStream is = getUrlInputStream(optiPngAfl);
Attachment a = new Attachment(is); Attachment a = new Attachment(is);
AttachmentItem item = controller.getAttachmentItem(h, a, true); AttachmentItem item = controller.getAttachmentItem(h, a, true);
@@ -176,7 +175,7 @@ public class AttachmentControllerIntegrationTest {
@Test @Test
public void testLibrawError() throws Exception { public void testLibrawError() throws Exception {
AttachmentHeader h = new AttachmentHeader(msgId, "image/jpg"); AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
InputStream is = getUrlInputStream(librawError); InputStream is = getUrlInputStream(librawError);
Attachment a = new Attachment(is); Attachment a = new Attachment(is);
AttachmentItem item = controller.getAttachmentItem(h, a, true); AttachmentItem item = controller.getAttachmentItem(h, a, true);
@@ -230,7 +229,7 @@ public class AttachmentControllerIntegrationTest {
@Test @Test
public void testHighError() throws Exception { public void testHighError() throws Exception {
AttachmentHeader h = new AttachmentHeader(msgId, "image/jpg"); AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
InputStream is = getAssetInputStream("error_high.jpg"); InputStream is = getAssetInputStream("error_high.jpg");
Attachment a = new Attachment(is); Attachment a = new Attachment(is);
AttachmentItem item = controller.getAttachmentItem(h, a, true); AttachmentItem item = controller.getAttachmentItem(h, a, true);
@@ -245,7 +244,7 @@ public class AttachmentControllerIntegrationTest {
@Test @Test
public void testWideError() throws Exception { public void testWideError() throws Exception {
AttachmentHeader h = new AttachmentHeader(msgId, "image/jpg"); AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
InputStream is = getAssetInputStream("error_wide.jpg"); InputStream is = getAssetInputStream("error_wide.jpg");
Attachment a = new Attachment(is); Attachment a = new Attachment(is);
AttachmentItem item = controller.getAttachmentItem(h, a, true); AttachmentItem item = controller.getAttachmentItem(h, a, true);