RAVE-556: User Display name empty. Patch submitted by Daniel Gornstein

git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1366497 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 27, 2012 · ce2d3e3 · ce2d3e3
1 parent 171a3ec
commit ce2d3e3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/...ts/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java b/...ts/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
@@ -21,7 +21,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.rave.portal.model.Page;
 import org.apache.rave.portal.model.User;
 import org.apache.rave.portal.web.model.NavigationItem;
 import org.apache.rave.portal.web.model.NavigationMenu;
@@ -73,7 +72,7 @@ public static void addNavItemsToModel(String view, Model model, long referringPa
     public static NavigationMenu getTopMenu(String view, long referringPageId, User user, boolean addStoreLink) {
         NavigationMenu menu = new NavigationMenu("topnav");
         if(view.startsWith(ViewNames.PAGE) || view.startsWith(ViewNames.MOBILE_HOME)) {
-            NavigationItem profile = new NavigationItem("page.profile.title", user.getDisplayName() != null ? user.getDisplayName() : user.getUsername(), "/app/person/" + user.getUsername() + "?referringPageId=" + referringPageId);
+            NavigationItem profile = new NavigationItem("page.profile.title", getDisplayName(user), "/app/person/" + user.getUsername() + "?referringPageId=" + referringPageId);
             menu.addNavigationItem(profile);
 
             if(addStoreLink){
@@ -124,6 +123,11 @@ public static NavigationMenu getTopMenu(String view, long referringPageId, User
         return menu;
     }
 
+    public static String getDisplayName(User user) {
+        String displayName = user.getDisplayName();
+        return (displayName == null || "".equals(displayName)) ? user.getUsername() : displayName;
+    }
+
     private static NavigationItem getBackItem(long referringPageId) {
         NavigationItem back = new NavigationItem();
         back.setName("page.general.back");
@@ -142,4 +146,4 @@ private static NavigationItem getAdminItem() {
     private static NavigationItem getLogoutItem() {
         return new NavigationItem("page.general.logout", null, "/j_spring_security_logout");
     }
-}
+}
diff --git a/...ave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java b/...ave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java
@@ -18,6 +18,8 @@
  */
 package org.apache.rave.portal.web.controller.util;
 
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mobile.device.DeviceResolver;
@@ -26,16 +28,19 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 public class ControllerUtilsTest {
     private MockHttpServletRequest request;
     private DeviceResolver deviceResolver;
+    private User user;
 
     @Before
     public void setUp() {
         request = new MockHttpServletRequest();
         deviceResolver = new LiteDeviceResolver();
+        user = new UserImpl();
+        user.setDisplayName("Test");
     }
 
     @Test
@@ -69,4 +74,23 @@ public void testGetDeviceAppropriateView_mobileView() {
         request.setAttribute(DeviceUtils.CURRENT_DEVICE_ATTRIBUTE, deviceResolver.resolveDevice(request));
         assertThat(ControllerUtils.getDeviceAppropriateView(request, defaultView, mobileView), is(mobileView));
     }
+
+    @Test
+    public void getDisplayName_withDisplayName(){
+        assertEquals(user.getDisplayName(), ControllerUtils.getDisplayName(user));
+    }
+
+    @Test
+    public void getDisplayName_withoutDisplayName(){
+        user.setDisplayName("");
+        user.setUsername("username");
+        assertEquals(user.getUsername(), ControllerUtils.getDisplayName(user));
+    }
+
+    @Test
+    public void getDisplayName_withNullDisplayName(){
+        user.setDisplayName(null);
+        user.setUsername("username");
+        assertEquals(user.getUsername(), ControllerUtils.getDisplayName(user));
+    }
 }