svn commit: r1102586 - in /incubator/jspwiki/trunk: src/java/org/apache/wiki/action/EditActionBean.java tests/java/org/apache/wiki/action/EditActionBeanTest.java

[ju...@apache.org]

Author: juanpablo
Date: Fri May 13 07:20:56 2011
New Revision: 1102586

URL: http://svn.apache.org/viewvc?rev=1102586&view=rev
Log:
fixes JSPWIKI-695

Modified:
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=1102586&r1=1102585&r2=1102586&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java Fri May 13 07:20:56 2011
@@ -438,6 +438,10 @@ public class EditActionBean extends Abst
         if( m_changenote != null )
         {
             page.setAttribute( WikiPage.CHANGENOTE, m_changenote );
+        } 
+        else 
+        {
+            page.setAttribute( WikiPage.CHANGENOTE, "" );
         }
 
         // If this is an append, add it to the page.

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java?rev=1102586&r1=1102585&r2=1102586&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java Fri May 13 07:20:56 2011
@@ -191,6 +191,75 @@ public class EditActionBeanTest extends 
         // Delete the test page
         m_engine.deletePage( pageName );
     }
+    
+    public void testEditChangeNote() throws Exception
+    {
+
+        String pageName = "EditChangeNote" + System.currentTimeMillis();
+
+        m_engine.saveText( pageName, "This is a test." );
+        WikiPage page = m_engine.getPage( pageName );
+        assertNotNull( "Did not save page " + pageName + "!", page );
+
+        // Set up the marked-up page
+        MockRoundtrip trip = m_engine.guestTrip( "/Edit.jsp" );
+        trip.setParameter( "page", pageName );
+        String startTime = String.valueOf( System.currentTimeMillis() );
+        trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );
+        trip.addParameter( "wikiText", "Edited text" );
+        trip.addParameter( "append", CryptoUtil.encrypt( "false" ) );
+        trip.addParameter( "changenote", "first changenote" );
+        TestEngine.addSpamProtectParams( trip );
+        trip.execute( "save" );
+
+        // ...we should automatically see the test page bound to the ActionBean
+        EditActionBean bean = trip.getActionBean( EditActionBean.class );
+        ValidationErrors errors = trip.getValidationErrors();
+        assertEquals( 0, errors.size() );
+        assertEquals( page, bean.getPage() );
+        assertEquals( "first changenote", page.getChangeNote() );
+
+        // ...and the destination should be the Wiki action bean
+        assertEquals( "/Wiki.jsp?view=&page=" + pageName, trip.getDestination() );
+        
+        // One more edit, without changenote
+        trip = m_engine.guestTrip( "/Edit.jsp" );
+        trip.setParameter( "page", pageName );
+        startTime = String.valueOf( System.currentTimeMillis() );
+        trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );
+        trip.addParameter( "wikiText", "This is the third revision." );
+        trip.addParameter( "append", CryptoUtil.encrypt( "false" ) );
+        TestEngine.addSpamProtectParams( trip );
+        trip.execute( "save" );
+        
+        // ...empty changenote
+        bean = trip.getActionBean( EditActionBean.class );
+        errors = trip.getValidationErrors();
+        assertEquals( 0, errors.size() );
+        assertEquals( page, bean.getPage() );
+        assertEquals( "", page.getChangeNote() );
+        
+        // One more edit, new changenote
+        trip = m_engine.guestTrip( "/Edit.jsp" );
+        trip.setParameter( "page", pageName );
+        startTime = String.valueOf( System.currentTimeMillis() );
+        trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );
+        trip.addParameter( "wikiText", "This is the third revision." );
+        trip.addParameter( "append", CryptoUtil.encrypt( "false" ) );
+        trip.addParameter( "changenote", "second changenote" );
+        TestEngine.addSpamProtectParams( trip );
+        trip.execute( "save" );
+        
+        // ...second changenote
+        bean = trip.getActionBean( EditActionBean.class );
+        errors = trip.getValidationErrors();
+        assertEquals( 0, errors.size() );
+        assertEquals( page, bean.getPage() );
+        assertEquals( "second changenote", page.getChangeNote() );
+
+        // Delete the test page
+        m_engine.deletePage( pageName );
+    }
 
     public static Test suite()
     {