[jspwiki] 02/04: overwrite deletePage method to add some log if an exception happens; add default constructor which uses getTestProperties internally

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 1800df5efa5f49bdf5ed442aa812881c5f85931f
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Sep 8 20:38:03 2019 +0200

    overwrite deletePage method to add some log if an exception happens; add default constructor which uses getTestProperties internally
---
 .../src/test/java/org/apache/wiki/TestEngine.java  | 45 +++++++++++-----------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
index ac3f099..71de8c0 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -113,16 +113,16 @@ public class TestEngine extends WikiEngine
             // Set up a test Janne session
             HttpServletRequest request = newHttpRequest();
             m_janneWikiSession = WikiSession.getWikiSession( this, request );
-            this.getAuthenticationManager().login( m_janneWikiSession, request,
-                    Users.JANNE,
-                    Users.JANNE_PASS );
+            this.getAuthenticationManager().login( m_janneWikiSession, request, Users.JANNE, Users.JANNE_PASS );
         }
         return m_janneWikiSession;
     }
 
-    public TestEngine( Properties props )
-        throws WikiException
-    {
+    public TestEngine() throws WikiException {
+        this( getTestProperties() );
+    }
+
+    public TestEngine( Properties props ) throws WikiException {
         super( new MockServletContext( "test" ), "test", cleanTestProps( props ) );
 
         // Stash the WikiEngine in the servlet context
@@ -261,29 +261,32 @@ public class TestEngine extends WikiEngine
     /**
      *  Copied from FileSystemProvider
      */
-    protected static String mangleName( String pagename )
-        throws IOException
-    {
-        Properties properties = new Properties();
-        String m_encoding = properties.getProperty( WikiEngine.PROP_ENCODING,
-                                                    AbstractFileProvider.DEFAULT_ENCODING );
+    protected static String mangleName( String pagename ) {
+        final Properties properties = new Properties();
+        final String m_encoding = properties.getProperty( WikiEngine.PROP_ENCODING, AbstractFileProvider.DEFAULT_ENCODING );
 
         pagename = TextUtil.urlEncode( pagename, m_encoding );
         pagename = TextUtil.replaceString( pagename, "/", "%2F" );
         return pagename;
     }
 
+    public void deletePage( final String pageName ) throws ProviderException {
+        try {
+            super.deletePage( pageName );
+        } catch( final ProviderException | RuntimeException e ) {
+            log.error( e.getMessage(), e );
+            throw e;
+        }
+    }
+
     /**
      *  Removes a page, but not any auxiliary information.  Works only
      *  with FileSystemProvider.
      */
-    public void deleteTestPage( String name )
-    {
-        Properties properties = getTestProperties();
-
-        try
-        {
-            String files = properties.getProperty( FileSystemProvider.PROP_PAGEDIR );
+    public void deleteTestPage( final String name ) {
+        final Properties properties = getTestProperties();
+        try {
+            final String files = properties.getProperty( FileSystemProvider.PROP_PAGEDIR );
 
             File f = new File( files, mangleName(name)+FileSystemProvider.FILE_EXT );
 
@@ -298,9 +301,7 @@ public class TestEngine extends WikiEngine
 
             deleteAttachments( name );
             firePageEvent( WikiPageEvent.PAGE_DELETED, name );
-        }
-        catch( Exception e )
-        {
+        } catch( final Exception e ) {
             log.error("Couldn't delete "+name, e );
         }
     }