svn commit: r1212519 - /commons/proper/digester/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java

[sebb]

Author: sebb
Date: Fri Dec  9 17:01:07 2011
New Revision: 1212519

URL: http://svn.apache.org/viewvc?rev=1212519&view=rev
Log:
Simplify; avoid potential NPE warnings

Modified:
    
commons/proper/digester/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java

Modified: 
commons/proper/digester/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java?rev=1212519&r1=1212518&r2=1212519&view=diff
==============================================================================
--- 
commons/proper/digester/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java
 (original)
+++ 
commons/proper/digester/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java
 Fri Dec  9 17:01:07 2011
@@ -54,14 +54,7 @@ public class TestDefaultPlugin
         Container root = new Container();
         digester.push( root );
 
-        try
-        {
-            digester.parse( Utils.getInputStream( this, "test2.xml" ) );
-        }
-        catch ( Exception e )
-        {
-            throw e;
-        }
+        digester.parse( Utils.getInputStream( this, "test2.xml" ) );
 
         Object child;
         List<Widget> children = root.getChildren();
@@ -103,25 +96,22 @@ public class TestDefaultPlugin
         Container root = new Container();
         digester.push( root );
 
-        Exception exception = null;
         Log oldLog = digester.getLogger();
         try
         {
             digester.setLogger( new NoOpLog() );
             digester.parse( Utils.getInputStream( this, "test2.xml" ) );
+            fail("Expected SAXParseException");
         }
-        catch ( Exception e )
+        catch ( SAXParseException e )
         {
-            exception = e;
+            assertEquals( PluginInvalidInputException.class, 
e.getException().getClass() );
         }
         finally
         {
             digester.setLogger( oldLog );
         }
 
-        assertNotNull( exception );
-        assertEquals( SAXParseException.class, exception.getClass() );
-        assertEquals( PluginInvalidInputException.class, ( (SAXParseException) 
exception ).getException().getClass() );
     }
 
     public void testDefaultPlugins3()
@@ -140,24 +130,20 @@ public class TestDefaultPlugin
         Container root = new Container();
         digester.push( root );
 
-        Exception exception = null;
         Log oldLog = digester.getLogger();
         try
         {
             digester.setLogger( new NoOpLog() );
             digester.parse( Utils.getInputStream( this, "test2.xml" ) );
+            fail("Expected SAXParseException");
         }
-        catch ( Exception e )
+        catch ( SAXParseException e )
         {
-            exception = e;
+            assertEquals( PluginConfigurationException.class, 
e.getException().getClass() );
         }
         finally
         {
             digester.setLogger( oldLog );
         }
-
-        assertNotNull( exception );
-        assertEquals( SAXParseException.class, exception.getClass() );
-        assertEquals( PluginConfigurationException.class, ( 
(SAXParseException) exception ).getException().getClass() );
     }
 }