You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/26 20:19:38 UTC
svn commit: r1354148 [7/9] - in /rave/trunk: ./ rave-components/
rave-components/rave-commons/
rave-components/rave-commons/src/main/java/org/apache/rave/model/
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/jpa/
rave-components...
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Tue Jun 26 18:18:57 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.web.api.rest;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.service.*;
import org.junit.Before;
import org.junit.Test;
@@ -31,8 +32,10 @@ import java.util.ArrayList;
import java.util.List;
import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
public class WidgetApiTest {
private WidgetApi widgetApi;
@@ -46,7 +49,7 @@ public class WidgetApiTest {
private final Long VALID_USER_ID = 5L;
private final Long VALID_WIDGET_ID = 10L;
- private User user;
+ private UserImpl user;
private List<Tag> tagList;
@Before
@@ -57,12 +60,12 @@ public class WidgetApiTest {
tagService = createMock(TagService.class);
widgetTagService = createMock(WidgetTagService.class);
- user = new User();
- user.setEntityId(VALID_USER_ID);
+ user = new UserImpl();
+ user.setId(VALID_USER_ID);
tagList = new ArrayList<Tag>();
- tagList.add(new Tag(1L, "tag1"));
- tagList.add(new Tag(2L, "tag2"));
+ tagList.add(new TagImpl("tag1"));
+ tagList.add(new TagImpl("tag2"));
response = createMock(MockHttpServletResponse.class);
widgetApi = new WidgetApi(widgetRatingService, widgetCommentService, userService, tagService, widgetTagService);
@@ -77,8 +80,8 @@ public class WidgetApiTest {
public void createWidgetComment() {
String comment = "new comment";
- Widget widget = new Widget();
- widget.setEntityId(1L);
+ WidgetImpl widget = new WidgetImpl();
+ widget.setId(1L);
widget.setComments(new ArrayList<WidgetComment>());
HttpServletResponse httpServletResponse = createMock(HttpServletResponse.class);
@@ -93,13 +96,13 @@ public class WidgetApiTest {
@Test
public void getWidgetComment() {
- WidgetComment widgetComment = new WidgetComment();
- widgetComment.setEntityId(2L);
+ WidgetComment widgetComment = new WidgetCommentImpl();
+ widgetComment.setId(2L);
expect(widgetCommentService.getWidgetComment(2L)).andReturn(widgetComment);
replay(widgetCommentService);
WidgetComment foundComment = widgetApi.getWidgetComment(1L, 2L);
- assertEquals(widgetComment.getEntityId(), foundComment.getEntityId());
+ assertEquals(widgetComment.getId(), foundComment.getId());
verify(widgetCommentService);
}
@@ -107,10 +110,10 @@ public class WidgetApiTest {
@Test
public void updateNonExistentWidgetComment() {
String message = "message";
- WidgetComment widgetComment = new WidgetComment();
+ WidgetComment widgetComment = new WidgetCommentImpl();
widgetComment.setWidgetId(2L);
widgetComment.setText(message);
- widgetComment.setUser(new User(VALID_USER_ID, "John.Doe"));
+ widgetComment.setUser(new UserImpl(VALID_USER_ID, "John.Doe"));
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(widgetCommentService.getWidgetComment(3L)).andReturn(null);
@@ -129,8 +132,8 @@ public class WidgetApiTest {
@Test
public void updateWidgetComment() {
String message = "updated comment";
- WidgetComment widgetComment = new WidgetComment();
- widgetComment.setEntityId(2L);
+ WidgetComment widgetComment = new WidgetCommentImpl();
+ widgetComment.setId(2L);
expect(widgetCommentService.getWidgetComment(2L)).andReturn(widgetComment);
widgetCommentService.saveWidgetComment(widgetComment);
@@ -175,17 +178,17 @@ public class WidgetApiTest {
@Test
public void updateWidgetRating() {
- WidgetRating widgetRating = new WidgetRating();
+ WidgetRating widgetRating = new WidgetRatingImpl();
widgetRating.setScore(5);
- widgetRating.setUserId(2L);
+ widgetRating.setUserId(5L);
widgetRating.setWidgetId(1L);
expect(userService.getAuthenticatedUser()).andReturn(user);
- widgetRatingService.saveWidgetRating(widgetRating);
+ widgetRatingService.saveWidgetRating(eq(widgetRating));
expectLastCall();
response.setStatus(HttpStatus.NO_CONTENT.value());
replay(userService, widgetRatingService, response);
- User user = new User(2L);
+ User user = new UserImpl(2L);
widgetApi.setWidgetRating(1L, 5, response);
verify(widgetRatingService, userService, response);
@@ -194,8 +197,8 @@ public class WidgetApiTest {
@Test
public void getAllUsers() {
List<Person> persons = new ArrayList<Person>();
- persons.add(new Person());
- persons.add(new Person());
+ persons.add(new PersonImpl());
+ persons.add(new PersonImpl());
expect(userService.getAllByAddedWidget(VALID_WIDGET_ID)).andReturn(persons);
replay(userService);
@@ -225,14 +228,16 @@ public class WidgetApiTest {
@Test
public void createWidgetTag_newTag() {
final String TAG_TEXT = "mytag";
- Tag tag = new Tag(1L, TAG_TEXT);
- WidgetTag widgetTag = new WidgetTag();
+ TagImpl tag = new TagImpl();
+ tag.setKeyword(TAG_TEXT);
+ WidgetTag widgetTag = new WidgetTagImpl();
widgetTag.setTag(tag);
+ widgetTag.setWidgetId(VALID_WIDGET_ID);
expect(widgetTagService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(null);
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(tagService.getTagByKeyword(TAG_TEXT)).andReturn(null);
- widgetTagService.saveWidgetTag(widgetTag);
+ widgetTagService.saveWidgetTag(isA(WidgetTag.class));
expectLastCall();
replay(widgetTagService, userService, tagService);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
@@ -242,14 +247,15 @@ public class WidgetApiTest {
@Test
public void createWidgetTag_newTag_existsForOtherWidget() {
final String TAG_TEXT = "mytag";
- Tag tag = new Tag(1L, TAG_TEXT);
- WidgetTag widgetTag = new WidgetTag();
+ TagImpl tag = new TagImpl();
+ tag.setKeyword(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl();
widgetTag.setTag(tag);
expect(widgetTagService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(null);
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(tagService.getTagByKeyword(TAG_TEXT)).andReturn(tag);
- widgetTagService.saveWidgetTag(widgetTag);
+ widgetTagService.saveWidgetTag(isA(WidgetTag.class));
expectLastCall();
replay(widgetTagService, userService, tagService);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
@@ -259,8 +265,9 @@ public class WidgetApiTest {
@Test
public void createWidgetTag_nullText() {
final String TAG_TEXT = null;
- Tag tag = new Tag(1L, TAG_TEXT);
- WidgetTag widgetTag = new WidgetTag();
+ TagImpl tag = new TagImpl();
+ tag.setKeyword(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl();
widgetTag.setTag(tag);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
@@ -269,8 +276,9 @@ public class WidgetApiTest {
@Test
public void createWidgetTag_emptyText() {
final String TAG_TEXT = " ";
- Tag tag = new Tag(1L, TAG_TEXT);
- WidgetTag widgetTag = new WidgetTag();
+ TagImpl tag = new TagImpl();
+ tag.setKeyword(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl();
widgetTag.setTag(tag);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
@@ -279,9 +287,9 @@ public class WidgetApiTest {
@Test
public void createWidgetTag_existingTag() {
final String TAG_TEXT = "mytag";
- Tag tag = new Tag(1L, TAG_TEXT);
- WidgetTag widgetTag = new WidgetTag();
- widgetTag.setEntityId(9L);
+ TagImpl tag = new TagImpl();
+ tag.setKeyword(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl();
widgetTag.setTag(tag);
expect(widgetTagService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(widgetTag);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java Tue Jun 26 18:18:57 2012
@@ -22,6 +22,7 @@ package org.apache.rave.portal.web.api.r
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.web.api.rpc.model.RpcResult;
import org.junit.Before;
@@ -42,7 +43,7 @@ public class PageApiTest {
private final int NEW_POSITION = 3;
private final long PAGE_ID = 20L;
private final long PAGE_2_ID = 38L;
-
+
private Page page, page2;
@@ -50,9 +51,9 @@ public class PageApiTest {
public void setup() {
pageService = createMock(PageService.class);
pageApi = new PageApi(pageService);
-
- page = new Page(PAGE_ID);
- page2 = new Page(PAGE_2_ID);
+
+ page = new PageImpl(PAGE_ID);
+ page2 = new PageImpl(PAGE_2_ID);
}
@Test
@@ -60,7 +61,7 @@ public class PageApiTest {
final long TO_REGION = 1;
final long FROM_REGION = 2;
- expect(pageService.moveRegionWidget(REGION_WIDGET_ID, NEW_POSITION, TO_REGION, FROM_REGION)).andReturn(new RegionWidget());
+ expect(pageService.moveRegionWidget(REGION_WIDGET_ID, NEW_POSITION, TO_REGION, FROM_REGION)).andReturn(new RegionWidgetImpl());
replay(pageService);
RpcResult<RegionWidget> result = pageApi.moveWidgetOnPage(REGION_WIDGET_ID, NEW_POSITION, TO_REGION, FROM_REGION);
verify(pageService);
@@ -103,14 +104,14 @@ public class PageApiTest {
assertThat(result.isError(), is(true));
assertThat(result.getErrorCode(), is(RpcResult.ErrorCode.INTERNAL_ERROR));
assertThat(result.getErrorMessage(), is(equalTo(INTERNAL_ERROR_MESSAGE)));
- }
-
+ }
+
@Test
public void addWidget_validParams() {
final int PAGE_ID = 1;
final long WIDGET_ID = 2;
- expect(pageService.addWidgetToPage(PAGE_ID, WIDGET_ID)).andReturn(new RegionWidget());
+ expect(pageService.addWidgetToPage(PAGE_ID, WIDGET_ID)).andReturn(new RegionWidgetImpl());
replay(pageService);
RpcResult result = pageApi.addWidgetToPage(PAGE_ID, WIDGET_ID);
verify(pageService);
@@ -156,7 +157,7 @@ public class PageApiTest {
@Test
public void deleteWidget_validParams() {
final long WIDGET_ID = 3;
- expect(pageService.removeWidgetFromPage(WIDGET_ID)).andReturn(new Region());
+ expect(pageService.removeWidgetFromPage(WIDGET_ID)).andReturn(new RegionImpl());
replay(pageService);
RpcResult<Region> result = pageApi.removeWidgetFromPage(WIDGET_ID);
@@ -196,13 +197,13 @@ public class PageApiTest {
assertThat(result.getErrorCode(), is(RpcResult.ErrorCode.INTERNAL_ERROR));
assertThat(result.getErrorMessage(), is(equalTo(INTERNAL_ERROR_MESSAGE)));
}
-
+
@Test
public void addPage_validParams() {
final String PAGE_NAME = "My New Page";
final String PAGE_LAYOUT_CODE = "layout1";
- expect(pageService.addNewUserPage(PAGE_NAME, PAGE_LAYOUT_CODE)).andReturn(new Page());
+ expect(pageService.addNewUserPage(PAGE_NAME, PAGE_LAYOUT_CODE)).andReturn(new PageImpl());
replay(pageService);
RpcResult result = pageApi.addPage(PAGE_NAME, PAGE_LAYOUT_CODE);
verify(pageService);
@@ -212,7 +213,7 @@ public class PageApiTest {
assertThat(result.getErrorCode(), is(RpcResult.ErrorCode.NO_ERROR));
assertThat(result.getErrorMessage(), is(nullValue()));
}
-
+
@Test
public void addPage_invalidParams() {
final String PAGE_NAME = "My New Page";
@@ -228,7 +229,7 @@ public class PageApiTest {
assertThat(result.getErrorCode(), is(RpcResult.ErrorCode.INVALID_PARAMS));
assertThat(result.getErrorMessage(), is(equalTo(PARAM_ERROR_MESSAGE)));
}
-
+
@Test
public void addPage_internalError() {
final String PAGE_NAME = "My New Page";
@@ -244,14 +245,14 @@ public class PageApiTest {
assertThat(result.getErrorCode(), is(RpcResult.ErrorCode.INTERNAL_ERROR));
assertThat(result.getErrorMessage(), is(equalTo(INTERNAL_ERROR_MESSAGE)));
}
-
+
@Test
public void getPage() {
expect(pageService.getPage(PAGE_ID)).andReturn(page);
replay(pageService);
-
+
RpcResult result = pageApi.getPage(PAGE_ID);
-
+
verify(pageService);
assertThat(result, is(notNullValue()));
assertThat((Page)result.getResult(), is (page));
@@ -265,9 +266,9 @@ public class PageApiTest {
String layoutName = "layout";
expect(pageService.updatePage(PAGE_ID, pageName, layoutName)).andReturn(page);
replay(pageService);
-
+
RpcResult result = pageApi.updatePageProperties(PAGE_ID, pageName, layoutName);
-
+
verify(pageService);
assertThat(result, is(notNullValue()));
assertThat((Page)result.getResult(), is (page));
@@ -275,40 +276,40 @@ public class PageApiTest {
assertThat(result.getErrorCode(), is (RpcResult.ErrorCode.NO_ERROR));
assertThat(result.getErrorMessage(), is(nullValue()));
}
-
+
@Test
public void movePage_nonNullMoveAfterPageId() {
expect(pageService.movePage(PAGE_ID, PAGE_2_ID)).andReturn(page);
replay(pageService);
-
- RpcResult result = pageApi.movePage(PAGE_ID, PAGE_2_ID);
-
- verify(pageService);
+
+ RpcResult result = pageApi.movePage(PAGE_ID, PAGE_2_ID);
+
+ verify(pageService);
assertThat(result, is(notNullValue()));
assertThat((Page)result.getResult(), is(page));
assertThat(result.isError(), is(false));
assertThat(result.getErrorCode(), is(RpcResult.ErrorCode.NO_ERROR));
assertThat(result.getErrorMessage(), is(nullValue()));
- }
-
+ }
+
@Test
public void movePage_nullMoveAfterPageId() {
expect(pageService.movePageToDefault(PAGE_2_ID)).andReturn(page2);
replay(pageService);
-
- RpcResult result = pageApi.movePage(PAGE_2_ID, null);
-
- verify(pageService);
+
+ RpcResult result = pageApi.movePage(PAGE_2_ID, null);
+
+ verify(pageService);
assertThat(result, is(notNullValue()));
assertThat((Page)result.getResult(), is(page2));
assertThat(result.isError(), is(false));
assertThat(result.getErrorCode(), is(RpcResult.ErrorCode.NO_ERROR));
assertThat(result.getErrorMessage(), is(nullValue()));
- }
-
+ }
+
@Test
- public void moveWidgetToPage_validParams() {
- expect(pageService.moveRegionWidgetToPage(REGION_WIDGET_ID, PAGE_2_ID)).andReturn(new RegionWidget());
+ public void moveWidgetToPage_validParams() {
+ expect(pageService.moveRegionWidgetToPage(REGION_WIDGET_ID, PAGE_2_ID)).andReturn(new RegionWidgetImpl());
replay(pageService);
RpcResult<RegionWidget> result = pageApi.moveWidgetToPage(PAGE_2_ID, REGION_WIDGET_ID);
verify(pageService);
@@ -320,7 +321,7 @@ public class PageApiTest {
}
@Test
- public void moveWidgetToPage_invalidParams() {
+ public void moveWidgetToPage_invalidParams() {
expect(pageService.moveRegionWidgetToPage(REGION_WIDGET_ID, PAGE_2_ID)).andThrow(new IllegalArgumentException(PARAM_ERROR_MESSAGE));
replay(pageService);
@@ -345,5 +346,5 @@ public class PageApiTest {
assertThat(result.isError(), is(true));
assertThat(result.getErrorCode(), is(RpcResult.ErrorCode.INTERNAL_ERROR));
assertThat(result.getErrorMessage(), is(equalTo(INTERNAL_ERROR_MESSAGE)));
- }
+ }
}
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java Tue Jun 26 18:18:57 2012
@@ -19,14 +19,8 @@
package org.apache.rave.portal.web.controller;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.ChangePasswordValidator;
@@ -38,6 +32,10 @@ import org.springframework.validation.Bi
import org.springframework.validation.DirectFieldBindingResult;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
/**
* @version "$Id$"
*/
@@ -71,7 +69,7 @@ public class ChangePasswordControllerTes
public void testUpdate() throws Exception {
final Model model = createNiceMock(Model.class);
RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- User newUser = new User();
+ UserForm newUser = new UserForm();
replay(redirectAttributes);
replay(model);
BindingResult results = new DirectFieldBindingResult(newUser, ModelKeys.USER);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java Tue Jun 26 18:18:57 2012
@@ -19,19 +19,13 @@
package org.apache.rave.portal.web.controller;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.assertThat;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.impl.ReCaptchaService;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.NewAccountValidator;
@@ -45,6 +39,12 @@ import org.springframework.validation.Bi
import org.springframework.validation.ObjectError;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.assertThat;
+
/**
* This is a test class for NewAccountController, which is used to make new user accounts through
@@ -93,7 +93,7 @@ public class NewAccountControllerTest {
@Test
public void create_UsernameNotSpecified() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = ""; //no username specified
final String password = "password";
@@ -123,12 +123,12 @@ public class NewAccountControllerTest {
@Test
public void create_UsernameAlreadyExists() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "canonical"; //specified username already exists in database
final String password = "password";
final String confirmPassword = password;
- final User existingUser = new User();
+ final User existingUser = new UserImpl();
List<ObjectError> errorList = new ArrayList<ObjectError>();
final ObjectError error = new ObjectError("username.exists", "Username already exists");
@@ -160,7 +160,7 @@ public class NewAccountControllerTest {
@Test
public void create_InvalidUsernameLength() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "u"; //username length less than 2 characters
final String password = "password";
@@ -190,7 +190,7 @@ public class NewAccountControllerTest {
@Test
public void create_PasswordNotSpecified() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username";
final String password = ""; //password not specified
@@ -220,7 +220,7 @@ public class NewAccountControllerTest {
@Test
public void create_ConfirmPasswordNotSpecified() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "usename";
final String password = "pasword";
@@ -249,7 +249,7 @@ public class NewAccountControllerTest {
@Test
public void create_InvalidPasswordLength() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "usename";
final String password = "pas"; //invalid length password
@@ -277,7 +277,7 @@ public class NewAccountControllerTest {
@Test
public void create_PasswordMismatchCaseOne() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username";
final String password = "password";
@@ -305,7 +305,7 @@ public class NewAccountControllerTest {
@Test
public void create_PasswordMismatchCaseTwo() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username";
final String password = "password";
@@ -333,7 +333,7 @@ public class NewAccountControllerTest {
@Test
public void create_BlankFormSubmitted() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = ""; //Username not specified
final String password = ""; //Password not specified
@@ -366,7 +366,7 @@ public class NewAccountControllerTest {
@Test
public void create_ValidFormSubmitted() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username"; //Username not specified
final String password = "password"; //Password not specified
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java Tue Jun 26 18:18:57 2012
@@ -19,28 +19,31 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.service.PageLayoutService;
-import org.apache.rave.portal.web.controller.util.MockHttpUtil;
-import org.springframework.mock.web.MockHttpServletRequest;
+import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.PageInvitationStatus;
import org.apache.rave.portal.model.PageLayout;
-import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.PageUser;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.PageImpl;
+import org.apache.rave.portal.model.impl.PageLayoutImpl;
+import org.apache.rave.portal.model.impl.PageUserImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
+import org.apache.rave.portal.service.PageLayoutService;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.controller.util.MockHttpUtil;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.ui.ExtendedModelMap;
import org.springframework.ui.Model;
import java.util.ArrayList;
import java.util.List;
-import static org.hamcrest.CoreMatchers.*;
import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
public class PageControllerTest {
@@ -49,22 +52,23 @@ public class PageControllerTest {
private PageLayoutService pageLayoutService;
private PageController pageController;
private MockHttpServletRequest request;
-
+
private Model model;
private Page defaultPage, otherPage;
private PageUser defaultPageUser, otherPageUser;
private List<Page> allPages;
private List<PageLayout> allPageLayouts;
-
+
private final Long DEFAULT_PAGE_ID = 99L;
private final Long OTHER_PAGE_ID = 22L;
private final Long USER_ID = 1L;
private final String VALID_PAGE_LAYOUT_CODE = "layout98";
- private User validUser;
+ private UserImpl validUser;
private PageLayout validPageLayout;
@Before
public void setup() {
+
userService = createMock(UserService.class);
pageService = createMock(PageService.class);
pageLayoutService = createMock(PageLayoutService.class);
@@ -72,144 +76,146 @@ public class PageControllerTest {
model = new ExtendedModelMap();
request = new MockHttpServletRequest();
- validPageLayout = new PageLayout();
- validPageLayout.setEntityId(33L);
+ validUser = new UserImpl(USER_ID);
+ validPageLayout = new PageLayoutImpl();
validPageLayout.setCode(VALID_PAGE_LAYOUT_CODE);
+ defaultPageUser = new PageUserImpl(validUser, defaultPage, 1L);
+ defaultPageUser.setPageStatus(PageInvitationStatus.OWNER);
- validUser = new User(USER_ID);
+ validUser.setDefaultPageLayout(validPageLayout);
- defaultPage = new Page(DEFAULT_PAGE_ID, validUser);
+ defaultPage = new PageImpl(DEFAULT_PAGE_ID, validUser);
defaultPage.setPageLayout(validPageLayout);
- defaultPageUser = new PageUser(validUser, defaultPage, 1L);
- defaultPageUser.setPageStatus(PageInvitationStatus.OWNER);
- defaultPage.setMembers(new ArrayList<PageUser>());
- defaultPage.getMembers().add(defaultPageUser);
- otherPage = new Page(OTHER_PAGE_ID, validUser);
+ List<PageUser> members = new ArrayList<PageUser>();
+ members.add(defaultPageUser);
+ defaultPage.setMembers(members);
+
+ otherPage = new PageImpl(OTHER_PAGE_ID, validUser);
otherPage.setPageLayout(validPageLayout);
- otherPageUser = new PageUser(validUser, otherPage, 2L);
+ otherPageUser = new PageUserImpl(validUser, otherPage, 2L);
otherPageUser.setPageStatus(PageInvitationStatus.OWNER);
- otherPage.setMembers(new ArrayList<PageUser>());
- otherPage.getMembers().add(otherPageUser);
+
+ List<PageUser> members2 = new ArrayList<PageUser>();
+ members2.add(otherPageUser);
+ otherPage.setMembers(members2);
allPages = new ArrayList<Page>();
- allPages.add(defaultPage);
+ allPages.add(defaultPage);
allPages.add(otherPage);
allPageLayouts = new ArrayList<PageLayout>();
allPageLayouts.add(validPageLayout);
-
- validUser.setDefaultPageLayout(validPageLayout);
}
@SuppressWarnings("unchecked")
@Test
public void view_pageId() {
MockHttpUtil.setupRequestAsNonMobileUserAgent(request);
-
- expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
+
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
expect(pageService.getAllUserPages(USER_ID)).andReturn(allPages);
expect(pageService.getPageFromList(OTHER_PAGE_ID, allPages)).andReturn(otherPage);
expect(pageLayoutService.getAllUserSelectable()).andReturn(allPageLayouts);
replay(userService, pageService, pageLayoutService);
String results = pageController.view(OTHER_PAGE_ID, model, request);
-
+
assertThat(results, equalTo(ViewNames.getPageView(VALID_PAGE_LAYOUT_CODE)));
assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(otherPage));
assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), equalTo(allPages));
assertThat((List<PageLayout>) model.asMap().get(ModelKeys.PAGE_LAYOUTS), sameInstance(allPageLayouts));
-
+
verify(userService, pageService, pageLayoutService);
}
-
+
@SuppressWarnings("unchecked")
@Test
- public void view_pageId_mobileClient() {
+ public void view_pageId_mobileClient() {
MockHttpUtil.setupRequestAsMobileUserAgent(request);
-
- expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
+
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
expect(pageService.getAllUserPages(USER_ID)).andReturn(allPages);
expect(pageService.getPageFromList(OTHER_PAGE_ID, allPages)).andReturn(otherPage);
expect(pageLayoutService.getAllUserSelectable()).andReturn(allPageLayouts);
replay(userService, pageService, pageLayoutService);
String results = pageController.view(OTHER_PAGE_ID, model, request);
-
+
assertThat(results, equalTo(ViewNames.MOBILE_HOME));
assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(otherPage));
assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), equalTo(allPages));
assertThat((List<PageLayout>) model.asMap().get(ModelKeys.PAGE_LAYOUTS), sameInstance(allPageLayouts));
-
+
verify(userService, pageService, pageLayoutService);
}
-
+
@SuppressWarnings("unchecked")
@Test
public void view_pageId_zeroExistingPages() {
MockHttpUtil.setupRequestAsNonMobileUserAgent(request);
List<Page> pages = new ArrayList<Page>();
-
+
assertThat(pages.isEmpty(), is(true));
- expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
expect(pageService.getAllUserPages(USER_ID)).andReturn(pages).times(2);
- expect(pageService.addNewDefaultUserPage(validUser.getEntityId())).andReturn(defaultPage);
+ expect(pageService.addNewDefaultUserPage(validUser.getId())).andReturn(defaultPage);
expect(pageService.getPageFromList(OTHER_PAGE_ID, pages)).andReturn(defaultPage);
expect(pageLayoutService.getAllUserSelectable()).andReturn(allPageLayouts);
replay(userService, pageService, pageLayoutService);
-
+
String results = pageController.view(OTHER_PAGE_ID, model, request);
-
+
assertThat(results, equalTo(ViewNames.getPageView(VALID_PAGE_LAYOUT_CODE)));
assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(defaultPage));
assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), sameInstance(pages));
assertThat((List<PageLayout>) model.asMap().get(ModelKeys.PAGE_LAYOUTS), sameInstance(allPageLayouts));
-
+
verify(userService, pageService, pageLayoutService);
- }
-
+ }
+
@SuppressWarnings("unchecked")
@Test
public void viewDefault_pageId() {
MockHttpUtil.setupRequestAsNonMobileUserAgent(request);
-
- expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
+
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
expect(pageService.getAllUserPages(USER_ID)).andReturn(allPages);
expect(pageService.getDefaultPageFromList(allPages)).andReturn(defaultPage);
expect(pageLayoutService.getAllUserSelectable()).andReturn(allPageLayouts);
replay(userService, pageService, pageLayoutService);
String results = pageController.viewDefault(model, request);
-
+
assertThat(results, equalTo(ViewNames.getPageView(VALID_PAGE_LAYOUT_CODE)));
assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(defaultPage));
assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), equalTo(allPages));
assertThat((List<PageLayout>) model.asMap().get(ModelKeys.PAGE_LAYOUTS), sameInstance(allPageLayouts));
-
+
verify(userService, pageService, pageLayoutService);
}
-
+
@SuppressWarnings("unchecked")
@Test
public void viewDefault_pageId_zeroExistingPages() {
MockHttpUtil.setupRequestAsNonMobileUserAgent(request);
List<Page> pages = new ArrayList<Page>();
-
+
assertThat(pages.isEmpty(), is(true));
- expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
expect(pageService.getAllUserPages(USER_ID)).andReturn(pages).times(2);
- expect(pageService.addNewDefaultUserPage(validUser.getEntityId())).andReturn(defaultPage);
+ expect(pageService.addNewDefaultUserPage(validUser.getId())).andReturn(defaultPage);
expect(pageService.getDefaultPageFromList(pages)).andReturn(defaultPage);
expect(pageLayoutService.getAllUserSelectable()).andReturn(allPageLayouts);
replay(userService, pageService, pageLayoutService);
String results = pageController.viewDefault(model, request);
-
+
assertThat(results, equalTo(ViewNames.getPageView(VALID_PAGE_LAYOUT_CODE)));
assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(defaultPage));
assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), sameInstance(pages));
assertThat((List<PageLayout>) model.asMap().get(ModelKeys.PAGE_LAYOUTS), sameInstance(allPageLayouts));
-
+
verify(userService, pageService, pageLayoutService);
}
}
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java Tue Jun 26 18:18:57 2012
@@ -19,15 +19,15 @@
package org.apache.rave.portal.web.controller;
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.PageLayout;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.PageImpl;
+import org.apache.rave.portal.model.impl.PageLayoutImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.hamcrest.CoreMatchers;
@@ -39,6 +39,11 @@ import org.springframework.ui.ModelMap;
import java.util.ArrayList;
import java.util.List;
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
/**
* Test class for {@link ProfileController}
*/
@@ -65,13 +70,12 @@ public class ProfileControllerTest {
pageService = createMock(PageService.class);
profileController = new ProfileController(userService, pageService);
- validPageLayout = new PageLayout();
- validPageLayout.setEntityId(33L);
+ validPageLayout = new PageLayoutImpl();
validPageLayout.setCode(VALID_PAGE_LAYOUT_CODE);
- defaultPage = new Page(DEFAULT_PAGE_ID);
+ defaultPage = new PageImpl(DEFAULT_PAGE_ID);
defaultPage.setPageLayout(validPageLayout);
- otherPage = new Page(OTHER_PAGE_ID);
+ otherPage = new PageImpl(OTHER_PAGE_ID);
otherPage.setPageLayout(validPageLayout);
allProfilePages = new ArrayList<Page>();
@@ -85,20 +89,20 @@ public class ProfileControllerTest {
@Test
public void viewPerson_ShouldAddAttributeForUser() {
//creating a mock user
- final User user = new User();
+ final UserImpl user = new UserImpl();
final ModelMap model = new ModelMap();
final int modelSize = 4;
final String username="Canonical";
user.setUsername(username);
- user.setEntityId(USER_ID);
+ user.setId(USER_ID);
String userProfile = new String(ModelKeys.USER_PROFILE);
- Page personProfile = new Page();
- PageLayout pageLayout = new PageLayout();
+ Page personProfile = new PageImpl();
+ PageLayout pageLayout = new PageLayoutImpl();
pageLayout.setCode(VALID_PAGE_LAYOUT_CODE);
personProfile.setPageLayout(pageLayout);
expect(userService.getUserByUsername(username)).andReturn(user).once();
- expect(pageService.getPersonProfilePage(user.getEntityId())).andReturn(personProfile);
+ expect(pageService.getPersonProfilePage(user.getId())).andReturn(personProfile);
replay(userService, pageService);
@@ -128,8 +132,8 @@ public class ProfileControllerTest {
final ModelMap model = new ModelMap();
final int modelSize = 4;
final String username="Canonical";
- Page personProfile = new Page();
- PageLayout pageLayout = new PageLayout();
+ Page personProfile = new PageImpl();
+ PageLayout pageLayout = new PageLayoutImpl();
pageLayout.setCode("person_profile");
personProfile.setPageLayout(pageLayout);
@@ -152,7 +156,7 @@ public class ProfileControllerTest {
String userProfile = new String(ModelKeys.USER_PROFILE);
//creating a mock authenticated user
- final User authUser = new User();
+ final User authUser = new UserImpl();
authUser.setUsername(USERNAME);
//set existing status
authUser.setStatus("Single");
@@ -163,7 +167,7 @@ public class ProfileControllerTest {
authUser.setEmail("testuser@rave.com");
//creating a mock updated user
- final User updatedUser = new User();
+ final UserForm updatedUser = new UserForm();
//set the updated status
updatedUser.setStatus("Married");
updatedUser.setGivenName("Test");
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java Tue Jun 26 18:18:57 2012
@@ -19,10 +19,10 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.impl.ReCaptchaService;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.NewPasswordValidator;
@@ -83,7 +83,7 @@ public class ReminderControllerTest {
@Test
public void testCreate() throws Exception {
Model model = createNiceMock(Model.class);
- User User = new User();
+ UserForm User = new UserForm();
BindingResult results = new DirectFieldBindingResult(User, ModelKeys.USER);
RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
replay(redirectAttributes);
@@ -109,7 +109,7 @@ public class ReminderControllerTest {
assertThat(viewResult, CoreMatchers.equalTo(ViewNames.USERNAME_REQUEST));
// password part:
model = createNiceMock(Model.class);
- User = new User();
+ User = new UserForm();
results = new DirectFieldBindingResult(User, ModelKeys.USER);
redirectAttributes = createNiceMock(RedirectAttributes.class);
replay(redirectAttributes);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java Tue Jun 26 18:18:57 2012
@@ -22,15 +22,12 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.Category;
import org.apache.rave.portal.model.Tag;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.UserImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
-import org.apache.rave.portal.service.PortalPreferenceService;
-import org.apache.rave.portal.service.TagService;
-import org.apache.rave.portal.service.CategoryService;
-import org.apache.rave.portal.service.UserService;
-import org.apache.rave.portal.service.WidgetService;
+import org.apache.rave.portal.service.*;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -48,18 +45,9 @@ import java.util.List;
import java.util.Map;
import static junit.framework.Assert.assertEquals;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
/**
@@ -73,14 +61,14 @@ public class WidgetStoreControllerTest {
private WidgetService widgetService;
private TagService tagService;
private CategoryService categoryService;
- private User validUser;
+ private UserImpl validUser;
private WidgetStatistics widgetStatistics;
private Map<Long, WidgetStatistics> allWidgetStatisticsMap;
@Before
public void setup() {
- validUser = new User();
- validUser.setEntityId(1L);
+ validUser = new UserImpl();
+ validUser.setId(1L);
widgetStatistics = new WidgetStatistics();
allWidgetStatisticsMap = new HashMap<Long, WidgetStatistics>();
@@ -111,7 +99,7 @@ public class WidgetStoreControllerTest {
SearchResult<Widget> emptyResult = new SearchResult<Widget>(widgets, 0);
expect(widgetService.getPublishedWidgets(0, 10)).andReturn(emptyResult);
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
replay(widgetService);
String view = controller.view(model, REFERRER_ID, 0);
@@ -133,8 +121,8 @@ public class WidgetStoreControllerTest {
List<Widget> widgets = new ArrayList<Widget>();
SearchResult<Widget> emptyResult = new SearchResult<Widget>(widgets, 0);
- expect(widgetService.getWidgetsByOwner(validUser.getEntityId(), 0, 10)).andReturn(emptyResult);
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getWidgetsByOwner(validUser.getId(), 0, 10)).andReturn(emptyResult);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
replay(widgetService);
String view = controller.viewMine(model, REFERRER_ID, 0);
@@ -153,13 +141,13 @@ public class WidgetStoreControllerTest {
@Test
public void viewWidget() {
Model model = new ExtendedModelMap();
- Widget w = new Widget(1L, "http://example.com/widget.xml");
+ Widget w = new WidgetImpl(1L, "http://example.com/widget.xml");
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
expect(tagService.getAllTags()).andReturn(new ArrayList<Tag>());
expect(categoryService.getAll()).andReturn(new ArrayList<Category>());
expect(widgetService.getWidget(WIDGET_ID)).andReturn(w);
- expect(widgetService.getWidgetStatistics(WIDGET_ID, validUser.getEntityId())).andReturn(widgetStatistics);
+ expect(widgetService.getWidgetStatistics(WIDGET_ID, validUser.getId())).andReturn(widgetStatistics);
replay(widgetService);
String view = controller.viewWidget(model, WIDGET_ID, REFERRER_ID);
@@ -183,7 +171,7 @@ public class WidgetStoreControllerTest {
int offset = 0;
int pageSize = 10;
SearchResult<Widget> searchResults = new SearchResult<Widget>(new ArrayList<Widget>(),0);
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
expect(tagService.getAllTags()).andReturn(new ArrayList<Tag>());
expect(categoryService.getAll()).andReturn(new ArrayList<Category>());
expect(widgetService.getWidgetsByCategory(categoryId, offset, pageSize)).andReturn(searchResults);
@@ -212,15 +200,15 @@ public class WidgetStoreControllerTest {
int offset = 0;
int pagesize = 10;
int totalResults = 2;
- Widget widget = new Widget();
- widget.setEntityId(1L);
+ WidgetImpl widget = new WidgetImpl();
+ widget.setId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
SearchResult<Widget> result = new SearchResult<Widget>(widgets, totalResults);
result.setPageSize(pagesize);
expect(widgetService.getPublishedWidgetsByFreeTextSearch(searchTerm, offset, pagesize)).andReturn(result);
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
replay(widgetService);
String view = controller.viewSearchResult(model, REFERRER_ID, searchTerm, offset);
@@ -251,8 +239,8 @@ public class WidgetStoreControllerTest {
public void doAddWidget() {
final String widgetUrl = "http://example.com/newwidget.xml";
final Model model = new ExtendedModelMap();
- final Widget widget = new Widget();
- widget.setEntityId(1L);
+ final WidgetImpl widget = new WidgetImpl();
+ widget.setId(1L);
widget.setTitle("Widget title");
widget.setUrl(widgetUrl);
widget.setType("OpenSocial");
@@ -265,7 +253,7 @@ public class WidgetStoreControllerTest {
String view = controller.viewAddWidgetResult(widget, errors, model,REFERRER_ID);
verify(widgetService);
- assertEquals("redirect:/app/store/widget/" + widget.getEntityId() + "?referringPageId=" + REFERRER_ID, view);
+ assertEquals("redirect:/app/store/widget/" + widget.getId() + "?referringPageId=" + REFERRER_ID, view);
assertFalse("Valid widget data", errors.hasErrors());
}
@@ -274,13 +262,13 @@ public class WidgetStoreControllerTest {
final String widgetUrl = "http://example.com/existingwidget.xml";
final Model model = new ExtendedModelMap();
- final Widget existingWidget = new Widget();
- existingWidget.setEntityId(123L);
+ final WidgetImpl existingWidget = new WidgetImpl();
+ existingWidget.setId(123L);
existingWidget.setTitle("Widget title");
existingWidget.setUrl(widgetUrl);
existingWidget.setType("OpenSocial");
- final Widget widget = new Widget();
+ final WidgetImpl widget = new WidgetImpl();
widget.setTitle("Widget title");
widget.setUrl(widgetUrl);
widget.setType("OpenSocial");
@@ -298,7 +286,7 @@ public class WidgetStoreControllerTest {
@Test
public void doAddWidget_invalid() {
- final Widget widget = new Widget();
+ final WidgetImpl widget = new WidgetImpl();
widget.setTitle("Not enough data");
final Model model = new ExtendedModelMap();
final BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java Tue Jun 26 18:18:57 2012
@@ -18,6 +18,8 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.Category;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.CategoryImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -31,15 +33,8 @@ import org.springframework.web.bind.supp
import java.util.ArrayList;
import java.util.List;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static junit.framework.Assert.*;
+import static org.easymock.EasyMock.*;
/**
* Test for {@link CategoryController}
@@ -50,7 +45,7 @@ public class CategoryControllerTest {
private UserService userService;
private CategoryService categoryService;
private String validToken;
-
+
private static final String UPDATE = "update";
private static final String DELETE = "delete";
private static final String CREATE = "create";
@@ -64,23 +59,23 @@ public class CategoryControllerTest {
controller.setUserService(userService);
controller.setCategoryService(categoryService);
}
-
+
@Test
public void getCategories_valid(){
List<Category> categories = new ArrayList<Category>();
expect(categoryService.getAll()).andReturn(categories);
replay(categoryService);
-
+
Model model = new ExtendedModelMap();
-
+
String viewName = controller.getCategories("", model);
verify(categoryService);
-
+
assertEquals(ViewNames.ADMIN_CATEGORIES, viewName);
assertEquals(categories, model.asMap().get("categories"));
assertFalse(model.containsAttribute("actionresult"));
assertTrue(model.containsAttribute("category"));
- assertEquals("Check that the category object available", new Category(), model.asMap().get("category"));
+ assertEquals("Check that the category object available", new CategoryImpl(), model.asMap().get("category"));
assertTrue(model.containsAttribute("topnav"));
assertTrue(model.containsAttribute("tabs"));
assertTrue("verify tokencheck", model.asMap().containsKey(ModelKeys.TOKENCHECK));
@@ -102,7 +97,7 @@ public class CategoryControllerTest {
assertTrue(model.containsAttribute("actionresult"));
assertEquals(UPDATE, model.asMap().get("actionresult"));
assertTrue(model.containsAttribute("category"));
- assertEquals("Check that the category object available", new Category(), model.asMap().get("category"));
+ assertEquals("Check that the category object available", new CategoryImpl(), model.asMap().get("category"));
assertTrue(model.containsAttribute("topnav"));
assertTrue(model.containsAttribute("tabs"));
}
@@ -123,7 +118,7 @@ public class CategoryControllerTest {
assertTrue(model.containsAttribute("actionresult"));
assertEquals(DELETE, model.asMap().get("actionresult"));
assertTrue(model.containsAttribute("category"));
- assertEquals("Check that the category object available", new Category(), model.asMap().get("category"));
+ assertEquals("Check that the category object available", new CategoryImpl(), model.asMap().get("category"));
assertTrue(model.containsAttribute("topnav"));
assertTrue(model.containsAttribute("tabs"));
}
@@ -144,21 +139,21 @@ public class CategoryControllerTest {
assertTrue(model.containsAttribute("actionresult"));
assertEquals(CREATE, model.asMap().get("actionresult"));
assertTrue(model.containsAttribute("category"));
- assertEquals("Check category object available", new Category(), model.asMap().get("category"));
+ assertEquals("Check category object available", new CategoryImpl(), model.asMap().get("category"));
assertTrue(model.containsAttribute("topnav"));
assertTrue(model.containsAttribute("tabs"));
}
-
+
@Test
public void createCategory_valid(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setText(categoryText);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
- expect(categoryService.create(categoryText, user)).andReturn(new Category());
+ expect(categoryService.create(categoryText, user)).andReturn(new CategoryImpl());
sessionStatus.setComplete();
expectLastCall();
replay(userService, categoryService,sessionStatus);
@@ -172,13 +167,13 @@ public class CategoryControllerTest {
public void createCategory_invalidToken(){
Model model = new ExtendedModelMap();
String invalidToken = AdminControllerUtil.generateSessionToken();
- User user = new User();
+ User user = new UserImpl();
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setText(categoryText);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
- expect(categoryService.create(categoryText, user)).andReturn(new Category());
+ expect(categoryService.create(categoryText, user)).andReturn(new CategoryImpl());
sessionStatus.setComplete();
expectLastCall();
replay(userService, categoryService,sessionStatus);
@@ -189,9 +184,9 @@ public class CategoryControllerTest {
@Test
public void createCategory_invalidValidRequest_emptyText(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
String categoryText = "";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setText(categoryText);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
@@ -205,13 +200,13 @@ public class CategoryControllerTest {
@Test
public void updateCategory_valid(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
expect(categoryService.get(id)).andReturn(category);
@@ -228,14 +223,14 @@ public class CategoryControllerTest {
@Test(expected = SecurityException.class)
public void updateCategory_invalidToken(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
expect(categoryService.get(id)).andReturn(category);
@@ -250,14 +245,14 @@ public class CategoryControllerTest {
@Test
public void updateCategory_invalidValidRequest_emptyText(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
replay(userService);
@@ -271,12 +266,12 @@ public class CategoryControllerTest {
public void updateCategory_invalidValidRequest_nullUser(){
Model model = new ExtendedModelMap();
long id = 1L;
- User user = new User();
+ User user = new UserImpl();
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
replay(userService);
@@ -289,13 +284,13 @@ public class CategoryControllerTest {
@Test
public void updateCategory_invalidValidRequest_nullWidgetToUpdate(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
expect(categoryService.get(id)).andReturn(null).once();
@@ -309,13 +304,13 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_valid(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
expect(categoryService.get(id)).andReturn(category).anyTimes();
@@ -333,14 +328,14 @@ public class CategoryControllerTest {
@Test(expected = SecurityException.class)
public void deleteCategory_invalidToken(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
expect(categoryService.get(id)).andReturn(category);
@@ -356,14 +351,14 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_invalidValidRequest_emptyText(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
replay(userService);
@@ -377,12 +372,12 @@ public class CategoryControllerTest {
public void deleteCategory_invalidValidRequest_nullUser(){
Model model = new ExtendedModelMap();
long id = 1L;
- User user = new User();
+ User user = new UserImpl();
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
replay(userService);
@@ -395,13 +390,13 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_invalidValidRequest_nullWidgetToDelete(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
expect(categoryService.get(id)).andReturn(null).once();
@@ -415,13 +410,13 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_invalidValidRequest_falseConfirmation(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
replay(userService);
@@ -433,14 +428,14 @@ public class CategoryControllerTest {
@Test
public void editCategory_valid () {
- User user = new User();
+ User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
Model model = new ExtendedModelMap();
- Category category = new Category();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
- category.setEntityId(id);
+ category.setId(id);
expect(categoryService.get(id)).andReturn(category).once();
replay(categoryService);
String view = controller.editCategory(id, model);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java Tue Jun 26 18:18:57 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.web.controller.admin;
import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.model.PortalPreferenceForm;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -39,14 +40,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static junit.framework.Assert.*;
+import static org.easymock.EasyMock.*;
/**
* Test for {@link PortalPreferenceController}
@@ -168,7 +163,7 @@ public class PortalPreferenceControllerT
public void testUpdatePreferences_invalidPageSizeValue() {
ModelMap model = new ExtendedModelMap();
HashMap<String, PortalPreference> preferenceMap = new HashMap<String, PortalPreference>();
- PortalPreference pageSizePref = new PortalPreference(PortalPreferenceKeys.PAGE_SIZE, "invalid");
+ PortalPreference pageSizePref = new PortalPreferenceImpl(PortalPreferenceKeys.PAGE_SIZE, "invalid");
preferenceMap.put(PortalPreferenceKeys.PAGE_SIZE, pageSizePref);
PortalPreferenceForm form = new PortalPreferenceForm(preferenceMap);
final BindingResult errors = new BeanPropertyBindingResult(form, "form");
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java Tue Jun 26 18:18:57 2012
@@ -19,26 +19,16 @@
package org.apache.rave.portal.web.controller.admin;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.rave.portal.model.Authority;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.AuthorityImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.NewAccountValidator;
@@ -53,6 +43,12 @@ import org.springframework.validation.Bi
import org.springframework.web.bind.support.SessionStatus;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import java.util.ArrayList;
+import java.util.List;
+
+import static junit.framework.Assert.*;
+import static org.easymock.EasyMock.*;
+
/**
* Test for {@link UserController}
*/
@@ -108,7 +104,7 @@ public class UserControllerTest {
public void viewAdminUserDetail() throws Exception {
Model model = new ExtendedModelMap();
Long userid = 123L;
- User user = new User(userid, "john.doe.sr");
+ User user = new UserImpl(userid, "john.doe.sr");
expect(userService.getUserById(userid)).andReturn(user);
replay(userService);
@@ -127,7 +123,7 @@ public class UserControllerTest {
ModelMap modelMap = new ExtendedModelMap();
final Long userid = 123L;
final String email = "john.doe.sr@example.net";
- User user = new User(userid, "john.doe.sr");
+ UserImpl user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
user.setConfirmPassword("secrect");
user.setEmail(email);
@@ -152,7 +148,7 @@ public class UserControllerTest {
public void updateUserDetail_withErrors() {
ModelMap modelMap = new ExtendedModelMap();
Long userid = 123L;
- User user = new User(userid, "john.doe.sr");
+ UserImpl user = new UserImpl(userid, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user, "user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -167,7 +163,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void updateUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- User user = new User(123L, "john.doe.sr");
+ UserImpl user = new UserImpl(123L, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user, "user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
@@ -188,14 +184,14 @@ public class UserControllerTest {
ModelMap modelMap = new ExtendedModelMap();
final Long userid = 123L;
final String email = "john.doe.sr@example.net";
- User user = new User(userid, "john.doe.sr");
+ User user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
user.setConfirmPassword(user.getConfirmPassword());
user.setEmail(email);
SessionStatus sessionStatus = createMock(SessionStatus.class);
- userService.deleteUser(user.getEntityId());
+ userService.deleteUser(user.getId());
sessionStatus.setComplete();
expectLastCall();
replay(userService, sessionStatus);
@@ -210,7 +206,7 @@ public class UserControllerTest {
public void deleteUserDetail_noConfirmChecked() {
ModelMap modelMap = new ExtendedModelMap();
Long userid = 123L;
- User user = new User(userid, "john.doe.sr");
+ User user = new UserImpl(userid, "john.doe.sr");
SessionStatus sessionStatus = createMock(SessionStatus.class);
replay(sessionStatus);
@@ -223,7 +219,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void deleteUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- User user = new User(123L, "john.doe.sr");
+ User user = new UserImpl(123L, "john.doe.sr");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
@@ -245,14 +241,14 @@ public class UserControllerTest {
final String viewName = controller.setUpForm(modelMap);
assertEquals(ViewNames.ADMIN_NEW_ACCOUNT, viewName);
assertTrue(modelMap.containsAttribute(TABS));
- assertTrue(modelMap.get(ModelKeys.NEW_USER) instanceof User);
+ assertTrue(modelMap.get(ModelKeys.NEW_USER) instanceof UserImpl);
}
@Test
public void create_ValidFormSubmitted() throws Exception {
final Model model = createNiceMock(Model.class);
final RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = new BeanPropertyBindingResult(User, ModelKeys.NEW_USER);
final String username = "username";
final String password = "password";
@@ -267,7 +263,7 @@ public class UserControllerTest {
expect(userService.getUserByUsername(username)).andReturn(null);
expect(userService.getUserByEmail(email)).andReturn(null);
- newAccountService.createNewAccount(User);
+ newAccountService.createNewAccount(isA(User.class));
expectLastCall();
replay(userService, model, newAccountService, redirectAttributes);
@@ -282,7 +278,7 @@ public class UserControllerTest {
public void create_EmptyForm() throws Exception {
final Model model = createNiceMock(Model.class);
final RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- final User User = new User();
+ final UserForm User = new UserForm();
final BindingResult errors = new BeanPropertyBindingResult(User, ModelKeys.NEW_USER);
final String username = "";
final String password = "";
@@ -294,7 +290,7 @@ public class UserControllerTest {
User.setConfirmPassword(confirmPassword);
User.setEmail(email);
- newAccountService.createNewAccount(User);
+ newAccountService.createNewAccount(isA(User.class));
replay(model);
@@ -341,8 +337,8 @@ public class UserControllerTest {
private static SearchResult<User> createSearchResultWithTwoUsers() {
- User user1 = new User(123L, "john.doe.sr");
- User user2 = new User(456L, "john.doe.jr");
+ UserImpl user1 = new UserImpl(123L, "john.doe.sr");
+ UserImpl user2 = new UserImpl(456L, "john.doe.jr");
List<User> users = new ArrayList<User>();
users.add(user1);
users.add(user2);
@@ -352,9 +348,9 @@ public class UserControllerTest {
private static SearchResult<Authority> createSearchResultWithTwoAuthorities() {
List<Authority> authorities = new ArrayList<Authority>();
- Authority foo = new Authority();
+ Authority foo = new AuthorityImpl();
foo.setAuthority("FOO");
- Authority bar = new Authority();
+ Authority bar = new AuthorityImpl();
bar.setAuthority("BAR");
authorities.add(foo);
authorities.add(bar);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java Tue Jun 26 18:18:57 2012
@@ -21,6 +21,8 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.Category;
import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.CategoryImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.PortalPreferenceService;
@@ -31,7 +33,6 @@ import org.apache.rave.portal.web.util.P
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.UpdateWidgetValidator;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.springframework.ui.ExtendedModelMap;
import org.springframework.ui.Model;
@@ -44,9 +45,9 @@ import org.springframework.web.bind.supp
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
/**
* Test for {@link WidgetController}
@@ -81,8 +82,8 @@ public class WidgetControllerTest {
controller.setCategoryService(categoryService);
categories = new ArrayList<Category>();
- categories.add(new Category());
- categories.add(new Category());
+ categories.add(new CategoryImpl());
+ categories.add(new CategoryImpl());
webDataBinder = createMock(WebDataBinder.class);
categoryEditor = new CategoryEditor(categoryService);
@@ -136,9 +137,9 @@ public class WidgetControllerTest {
@Test
public void viewAdminWidgetDetail() throws Exception {
Model model = new ExtendedModelMap();
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
final long entityId = 123L;
- widget.setEntityId(entityId);
+ widget.setId(entityId);
widget.setTitle("My widget");
expect(service.getWidget(entityId)).andReturn(widget);
@@ -157,8 +158,8 @@ public class WidgetControllerTest {
@Test
public void updateWidget_valid() {
final String widgetUrl = "http://example.com/widget";
- Widget widget = new Widget(123L, widgetUrl);
- widget.setTitle("Widget title");
+ WidgetImpl widget = new WidgetImpl(123L, widgetUrl);
+ widget.setTitle("WidgetImpl title");
widget.setType("OpenSocial");
widget.setDescription("Lorem ipsum");
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
@@ -180,7 +181,7 @@ public class WidgetControllerTest {
@Test(expected = SecurityException.class)
public void updateWidget_wrongToken() {
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
SessionStatus sessionStatus = createMock(SessionStatus.class);
ModelMap modelMap = new ExtendedModelMap();
@@ -199,7 +200,7 @@ public class WidgetControllerTest {
@Test
public void updateWidget_invalid() {
- Widget widget = new Widget(123L, "http://broken/url");
+ WidgetImpl widget = new WidgetImpl(123L, "http://broken/url");
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
SessionStatus sessionStatus = createMock(SessionStatus.class);
ModelMap modelMap = new ExtendedModelMap();
@@ -226,8 +227,8 @@ public class WidgetControllerTest {
private static SearchResult<Widget> populateWidgetSearchResult() {
List<Widget> widgetList = new ArrayList<Widget>();
for (int i = 0; i < DEFAULT_PAGESIZE; i++) {
- Widget widget = new Widget();
- widget.setTitle("Widget " + i);
+ WidgetImpl widget = new WidgetImpl();
+ widget.setTitle("WidgetImpl " + i);
widgetList.add(widget);
}
return new SearchResult<Widget>(widgetList, 25);