You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/01/29 03:22:08 UTC
svn commit: r904350 -
/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java
Author: lindner
Date: Fri Jan 29 02:22:08 2010
New Revision: 904350
URL: http://svn.apache.org/viewvc?rev=904350&view=rev
Log:
junit4 test cleanups
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java?rev=904350&r1=904349&r2=904350&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java Fri Jan 29 02:22:08 2010
@@ -47,53 +47,33 @@
assertTrue(rewritten.getContentLength() <= resp.getContentLength());
}
- @Test
+ @Test(expected=Throwable.class)
public void testBadImage() throws Exception {
// Not a JPEG
- try {
- HttpResponse resp =
- createResponse("org/apache/shindig/gadgets/rewrite/image/bad.jpg", "image/jpeg");
- rewrite(resp);
- fail("Should fail to read an invalid JPEG");
- } catch (Throwable t) {
- // Exception type can vary between implementations
- }
-
+ HttpResponse resp =
+ createResponse("org/apache/shindig/gadgets/rewrite/image/bad.jpg", "image/jpeg");
+ rewrite(resp);
}
- @Test
- @Ignore
+ @Test(expected=Throwable.class)
public void xtestBadICC1() throws Exception {
// ICC section too long
- HttpResponse resp =
- createResponse("org/apache/shindig/gadgets/rewrite/image/badicc.jpg", "image/jpeg");
+ HttpResponse resp = createResponse("org/apache/shindig/gadgets/rewrite/image/badicc.jpg", "image/jpeg");
rewrite(resp);
}
- @Test
+ @Test(expected=Throwable.class)
public void testBadICC2() throws Exception {
// ICC section too long
- try {
- HttpResponse resp =
- createResponse("org/apache/shindig/gadgets/rewrite/image/badicc2.jpg", "image/jpeg");
- rewrite(resp);
- fail("Should error with invalid ICC data");
- } catch (Throwable t) {
- //assertTrue(t instanceof ImageReadException);
- }
+ HttpResponse resp = createResponse("org/apache/shindig/gadgets/rewrite/image/badicc2.jpg", "image/jpeg");
+ rewrite(resp);
}
- @Test
+ @Test(expected=Throwable.class)
public void testBadICC3() throws Exception {
// ICC length lies
- try {
- HttpResponse resp =
- createResponse("org/apache/shindig/gadgets/rewrite/image/badicc3.jpg", "image/jpeg");
- rewrite(resp);
- fail("Should error with invalid ICC data");
- } catch (Throwable t) {
- //assertTrue(t instanceof ImageReadException);
- }
+ HttpResponse resp = createResponse("org/apache/shindig/gadgets/rewrite/image/badicc3.jpg", "image/jpeg");
+ rewrite(resp);
}
@Test