Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java (original) +++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java Tue Jun 26 18:18:57 2012 @@ -15,8 +15,9 @@ */ package org.apache.rave.portal.security.impl; -import org.apache.rave.portal.model.User; import org.apache.rave.portal.model.WidgetComment; +import org.apache.rave.portal.model.impl.UserImpl; +import org.apache.rave.portal.model.impl.WidgetCommentImpl; import org.apache.rave.portal.repository.WidgetCommentRepository; import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission; import org.apache.rave.portal.security.util.AuthenticationUtils; @@ -44,7 +45,7 @@ public class DefaultWidgetCommentPermiss private WidgetCommentRepository mockWidgetCommentRepository; private Authentication mockAuthentication; private WidgetComment widgetComment; - private User user, user2; + private UserImpl user, user2; private List<GrantedAuthority> grantedAuthoritiesList; private final Long VALID_COMMENT_ID = 3L; @@ -59,14 +60,14 @@ public class DefaultWidgetCommentPermiss mockAuthentication = createMock(Authentication.class); defaultWidgetCommentPermissionEvaluator = new DefaultWidgetCommentPermissionEvaluator(mockWidgetCommentRepository); - user = new User(); + user = new UserImpl(); user.setUsername(VALID_USERNAME); - user.setEntityId(VALID_USER_ID); - user2 = new User(); + user.setId(VALID_USER_ID); + user2 = new UserImpl(); user2.setUsername(VALID_USERNAME2); - user2.setEntityId(INVALID_USER_ID); - widgetComment = new WidgetComment(); - widgetComment.setEntityId(VALID_COMMENT_ID); + user2.setId(INVALID_USER_ID); + widgetComment = new WidgetCommentImpl(); + widgetComment.setId(VALID_COMMENT_ID); widgetComment.setUser(user); grantedAuthoritiesList = new ArrayList<GrantedAuthority>(); grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER")); @@ -223,9 +224,9 @@ public class DefaultWidgetCommentPermiss expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes(); replay(mockAuthentication); - WidgetComment localWidgetComment = new WidgetComment(); - User localUser = new User(); - localUser.setEntityId(VALID_USER_ID); + WidgetComment localWidgetComment = new WidgetCommentImpl(); + UserImpl localUser = new UserImpl(); + localUser.setId(VALID_USER_ID); localWidgetComment.setUser(localUser); expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(localWidgetComment).anyTimes(); replay(mockWidgetCommentRepository);
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java (original) +++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java Tue Jun 26 18:18:57 2012 @@ -20,7 +20,10 @@ package org.apache.rave.portal.security. import org.apache.rave.portal.model.Page; import org.apache.rave.portal.model.Widget; -import org.apache.rave.portal.model.User; +import org.apache.rave.portal.model.WidgetStatus; +import org.apache.rave.portal.model.impl.PageImpl; +import org.apache.rave.portal.model.impl.UserImpl; +import org.apache.rave.portal.model.impl.WidgetImpl; import org.apache.rave.portal.repository.WidgetRepository; import org.apache.rave.portal.security.ModelPermissionEvaluator; import org.apache.rave.portal.security.util.AuthenticationUtils; @@ -35,7 +38,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.rave.portal.model.WidgetStatus; import static org.easymock.EasyMock.*; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -45,11 +47,11 @@ public class DefaultWidgetPermissionEval private WidgetRepository mockWidgetRepository; private Page page; private Widget widget, widget2; - private User user, user2; + private UserImpl user, user2; private Authentication mockAuthentication; private List<GrantedAuthority> grantedAuthoritiesList; - private final Long VALID_REGION_ID = 1L; + private final Long VALID_WIDGET_ID = 1L; private final Long VALID_PAGE_ID = 3L; private final Long VALID_USER_ID = 99L; private final String VALID_USERNAME = "john.doe"; @@ -61,16 +63,15 @@ public class DefaultWidgetPermissionEval defaultWidgetPermissionEvaluator = new DefaultWidgetPermissionEvaluator(mockWidgetRepository); mockAuthentication = createMock(Authentication.class); - user = new User(); + user = new UserImpl(); user.setUsername(VALID_USERNAME); - user.setEntityId(VALID_USER_ID); - user2 = new User(); + user.setId(VALID_USER_ID); + user2 = new UserImpl(); user2.setUsername(VALID_USERNAME2); - page = new Page(); - page.setEntityId(VALID_PAGE_ID); + page = new PageImpl(); + page.setId(VALID_PAGE_ID); page.setOwner(user); - widget = new Widget(); - widget.setEntityId(VALID_REGION_ID); + widget = new WidgetImpl(VALID_WIDGET_ID); widget.setOwner(user); widget.setWidgetStatus(WidgetStatus.PUBLISHED); grantedAuthoritiesList = new ArrayList<GrantedAuthority>(); @@ -103,7 +104,7 @@ public class DefaultWidgetPermissionEval public void testHasPermission_3args_create_isWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.CREATE), is(true)); @@ -115,7 +116,7 @@ public class DefaultWidgetPermissionEval public void testHasPermission_3args_create_isNotWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.CREATE), is(false)); @@ -127,7 +128,7 @@ public class DefaultWidgetPermissionEval public void testHasPermission_3args_delete_isWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.DELETE), is(true)); @@ -139,7 +140,7 @@ public class DefaultWidgetPermissionEval public void testHasPermission_3args_delete_isNotWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.DELETE), is(false)); @@ -151,7 +152,7 @@ public class DefaultWidgetPermissionEval public void testHasPermission_3args_update_isWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.UPDATE), is(true)); @@ -163,19 +164,19 @@ public class DefaultWidgetPermissionEval public void testHasPermission_3args_update_isNotWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.UPDATE), is(false)); verify(mockAuthentication); verify(mockWidgetRepository); - } + } @Test public void testHasPermission_3args_read_isWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.READ), is(true)); @@ -187,7 +188,7 @@ public class DefaultWidgetPermissionEval public void testHasPermission_3args_read_isNotWidgetOwner_isPublishedGadget() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.READ), is(true)); @@ -201,19 +202,19 @@ public class DefaultWidgetPermissionEval EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, widget, ModelPermissionEvaluator.Permission.READ), is(false)); verify(mockAuthentication); verify(mockWidgetRepository); - } - + } + @Test public void testHasPermission_4args_administer() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); replay(mockAuthentication); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.ADMINISTER), is(false)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.ADMINISTER), is(false)); verify(mockAuthentication); } @@ -221,10 +222,10 @@ public class DefaultWidgetPermissionEval public void testHasPermission_4args_create_isWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true)); verify(mockAuthentication); verify(mockWidgetRepository); } @@ -233,10 +234,10 @@ public class DefaultWidgetPermissionEval public void testHasPermission_4args_create_isNotWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false)); verify(mockAuthentication); verify(mockWidgetRepository); } @@ -245,10 +246,10 @@ public class DefaultWidgetPermissionEval public void testHasPermission_4args_delete_isWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true)); verify(mockAuthentication); verify(mockWidgetRepository); } @@ -257,10 +258,10 @@ public class DefaultWidgetPermissionEval public void testHasPermission_4args_delete_isNotWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false)); verify(mockAuthentication); verify(mockWidgetRepository); } @@ -269,10 +270,10 @@ public class DefaultWidgetPermissionEval public void testHasPermission_4args_read_isWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true)); verify(mockAuthentication); verify(mockWidgetRepository); } @@ -281,10 +282,10 @@ public class DefaultWidgetPermissionEval public void testHasPermission_4args_read_isNotWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false)); verify(mockAuthentication); verify(mockWidgetRepository); } @@ -293,10 +294,10 @@ public class DefaultWidgetPermissionEval public void testHasPermission_4args_update_isWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true)); verify(mockAuthentication); verify(mockWidgetRepository); } @@ -305,10 +306,10 @@ public class DefaultWidgetPermissionEval public void testHasPermission_4args_update_isNotWidgetOwner() { EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList); expect(mockAuthentication.getPrincipal()).andReturn(user2); - expect(mockWidgetRepository.get(VALID_REGION_ID)).andReturn(widget); + expect(mockWidgetRepository.get(VALID_WIDGET_ID)).andReturn(widget); replay(mockAuthentication); replay(mockWidgetRepository); - assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_REGION_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false)); + assertThat(defaultWidgetPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_ID, Widget.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false)); verify(mockAuthentication); verify(mockWidgetRepository); } Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java (original) +++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java Tue Jun 26 18:18:57 2012 @@ -18,8 +18,9 @@ */ package org.apache.rave.portal.security.impl; -import org.apache.rave.portal.model.User; import org.apache.rave.portal.model.WidgetRating; +import org.apache.rave.portal.model.impl.UserImpl; +import org.apache.rave.portal.model.impl.WidgetRatingImpl; import org.apache.rave.portal.repository.WidgetRatingRepository; import org.apache.rave.portal.security.ModelPermissionEvaluator; import org.apache.rave.portal.security.util.AuthenticationUtils; @@ -45,7 +46,7 @@ public class DefaultWidgetRatingPermissi private Authentication mockAuthentication; private List<GrantedAuthority> grantedAuthoritiesList; private WidgetRating widgetRating; - private User user, user2; + private UserImpl user, user2; private final Long VALID_USER_ID = 99L; private final Long VALID_USER_ID2 = 100L; @@ -59,16 +60,16 @@ public class DefaultWidgetRatingPermissi mockWidgetRatingRepository = createMock(WidgetRatingRepository.class); defaultWidgetRatingPermissionEvaluator = new DefaultWidgetRatingPermissionEvaluator(mockWidgetRatingRepository); - widgetRating = new WidgetRating(); + widgetRating = new WidgetRatingImpl(); widgetRating.setUserId(VALID_USER_ID); widgetRating.setWidgetId(VALID_WIDGET_ID); - widgetRating.setEntityId(VALID_WIDGET_ID); + widgetRating.setId(VALID_WIDGET_ID); - user = new User(); + user = new UserImpl(); user.setUsername(VALID_USERNAME); - user.setEntityId(VALID_USER_ID); - user2 = new User(); - user2.setEntityId(VALID_USER_ID2); + user.setId(VALID_USER_ID); + user2 = new UserImpl(); + user2.setId(VALID_USER_ID2); user2.setUsername(VALID_USERNAME2); mockAuthentication = createMock(Authentication.class); Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java (original) +++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java Tue Jun 26 18:18:57 2012 @@ -19,17 +19,20 @@ package org.apache.rave.portal.security.impl; import org.apache.rave.persistence.BasicEntity; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; import org.apache.rave.portal.security.ModelPermissionEvaluator; import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission; -import org.springframework.security.core.Authentication; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; +import org.springframework.security.core.Authentication; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + import static org.easymock.EasyMock.*; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; /** * @@ -40,89 +43,104 @@ public class RavePermissionEvaluatorTest private Authentication authentication; private BasicEntityModel basicEntityModel; private NonBasicEntityModel nonBasicEntityModel; - + private String READ_PERMISSION = "read"; private String CREATE_OR_UPDATE_PERMISSION = "create_or_update"; private Long VALID_BASIC_ENTITY_MODEL_ID = 4L; - - + @Before public void setUp() { List<ModelPermissionEvaluator<?>> modelPermissionEvaluatorList = new ArrayList<ModelPermissionEvaluator<?>>(); - modelPermissionEvaluatorList.add(new BasicEntityModelPermissionEvaluator()); - modelPermissionEvaluatorList.add(new NonBasicEntityModelPermissionEvaluator()); + modelPermissionEvaluatorList.add(new BasicEntityModelPermissionEvaluator()); + modelPermissionEvaluatorList.add(new NonBasicEntityModelPermissionEvaluator()); + modelPermissionEvaluatorList.add(new TestModelPermissionEvaluator()); ravePermissionEvaluator = new RavePermissionEvaluator(modelPermissionEvaluatorList); - + authentication = createMock(Authentication.class); - basicEntityModel = new BasicEntityModel(VALID_BASIC_ENTITY_MODEL_ID); + basicEntityModel = new BasicEntityModel(VALID_BASIC_ENTITY_MODEL_ID); nonBasicEntityModel = new NonBasicEntityModel(); } - + @Test public void testLoadOrderOverride() { @SuppressWarnings("unchecked") ModelPermissionEvaluator<BasicEntityModel> mockedOverriddenPermissionEvaluator = createMock(ModelPermissionEvaluator.class); expect(mockedOverriddenPermissionEvaluator.getType()).andReturn(BasicEntityModel.class); expect(mockedOverriddenPermissionEvaluator.getLoadOrder()).andReturn(2); - expect(mockedOverriddenPermissionEvaluator.hasPermission(authentication, basicEntityModel, Permission.fromString(READ_PERMISSION))).andReturn(true); + expect(mockedOverriddenPermissionEvaluator.hasPermission(authentication, basicEntityModel, Permission.fromString(READ_PERMISSION))).andReturn(true); replay(mockedOverriddenPermissionEvaluator); - + List<ModelPermissionEvaluator<?>> modelPermissionEvaluatorList = new ArrayList<ModelPermissionEvaluator<?>>(); // note we are adding the override instance first to verify the Collections.sort works as expected modelPermissionEvaluatorList.add(mockedOverriddenPermissionEvaluator); - modelPermissionEvaluatorList.add(new BasicEntityModelPermissionEvaluator()); + modelPermissionEvaluatorList.add(new BasicEntityModelPermissionEvaluator()); ravePermissionEvaluator = new RavePermissionEvaluator(modelPermissionEvaluatorList); - - assertThat(ravePermissionEvaluator.hasPermission(authentication, basicEntityModel, READ_PERMISSION), is(true)); - verify(mockedOverriddenPermissionEvaluator); - } - - @Test - public void testHasPermission_3args_read() { - assertThat(ravePermissionEvaluator.hasPermission(authentication, basicEntityModel, READ_PERMISSION), is(true)); - } - - @Test - public void testHasPermission_3args_createOrUpdate_nullEntityId() { - assertThat(ravePermissionEvaluator.hasPermission(authentication, new BasicEntityModel(), CREATE_OR_UPDATE_PERMISSION), is(true)); - } - - @Test - public void testHasPermission_3args_createOrUpdate_populatedEntityId() { - assertThat(ravePermissionEvaluator.hasPermission(authentication, basicEntityModel, CREATE_OR_UPDATE_PERMISSION), is(true)); - } - + + assertThat(ravePermissionEvaluator.hasPermission(authentication, basicEntityModel, READ_PERMISSION), is(true)); + verify(mockedOverriddenPermissionEvaluator); + } + + @Test + public void testHasPermission_3args_read() { + assertThat(ravePermissionEvaluator.hasPermission(authentication, basicEntityModel, READ_PERMISSION), is(true)); + } + + @Test + public void testHasPermission_3args_createOrUpdate_nullEntityId() { + assertThat(ravePermissionEvaluator.hasPermission(authentication, new BasicEntityModel(), CREATE_OR_UPDATE_PERMISSION), is(true)); + } + + @Test + public void testHasPermission_3args_createOrUpdate_populatedEntityId() { + assertThat(ravePermissionEvaluator.hasPermission(authentication, basicEntityModel, CREATE_OR_UPDATE_PERMISSION), is(true)); + } + + @Ignore @Test(expected=IllegalArgumentException.class) - public void testHasPermission_3args_createOrUpdate_nonBasicEntityModel() { + public void testHasPermission_3args_createOrUpdate_nonBasicEntityModel() { ravePermissionEvaluator.hasPermission(authentication, nonBasicEntityModel, CREATE_OR_UPDATE_PERMISSION); - } - + } + @Test - public void testHasPermission_3args_nullModel() { - assertThat(ravePermissionEvaluator.hasPermission(authentication, null, READ_PERMISSION), is(false)); + public void testHasPermission_3args_nullModel() { + assertThat(ravePermissionEvaluator.hasPermission(authentication, null, READ_PERMISSION), is(false)); } - + @Test(expected=IllegalArgumentException.class) - public void testHasPermission_3args_invalidEvaluator() { + public void testHasPermission_3args_invalidEvaluator() { List<String> list = new ArrayList<String>(); - assertThat(ravePermissionEvaluator.hasPermission(authentication, list, READ_PERMISSION), is(true)); - } - + assertThat(ravePermissionEvaluator.hasPermission(authentication, list, READ_PERMISSION), is(true)); + } + @Test - public void testHasPermission_4args() { - assertThat(ravePermissionEvaluator.hasPermission(authentication, VALID_BASIC_ENTITY_MODEL_ID, BasicEntityModel.class.getName(), READ_PERMISSION), is(true)); + public void testHasPermission_4args() { + assertThat(ravePermissionEvaluator.hasPermission(authentication, VALID_BASIC_ENTITY_MODEL_ID, BasicEntityModel.class.getName(), READ_PERMISSION), is(true)); } @Test(expected=IllegalArgumentException.class) - public void testHasPermission_4args_createOrUpdatePermission() { + public void testHasPermission_4args_createOrUpdatePermission() { ravePermissionEvaluator.hasPermission(authentication, VALID_BASIC_ENTITY_MODEL_ID, BasicEntityModel.class.getName(), CREATE_OR_UPDATE_PERMISSION); - } - + } + + @Test(expected=IllegalArgumentException.class) + public void testHasPermission_4args_invalidClass() { + assertThat(ravePermissionEvaluator.hasPermission(authentication, VALID_BASIC_ENTITY_MODEL_ID, "badclass", READ_PERMISSION), is(true)); + } + + @Test + public void testFindAndRegisterCompatibleMPE() { + assertThat(ravePermissionEvaluator.hasPermission(authentication, new TestModelImpl(), READ_PERMISSION), is(true)); + } + + interface TestModel {}; + + class TestModelImpl implements TestModel {} + class BasicEntityModel implements BasicEntity { private Long entityId; - + public BasicEntityModel() { } - + public BasicEntityModel(Long entityId) { this.entityId = entityId; } @@ -137,7 +155,7 @@ public class RavePermissionEvaluatorTest this.entityId = entityId; } } - + class BasicEntityModelPermissionEvaluator extends AbstractModelPermissionEvaluator<BasicEntityModel> { @Override public Class<BasicEntityModel> getType() { @@ -148,17 +166,17 @@ public class RavePermissionEvaluatorTest public boolean hasPermission(Authentication authentication, BasicEntityModel basicEntityModel, Permission permission) { return true; } - + @Override public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Permission permission) { return true; } - } - - class NonBasicEntityModel { - public NonBasicEntityModel() { } } - + + class NonBasicEntityModel { + public NonBasicEntityModel() { } + } + class NonBasicEntityModelPermissionEvaluator extends AbstractModelPermissionEvaluator<NonBasicEntityModel> { @Override public Class<NonBasicEntityModel> getType() { @@ -169,10 +187,28 @@ public class RavePermissionEvaluatorTest public boolean hasPermission(Authentication authentication, NonBasicEntityModel nonBasicEntityModel, Permission permission) { return true; } - + + @Override + public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Permission permission) { + return true; + } + } + + class TestModelPermissionEvaluator extends AbstractModelPermissionEvaluator<TestModel> { + @Override + public Class<TestModel> getType() { + return TestModel.class; + } + + @Override + public boolean hasPermission(Authentication authentication, TestModel testModel, Permission permission) { + return true; + } + @Override public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Permission permission) { return true; } - } + } + } Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java (original) +++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java Tue Jun 26 18:18:57 2012 @@ -20,20 +20,19 @@ package org.apache.rave.portal.service.impl; import org.apache.rave.portal.model.Authority; +import org.apache.rave.portal.model.impl.AuthorityImpl; import org.apache.rave.portal.model.util.SearchResult; import org.apache.rave.portal.repository.AuthorityRepository; -import org.apache.rave.portal.service.impl.DefaultAuthorityService; +import org.apache.rave.portal.service.AuthorityService; import org.junit.Before; import org.junit.Test; import java.util.ArrayList; import java.util.List; -import org.apache.rave.portal.service.AuthorityService; import static org.easymock.EasyMock.*; - +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; -import static org.hamcrest.CoreMatchers.*; /** Test for {@link org.apache.rave.portal.service.impl.DefaultAuthorityService} @@ -75,19 +74,17 @@ public class DefaultAuthorityServiceTest } private static Authority createAuthority() { - Authority authority = new Authority(); + AuthorityImpl authority = new AuthorityImpl(); authority.setAuthority("FOO"); final long entityId = 123L; - authority.setEntityId(entityId); return authority; } @Test public void getAuthorityById_NotFound() { - Authority authority = new Authority(); + AuthorityImpl authority = new AuthorityImpl(); authority.setAuthority("BAR"); final long entityId = 456L; - authority.setEntityId(entityId); expect(repository.get(entityId)).andReturn(null); replay(repository); @@ -100,9 +97,9 @@ public class DefaultAuthorityServiceTest @Test public void allAuthorities() { 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); @@ -120,10 +117,10 @@ public class DefaultAuthorityServiceTest @Test public void test_getAllDefault() { List<Authority> authorities = new ArrayList<Authority>(); - Authority foo = new Authority(); + Authority foo = new AuthorityImpl(); foo.setAuthority("FOO"); foo.setDefaultForNewUser(true); - Authority bar = new Authority(); + Authority bar = new AuthorityImpl(); bar.setAuthority("BAR"); bar.setDefaultForNewUser(true); Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java (original) +++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java Tue Jun 26 18:18:57 2012 @@ -21,6 +21,8 @@ package org.apache.rave.portal.service.i 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.repository.CategoryRepository; import org.apache.rave.portal.service.CategoryService; import org.junit.Before; @@ -31,8 +33,8 @@ import java.util.Date; import java.util.List; import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.assertThat; /** * Test for {@link org.apache.rave.portal.service.impl.DefaultCategoryService} @@ -40,7 +42,7 @@ import static org.hamcrest.CoreMatchers. public class DefaultCategoryServiceTest { private CategoryService service; private CategoryRepository repository; - + private final Long VALID_ID = 4L; private final String VALID_TEXT = "category1"; private final Date VALID_CREATED_DATE = new Date(66666666); @@ -48,7 +50,7 @@ public class DefaultCategoryServiceTest private final Long VALID_CREATED_USER_ID = 77L; private final Long VALID_LAST_MODIFIED_USER_ID = 88L; private User validCreatedUser; - private User validLastModifiedUser; + private User validLastModifiedUser; private Category validCategory; private final Long INVALID_ID = -999L; @@ -58,11 +60,11 @@ public class DefaultCategoryServiceTest repository = createMock(CategoryRepository.class); service = new DefaultCategoryService(repository); - validCreatedUser = new User(VALID_CREATED_USER_ID); - validLastModifiedUser = new User(VALID_LAST_MODIFIED_USER_ID); - - validCategory = new Category(); - validCategory.setEntityId(VALID_ID); + validCreatedUser = new UserImpl(VALID_CREATED_USER_ID); + validLastModifiedUser = new UserImpl(VALID_LAST_MODIFIED_USER_ID); + + validCategory = new CategoryImpl(); + validCategory.setId(VALID_ID); validCategory.setText(VALID_TEXT); validCategory.setCreatedUser(validCreatedUser); validCategory.setCreatedDate(VALID_CREATED_DATE); @@ -90,19 +92,19 @@ public class DefaultCategoryServiceTest public void getAll() { List<Category> list = new ArrayList<Category>(); list.add(validCategory); - list.add(new Category()); - list.add(new Category()); + list.add(new CategoryImpl()); + list.add(new CategoryImpl()); expect(repository.getAll()).andReturn(list); replay(repository); assertThat(service.getAll(), is(list)); - verify(repository); + verify(repository); } @Test public void create() { final String NEW_CATEGORY_TEXT = "new category"; - Category expectedCategory = new Category(); + Category expectedCategory = new CategoryImpl(); expectedCategory.setText(NEW_CATEGORY_TEXT); expect(repository.save(expectedCategory)).andReturn(expectedCategory); @@ -114,7 +116,7 @@ public class DefaultCategoryServiceTest assertThat(wc.getCreatedDate(), is(wc.getLastModifiedDate())); assertThat(wc.getCreatedUser(), is(validCreatedUser)); assertThat(wc.getLastModifiedUser(), is(validCreatedUser)); - + verify(repository); } @@ -122,8 +124,8 @@ public class DefaultCategoryServiceTest public void update() { final String UPDATED_TEXT = "modified category"; - Category expectedSaveCategory = new Category(); - expectedSaveCategory.setEntityId(VALID_ID); + Category expectedSaveCategory = new CategoryImpl(); + expectedSaveCategory.setId(VALID_ID); expectedSaveCategory.setText(UPDATED_TEXT); expectedSaveCategory.setCreatedUser(validCreatedUser); expectedSaveCategory.setLastModifiedUser(validLastModifiedUser); @@ -133,9 +135,9 @@ public class DefaultCategoryServiceTest expect(repository.get(VALID_ID)).andReturn(validCategory); expect(repository.save(expectedSaveCategory)).andReturn(expectedSaveCategory); replay(repository); - + Category updatedCategory = service.update(VALID_ID, UPDATED_TEXT, validLastModifiedUser); - assertThat(updatedCategory.getEntityId(), is(VALID_ID)); + assertThat(updatedCategory.getId(), is(VALID_ID)); assertThat(updatedCategory.getText(), is(UPDATED_TEXT)); assertThat(updatedCategory.getCreatedUser(), is(validCreatedUser)); assertThat(updatedCategory.getLastModifiedUser(), is(validLastModifiedUser)); @@ -146,7 +148,7 @@ public class DefaultCategoryServiceTest @Test public void delete() { - expect(repository.get(validCategory.getEntityId())).andReturn(validCategory); + expect(repository.get(validCategory.getId())).andReturn(validCategory); repository.delete(validCategory); expectLastCall(); replay(repository); Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java (original) +++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java Tue Jun 26 18:18:57 2012 @@ -19,19 +19,11 @@ package org.apache.rave.portal.service.impl; -import static junit.framework.Assert.fail; -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 java.util.ArrayList; -import java.util.List; - import org.apache.rave.portal.model.Authority; -import org.apache.rave.portal.model.PageLayout; import org.apache.rave.portal.model.User; +import org.apache.rave.portal.model.impl.AuthorityImpl; +import org.apache.rave.portal.model.impl.PageLayoutImpl; +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; @@ -45,6 +37,12 @@ import org.springframework.security.core import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.test.util.ReflectionTestUtils; +import java.util.ArrayList; +import java.util.List; + +import static junit.framework.Assert.fail; +import static org.easymock.EasyMock.*; + /** * Test class for {@link org.apache.rave.portal.service.impl.DefaultNewAccountService} */ @@ -61,7 +59,7 @@ public class DefaultNewAccountServiceTes private final String VALID_PASSWORD = "valid.password"; private final String VALID_LAYOUT_CODE = "valid.layout"; private final String VALID_EMAIL = "valid.email"; - private PageLayout validPageLayout; + private PageLayoutImpl validPageLayout; private SearchResult<Authority> validAuthoritySearchResult; private List<Authority> validAuthorityList; @@ -77,14 +75,13 @@ public class DefaultNewAccountServiceTes newAccountService = new DefaultNewAccountService(userService, pageLayoutService, authorityService); - validPageLayout = new PageLayout(); - validPageLayout.setEntityId(99L); + validPageLayout = new PageLayoutImpl(); validPageLayout.setNumberOfRegions(4L); validPageLayout.setCode(VALID_LAYOUT_CODE); - Authority role1 = new Authority(); + Authority role1 = new AuthorityImpl(); role1.setAuthority("DEFAULT_ROLE1"); - Authority role2 = new Authority(); + Authority role2 = new AuthorityImpl(); role2.setAuthority("DEFAULT_ROLE2"); validAuthorityList = new ArrayList<Authority>(); @@ -95,14 +92,14 @@ public class DefaultNewAccountServiceTes @Test public void createNewAccountTest() throws Exception { - User newUser = new User(); + UserImpl newUser = new UserImpl(); newUser.setUsername(VALID_USER); newUser.setPassword(VALID_PASSWORD); newUser.setConfirmPassword(VALID_PASSWORD); newUser.setEmail(VALID_EMAIL); newUser.setDefaultPageLayoutCode(VALID_LAYOUT_CODE); - User expectedUser = new User(); + User expectedUser = new UserImpl(); expectedUser.setUsername(newUser.getUsername()); expectedUser.setPassword(newUser.getPassword()); expectedUser.setEmail(newUser.getEmail()); @@ -118,7 +115,7 @@ public class DefaultNewAccountServiceTes expect(userService.getUserByEmail(VALID_EMAIL)).andReturn(null); expect(pageLayoutService.getPageLayoutByCode(VALID_LAYOUT_CODE)).andReturn(validPageLayout); expect(authorityService.getDefaultAuthorities()).andReturn(validAuthoritySearchResult); - userService.registerNewUser(expectedUser); + userService.registerNewUser(isA(User.class)); expectLastCall(); replay(userDetails, passwordEncoder, userService, pageLayoutService, authorityService); @@ -129,14 +126,14 @@ public class DefaultNewAccountServiceTes @Test public void createNewAccountTest_blankEmail() throws Exception { - User newUser = new User(); + UserImpl newUser = new UserImpl(); newUser.setUsername(VALID_USER); newUser.setPassword(VALID_PASSWORD); newUser.setConfirmPassword(VALID_PASSWORD); newUser.setEmail(""); newUser.setDefaultPageLayoutCode(VALID_LAYOUT_CODE); - User expectedUser = new User(); + User expectedUser = new UserImpl(); expectedUser.setUsername(newUser.getUsername()); expectedUser.setPassword(newUser.getPassword()); expectedUser.setEmail(newUser.getEmail()); @@ -152,7 +149,7 @@ public class DefaultNewAccountServiceTes //if the email is blank getUserByEmail should not be called so dont expect it expect(pageLayoutService.getPageLayoutByCode(VALID_LAYOUT_CODE)).andReturn(validPageLayout); expect(authorityService.getDefaultAuthorities()).andReturn(validAuthoritySearchResult); - userService.registerNewUser(expectedUser); + userService.registerNewUser(isA(User.class)); expectLastCall(); replay(userDetails, passwordEncoder, userService, pageLayoutService, authorityService); @@ -164,9 +161,9 @@ public class DefaultNewAccountServiceTes @Test public void failedAccountCreationTest_duplicateUsername() throws Exception { String duplicateUserName = "duplicateUserName"; - User newUser = new User(); + UserImpl newUser = new UserImpl(); newUser.setUsername(duplicateUserName); - User existingUser = new User(); + User existingUser = new UserImpl(); existingUser.setUsername(duplicateUserName); expect(userService.getUserByUsername(duplicateUserName)).andReturn(existingUser); @@ -183,10 +180,10 @@ public class DefaultNewAccountServiceTes @Test public void failedAccountCreationTest_duplicateEmail() throws Exception { String duplicateEmail = "duplicateEmail"; - User newUser = new User(); + UserImpl newUser = new UserImpl(); newUser.setUsername("newUser"); newUser.setEmail(duplicateEmail); - User existingUser = new User(); + User existingUser = new UserImpl(); existingUser.setEmail(duplicateEmail); expect(userService.getUserByUsername("newUser")).andReturn(null); Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff ============================================================================== --- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java (original) +++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java Tue Jun 26 18:18:57 2012 @@ -20,6 +20,7 @@ package org.apache.rave.portal.service.impl; import org.apache.rave.portal.model.PageLayout; +import org.apache.rave.portal.model.impl.PageLayoutImpl; import org.apache.rave.portal.repository.PageLayoutRepository; import org.apache.rave.portal.service.PageLayoutService; import org.junit.Before; @@ -29,9 +30,7 @@ import java.util.ArrayList; import java.util.List; import static org.easymock.EasyMock.*; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.CoreMatchers.sameInstance; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.assertThat; public class DefaultPageLayoutServiceTest { @@ -47,7 +46,7 @@ public class DefaultPageLayoutServiceTes pageLayoutRepository = createMock(PageLayoutRepository.class); pageLayoutService = new DefaultPageLayoutService(pageLayoutRepository); - validPageLayout = new PageLayout(); + validPageLayout = new PageLayoutImpl(); validPageLayout.setCode(VALID_LAYOUT_CODE); } @@ -87,7 +86,7 @@ public class DefaultPageLayoutServiceTes public void getPageLayoutByCode_invalidPageLayout() { expect(pageLayoutRepository.getByPageLayoutCode(INVALID_LAYOUT_CODE)).andReturn(null); replay(pageLayoutRepository); - assertThat(pageLayoutService.getPageLayoutByCode(INVALID_LAYOUT_CODE), is(nullValue(PageLayout.class))); + assertThat(pageLayoutService.getPageLayoutByCode(INVALID_LAYOUT_CODE), is(nullValue())); verify(pageLayoutRepository); } } \ No newline at end of file
