You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ra...@apache.org on 2011/12/06 03:20:26 UTC
svn commit: r1210751 - in /incubator/rave/trunk/rave-components/rave-web/src:
main/java/org/apache/rave/portal/web/controller/admin/
test/java/org/apache/rave/portal/web/controller/admin/
Author: raminder
Date: Tue Dec 6 02:20:25 2011
New Revision: 1210751
URL: http://svn.apache.org/viewvc?rev=1210751&view=rev
Log:
updated for Unit tests. RAVE-376
Modified:
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java?rev=1210751&r1=1210750&r2=1210751&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java Tue Dec 6 02:20:25 2011
@@ -173,6 +173,11 @@ public class UserController {
this.userProfileValidator = userProfileValidator;
}
+ // setters for unit tests
+ public void setPreferenceService(PortalPreferenceService preferenceService) {
+ this.preferenceService = preferenceService;
+ }
+
/**
* Mapping between the submitted form value and an {@link Authority}
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java?rev=1210751&r1=1210750&r2=1210751&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java Tue Dec 6 02:20:25 2011
@@ -143,6 +143,11 @@ public class WidgetController {
void setWidgetValidator(UpdateWidgetValidator widgetValidator) {
this.widgetValidator = widgetValidator;
}
+ // setters for unit tests
+ public void setPreferenceService(PortalPreferenceService preferenceService) {
+ this.preferenceService = preferenceService;
+ }
+
public int getPageSize() {
final PortalPreference pageSizePref = preferenceService.getPreference(PortalPreferenceKeys.PAGE_SIZE);
Modified: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java?rev=1210751&r1=1210750&r2=1210751&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java Tue Dec 6 02:20:25 2011
@@ -23,8 +23,10 @@ import org.apache.rave.portal.model.Auth
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
+import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
+import org.apache.rave.portal.web.util.PortalPreferenceKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.UserProfileValidator;
import org.junit.Before;
@@ -58,6 +60,7 @@ public class UserControllerTest {
private UserController controller;
private UserService userService;
private AuthorityService authorityService;
+ private PortalPreferenceService preferenceService;
private String validToken;
@Test
@@ -249,6 +252,9 @@ public class UserControllerTest {
userService = createMock(UserService.class);
controller.setUserService(userService);
+ preferenceService = createMock(PortalPreferenceService.class);
+ controller.setPreferenceService(preferenceService);
+
authorityService = createMock(AuthorityService.class);
controller.setAuthorityService(authorityService);
Modified: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java?rev=1210751&r1=1210750&r2=1210751&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java Tue Dec 6 02:20:25 2011
@@ -21,8 +21,10 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.model.util.SearchResult;
+import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.service.WidgetService;
import org.apache.rave.portal.web.util.ModelKeys;
+import org.apache.rave.portal.web.util.PortalPreferenceKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.UpdateWidgetValidator;
import org.junit.Before;
@@ -58,15 +60,21 @@ public class WidgetControllerTest {
private WidgetController controller;
private WidgetService service;
private UpdateWidgetValidator widgetValidator;
+ private PortalPreferenceService preferenceService;
private String validToken;
@Test
public void adminWidgets() throws Exception {
Model model = new ExtendedModelMap();
+ PortalPreferenceService preferenceService = createMock(PortalPreferenceService.class);
+ expect(preferenceService.getPreference(PortalPreferenceKeys.PAGE_SIZE)).andReturn(null);
+ replay(preferenceService);
SearchResult<Widget> widgetSearchResult = populateWidgetSearchResult();
expect(service.getLimitedListOfWidgets(DEFAULT_OFFSET, DEFAULT_PAGESIZE)).andReturn(widgetSearchResult);
replay(service);
+
+
String adminWidgetsView = controller.viewWidgets(DEFAULT_OFFSET, null, model);
verify(service);
assertEquals(ViewNames.ADMIN_WIDGETS, adminWidgetsView);
@@ -80,10 +88,15 @@ public class WidgetControllerTest {
String searchTerm = "widget";
String type = "OpenSocial";
String status = "published";
+ PortalPreferenceService preferenceService = createMock(PortalPreferenceService.class);
+ expect(preferenceService.getPreference(PortalPreferenceKeys.PAGE_SIZE)).andReturn(null);
+ replay(preferenceService);
+
SearchResult<Widget> widgetSearchResult = populateWidgetSearchResult();
expect(service.getWidgetsBySearchCriteria(searchTerm, type, status, DEFAULT_OFFSET, DEFAULT_PAGESIZE)).andReturn(widgetSearchResult);
replay(service);
+
String searchView = controller.searchWidgets(searchTerm, type, status, DEFAULT_OFFSET, model);
verify(service);
@@ -176,6 +189,8 @@ public class WidgetControllerTest {
widgetValidator = new UpdateWidgetValidator(service);
controller.setWidgetValidator(widgetValidator);
validToken = AdminControllerUtil.generateSessionToken();
+ preferenceService = createMock(PortalPreferenceService.class);
+ controller.setPreferenceService(preferenceService);
}