commit a61f3728d4e2c6454dd0069148397745b6b3a5bf
author Sebastian Bazley <sebb@apache.org> Fri Dec 09 17:01:07 2011 +0000
committer Sebastian Bazley <sebb@apache.org> Fri Dec 09 17:01:07 2011 +0000
tree 2620d30005c3924a8203225dfa0c5d5539bbc659
parent 8ff705130a6c360e7d2009cb9f1a4d0a307985f5

Simplify; avoid potential NPE warnings

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/digester/trunk@1212519 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java

diff --git a/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java b/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java
index 853941b..fd87f2d 100644
--- a/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java
+++ b/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java
@@ -54,14 +54,7 @@
         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 @@
         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 @@
         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() );
     }
 }