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/12/28 18:43:30 UTC
svn commit: r1426593 [4/16] - in /rave/branches/mongo: ./ rave-components/
rave-components/rave-commons/
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/
rave-components/rave-core/src/main/java/org/apac...
Modified: rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java Fri Dec 28 17:43:23 2012
@@ -20,7 +20,8 @@
package org.apache.rave.portal.web.renderer.impl;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.repository.WidgetRepository;
+import org.apache.rave.portal.web.renderer.model.RegionWidgetWrapper;
import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.apache.rave.portal.web.renderer.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +38,12 @@ import java.util.*;
@Service
public class DefaultRenderService implements RenderService {
+ public static final String WIDGET_CONTEXT_KEY = "widget";
+
private final Map<String, RegionWidgetRenderer> supportedWidgets;
@Autowired
- public DefaultRenderService(List<RegionWidgetRenderer> widgetRenderers) {
+ public DefaultRenderService(List<RegionWidgetRenderer> widgetRenderers, WidgetRepository widgetRepository) {
this.supportedWidgets = new HashMap<String, RegionWidgetRenderer>();
mapRenderersByType(this.supportedWidgets, widgetRenderers);
}
@@ -51,21 +54,21 @@ public class DefaultRenderService implem
}
/**
- * Renders the given widget iff there is a {@link org.apache.rave.portal.web.renderer.RegionWidgetRenderer } for the
- * widget type
+ * Renders the given rw iff there is a {@link org.apache.rave.portal.web.renderer.RegionWidgetRenderer } for the
+ * rw type
*
- * @param widget widget to renderer
+ * @param rw RegionWidget to renderer
* @param context
* @return the String representation of the rendered RegionWidget
* @throws {@link org.apache.rave.exception.NotSupportedException}
*/
@Override
- public String render(RegionWidget widget, RenderContext context) {
- RegionWidgetRenderer renderer = supportedWidgets.get(widget.getWidget().getType());
+ public String render(RegionWidgetWrapper rw, RenderContext context) {
+ RegionWidgetRenderer renderer = supportedWidgets.get(rw.getWidget().getType());
if(renderer == null) {
- throw new NotSupportedException(widget.getWidget().getType() + " is not supported");
+ throw new NotSupportedException(rw.getWidget().getType() + " is not supported");
}
- return renderer.render(widget, context);
+ return renderer.render(rw, context);
}
private static <T extends Renderer> void mapRenderersByType(Map<String, T> map, List<T> renderers) {
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java Fri Dec 28 17:43:23 2012
@@ -29,7 +29,7 @@ import java.util.List;
import static org.junit.Assert.assertTrue;
public class ModelUtilsTest {
- long VALID_REGION_WIDGET_ID = 1L;
+ String VALID_REGION_WIDGET_ID = "1";
@Test
public void normalizeRegionWidgetPreference() {
@@ -50,7 +50,7 @@ public class ModelUtilsTest {
public List<RegionWidgetPreference> getTestRegionWidgetPreferences() {
return Arrays.asList((RegionWidgetPreference)new RegionWidgetPreferenceImpl( null, "camelCaseName", "FOO"),
- (RegionWidgetPreference)new RegionWidgetPreferenceImpl(20L, "lowercasename", "FOO"),
- (RegionWidgetPreference)new RegionWidgetPreferenceImpl( -100L, "UPPERCASENAME", "FOO"));
+ (RegionWidgetPreference)new RegionWidgetPreferenceImpl("20", "lowercasename", "FOO"),
+ (RegionWidgetPreference)new RegionWidgetPreferenceImpl( "-100", "UPPERCASENAME", "FOO"));
}
}
\ No newline at end of file
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java Fri Dec 28 17:43:23 2012
@@ -49,8 +49,8 @@ public class DefaultCategoryPermissionEv
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthorities;
- private final Long VALID_WIDGET_CATEGORY_ID = 22L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_WIDGET_CATEGORY_ID = "22";
+ private final String VALID_USER_ID = "99";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@@ -68,7 +68,7 @@ public class DefaultCategoryPermissionEv
category = new CategoryImpl();
category.setId(VALID_WIDGET_CATEGORY_ID);
- category.setCreatedUser(user);
+ category.setCreatedUserId(VALID_USER_ID);
grantedAuthorities = new ArrayList<GrantedAuthority>();
grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java Fri Dec 28 17:43:23 2012
@@ -53,45 +53,47 @@ public class DefaultPagePermissionEvalua
private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "66";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_PAGE_ID2 = 77L;
- private final Long VALID_PAGE_ID3 = 177L;
- private final Long VALID_PAGE_ID4 = 665L;
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_PAGE_ID2 = "77";
+ private final String VALID_PAGE_ID3 = "177";
+ private final String VALID_PAGE_ID4 = "665";
@Before
public void setUp() {
mockPageRepository = createMock(PageRepository.class);
mockAuthentication = createMock(Authentication.class);
- defaultPagePermissionEvaluator = new DefaultPagePermissionEvaluator(mockPageRepository);
+ defaultPagePermissionEvaluator = new DefaultPagePermissionEvaluator(mockPageRepository, null);
user = new UserImpl();
user.setUsername(VALID_USERNAME);
user.setId(VALID_USER_ID);
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
+ user2.setId(VALID_USER_ID2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
- page.setOwner(user);
+ page.setOwnerId(user.getId());
page.setPageType(PageType.USER);
pageSubPage = new PageImpl();
pageSubPage.setId(VALID_PAGE_ID4);
- pageSubPage.setOwner(user);
+ pageSubPage.setOwnerId(user.getId());
pageSubPage.setPageType(PageType.SUB_PAGE);
pageSubPage.setParentPage(page);
personProfilePage = new PageImpl();
personProfilePage.setId(VALID_PAGE_ID2);
- personProfilePage.setOwner(user);
+ personProfilePage.setOwnerId(user.getId());
personProfilePage.setPageType(PageType.PERSON_PROFILE);
personProfileSubPage = new PageImpl();
personProfileSubPage.setId(VALID_PAGE_ID3);
- personProfileSubPage.setOwner(user);
+ personProfileSubPage.setOwnerId(user.getId());
personProfileSubPage.setPageType(PageType.PERSON_PROFILE);
personProfileSubPage.setParentPage(personProfilePage);
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java Fri Dec 28 17:43:23 2012
@@ -50,16 +50,17 @@ public class DefaultRegionPermissionEval
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_REGION_ID = 1L;
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_REGION_ID = "1";
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "66";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@Before
public void setUp() {
mockRegionRepository = createMock(RegionRepository.class);
- defaultRegionPermissionEvaluator = new DefaultRegionPermissionEvaluator(mockRegionRepository);
+ defaultRegionPermissionEvaluator = new DefaultRegionPermissionEvaluator(mockRegionRepository, null);
mockAuthentication = createMock(Authentication.class);
user = new UserImpl();
@@ -67,11 +68,11 @@ public class DefaultRegionPermissionEval
user.setId(VALID_USER_ID);
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
+ user2.setId(VALID_USER_ID2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
- page.setOwner(user);
- region = new RegionImpl();
- region.setId(VALID_REGION_ID);
+ page.setOwnerId(user.getId());
+ region = new RegionImpl(VALID_REGION_ID);
region.setPage(page);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java Fri Dec 28 17:43:23 2012
@@ -53,17 +53,18 @@ public class DefaultRegionWidgetPermissi
private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_REGION_ID = 1L;
- private final Long VALID_REGION_WIDGET_ID = 1L;
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_REGION_ID = "1";
+ private final String VALID_REGION_WIDGET_ID = "1";
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "66";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@Before
public void setUp() {
mockRegionWidgetRepository = createMock(RegionWidgetRepository.class);
- defaultRegionWidgetPermissionEvaluator = new DefaultRegionWidgetPermissionEvaluator(mockRegionWidgetRepository);
+ defaultRegionWidgetPermissionEvaluator = new DefaultRegionWidgetPermissionEvaluator(mockRegionWidgetRepository, null);
mockAuthentication = createMock(Authentication.class);
user = new UserImpl();
@@ -71,14 +72,13 @@ public class DefaultRegionWidgetPermissi
user.setId(VALID_USER_ID);
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
+ user2.setId(VALID_USER_ID2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
- page.setOwner(user);
- region = new RegionImpl();
- region.setId(VALID_REGION_ID);
+ page.setOwnerId(user.getId());
+ region = new RegionImpl(VALID_REGION_ID);
region.setPage(page);
- regionWidget = new RegionWidgetImpl();
- regionWidget.setId(VALID_REGION_WIDGET_ID);
+ regionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
regionWidget.setRegion(region);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java Fri Dec 28 17:43:23 2012
@@ -18,7 +18,7 @@ package org.apache.rave.portal.security.
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.repository.WidgetRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission;
import org.apache.rave.portal.security.util.AuthenticationUtils;
import org.easymock.EasyMock;
@@ -42,23 +42,23 @@ import static org.junit.Assert.assertTha
public class DefaultWidgetCommentPermissionEvaluatorTest {
private DefaultWidgetCommentPermissionEvaluator defaultWidgetCommentPermissionEvaluator;
- private WidgetCommentRepository mockWidgetCommentRepository;
+ private WidgetRepository widgetRepository;
private Authentication mockAuthentication;
private WidgetComment widgetComment;
private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_COMMENT_ID = 3L;
- private final Long VALID_USER_ID = 99L;
- private final Long INVALID_USER_ID = VALID_USER_ID + 1;
+ private final String VALID_COMMENT_ID = "3";
+ private final String VALID_USER_ID = "99";
+ private final String INVALID_USER_ID = VALID_USER_ID + 1;
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@Before
public void setUp() {
- mockWidgetCommentRepository = createMock(WidgetCommentRepository.class);
+ widgetRepository = createMock(WidgetRepository.class);
mockAuthentication = createMock(Authentication.class);
- defaultWidgetCommentPermissionEvaluator = new DefaultWidgetCommentPermissionEvaluator(mockWidgetCommentRepository);
+ defaultWidgetCommentPermissionEvaluator = new DefaultWidgetCommentPermissionEvaluator(widgetRepository);
user = new UserImpl();
user.setUsername(VALID_USERNAME);
@@ -66,9 +66,8 @@ public class DefaultWidgetCommentPermiss
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
user2.setId(INVALID_USER_ID);
- widgetComment = new WidgetCommentImpl();
- widgetComment.setId(VALID_COMMENT_ID);
- widgetComment.setUser(user);
+ widgetComment = new WidgetCommentImpl(VALID_COMMENT_ID);
+ widgetComment.setUserId(VALID_USER_ID);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
}
@@ -108,8 +107,8 @@ public class DefaultWidgetCommentPermiss
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes();
replay(mockAuthentication);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.ADMINISTER), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE), is(true));
@@ -118,7 +117,7 @@ public class DefaultWidgetCommentPermiss
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.UPDATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE_OR_UPDATE), is(true));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
@Test
@@ -126,18 +125,18 @@ public class DefaultWidgetCommentPermiss
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user2).anyTimes();
replay(mockAuthentication);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.ADMINISTER), is(false));
- assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE), is(false));
+ assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.READ), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.DELETE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.UPDATE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE_OR_UPDATE), is(false));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
@Test
@@ -145,8 +144,8 @@ public class DefaultWidgetCommentPermiss
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes();
replay(mockAuthentication);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.ADMINISTER), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE), is(true));
@@ -155,7 +154,7 @@ public class DefaultWidgetCommentPermiss
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.UPDATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE), is(true));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
@Test
@@ -163,18 +162,18 @@ public class DefaultWidgetCommentPermiss
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user2).anyTimes();
replay(mockAuthentication);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.ADMINISTER), is(false));
- assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE), is(false));
+ assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.READ), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.DELETE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.UPDATE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE), is(false));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
@Test
@@ -221,13 +220,13 @@ public class DefaultWidgetCommentPermiss
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);
+ localWidgetComment.setUserId(VALID_USER_ID);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(localWidgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, localWidgetComment, Permission.CREATE), is(true));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
}
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java Fri Dec 28 17:43:23 2012
@@ -24,6 +24,7 @@ import org.apache.rave.portal.model.Widg
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.TagRepository;
import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
import org.apache.rave.portal.security.util.AuthenticationUtils;
@@ -45,22 +46,25 @@ import static org.junit.Assert.assertTha
public class DefaultWidgetPermissionEvaluatorTest {
private DefaultWidgetPermissionEvaluator defaultWidgetPermissionEvaluator;
private WidgetRepository mockWidgetRepository;
+ private TagRepository mockTagRepository;
private Page page;
private Widget widget, widget2;
private UserImpl user, user2;
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
- 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_WIDGET_ID = "1";
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "66";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@Before
public void setUp() {
mockWidgetRepository = createMock(WidgetRepository.class);
- defaultWidgetPermissionEvaluator = new DefaultWidgetPermissionEvaluator(mockWidgetRepository);
+ mockTagRepository = createMock(TagRepository.class);
+ defaultWidgetPermissionEvaluator = new DefaultWidgetPermissionEvaluator(mockWidgetRepository, mockTagRepository);
mockAuthentication = createMock(Authentication.class);
user = new UserImpl();
@@ -68,11 +72,12 @@ public class DefaultWidgetPermissionEval
user.setId(VALID_USER_ID);
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
+ user2.setId(VALID_USER_ID2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
- page.setOwner(user);
+ page.setOwnerId(user.getId());
widget = new WidgetImpl(VALID_WIDGET_ID);
- widget.setOwner(user);
+ widget.setOwnerId(VALID_USER_ID);
widget.setWidgetStatus(WidgetStatus.PUBLISHED);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java Fri Dec 28 17:43:23 2012
@@ -21,7 +21,7 @@ package org.apache.rave.portal.security.
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.repository.WidgetRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
import org.apache.rave.portal.security.util.AuthenticationUtils;
import org.easymock.EasyMock;
@@ -42,28 +42,26 @@ import static org.junit.Assert.assertTha
public class DefaultWidgetRatingPermissionEvaluatorTest {
private DefaultWidgetRatingPermissionEvaluator defaultWidgetRatingPermissionEvaluator;
- private WidgetRatingRepository mockWidgetRatingRepository;
+ private WidgetRepository mockWidgetRatingRepository;
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
private WidgetRating widgetRating;
private UserImpl user, user2;
- private final Long VALID_USER_ID = 99L;
- private final Long VALID_USER_ID2 = 100L;
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "100";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
- private final Long VALID_WIDGET_ID = 1L;
- private final Long VALID_WIDGET_RATING_ID = 1L;
+ private final String VALID_WIDGET_ID = "1";
+ private final String VALID_WIDGET_RATING_ID = "1";
@Before
public void setUp() {
- mockWidgetRatingRepository = createMock(WidgetRatingRepository.class);
+ mockWidgetRatingRepository = createMock(WidgetRepository.class);
defaultWidgetRatingPermissionEvaluator = new DefaultWidgetRatingPermissionEvaluator(mockWidgetRatingRepository);
- widgetRating = new WidgetRatingImpl();
+ widgetRating = new WidgetRatingImpl(VALID_WIDGET_ID);
widgetRating.setUserId(VALID_USER_ID);
- widgetRating.setWidgetId(VALID_WIDGET_ID);
- widgetRating.setId(VALID_WIDGET_ID);
user = new UserImpl();
user.setUsername(VALID_USERNAME);
@@ -123,7 +121,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_delete_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.DELETE), is(true));
@@ -135,7 +133,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_delete_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.DELETE), is(false));
@@ -147,7 +145,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_update_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.UPDATE), is(true));
@@ -159,7 +157,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_update_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.UPDATE), is(false));
@@ -171,7 +169,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_read_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.READ), is(true));
@@ -183,7 +181,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_read_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.READ), is(false));
@@ -203,7 +201,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_create_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true));
@@ -215,7 +213,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_create_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false));
@@ -227,7 +225,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_delete_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.DELETE), is(true));
@@ -239,7 +237,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_delete_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.DELETE), is(false));
@@ -251,7 +249,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_read_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.READ), is(true));
@@ -263,7 +261,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_read_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.READ), is(false));
@@ -275,7 +273,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_update_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(true));
@@ -287,7 +285,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_update_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(false));
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java Fri Dec 28 17:43:23 2012
@@ -52,9 +52,9 @@ public class DefaultAuthorityServiceTest
public void getAuthorityById() {
Authority authority = createAuthority();
- expect(repository.get(123L)).andReturn(authority);
+ expect(repository.get("123")).andReturn(authority);
replay(repository);
- Authority sAuthority = service.getAuthorityById(123L);
+ Authority sAuthority = service.getAuthorityById("123");
assertEquals(sAuthority, authority);
verify(repository);
@@ -84,7 +84,7 @@ public class DefaultAuthorityServiceTest
public void getAuthorityById_NotFound() {
AuthorityImpl authority = new AuthorityImpl();
authority.setAuthority("BAR");
- final long entityId = 456L;
+ final String entityId = "456";
expect(repository.get(entityId)).andReturn(null);
replay(repository);
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java Fri Dec 28 17:43:23 2012
@@ -43,17 +43,17 @@ public class DefaultCategoryServiceTest
private CategoryService service;
private CategoryRepository repository;
- private final Long VALID_ID = 4L;
+ private final String VALID_ID = "4";
private final String VALID_TEXT = "category1";
private final Date VALID_CREATED_DATE = new Date(66666666);
private final Date VALID_LAST_MODIFIED_DATE = new Date(77777777);
- private final Long VALID_CREATED_USER_ID = 77L;
- private final Long VALID_LAST_MODIFIED_USER_ID = 88L;
+ private final String VALID_CREATED_USER_ID = "77";
+ private final String VALID_LAST_MODIFIED_USER_ID = "88";
private User validCreatedUser;
private User validLastModifiedUser;
private Category validCategory;
- private final Long INVALID_ID = -999L;
+ private final String INVALID_ID = "-999";
@Before
public void setup() {
@@ -66,9 +66,9 @@ public class DefaultCategoryServiceTest
validCategory = new CategoryImpl();
validCategory.setId(VALID_ID);
validCategory.setText(VALID_TEXT);
- validCategory.setCreatedUser(validCreatedUser);
+ validCategory.setCreatedUserId(VALID_CREATED_USER_ID);
validCategory.setCreatedDate(VALID_CREATED_DATE);
- validCategory.setLastModifiedUser(validLastModifiedUser);
+ validCategory.setLastModifiedUserId(VALID_LAST_MODIFIED_USER_ID);
validCategory.setLastModifiedDate(VALID_LAST_MODIFIED_DATE);
}
@@ -114,8 +114,8 @@ public class DefaultCategoryServiceTest
assertThat(wc.getText(), is(NEW_CATEGORY_TEXT));
assertThat(wc.getCreatedDate(), is(notNullValue(Date.class)));
assertThat(wc.getCreatedDate(), is(wc.getLastModifiedDate()));
- assertThat(wc.getCreatedUser(), is(validCreatedUser));
- assertThat(wc.getLastModifiedUser(), is(validCreatedUser));
+ assertThat(wc.getCreatedUserId(), is(VALID_CREATED_USER_ID));
+ assertThat(wc.getLastModifiedUserId(), is(VALID_CREATED_USER_ID));
verify(repository);
}
@@ -127,8 +127,8 @@ public class DefaultCategoryServiceTest
Category expectedSaveCategory = new CategoryImpl();
expectedSaveCategory.setId(VALID_ID);
expectedSaveCategory.setText(UPDATED_TEXT);
- expectedSaveCategory.setCreatedUser(validCreatedUser);
- expectedSaveCategory.setLastModifiedUser(validLastModifiedUser);
+ expectedSaveCategory.setCreatedUserId(VALID_CREATED_USER_ID);
+ expectedSaveCategory.setLastModifiedUserId(VALID_LAST_MODIFIED_USER_ID);
expectedSaveCategory.setCreatedDate(VALID_CREATED_DATE);
expectedSaveCategory.setLastModifiedDate(VALID_LAST_MODIFIED_DATE);
@@ -139,8 +139,8 @@ public class DefaultCategoryServiceTest
Category updatedCategory = service.update(VALID_ID, UPDATED_TEXT, validLastModifiedUser);
assertThat(updatedCategory.getId(), is(VALID_ID));
assertThat(updatedCategory.getText(), is(UPDATED_TEXT));
- assertThat(updatedCategory.getCreatedUser(), is(validCreatedUser));
- assertThat(updatedCategory.getLastModifiedUser(), is(validLastModifiedUser));
+ assertThat(updatedCategory.getCreatedUserId(), is(VALID_CREATED_USER_ID));
+ assertThat(updatedCategory.getLastModifiedUserId(), is(VALID_LAST_MODIFIED_USER_ID));
assertThat(updatedCategory.getLastModifiedDate().after(updatedCategory.getCreatedDate()), is(true));
verify(repository);
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java Fri Dec 28 17:43:23 2012
@@ -51,16 +51,17 @@ public class DefaultPageServiceTest {
private PageLayoutRepository pageLayoutRepository;
private UserService userService;
- private final long REGION_WIDGET_ID = 5L;
- private final long TO_REGION_ID = 1L;
- private final long FROM_REGION_ID = 2L;
+ private final String REGION_WIDGET_ID = "5";
+ private final String TO_REGION_ID = "1";
+ private final String FROM_REGION_ID = "2";
private final String PAGE_LAYOUT_CODE = "layout1";
- private final long PAGE_ID = 1L;
- private final long INVALID_PAGE_ID = -1L;
- private final Long VALID_REGION_WIDGET_ID = 1L;
- private final Long INVALID_REGION_WIDGET_ID = 100L;
- private final Long USER_PAGE_TYPE_ID = 1L;
- private final Long VALID_USER_ID = 9876L;
+ private final String PAGE_ID = "1";
+ private final String PAGE_ID2 = "99";
+ private final String INVALID_PAGE_ID = "-1";
+ private final String VALID_REGION_WIDGET_ID = "1";
+ private final String INVALID_REGION_WIDGET_ID = "100";
+ private final String USER_PAGE_TYPE_ID = "1";
+ private final String VALID_USER_ID = "9876";
private Region targetRegion, originalRegion, lockedRegion;
private Widget validWidget;
@@ -76,6 +77,15 @@ public class DefaultPageServiceTest {
@Before
public void setup() {
+ pageLayout = new PageLayoutImpl();
+ pageLayout.setCode(PAGE_LAYOUT_CODE);
+ pageLayout.setNumberOfRegions(3L);
+
+ user = new UserImpl();
+ user.setUsername("acarlucci");
+ user.setId("1");
+ user.setDefaultPageLayout(pageLayout);
+
pageRepository = createMock(PageRepository.class);
pageTemplateRepository = createMock(PageTemplateRepository.class);
regionRepository = createMock(RegionRepository.class);
@@ -87,48 +97,37 @@ public class DefaultPageServiceTest {
pageService = new DefaultPageService(pageRepository, pageTemplateRepository, regionRepository, widgetRepository, regionWidgetRepository,
pageLayoutRepository, userService, defaultPageName);
- validWidget = new WidgetImpl(1L, "http://dummy.apache.org/widgets/widget.xml");
+ validWidget = new WidgetImpl("1", "http://dummy.apache.org/widgets/widget.xml");
- page = new PageImpl(PAGE_ID, user);
- pageUser = new PageUserImpl(user, page, 1L);
+ page = new PageImpl(PAGE_ID, user.getId());
+ pageUser = new PageUserImpl(user.getId(), page, 1L);
page.setMembers(new ArrayList<PageUser>());
page.getMembers().add(pageUser);
- page2 = new PageImpl(99L, user);
- pageUser2 = new PageUserImpl(user, page2, 2L);
+ page2 = new PageImpl(PAGE_ID2, user.getId());
+ pageUser2 = new PageUserImpl(user.getId(), page2, 2L);
page2.setMembers(new ArrayList<PageUser>());
page2.getMembers().add(pageUser2);
- targetRegion = new RegionImpl();
- targetRegion.setId(2L);
+ targetRegion = new RegionImpl("2");
targetRegion.setLocked(false);
targetRegion.setRegionWidgets(new ArrayList<RegionWidget>());
- targetRegion.getRegionWidgets().add(new RegionWidgetImpl(1L, validWidget, targetRegion, 0));
- targetRegion.getRegionWidgets().add(new RegionWidgetImpl(2L, validWidget, targetRegion, 1));
- targetRegion.getRegionWidgets().add(new RegionWidgetImpl(3L, validWidget, targetRegion, 2));
+ targetRegion.getRegionWidgets().add(new RegionWidgetImpl("1", validWidget.getId(), targetRegion, 0));
+ targetRegion.getRegionWidgets().add(new RegionWidgetImpl("2", validWidget.getId(), targetRegion, 1));
+ targetRegion.getRegionWidgets().add(new RegionWidgetImpl("3", validWidget.getId(), targetRegion, 2));
targetRegion.setPage(page);
- originalRegion = new RegionImpl();
- originalRegion.setId(1L);
+ originalRegion = new RegionImpl("2");
originalRegion.setLocked(false);
originalRegion.setRegionWidgets(new ArrayList<RegionWidget>());
- originalRegion.getRegionWidgets().add(new RegionWidgetImpl(4L, validWidget, targetRegion, 0));
- originalRegion.getRegionWidgets().add(new RegionWidgetImpl(5L, validWidget, targetRegion, 1));
- originalRegion.getRegionWidgets().add(new RegionWidgetImpl(6L, validWidget, targetRegion, 2));
+ originalRegion.getRegionWidgets().add(new RegionWidgetImpl("4", validWidget.getId(), targetRegion, 0));
+ originalRegion.getRegionWidgets().add(new RegionWidgetImpl("5", validWidget.getId(), targetRegion, 1));
+ originalRegion.getRegionWidgets().add(new RegionWidgetImpl("6", validWidget.getId(), targetRegion, 2));
lockedRegion = new RegionImpl();
lockedRegion.setLocked(true);
lockedRegion.setPage(page);
- pageLayout = new PageLayoutImpl();
- pageLayout.setCode(PAGE_LAYOUT_CODE);
- pageLayout.setNumberOfRegions(3L);
-
- user = new UserImpl();
- user.setUsername("acarlucci");
- user.setId(1L);
- user.setDefaultPageLayout(pageLayout);
-
pageList = new ArrayList<Page>();
pageList.add(page2);
pageList.add(page);
@@ -137,9 +136,8 @@ public class DefaultPageServiceTest {
pageUserList.add(pageUser);
pageUserList.add(pageUser2);
- validRegionWidget = new RegionWidgetImpl();
- validRegionWidget.setId(VALID_REGION_WIDGET_ID);
- validRegionWidget.setWidget(validWidget);
+ validRegionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
+ validRegionWidget.setWidgetId(validWidget.getId());
validRegionWidget.setRegion(originalRegion);
}
@@ -178,7 +176,7 @@ public class DefaultPageServiceTest {
UserImpl user = new UserImpl();
expect(pageRepository.getAllPages(VALID_USER_ID, PageType.PERSON_PROFILE)).andReturn(VALID_PAGES);
- expect(userService.getUserById(isA(Long.class))).andReturn(user).once();
+ expect(userService.getUserById(isA(String.class))).andReturn(user).once();
expect(pageTemplateRepository.getDefaultPage(PageType.PERSON_PROFILE)).andReturn(pageTemplate).once();
expect(pageRepository.createPageForUser(user, pageTemplate)).andReturn(personPage);
replay(pageRepository, userService, pageTemplateRepository);
@@ -195,11 +193,11 @@ public class DefaultPageServiceTest {
PageTemplate pageTemplate = new PageTemplateImpl() ;
Page expectedPage = new PageImpl();
expectedPage.setName(PAGE_NAME);
- expectedPage.setOwner(user);
+ expectedPage.setOwnerId(user.getId());
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
expectedPage.setPageType(PageType.USER);
- PageUser lPageUser = new PageUserImpl(user, expectedPage, EXPECTED_RENDER_SEQUENCE);
+ PageUser lPageUser = new PageUserImpl(user.getId(), expectedPage, EXPECTED_RENDER_SEQUENCE);
List<PageUser> members = new ArrayList<PageUser>();
members.add(lPageUser);
expectedPage.setMembers(members);
@@ -228,7 +226,7 @@ public class DefaultPageServiceTest {
Page expectedPage = new PageImpl();
expectedPage.setName(PAGE_NAME);
- expectedPage.setOwner(user);
+ expectedPage.setOwnerId(user.getId());
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
expectedPage.setPageType(PageType.USER);
@@ -262,7 +260,7 @@ public class DefaultPageServiceTest {
Page expectedPage = new PageImpl();
expectedPage.setName(PAGE_NAME);
- expectedPage.setOwner(user);
+ expectedPage.setOwnerId(user.getId());
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
expectedPage.setPageType(PageType.USER);
@@ -300,11 +298,11 @@ public class DefaultPageServiceTest {
Page expectedPage = new PageImpl();
expectedPage.setName(PAGE_NAME);
- expectedPage.setOwner(user);
+ expectedPage.setOwnerId(user.getId());
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
expectedPage.setPageType(PageType.USER);
- PageUser lPageUser = new PageUserImpl(user, expectedPage, EXPECTED_RENDER_SEQUENCE);
+ PageUser lPageUser = new PageUserImpl(user.getId(), expectedPage, EXPECTED_RENDER_SEQUENCE);
List<PageUser> members = new ArrayList<PageUser>();
members.add(lPageUser);
userPage.setMembers(members);
@@ -335,10 +333,10 @@ public class DefaultPageServiceTest {
Page expectedPage = new PageImpl();
expectedPage.setName(PAGE_NAME);
- expectedPage.setOwner(user);
+ expectedPage.setOwnerId(user.getId());
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
- PageUser lPageUser = new PageUserImpl(user, expectedPage, EXPECTED_RENDER_SEQUENCE);
+ PageUser lPageUser = new PageUserImpl(user.getId(), expectedPage, EXPECTED_RENDER_SEQUENCE);
List<PageUser> members = new ArrayList<PageUser>();
members.add(lPageUser);
expectedPage.setMembers(members);
@@ -376,13 +374,13 @@ public class DefaultPageServiceTest {
Page expectedPage = new PageImpl();
expectedPage.setName(PAGE_NAME);
- expectedPage.setOwner(user);
+ expectedPage.setOwnerId(user.getId());
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
Page parentPage = new PageImpl();
parentPage.setName(PARENT_PAGE_NAME);
- parentPage.setOwner(user);
+ parentPage.setOwnerId(user.getId());
parentPage.setPageLayout(pageLayout);
parentPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
@@ -413,13 +411,13 @@ public class DefaultPageServiceTest {
Page expectedPage = new PageImpl();
expectedPage.setName(PAGE_NAME);
- expectedPage.setOwner(user);
+ expectedPage.setOwnerId(user.getId());
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
Page parentPage = new PageImpl();
parentPage.setName(PARENT_PAGE_NAME);
- parentPage.setOwner(user);
+ parentPage.setOwnerId(user.getId());
parentPage.setPageLayout(pageLayout);
parentPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
parentPage.setSubPages(existingPages);
@@ -447,10 +445,10 @@ public class DefaultPageServiceTest {
PageTemplate pageTemplate = new PageTemplateImpl();
Page expectedPage = new PageImpl();
expectedPage.setName(defaultPageName);
- expectedPage.setOwner(user);
+ expectedPage.setOwnerId(user.getId());
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
- PageUser lPageUser = new PageUserImpl(user, expectedPage, EXPECTED_RENDER_SEQUENCE);
+ PageUser lPageUser = new PageUserImpl(user.getId(), expectedPage, EXPECTED_RENDER_SEQUENCE);
List<PageUser> members = new ArrayList<PageUser>();
members.add(lPageUser);
expectedPage.setMembers(members);
@@ -496,7 +494,7 @@ public class DefaultPageServiceTest {
@Test
public void deletePage_invalidId() {
- final long INVALID_PAGE_ID = -999L;
+ final String INVALID_PAGE_ID = "-999";
List<PageUser> pageUserListAfterDelete = new ArrayList<PageUser>(pageUserList);
expect(userService.getAuthenticatedUser()).andReturn(user);
@@ -649,34 +647,34 @@ public class DefaultPageServiceTest {
@Test(expected = IllegalArgumentException.class)
public void moveRegionWidget_invalidWidget() {
createMoveBetweenRegionsExpectations();
- expect(regionWidgetRepository.get(-1L)).andReturn(null);
+ expect(regionWidgetRepository.get("-1")).andReturn(null);
replay(regionWidgetRepository);
- pageService.moveRegionWidget(-1L, 0, 1L, 2L);
+ pageService.moveRegionWidget("-1", 0, "1", "2");
verify(regionWidgetRepository);
}
@Test(expected = IllegalArgumentException.class)
public void moveRegionWidget_invalidWidget_sameRegion() {
createMoveBetweenRegionsExpectations();
- expect(regionWidgetRepository.get(-1L)).andReturn(null);
+ expect(regionWidgetRepository.get("-1")).andReturn(null);
replay(regionWidgetRepository);
- pageService.moveRegionWidget(-1L, 0, 1L, 1L);
+ pageService.moveRegionWidget("-1", 0, "1", "2");
verify(regionWidgetRepository);
}
@Test(expected = IllegalArgumentException.class)
public void moveRegionWidget_invalidTarget() {
- pageService.moveRegionWidget(-1L, 0, 5L, 6L);
+ pageService.moveRegionWidget("-1", 0, "5", "6");
}
@Test(expected = IllegalArgumentException.class)
public void moveRegionWidget_invalidTarget_sameRegion() {
- pageService.moveRegionWidget(-1L, 0, 5L, 5L);
+ pageService.moveRegionWidget("-1", 0, "5", "5");
}
@Test
public void addWigetToPage_valid() {
- final long WIDGET_ID = 1L;
+ final String WIDGET_ID = "1";
Page value = new PageImpl();
value.setRegions(new ArrayList<Region>());
@@ -699,14 +697,14 @@ public class DefaultPageServiceTest {
verifyPositions(0, instance, true);
assertThat(originalRegion.getRegionWidgets().get(0), is(sameInstance(instance)));
- assertThat(instance.getWidget().getId(), is(equalTo(widget.getId())));
+ assertThat(instance.getWidgetId(), is(equalTo(widget.getId())));
}
@Test(expected = UnsupportedOperationException.class)
public void addWigetToPage_lockedRegion() {
originalRegion.setLocked(true);
- final long WIDGET_ID = 1L;
+ final String WIDGET_ID = "1";
Page value = new PageImpl();
value.setRegions(new ArrayList<Region>());
@@ -729,14 +727,13 @@ public class DefaultPageServiceTest {
verifyPositions(0, instance, true);
assertThat(originalRegion.getRegionWidgets().get(0), is(sameInstance(instance)));
- assertThat(instance.getWidget(), is(sameInstance(widget)));
}
@Test(expected = IllegalArgumentException.class)
public void addWigetToPage_nullRegion() {
originalRegion = null;
- final long WIDGET_ID = 1L;
+ final String WIDGET_ID = "1";
Page value = new PageImpl();
value.setRegions(new ArrayList<Region>());
@@ -755,12 +752,11 @@ public class DefaultPageServiceTest {
verifyPositions(0, instance, true);
assertThat(originalRegion.getRegionWidgets().get(0), is(sameInstance(instance)));
- assertThat(instance.getWidget(), is(sameInstance(widget))) ;
}
@Test(expected = IllegalArgumentException.class)
public void addWidgetToPage_invalidWidget() {
- long WIDGET_ID = -1L;
+ final String WIDGET_ID = "1";
expect(pageRepository.get(PAGE_ID)).andReturn(new PageImpl());
expect(widgetRepository.get(WIDGET_ID)).andReturn(null);
replay(pageRepository);
@@ -772,7 +768,7 @@ public class DefaultPageServiceTest {
@Test(expected = IllegalArgumentException.class)
public void addWidgetToPage_invalidPage() {
- long WIDGET_ID = -1L;
+ String WIDGET_ID = "-1";
expect(pageRepository.get(PAGE_ID)).andReturn(null);
expect(widgetRepository.get(WIDGET_ID)).andReturn(new WidgetImpl());
replay(pageRepository);
@@ -784,8 +780,8 @@ public class DefaultPageServiceTest {
@Test
public void removeWidgetFromPage_validWidget() {
- long WIDGET_ID = 1L;
- long REGION_ID = 2L;
+ String WIDGET_ID = "1";
+ String REGION_ID = "2";
RegionWidget regionWidget = new RegionWidgetImpl(WIDGET_ID);
regionWidget.setRegion(new RegionImpl(REGION_ID));
Region region = new RegionImpl();
@@ -805,8 +801,8 @@ public class DefaultPageServiceTest {
@Test(expected = UnsupportedOperationException.class)
public void removeWidgetFromPage_lockedRegion() {
- long WIDGET_ID = 1L;
- long REGION_ID = 2L;
+ String WIDGET_ID = "1";
+ String REGION_ID = "2";
Region region = new RegionImpl(REGION_ID);
region.setLocked(true);
RegionWidget regionWidget = new RegionWidgetImpl(WIDGET_ID);
@@ -824,8 +820,8 @@ public class DefaultPageServiceTest {
@Test(expected = UnsupportedOperationException.class)
public void removeWidgetFromPage_lockedRegionWidget() {
- long WIDGET_ID = 1L;
- long REGION_ID = 2L;
+ String WIDGET_ID = "1";
+ String REGION_ID = "2";
Region region = new RegionImpl(REGION_ID);
region.setLocked(true);
RegionWidget regionWidget = new RegionWidgetImpl(WIDGET_ID);
@@ -844,7 +840,7 @@ public class DefaultPageServiceTest {
@Test(expected = IllegalArgumentException.class)
public void removeWidgetFromPage_invalidWidget() {
- long WIDGET_ID = -1L;
+ String WIDGET_ID = "-1";
expect(regionWidgetRepository.get(WIDGET_ID)).andReturn(null);
replay(regionWidgetRepository);
replay(regionRepository);
@@ -995,8 +991,7 @@ public class DefaultPageServiceTest {
String layoutCode = "CODE";
List<Region> regions = new ArrayList<Region>();
- Region region = new RegionImpl();
- region.setId(99L);
+ Region region = new RegionImpl("99");
region.setRenderOrder(1);
regions.add(new RegionImpl());
regions.add(region);
@@ -1269,9 +1264,9 @@ public class DefaultPageServiceTest {
@Test
public void moveRegionWidgetToPage_valid() {
- final long WIDGET_ID = 1L;
- final long CURRENT_PAGE_ID = 1L;
- final long TO_PAGE_ID = 2L;
+ final String WIDGET_ID = "1";
+ final String CURRENT_PAGE_ID = "1";
+ final String TO_PAGE_ID = "2";
Page currentPageValue = new PageImpl();
currentPageValue.setRegions(new ArrayList<Region>());
@@ -1305,9 +1300,9 @@ public class DefaultPageServiceTest {
@Test(expected = IllegalArgumentException.class)
public void moveRegionWidgetToPage_invalidWidget() {
- long WIDGET_ID = -1L;
- final long CURRENT_PAGE_ID = 1L;
- final long TO_PAGE_ID = 2L;
+ String WIDGET_ID = "-1";
+ final String CURRENT_PAGE_ID = "1";
+ final String TO_PAGE_ID = "2";
Page currentPageValue = new PageImpl();
currentPageValue.setRegions(new ArrayList<Region>());
@@ -1328,9 +1323,9 @@ public class DefaultPageServiceTest {
@Test(expected = UnsupportedOperationException.class)
public void moveRegionWidgetToPage_lockedRegionWidget() {
- final long WIDGET_ID = 1L;
- final long CURRENT_PAGE_ID = 1L;
- final long TO_PAGE_ID = 2L;
+ final String WIDGET_ID = "1";
+ final String CURRENT_PAGE_ID = "1";
+ final String TO_PAGE_ID = "2";
Page currentPageValue = new PageImpl();
currentPageValue.setRegions(new ArrayList<Region>());
@@ -1360,9 +1355,9 @@ public class DefaultPageServiceTest {
public void moveRegionWidgetToPage_lockedTargetRegion() {
targetRegion.setLocked(true);
- final long WIDGET_ID = 1L;
- final long CURRENT_PAGE_ID = 1L;
- final long TO_PAGE_ID = 2L;
+ final String WIDGET_ID = "1";
+ final String CURRENT_PAGE_ID = "1";
+ final String TO_PAGE_ID = "2";
Page currentPageValue = new PageImpl();
currentPageValue.setRegions(new ArrayList<Region>());
@@ -1392,9 +1387,9 @@ public class DefaultPageServiceTest {
public void moveRegionWidgetToPage_lockedSourceRegion() {
originalRegion.setLocked(true);
- final long WIDGET_ID = 1L;
- final long CURRENT_PAGE_ID = 1L;
- final long TO_PAGE_ID = 2L;
+ final String WIDGET_ID = "1";
+ final String CURRENT_PAGE_ID = "1";
+ final String TO_PAGE_ID = "2";
Page currentPageValue = new PageImpl();
currentPageValue.setRegions(new ArrayList<Region>());
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java Fri Dec 28 17:43:23 2012
@@ -43,8 +43,8 @@ public class DefaultRegionWidgetServiceT
private RegionWidgetRepository regionWidgetRepository;
private RegionWidgetService regionWidgetService;
- final Long VALID_REGION_WIDGET_ID = 1L;
- final Long INVALID_REGION_WIDGET_ID = 100L;
+ final String VALID_REGION_WIDGET_ID = "1";
+ final String INVALID_REGION_WIDGET_ID = "100";
@Before
public void setup() {
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java Fri Dec 28 17:43:23 2012
@@ -49,23 +49,22 @@ public class DefaultTagServiceTest {
@Test
public void getTagById() {
Tag tag = createTag("test");
- expect(repository.get(1L)).andReturn(tag);
+ expect(repository.get("1")).andReturn(tag);
replay(repository);
- Tag sTag = service.getTagById(1L);
+ Tag sTag = service.getTagById("1");
assertEquals(sTag, tag);
verify(repository);
}
private static Tag createTag(String keyword) {
- TagImpl tag = new TagImpl();
- tag.setKeyword(keyword);
+ TagImpl tag = new TagImpl(keyword);
return tag;
}
@Test
public void getTagById_NotFound() {
- final long entityId = 456L;
+ final String entityId = "456";
expect(repository.get(entityId)).andReturn(null);
replay(repository);
Tag sTag = service.getTagById(entityId);
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java Fri Dec 28 17:43:23 2012
@@ -19,43 +19,13 @@
package org.apache.rave.portal.service.impl;
-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.isA;
-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.not;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.PageTemplate;
-import org.apache.rave.portal.model.PageType;
-import org.apache.rave.portal.model.Person;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.PageTemplateImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
-import org.apache.rave.portal.repository.CategoryRepository;
-import org.apache.rave.portal.repository.PageRepository;
-import org.apache.rave.portal.repository.PageTemplateRepository;
-import org.apache.rave.portal.repository.PersonRepository;
-import org.apache.rave.portal.repository.UserRepository;
-import org.apache.rave.portal.repository.WidgetCommentRepository;
-import org.apache.rave.portal.repository.WidgetRatingRepository;
-import org.apache.rave.portal.repository.WidgetRepository;
+import org.apache.rave.portal.repository.*;
import org.apache.rave.portal.service.UserService;
import org.junit.After;
import org.junit.Before;
@@ -71,15 +41,21 @@ import org.springframework.security.open
import org.springframework.security.openid.OpenIDAuthenticationStatus;
import org.springframework.security.openid.OpenIDAuthenticationToken;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.*;
+
public class DefaultUserServiceTest {
- private static final Long USER_ID = 1234L;
+ private static final String USER_ID = "1234";
private UserService service;
private UserRepository userRepository;
private PageRepository pageRepository;
private PageTemplateRepository pageTemplateRepository;
- private WidgetCommentRepository widgetCommentRepository;
- private WidgetRatingRepository widgetRatingRepository;
private WidgetRepository widgetRepository;
private CategoryRepository categoryRepository;
private PersonRepository personRepository;
@@ -88,21 +64,19 @@ public class DefaultUserServiceTest {
private static final String USER_EMAIL = "test@test.com";
private static final String OPENID_INVALID = "http://user.myopenid.com/";
private static final String OPENID_VALID = "http://rave2011.myopenid.com/";
- private static final Long VALID_WIDGET_ID = 1L;
- private static final Long INVALID_USER_ID = -9999L;
+ private static final String VALID_WIDGET_ID = "1";
+ private static final String INVALID_USER_ID = "-9999";
@Before
public void setup() {
userRepository = createMock(UserRepository.class);
pageRepository = createMock(PageRepository.class);
pageTemplateRepository = createMock(PageTemplateRepository.class);
- widgetCommentRepository = createMock(WidgetCommentRepository.class);
- widgetRatingRepository = createMock(WidgetRatingRepository.class);
widgetRepository = createMock(WidgetRepository.class);
categoryRepository = createMock(CategoryRepository.class);
personRepository = createMock(PersonRepository.class);
- service = new DefaultUserService(pageRepository, userRepository, widgetRatingRepository, widgetCommentRepository,
+ service = new DefaultUserService(pageRepository, userRepository,
widgetRepository, pageTemplateRepository, categoryRepository, personRepository);
}
@@ -276,8 +250,8 @@ public class DefaultUserServiceTest {
@Test
public void getLimitedListOfUsers() {
- User user1 = new UserImpl(123L, "john.doe.sr");
- User user2 = new UserImpl(456L, "john.doe.jr");
+ User user1 = new UserImpl("123", "john.doe.sr");
+ User user2 = new UserImpl("456", "john.doe.jr");
List<User> users = new ArrayList<User>();
users.add(user1);
users.add(user2);
@@ -297,8 +271,8 @@ public class DefaultUserServiceTest {
@Test
public void getUsersByFreeTextSearch() {
final String searchTerm = "Doe";
- User user1 = new UserImpl(123L, "john.doe.sr");
- User user2 = new UserImpl(456L, "john.doe.jr");
+ User user1 = new UserImpl("123", "john.doe.sr");
+ User user2 = new UserImpl("456", "john.doe.jr");
List<User> users = new ArrayList<User>();
users.add(user1);
users.add(user2);
@@ -332,34 +306,34 @@ public class DefaultUserServiceTest {
final int NUM_RATINGS = 99;
final int NUM_WIDGETS_OWNED = 4;
UserImpl user = new UserImpl(USER_ID, USER_NAME);
- Page page = new PageImpl(1L, user);
+ Page page = new PageImpl("1", user.getId());
List<Page> pages = new ArrayList<Page>();
pages.add(page);
expect(userRepository.get(USER_ID)).andReturn(user);
expect(pageRepository.deletePages(USER_ID, PageType.USER)).andReturn(pages.size());
expect(pageRepository.deletePages(USER_ID, PageType.PERSON_PROFILE)).andReturn(pages.size());
- expect(widgetCommentRepository.deleteAll(USER_ID)).andReturn(NUM_COMMENTS);
- expect(widgetRatingRepository.deleteAll(USER_ID)).andReturn(NUM_RATINGS);
+ expect(widgetRepository.deleteAllWidgetComments(USER_ID)).andReturn(NUM_COMMENTS);
+ expect(widgetRepository.deleteAllWidgetRatings(USER_ID)).andReturn(NUM_RATINGS);
expect(widgetRepository.unassignWidgetOwner(USER_ID)).andReturn( NUM_WIDGETS_OWNED);
expect(categoryRepository.removeFromCreatedOrModifiedFields(USER_ID)).andReturn( NUM_WIDGETS_OWNED);
userRepository.delete(user);
expectLastCall();
- replay(userRepository, pageRepository, widgetCommentRepository, widgetRatingRepository, widgetRepository, categoryRepository);
+ replay(userRepository, pageRepository, widgetRepository, categoryRepository);
service.deleteUser(USER_ID);
- verify(userRepository, pageRepository, widgetCommentRepository, widgetRatingRepository, widgetRepository, categoryRepository);
+ verify(userRepository, pageRepository, widgetRepository, categoryRepository);
}
@Test
public void deleteUser_invalidUserId() {
expect(userRepository.get(INVALID_USER_ID)).andReturn(null);
- replay(userRepository, pageRepository, widgetCommentRepository, widgetRatingRepository, widgetRepository);
+ replay(userRepository, pageRepository, widgetRepository);
service.deleteUser(INVALID_USER_ID);
- verify(userRepository, pageRepository, widgetCommentRepository, widgetRatingRepository, widgetRepository);
+ verify(userRepository, pageRepository, widgetRepository);
}
@Test
Modified: rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceServiceTest.java Fri Dec 28 17:43:23 2012
@@ -25,10 +25,9 @@ import java.util.Map;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.PortalPreferenceService;
-import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.service.RemoteWidgetResolverService;
import org.apache.rave.portal.service.WidgetMarketplaceService;
import org.apache.rave.portal.service.WidgetMetadataResolver;
-import org.apache.rave.portal.service.WidgetService;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -36,9 +35,7 @@ import static org.easymock.EasyMock.*;
public class DefaultWidgetMarketplaceServiceTest {
- static WidgetService widgetService;
- static UserService userService;
- static PortalPreferenceService portalPreferenceService;
+ static RemoteWidgetResolverService widgetResolverService;
static PortalPreferenceService prefs;
static WidgetMarketplaceService service;
static Map<String, WidgetMetadataResolver> widgetMetadataResolverMap;
@@ -46,11 +43,9 @@ public class DefaultWidgetMarketplaceSer
@BeforeClass
public static void setup(){
- widgetService = createMock(WidgetService.class);
- userService = createMock(UserService.class);
prefs = createMock(PortalPreferenceService.class);
metadataResolver = new ArrayList<WidgetMetadataResolver>();
- service = new DefaultWidgetMarketplaceService(widgetService, userService, prefs, metadataResolver);
+ service = new DefaultWidgetMarketplaceService(widgetResolverService, prefs);
}
@Ignore
@@ -67,7 +62,7 @@ public class DefaultWidgetMarketplaceSer
@Test
public void getCategoryResults() throws Exception{
prefs = createMock(PortalPreferenceService.class);
- service = new DefaultWidgetMarketplaceService(widgetService, userService, prefs, metadataResolver);
+ service = new DefaultWidgetMarketplaceService(widgetResolverService, prefs);
SearchResult<Widget> results = service.getWidgetsByCategory("a", 0, 10);
for (Widget widget: results.getResultSet()){
System.out.println(widget.getTitle());
@@ -79,7 +74,7 @@ public class DefaultWidgetMarketplaceSer
@Test
public void getCategories() throws Exception{
prefs = createMock(PortalPreferenceService.class);
- service = new DefaultWidgetMarketplaceService(widgetService, userService, prefs, metadataResolver);
+ service = new DefaultWidgetMarketplaceService(widgetResolverService, prefs);
List<String> results = service.getCategories();
for (String category: results){
System.out.println(category);