You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@commons.apache.org by br...@apache.org on 2013/08/05 19:42:00 UTC

svn commit: r1510622 - /commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java

Author: britter
Date: Mon Aug  5 17:42:00 2013
New Revision: 1510622

URL: http://svn.apache.org/r1510622
Log:
Use annotation based testing for failure cases

Modified:
    commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java

Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java?rev=1510622&r1=1510621&r2=1510622&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java Mon Aug  5 17:42:00 2013
@@ -55,21 +55,12 @@ public class DataSourceCompositeResolver
         assertTrue(toByteArray(dataSourceResolver.resolve("/contentTypeTest.gif")).length > 0);
     }
 
-    @Test
+    @Test(expected = IOException.class)
     public void testResolvingFilesNonLenient() throws Exception
     {
         DataSourceResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, false);
 
-        try
-        {
-            dataSourceResolver.resolve("./image/does-not-exist.gif");
-            fail("Expected an IOException");
-        }
-        catch(IOException e)
-        {
-            // expected
-            return;
-        }
+        dataSourceResolver.resolve("./image/does-not-exist.gif");
     }
 
     @Test