svn commit: r1368860 - in /rave/trunk/rave-components/rave-web/src: main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java

[jasha]

Author: jasha
Date: Fri Aug  3 10:00:43 2012
New Revision: 1368860

URL: http://svn.apache.org/viewvc?rev=1368860&view=rev
Log:
RAVE-746 Fixed incorrect key for initialWidgetStatus (result of RAVE-742)

Modified:
    
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
    
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java

Modified: 
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java?rev=1368860&r1=1368859&r2=1368860&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
 (original)
+++ 
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
 Fri Aug  3 10:00:43 2012
@@ -24,7 +24,10 @@ import org.apache.rave.portal.model.impl
 
 import java.util.Map;
 
-import static org.apache.rave.portal.web.util.PortalPreferenceKeys.*;
+import static 
org.apache.rave.portal.web.util.PortalPreferenceKeys.INITIAL_WIDGET_STATUS;
+import static 
org.apache.rave.portal.web.util.PortalPreferenceKeys.JAVASCRIPT_DEBUG_MODE;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.PAGE_SIZE;
+import static 
org.apache.rave.portal.web.util.PortalPreferenceKeys.TITLE_SUFFIX;
 
 /**
  * Form object for portal preferences
@@ -56,12 +59,12 @@ public class PortalPreferenceForm {
             preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new 
PortalPreferenceImpl(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
         }
         if (getInitialWidgetStatus() == null){
-               preferenceMap.put(DEFAULT_INITIAL_WIDGET_STATUS, new 
PortalPreferenceImpl(INITIAL_WIDGET_STATUS, DEFAULT_INITIAL_WIDGET_STATUS));
+               preferenceMap.put(INITIAL_WIDGET_STATUS, new 
PortalPreferenceImpl(INITIAL_WIDGET_STATUS, DEFAULT_INITIAL_WIDGET_STATUS));
         }
     }
     
     public PortalPreference getInitialWidgetStatus(){
-       return preferenceMap.get(INITIAL_WIDGET_STATUS);
+        return preferenceMap.get(INITIAL_WIDGET_STATUS);
     }
 
     public PortalPreference getPageSize() {

Modified: 
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java?rev=1368860&r1=1368859&r2=1368860&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
 (original)
+++ 
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
 Fri Aug  3 10:00:43 2012
@@ -28,7 +28,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static junit.framework.Assert.assertEquals;
-import static org.apache.rave.portal.web.util.PortalPreferenceKeys.*;
+import static 
org.apache.rave.portal.web.util.PortalPreferenceKeys.INITIAL_WIDGET_STATUS;
+import static 
org.apache.rave.portal.web.util.PortalPreferenceKeys.JAVASCRIPT_DEBUG_MODE;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.PAGE_SIZE;
+import static 
org.apache.rave.portal.web.util.PortalPreferenceKeys.TITLE_SUFFIX;
 
 /**
  * Test for {@link PortalPreferenceForm}
@@ -44,6 +47,8 @@ public class PortalPreferenceFormTest {
         preferenceMap.put(PAGE_SIZE, pageSizePref);
         PortalPreference javaScriptDebugMode = new 
PortalPreferenceImpl(JAVASCRIPT_DEBUG_MODE, "0");
         preferenceMap.put(JAVASCRIPT_DEBUG_MODE, javaScriptDebugMode);
+        PortalPreference initialWidgetStatus = new 
PortalPreferenceImpl(INITIAL_WIDGET_STATUS, "PUBLISHED");
+        preferenceMap.put(INITIAL_WIDGET_STATUS, initialWidgetStatus);
     }
 
     @Test
@@ -52,6 +57,7 @@ public class PortalPreferenceFormTest {
         assertEquals("Test portal", form.getTitleSuffix().getValue());
         assertEquals("20", form.getPageSize().getValue());
         assertEquals("0", form.getJavaScriptDebugMode().getValue());
+        assertEquals("PUBLISHED", form.getInitialWidgetStatus().getValue());
     }
 
     @Test
@@ -60,5 +66,6 @@ public class PortalPreferenceFormTest {
         assertEquals(PortalPreferenceForm.DEFAULT_PAGE_SIZE, 
form.getPageSize().getValue());
         assertEquals(PortalPreferenceForm.DEFAULT_TITLE_SUFFIX, 
form.getTitleSuffix().getValue());
         assertEquals(PortalPreferenceForm.DEFAULT_JAVASCRIPT_DEBUG_MODE, 
form.getJavaScriptDebugMode().getValue());
+        assertEquals(PortalPreferenceForm.DEFAULT_INITIAL_WIDGET_STATUS, 
form.getInitialWidgetStatus().getValue());
     }
 }