You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/10/29 05:00:05 UTC
svn commit: r1403166 [6/11] - in /rave/trunk: ./
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/porta...
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java Mon Oct 29 03:59:56 2012
@@ -22,8 +22,12 @@ package org.apache.rave.portal.repositor
import org.apache.commons.lang.StringUtils;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.conversion.JpaWidgetCommentConverter;
import org.apache.rave.portal.model.conversion.JpaWidgetConverter;
+import org.apache.rave.portal.model.conversion.JpaWidgetRatingConverter;
+import org.apache.rave.portal.model.conversion.JpaWidgetTagConverter;
import org.apache.rave.portal.model.util.WidgetStatistics;
+import org.apache.rave.portal.repository.TagRepository;
import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.util.CollectionUtils;
import org.slf4j.Logger;
@@ -48,6 +52,18 @@ public class JpaWidgetRepository impleme
@Autowired
private JpaWidgetConverter converter;
+ @Autowired
+ private JpaWidgetTagConverter tagConverter;
+
+ @Autowired
+ private JpaWidgetCommentConverter commentConverter;
+
+ @Autowired
+ JpaWidgetRatingConverter ratingConverter;
+
+ @Autowired
+ private TagRepository tagRepository;
+
@PersistenceContext
private EntityManager manager;
@@ -130,14 +146,14 @@ public class JpaWidgetRepository impleme
@Override
public List<Widget> getByOwner(User owner, int offset, int pageSize) {
TypedQuery<JpaWidget> query = manager.createNamedQuery(JpaWidget.WIDGET_GET_BY_OWNER, JpaWidget.class);
- query.setParameter(JpaWidget.PARAM_OWNER, owner);
+ query.setParameter(JpaWidget.PARAM_OWNER, owner.getId());
return CollectionUtils.<Widget>toBaseTypedList(getPagedResultList(query, offset, pageSize));
}
@Override
public int getCountByOwner(User owner, int offset, int pageSize) {
Query query = manager.createNamedQuery(JpaWidget.WIDGET_COUNT_BY_OWNER);
- query.setParameter(JpaWidget.PARAM_OWNER, owner);
+ query.setParameter(JpaWidget.PARAM_OWNER, owner.getId());
Number countResult = (Number) query.getSingleResult();
return countResult.intValue();
}
@@ -156,25 +172,25 @@ public class JpaWidgetRepository impleme
}
@Override
- public WidgetStatistics getWidgetStatistics(long widget_id, long user_id) {
+ public WidgetStatistics getWidgetStatistics(String widget_id, String user_id) {
WidgetStatistics widgetStatistics = new WidgetStatistics();
Query query = manager.createNamedQuery(JpaWidgetRating.WIDGET_TOTAL_LIKES);
- query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, Long.parseLong(widget_id));
widgetStatistics.setTotalLike(((Number) query.getSingleResult()).intValue());
query = manager.createNamedQuery(JpaWidgetRating.WIDGET_TOTAL_DISLIKES);
- query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, Long.parseLong(widget_id));
widgetStatistics.setTotalDislike(((Number) query.getSingleResult()).intValue());
query = manager.createNamedQuery(JpaRegionWidget.REGION_WIDGET_GET_DISTINCT_USER_COUNT_SINGLE_WIDGET);
- query.setParameter(JpaRegionWidget.PARAM_WIDGET_ID, widget_id);
+ query.setParameter(JpaRegionWidget.PARAM_WIDGET_ID, Long.parseLong(widget_id));
widgetStatistics.setTotalUserCount(((Number) query.getSingleResult()).intValue());
try {
query = manager.createNamedQuery(JpaWidgetRating.WIDGET_USER_RATING);
- query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
- query.setParameter(JpaWidgetRating.PARAM_USER_ID, user_id);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, Long.parseLong(widget_id));
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, Long.parseLong(user_id));
widgetStatistics.setUserRating(((Number) query.getSingleResult()).intValue());
} catch (NoResultException e) {
widgetStatistics.setUserRating(JpaWidgetRating.UNSET);
@@ -184,13 +200,13 @@ public class JpaWidgetRepository impleme
}
@Override
- public Map<Long, WidgetRating> getUsersWidgetRatings(long user_id) {
+ public Map<String, WidgetRating> getUsersWidgetRatings(String user_id) {
TypedQuery<JpaWidgetRating> query =
manager.createNamedQuery(JpaWidgetRating.WIDGET_ALL_USER_RATINGS, JpaWidgetRating.class);
- query.setParameter(JpaWidgetRating.PARAM_USER_ID, user_id);
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, user_id == null ? null : Long.parseLong(user_id));
- Map<Long, WidgetRating> map = new HashMap<Long, WidgetRating>();
- for (WidgetRating widgetRating : query.getResultList()) {
+ Map<String, WidgetRating> map = new HashMap<String, WidgetRating>();
+ for (JpaWidgetRating widgetRating : query.getResultList()) {
map.put(widgetRating.getWidgetId(), widgetRating);
}
@@ -199,8 +215,8 @@ public class JpaWidgetRepository impleme
@SuppressWarnings("unchecked")
@Override
- public Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId) {
- HashMap<Long, WidgetStatistics> map = new HashMap<Long, WidgetStatistics>();
+ public Map<String, WidgetStatistics> getAllWidgetStatistics(String userId) {
+ HashMap<String, WidgetStatistics> map = new HashMap<String, WidgetStatistics>();
//Generate the mapping of all likes done for the widgets
Query query = manager.createNamedQuery(JpaWidgetRating.WIDGET_ALL_TOTAL_LIKES);
@@ -209,7 +225,7 @@ public class JpaWidgetRepository impleme
Long widgetId = (Long) result[1];
WidgetStatistics widgetStatistics = new WidgetStatistics();
widgetStatistics.setTotalLike(totalLikes.intValue());
- map.put(widgetId, widgetStatistics);
+ map.put(widgetId.toString(), widgetStatistics);
}
//Add the mapping of all dislikes done for the widgets
@@ -217,10 +233,10 @@ public class JpaWidgetRepository impleme
for (Object[] result : (List<Object[]>) query.getResultList()) {
Long totalDislikes = (Long) result[0];
Long widgetId = (Long) result[1];
- WidgetStatistics widgetStatistics = map.get(widgetId);
+ WidgetStatistics widgetStatistics = map.get(widgetId.toString());
if (widgetStatistics == null) {
widgetStatistics = new WidgetStatistics();
- map.put(widgetId, widgetStatistics);
+ map.put(widgetId.toString(), widgetStatistics);
}
widgetStatistics.setTotalDislike(totalDislikes.intValue());
}
@@ -230,17 +246,17 @@ public class JpaWidgetRepository impleme
for (Object[] result : (List<Object[]>) query.getResultList()) {
Long widgetId = (Long) result[0];
Long totalUserCount = (Long) result[1];
- WidgetStatistics widgetStatistics = map.get(widgetId);
+ WidgetStatistics widgetStatistics = map.get(widgetId.toString());
if (widgetStatistics == null) {
widgetStatistics = new WidgetStatistics();
- map.put(widgetId, widgetStatistics);
+ map.put(widgetId.toString(), widgetStatistics);
}
widgetStatistics.setTotalUserCount(totalUserCount.intValue());
}
//Add the current user's current rating of the widget
- Map<Long, WidgetRating> userRatings = getUsersWidgetRatings(userId);
- for (Map.Entry<Long, WidgetStatistics> entry : map.entrySet()) {
+ Map<String, WidgetRating> userRatings = getUsersWidgetRatings(userId);
+ for (Map.Entry<String, WidgetStatistics> entry : map.entrySet()) {
//If the user has a widget rating then record it
if (userRatings.containsKey(entry.getKey())) {
entry.getValue().setUserRating(userRatings.get(entry.getKey()).getScore());
@@ -259,8 +275,9 @@ public class JpaWidgetRepository impleme
if (tagKeyword != null) {
tagKeyword = tagKeyword.toLowerCase();
}
+ Tag tag = tagRepository.getByKeyword(tagKeyword);
TypedQuery<JpaWidget> query = manager.createNamedQuery(JpaWidget.WIDGET_GET_BY_TAG, JpaWidget.class);
- query.setParameter(JpaWidget.PARAM_TAG, tagKeyword);
+ query.setParameter(JpaWidget.PARAM_TAG_ID, tag == null ? null : Long.parseLong(tag.getId()));
return CollectionUtils.<Widget>toBaseTypedList(getPagedResultList(query, offset, pageSize));
}
@@ -269,14 +286,15 @@ public class JpaWidgetRepository impleme
if (tagKeyword != null) {
tagKeyword = tagKeyword.toLowerCase();
}
+ Tag tag = tagRepository.getByKeyword(tagKeyword);
Query query = manager.createNamedQuery(JpaWidget.WIDGET_COUNT_BY_TAG);
- query.setParameter(JpaWidget.PARAM_TAG, tagKeyword);
+ query.setParameter(JpaWidget.PARAM_TAG_ID, tag == null ? null : Long.parseLong(tag.getId()));
Number countResult = (Number) query.getSingleResult();
return countResult.intValue();
}
@Override
- public int unassignWidgetOwner(long userId) {
+ public int unassignWidgetOwner(String userId) {
Query query = manager.createNamedQuery(JpaWidget.WIDGET_UNASSIGN_OWNER);
query.setParameter(JpaWidget.PARAM_OWNER, userId);
return query.executeUpdate();
@@ -288,7 +306,7 @@ public class JpaWidgetRepository impleme
}
@Override
- public Widget get(long id) {
+ public Widget get(String id) {
return manager.find(JpaWidget.class, id);
}
@@ -360,4 +378,118 @@ public class JpaWidgetRepository impleme
}
return "%" + searchTerm.toLowerCase() + "%";
}
+
+ // ***************************************************************************************************************
+ // Widget Tag Methods
+ // ***************************************************************************************************************
+
+
+ @Override
+ public WidgetTag getTagByWidgetIdAndKeyword(String widgetId, String keyword) {
+ if (keyword != null) {
+ keyword = keyword.trim();
+ }
+ Tag tag = tagRepository.getByKeyword(keyword);
+ TypedQuery<JpaWidgetTag> query = manager.createNamedQuery(JpaWidgetTag.FIND_BY_WIDGETID_AND_TAGID, JpaWidgetTag.class);
+ query.setParameter(JpaWidgetTag.TAG_ID_PARAM, tag == null ? null : Long.parseLong(tag.getId()));
+ query.setParameter(JpaWidgetTag.WIDGET_ID_PARAM, widgetId == null ? null : Long.parseLong(widgetId));
+ return getSingleResult(query.getResultList());
+ }
+
+ @Override
+ public WidgetTag getTagById(String widgetTagId) {
+ return manager.find(JpaWidgetTag.class, widgetTagId);
+ }
+
+ @Override
+ public WidgetTag saveWidgetTag(String widgetId, WidgetTag tag) {
+ JpaWidgetTag jpaWidgetTag = tagConverter.convert(tag, widgetId);
+
+ return saveOrUpdate(jpaWidgetTag.getId(), manager, jpaWidgetTag);
+ }
+
+ @Override
+ public void deleteWidgetTag(WidgetTag tag) {
+ manager.remove(tag instanceof JpaWidgetTag ? tag: manager.find(Tag.class, tag.getTagId()));
+ }
+
+ // ***************************************************************************************************************
+ // Widget Comment Methods
+ // ***************************************************************************************************************
+
+ @Override
+ public WidgetComment getCommentById(String widgetId, String widgetCommentId) {
+ // widgetId ignored in JPA
+ return manager.find(JpaWidgetComment.class, Long.parseLong(widgetCommentId));
+ }
+
+ @Override
+ public WidgetComment createWidgetComment(String widgetId, WidgetComment comment) {
+ JpaWidgetComment category = commentConverter.convert(comment, widgetId);
+ return saveOrUpdate(category.getEntityId(), manager, category);
+ }
+
+ @Override
+ public WidgetComment updateWidgetComment(String widgetId, WidgetComment comment) {
+ JpaWidgetComment category = commentConverter.convert(comment, widgetId);
+ return saveOrUpdate(category.getEntityId(), manager, category);
+ }
+
+ @Override
+ public void deleteWidgetComment(String widgetId, WidgetComment comment) {
+ // widgetId ignored in JPA
+ manager.remove(comment instanceof JpaWidgetComment ? comment : getCommentById(widgetId, comment.getId()));
+ }
+
+ /**
+ * Delete all Widget Comments for a userId
+ *
+ * @param userId
+ * @return count of comments deleted
+ */
+ @Override
+ public int deleteAllWidgetComments(String userId) {
+ TypedQuery<JpaWidgetComment> query = manager.createNamedQuery(JpaWidgetComment.DELETE_ALL_BY_USER, JpaWidgetComment.class);
+ query.setParameter("userId", userId);
+ return query.executeUpdate();
+ }
+
+ @Override
+ public WidgetRating getRatingById(String widgetId, String widgetRatingId) {
+ return manager.find(JpaWidgetRating.class, widgetRatingId);
+ }
+
+ @Override
+ public WidgetRating createWidgetRating(String widgetId, WidgetRating rating) {
+ JpaWidgetRating jpaItem = ratingConverter.convert(rating, widgetId);
+ return saveOrUpdate(jpaItem.getEntityId(), manager, jpaItem);
+ }
+
+ @Override
+ public WidgetRating updateWidgetRating(String widgetId, WidgetRating rating) {
+ JpaWidgetRating jpaItem = ratingConverter.convert(rating, widgetId);
+ return saveOrUpdate(jpaItem.getEntityId(), manager, jpaItem);
+ }
+
+ @Override
+ public void deleteWidgetRating(String widgetId, WidgetRating rating) {
+ manager.remove(ratingConverter.convert(rating, widgetId));
+ }
+
+ @Override
+ public WidgetRating getWidgetRatingsByWidgetIdAndUserId(String widgetId, String userId) {
+ TypedQuery<JpaWidgetRating> query =
+ manager.createNamedQuery(JpaWidgetRating.WIDGET_RATING_BY_WIDGET_AND_USER, JpaWidgetRating.class);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, Long.parseLong(widgetId));
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, Long.parseLong(userId));
+ final List<JpaWidgetRating> resultList = query.getResultList();
+ return getSingleResult(resultList);
+ }
+
+ @Override
+ public int deleteAllWidgetRatings(String userId) {
+ TypedQuery<JpaWidgetRating> query = manager.createNamedQuery(JpaWidgetRating.DELETE_ALL_BY_USER, JpaWidgetRating.class);
+ query.setParameter("userId", userId == null ? null : Long.parseLong(userId));
+ return query.executeUpdate();
+ }
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java Mon Oct 29 03:59:56 2012
@@ -41,8 +41,8 @@ import static org.junit.Assert.assertTru
@Ignore
public class PageTest {
private Page page;
- private long id;
- private long parentId;
+ private String id;
+ private String parentId;
private String testName;
private JpaUser testOwner;
private Page parentPage;
@@ -52,29 +52,30 @@ public class PageTest {
private List<Region> regions;
private PageUser pageUser;
- private final Long SUB_PAGE_1_ID = 666666L;
- private final Long SUB_PAGE_2_ID = 121212L;
+ private final String SUB_PAGE_1_ID = "666666";
+ private final String SUB_PAGE_2_ID = "121212";
@Before
public void setup(){
- page=new PageImpl();
- id=19191991L;
- parentId = 12345L;
+ long longId = 19191991L;
+ id=Long.toBinaryString(longId);
+ page=new PageImpl(id);
+ parentId = "12345";
testName="testName";
- testOwner=new JpaUser(id);
+ testOwner=new JpaUser(longId);
parentPage = new PageImpl(parentId);
subPages = new ArrayList<Page>();
Page subPage1 = new PageImpl();
subPage1.setId(SUB_PAGE_1_ID);
- subPage1.setOwner(testOwner);
+ subPage1.setOwnerId(testOwner.getId());
Page subPage2 = new PageImpl();
subPage2.setId(SUB_PAGE_2_ID);
- subPage2.setOwner(testOwner);
+ subPage2.setOwnerId(testOwner.getId());
List<PageUser> pageUsers1 = new ArrayList<PageUser>();
PageUser pageUser1 = new PageUserImpl();
- pageUser1.setUser(testOwner);
+ pageUser1.setUserId(id);
pageUser1.setPage(subPage1);
pageUser1.setRenderSequence(2L);
pageUsers1.add(pageUser1);
@@ -82,13 +83,13 @@ public class PageTest {
List<PageUser> pageUsers2 = new ArrayList<PageUser>();
PageUser pageUser2 = new PageUserImpl();
- pageUser2.setUser(new JpaUser());
+ pageUser2.setUserId("");
pageUser2.setPage(subPage2);
pageUser2.setRenderSequence(19L);
pageUsers2.add(pageUser2);
PageUser pageUser3 = new PageUserImpl();
- pageUser3.setUser(testOwner);
+ pageUser3.setUserId(testOwner.getId());
pageUser3.setPage(subPage2);
pageUser3.setRenderSequence(1L);
pageUsers2.add(pageUser3);
@@ -103,9 +104,8 @@ public class PageTest {
regions.add(new RegionImpl());
regions.add(new RegionImpl());
- page.setId(id);
page.setName(testName);
- page.setOwner(testOwner);
+ page.setOwnerId(testOwner.getId());
page.setParentPage(parentPage);
page.setSubPages(subPages);
page.setPageLayout(pageLayout);
@@ -113,7 +113,7 @@ public class PageTest {
pageUser = new PageUserImpl();
pageUser.setPage(page);
- pageUser.setUser(testOwner);
+ pageUser.setUserId(id);
pageUser.setRenderSequence(renderSequence);
}
@@ -124,9 +124,9 @@ public class PageTest {
@Test
public void testAccessorMethods() {
- assertTrue(page.getId()==id);
+ assertTrue(page.getId().equals(id));
assertTrue(page.getName().equals(testName));
- assertTrue(page.getOwner().equals(testOwner));
+ assertTrue(page.getOwnerId().equals(testOwner));
assertTrue(page.getParentPage().equals(parentPage));
assertTrue(page.getSubPages().containsAll(subPages));
assertTrue(page.getPageLayout().equals(pageLayout));
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/TagTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/TagTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/TagTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/TagTest.java Mon Oct 29 03:59:56 2012
@@ -30,8 +30,7 @@ public class TagTest {
@Test
public void testAuthority() throws Exception {
- Tag tag = new JpaTag();
- tag.setKeyword("test");
+ Tag tag = new JpaTag("test");
assertEquals("test", tag.getKeyword());
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java Mon Oct 29 03:59:56 2012
@@ -33,15 +33,15 @@ public class WidgetRatingTest {
JpaWidgetRating widgetRating;
Long id;
- Long widgetId;
- Long userId;
+ String widgetId;
+ String userId;
Integer score;
@Before
public void setUp() throws Exception {
id = 1L;
- widgetId = 1L;
- userId = 1L;
+ widgetId = "1";
+ userId = "1";
score = 1;
widgetRating = new JpaWidgetRating();
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java Mon Oct 29 03:59:56 2012
@@ -38,19 +38,18 @@ public class WidgetTagTest {
@Before
public void setUp() {
- widgetTag = new JpaWidgetTag();
+ widgetTag = new JpaWidgetTag(VALID_WIDGET_ID);
widgetTag.setEntityId(VALID_ENTITY_ID);
- widgetTag.setWidgetId(VALID_WIDGET_ID);
- widgetTag.setUser(new JpaUser(1L, "John.Doe"));
+ widgetTag.setUserEntityId(1L);
widgetTag.setCreatedDate(VALID_CREATED_DATE);
- widgetTag.setTag(new JpaTag(1L, "test"));
+ widgetTag.setTagEntityId(1L);
}
@Test
public void getters() {
assertEquals(VALID_ENTITY_ID, widgetTag.getEntityId());
assertEquals(VALID_WIDGET_ID, widgetTag.getWidgetId());
- assertEquals(VALID_USER_ID, widgetTag.getUser().getId());
+ assertEquals(VALID_USER_ID, widgetTag.getUserId());
assertEquals(VALID_CREATED_DATE, widgetTag.getCreatedDate());
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java Mon Oct 29 03:59:56 2012
@@ -70,8 +70,8 @@ public class WidgetTest {
ratings.add(new JpaWidgetRating(1L, 1L, 1L, 1));
tags = new ArrayList<WidgetTag>();
- tags.add(new JpaWidgetTag(1L, 1L, new JpaUser(), new Date(), tag)) ;
- tags.add(new JpaWidgetTag(2L,1L, new JpaUser(), new Date(), tag1)) ;
+ tags.add(new JpaWidgetTag(1L, 1L, 1, new Date(), tag.getEntityId())) ;
+ tags.add(new JpaWidgetTag(2L,1L, 2, new Date(), tag1.getEntityId())) ;
widget.setEntityId(id);
widget.setTitle(title);
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java Mon Oct 29 03:59:56 2012
@@ -54,7 +54,7 @@ public class JpaApplicationDataConverter
@Test
public void newApplicationData() {
ApplicationData applicationData = new ApplicationDataImpl();
- applicationData.setId(1L);
+ applicationData.setId("1");
applicationData.setAppUrl("url");
applicationData.setData(new HashMap<String, String>());
applicationData.setUserId("userid");
@@ -63,7 +63,7 @@ public class JpaApplicationDataConverter
assertThat(converted, is(not(sameInstance(applicationData))));
assertThat(converted, is(instanceOf(JpaApplicationData.class)));
assertThat(converted.getId(), is(equalTo(applicationData.getId())));
- assertThat(converted.getEntityId(), is(equalTo(applicationData.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(applicationData.getId())));
assertThat(converted.getAppUrl(), is(equalTo(applicationData.getAppUrl())));
assertThat(converted.getData(), is(equalTo(applicationData.getData())));
assertThat(converted.getUserId(), is(equalTo(applicationData.getUserId())));
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java Mon Oct 29 03:59:56 2012
@@ -62,7 +62,7 @@ public class JpaAuthorityConverterTest {
Authority template = new AuthorityImpl();
template.setAuthority("FOO");
template.setDefaultForNewUser(true);
- template.addUser(new UserImpl(42L));
+ template.addUser(new UserImpl("42"));
JpaAuthority jpaTemplate = converter.convert(template);
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java Mon Oct 29 03:59:56 2012
@@ -55,22 +55,22 @@ public class JpaCategoryConverterTest {
public void newCategory() {
Category category = new CategoryImpl();
category.setCreatedDate(new Date());
- category.setId(9L);
+ category.setId("9");
category.setLastModifiedDate(new Date());
category.setText("hello");
- category.setCreatedUser(new JpaUser(1L));
- category.setLastModifiedUser(new JpaUser(1L));
+ category.setCreatedUserId("1");
+ category.setLastModifiedUserId("1");
category.setWidgets(new ArrayList<Widget>());
JpaCategory converted = categoryConverter.convert(category);
assertThat(converted, is(not(sameInstance(category))));
assertThat(converted, is(instanceOf(JpaCategory.class)));
assertThat(converted.getCreatedDate(), is(equalTo(category.getCreatedDate())));
- assertThat(converted.getCreatedUser(), is(equalTo(category.getCreatedUser())));
- assertThat(converted.getEntityId(), is(equalTo(category.getId())));
+ assertThat(converted.getCreatedUserId(), is(equalTo(category.getCreatedUserId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(category.getId())));
assertThat(converted.getId(), is(equalTo(category.getId())));
assertThat(converted.getLastModifiedDate(), is(equalTo(category.getLastModifiedDate())));
- assertThat(converted.getLastModifiedUser(), is(equalTo(category.getLastModifiedUser())));
+ assertThat(converted.getLastModifiedUserId(), is(equalTo(category.getLastModifiedUserId())));
assertThat(converted.getText(), is(equalTo(category.getText())));
assertThat(converted.getWidgets(), is(equalTo(category.getWidgets())));
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java Mon Oct 29 03:59:56 2012
@@ -49,24 +49,25 @@ public class JpaGroupConverterTest {
private Long entityId = Long.valueOf(400);
private String title = "GroupTitle";
private Person owner = null;
- private List<Person> members = null;
+ private List<String> members = null;
- private String ownerDisplayName = "Bob";
- private String ownerGivenName = "Smith";
+ private static final String ownerDisplayName = "Bob";
+ private static final String ownerGivenName = "Smith";
+ private static final String ownerId = "12345";
@Before
public void setup() {
- members = new ArrayList<Person>();
+ members = new ArrayList<String>();
owner = new PersonImpl();
owner.setDisplayName(ownerDisplayName);
owner.setGivenName(ownerGivenName);
- members.add(owner);
+ members.add(ownerId);
group = new GroupImpl();
group.setDescription(description);
group.setTitle(title);
- group.setOwner(owner);
- group.setMembers(members);
+ group.setOwnerId(ownerId);
+ group.setMemberIds(members);
}
@Test
@@ -89,8 +90,8 @@ public class JpaGroupConverterTest {
assertThat(jpaGroup, is(instanceOf(JpaGroup.class)));
assertEquals(description, jpaGroup.getDescription());
assertEquals(title, jpaGroup.getTitle());
- assertEquals(owner.getDisplayName(), jpaGroup.getOwner().getDisplayName());
- assertEquals(members.size(), jpaGroup.getMembers().size());
+ assertEquals(ownerId, jpaGroup.getOwnerId());
+ assertEquals(members.size(), jpaGroup.getMemberIds().size());
}
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java Mon Oct 29 03:59:56 2012
@@ -52,7 +52,7 @@ public class JpaOAuthConsumerStoreConver
@Test
public void newOAuthConsumerStore() {
OAuthConsumerStore oAuthConsumerStore = new OAuthConsumerStoreImpl();
- oAuthConsumerStore.setId(1L);
+ oAuthConsumerStore.setId("1");
oAuthConsumerStore.setServiceName("servicename");
oAuthConsumerStore.setCallbackUrl("callbackurl");
oAuthConsumerStore.setConsumerKey("key");
@@ -69,7 +69,7 @@ public class JpaOAuthConsumerStoreConver
assertThat(converted.getCallbackUrl(), is(equalTo(oAuthConsumerStore.getCallbackUrl())));
assertThat(converted.getConsumerKey(), is(equalTo(oAuthConsumerStore.getConsumerKey())));
assertThat(converted.getConsumerSecret(), is(equalTo(oAuthConsumerStore.getConsumerSecret())));
- assertThat(converted.getEntityId(), is(equalTo(oAuthConsumerStore.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(oAuthConsumerStore.getId())));
assertThat(converted.getGadgetUri(), is(equalTo(oAuthConsumerStore.getGadgetUri())));
assertThat(converted.getKeyName(), is(equalTo(oAuthConsumerStore.getKeyName())));
assertThat(converted.getKeyType(), is(equalTo(oAuthConsumerStore.getKeyType())));
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java Mon Oct 29 03:59:56 2012
@@ -53,7 +53,7 @@ public class JpaOAuthTokenInfoConverterT
@Test
public void newOAuthTokenInfo() {
OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfoImpl();
- oAuthTokenInfo.setId(1L);
+ oAuthTokenInfo.setId("1");
oAuthTokenInfo.setAccessToken("accesstoken");
oAuthTokenInfo.setAppUrl("appurl");
oAuthTokenInfo.setModuleId("moduleid");
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java Mon Oct 29 03:59:56 2012
@@ -54,13 +54,13 @@ public class JpaPageConverterTest {
@Test
public void newPage() {
Page page = new PageImpl();
- page.setId(1L);
+ page.setId("1");
page.setMembers(new ArrayList<PageUser>());
page.setName("name");
- page.setOwner(new JpaUser());
+ page.setOwnerId("");
page.setPageLayout(new PageLayoutImpl());
page.setPageType(PageType.USER);
- page.setParentPage(new PageImpl(1L));
+ page.setParentPage(new PageImpl("1"));
page.setRegions(new ArrayList<Region>());
page.setSubPages(new ArrayList<Page>());
@@ -72,7 +72,7 @@ public class JpaPageConverterTest {
assertThat(converted.getRegions(), is(equalTo(page.getRegions())));
assertThat(converted.getMembers(), is(equalTo(page.getMembers())));
assertThat(converted.getName(), is(equalTo(page.getName())));
- assertThat(converted.getOwner(), is(equalTo(page.getOwner())));
+ assertThat(converted.getOwnerId(), is(equalTo(page.getOwnerId())));
assertThat(converted.getPageLayout().getCode(), is(equalTo(page.getPageLayout().getCode())));
assertThat(converted.getPageType(), is(equalTo(page.getPageType())));
assertThat(converted.getSubPages(), is(equalTo(page.getSubPages())));
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java Mon Oct 29 03:59:56 2012
@@ -60,14 +60,14 @@ public class JpaPageTemplateConverterTes
@Test
public void convertValid() {
- PageTemplate template = new PageTemplateImpl();
+ PageTemplate template = new PageTemplateImpl("1");
template.setName("name");
template.setSubPageTemplates(new ArrayList<PageTemplate>());
template.setDefaultTemplate(true);
template.setRenderSequence(1);
template.setPageTemplateRegions(new ArrayList<PageTemplateRegion>());
template.setPageLayout(new PageLayoutImpl());
- template.setParentPageTemplate(new PageTemplateImpl());
+ template.setParentPageTemplate(new PageTemplateImpl("1"));
template.setDescription("Description");
template.setPageType(PageType.USER);
@@ -75,7 +75,7 @@ public class JpaPageTemplateConverterTes
assertThat(jpaTemplate, is(not(sameInstance(template))));
assertThat(jpaTemplate, is(instanceOf(JpaPageTemplate.class)));
- assertThat(jpaTemplate.getId(), is(equalTo(template.getId())));
+ assertThat(jpaTemplate.getId().toString(), is(equalTo(template.getId())));
assertThat(jpaTemplate.getPageType(), is(equalTo(template.getPageType())));
assertThat(jpaTemplate.getName(), is(equalTo(template.getName())));
assertThat(jpaTemplate.getDescription(), is(equalTo(template.getDescription())));
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java Mon Oct 29 03:59:56 2012
@@ -63,10 +63,10 @@ public class JpaPageTemplateRegionConver
@Test
public void convertValid() {
- PageTemplateRegion template = new PageTemplateRegionImpl();
+ PageTemplateRegion template = new PageTemplateRegionImpl("1");
template.setRenderSequence(1);
template.setPageTemplateWidgets(new ArrayList<PageTemplateWidget>());
- template.setPageTemplate(new PageTemplateImpl());
+ template.setPageTemplate(new PageTemplateImpl("1"));
template.setLocked(true);
JpaPageTemplateRegion jpaTemplate = converter.convert(template);
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java Mon Oct 29 03:59:56 2012
@@ -59,12 +59,13 @@ public class JpaPageTemplateWidgetConver
@Test
public void convertValid() {
JpaWidget widget = new JpaWidget();
- PageTemplateWidget template = new PageTemplateWidgetImpl();
+ widget.setEntityId(1L);
+ PageTemplateWidget template = new PageTemplateWidgetImpl("1");
template.setLocked(true);
template.setHideChrome(true);
- template.setPageTemplateRegion(new PageTemplateRegionImpl());
+ template.setPageTemplateRegion(new PageTemplateRegionImpl("1"));
template.setRenderSeq(1);
- template.setWidget(widget);
+ template.setWidgetId(widget.getId());
JpaPageTemplateWidget jpaTemplate = converter.convert(template);
@@ -73,7 +74,7 @@ public class JpaPageTemplateWidgetConver
assertThat(jpaTemplate.isLocked(), is(equalTo(template.isLocked())));
assertThat(jpaTemplate.getPageTemplateRegion(), is(instanceOf(JpaPageTemplateRegion.class)));
assertThat(jpaTemplate.getRenderSeq(), is(equalTo(template.getRenderSeq())));
- assertThat(jpaTemplate.getWidget(), is(equalTo(template.getWidget())));
+ assertThat(jpaTemplate.getWidgetId(), is(equalTo(template.getWidgetId())));
assertThat(jpaTemplate.isLocked(), is(equalTo(template.isLocked())));
assertThat(jpaTemplate.isHideChrome(), is(equalTo(template.isHideChrome())));
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java Mon Oct 29 03:59:56 2012
@@ -58,8 +58,7 @@ public class JpaPersonPropertyConverterT
@Test
public void convertValid() {
- PersonProperty template = new PersonPropertyImpl();
- template.setId(42L);
+ PersonProperty template = new PersonPropertyImpl("42");
template.setType("TEST_A");
template.setValue("TEST_B");
template.setQualifier("TEST_C");
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java Mon Oct 29 03:59:56 2012
@@ -54,8 +54,7 @@ public class JpaRegionConverterTest {
@Test
public void newRegion() {
- Region region = new RegionImpl();
- region.setId(9L);
+ Region region = new RegionImpl("9");
region.setLocked(false);
region.setPage(new JpaPage());
region.setRegionWidgets(new ArrayList<RegionWidget>());
@@ -65,7 +64,7 @@ public class JpaRegionConverterTest {
assertThat(converted, is(not(sameInstance(region))));
assertThat(converted, is(instanceOf(JpaRegion.class)));
assertThat(converted.getRegionWidgets(), is(equalTo(region.getRegionWidgets())));
- assertThat(converted.getEntityId(), is(equalTo(region.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(region.getId())));
assertThat(converted.getId(), is(equalTo(region.getId())));
assertThat(converted.getPage(), is(instanceOf(Page.class)));
assertThat(converted.getRenderOrder(), is(equalTo(region.getRenderOrder())));
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java Mon Oct 29 03:59:56 2012
@@ -55,22 +55,21 @@ public class JpaRegionWidgetConverterTes
@Test
public void newRegion() {
- RegionWidget rw = new RegionWidgetImpl();
- rw.setId(9L);
+ RegionWidget rw = new RegionWidgetImpl("9");
rw.setLocked(false);
rw.setCollapsed(false);
rw.setHideChrome(true);
rw.setRenderOrder(9);
rw.setPreferences(new ArrayList<RegionWidgetPreference>());
- rw.setRegion(new RegionImpl());
+ rw.setRegion(new RegionImpl("1"));
rw.setRenderPosition("last");
- rw.setWidget(new WidgetImpl());
+ rw.setWidgetId("1");
JpaRegionWidget converted = regionWidgetConverter.convert(rw);
assertThat(converted, is(not(sameInstance(rw))));
assertThat(converted, is(instanceOf(JpaRegionWidget.class)));
assertThat(converted.getPreferences(), is(equalTo(rw.getPreferences())));
- assertThat(converted.getEntityId(), is(equalTo(rw.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(rw.getId())));
assertThat(converted.getId(), is(equalTo(rw.getId())));
assertThat(converted.isCollapsed(), is(equalTo(rw.isCollapsed())));
assertThat(converted.getRenderOrder(), is(equalTo(rw.getRenderOrder())));
@@ -78,6 +77,6 @@ public class JpaRegionWidgetConverterTes
assertThat(converted.isHideChrome(), is(equalTo(rw.isHideChrome())));
assertThat(converted.getRegion(), is(instanceOf(JpaRegion.class)));
assertThat(converted.getRenderPosition(), is(equalTo(rw.getRenderPosition())));
- assertThat(converted.getWidget(), is(instanceOf(JpaWidget.class)));
+ assertThat(converted.getWidgetId(), is(instanceOf(String.class)));
}
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java Mon Oct 29 03:59:56 2012
@@ -60,7 +60,7 @@ public class JpaRegionWidgetPreferenceCo
public void convertValid() {
RegionWidgetPreference template = new RegionWidgetPreferenceImpl();
template.setName("TEST_A");
- template.setRegionWidgetId(42L);
+ template.setRegionWidgetId("42");
template.setValue("TEST_B");
JpaRegionWidgetPreference jpaTemplate = converter.convert(template);
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java Mon Oct 29 03:59:56 2012
@@ -42,11 +42,10 @@ public class JpaTagConverterTest {
@Test
public void convert_valid_tagImpl(){
- TagImpl tag = new TagImpl("blazer", new ArrayList<WidgetTag>());
+ TagImpl tag = new TagImpl("blazer");
JpaTag jpaTag = jpaTagConverter.convert(tag);
assertNotNull(jpaTag);
- assertEquals(tag.getKeyword(), jpaTag.getKeyword());
- assertEquals(tag.getWidgets().size(), jpaTag.getWidgets().size());
+ assertEquals(tag.getKeyword(), jpaTag.getKeyword());
}
@@ -54,7 +53,6 @@ public class JpaTagConverterTest {
public void convert_valid_jpaTag(){
JpaTag tag = new JpaTag();
tag.setKeyword("blazer");
- tag.setWidgets(new ArrayList<WidgetTag>());
tag.setEntityId(387L);
JpaTag jpaTag = jpaTagConverter.convert(tag);
assertNotNull(jpaTag);
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java Mon Oct 29 03:59:56 2012
@@ -63,7 +63,7 @@ public class JpaUserConverterTest {
@Test
public void convertValid() {
- User template = new UserImpl();
+ User template = new UserImpl("1");
template.setUsername("TEST_A");
template.setEmail("TEST_B");
template.setDisplayName("TEST_C");
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java Mon Oct 29 03:59:56 2012
@@ -18,7 +18,6 @@
*/
package org.apache.rave.portal.model.conversion;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.JpaWidgetComment;
import org.apache.rave.portal.model.WidgetComment;
import org.apache.rave.portal.model.impl.WidgetCommentImpl;
@@ -43,35 +42,32 @@ public class JpaWidgetCommentConverterTe
@Test
public void noConversion() {
WidgetComment comment = new JpaWidgetComment();
- assertThat(widgetCommentConverter.convert(comment), is(sameInstance(comment)));
+ assertThat(widgetCommentConverter.convert(comment, null), is(sameInstance(comment)));
}
@Test
public void nullConversion() {
WidgetComment template = null;
- assertThat(widgetCommentConverter.convert(template), is(nullValue()));
+ assertThat(widgetCommentConverter.convert(template, null), is(nullValue()));
}
@Test
public void newComment() {
- WidgetComment comment = new WidgetCommentImpl();
+ WidgetComment comment = new WidgetCommentImpl("9");
comment.setCreatedDate(new Date());
- comment.setId(9L);
comment.setLastModifiedDate(new Date());
comment.setText("hello");
- comment.setUser(new JpaUser(1L));
- comment.setWidgetId(9L);
+ comment.setUserId("1");
- JpaWidgetComment converted = widgetCommentConverter.convert(comment);
+ JpaWidgetComment converted = widgetCommentConverter.convert(comment, "9");
assertThat(converted, is(not(sameInstance(comment))));
assertThat(converted, is(instanceOf(JpaWidgetComment.class)));
assertThat(converted.getCreatedDate(), is(equalTo(comment.getCreatedDate())));
- assertThat(converted.getEntityId(), is(equalTo(comment.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(comment.getId())));
assertThat(converted.getId(), is(equalTo(comment.getId())));
assertThat(converted.getLastModifiedDate(), is(equalTo(comment.getLastModifiedDate())));
assertThat(converted.getText(), is(equalTo(comment.getText())));
- assertThat(converted.getUser(), is(equalTo(comment.getUser())));
- assertThat(converted.getWidgetId(), is(equalTo(comment.getWidgetId())));
+ assertThat(converted.getUserId(), is(equalTo(comment.getUserId())));
}
}
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java Mon Oct 29 03:59:56 2012
@@ -19,7 +19,6 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.portal.model.*;
-import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.junit.Before;
import org.junit.Test;
@@ -60,8 +59,7 @@ public class JpaWidgetConverterTest {
@Test
public void convertValid() {
- WidgetImpl template = new WidgetImpl();
- template.setId(42L);
+ WidgetImpl template = new WidgetImpl("42");
template.setUrl("TEST_A");
template.setType("TEST_B");
template.setTitle("TEST_C");
@@ -74,7 +72,7 @@ public class JpaWidgetConverterTest {
template.setDescription("TEST_J");
template.setWidgetStatus(WidgetStatus.PUBLISHED);
template.setComments(new ArrayList<WidgetComment>());
- template.setOwner(new UserImpl(24L));
+ template.setOwnerId("24");
template.setDisableRendering(true);
template.setRatings(new ArrayList<WidgetRating>());
template.setTags(new ArrayList<WidgetTag>());
@@ -98,7 +96,7 @@ public class JpaWidgetConverterTest {
assertThat(jpaTemplate.getDescription(), is(equalTo(template.getDescription())));
assertThat(jpaTemplate.getWidgetStatus(), is(equalTo(template.getWidgetStatus())));
assertThat(jpaTemplate.getComments(), is(equalTo(template.getComments())));
- assertThat(jpaTemplate.getOwner().getId(), is(equalTo(template.getOwner().getId())));
+ assertThat(jpaTemplate.getOwnerId(), is(equalTo(template.getOwnerId())));
assertThat(jpaTemplate.isDisableRendering(), is(equalTo(template.isDisableRendering())));
assertThat(jpaTemplate.getRatings(), is(equalTo(template.getRatings())));
assertThat(jpaTemplate.getTags(), is(equalTo(template.getTags())));
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java Mon Oct 29 03:59:56 2012
@@ -46,30 +46,28 @@ public class JpaWidgetRatingConverterTes
@Test
public void testNoConversion() {
JpaWidgetRating template = new JpaWidgetRating();
- assertThat(converter.convert(template), is(sameInstance(template)));
+ assertThat(converter.convert(template, "1"), is(sameInstance(template)));
}
@Test
public void nullConversion() {
WidgetRating template = null;
- assertThat(converter.convert(template), is(nullValue()));
+ assertThat(converter.convert(template, "1"), is(nullValue()));
}
@Test
public void convertValid() {
- WidgetRating template = new WidgetRatingImpl();
+ WidgetRating template = new WidgetRatingImpl("1");
template.setScore(1);
- template.setUserId(42L);
- template.setWidgetId(24L);
+ template.setUserId("42");
- JpaWidgetRating jpaTemplate = converter.convert(template);
+ JpaWidgetRating jpaTemplate = converter.convert(template, "24");
assertThat(jpaTemplate, is(not(sameInstance(template))));
assertThat(jpaTemplate, is(instanceOf(JpaWidgetRating.class)));
assertThat(jpaTemplate.getScore(), is(equalTo(template.getScore())));
assertThat(jpaTemplate.getUserId(), is(equalTo(template.getUserId())));
- assertThat(jpaTemplate.getWidgetId(), is(equalTo(template.getWidgetId())));
}
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java Mon Oct 29 03:59:56 2012
@@ -41,27 +41,23 @@ public class JpaWidgetTagConverterTest {
@Test
public void convert_valid_widgetTaq(){
- WidgetTag widgetTag = new WidgetTagImpl();
- widgetTag.setCreatedDate(new Date());
- widgetTag.setUser(new JpaUser());
- widgetTag.setWidgetId(3L);
- widgetTag.setTag(new JpaTag(1L, "news"));
- JpaWidgetTag jpaWidgetTag = jpaWidgetTagConverter.convert(widgetTag);
+ JpaWidget widget = new JpaWidget(1L, "");
+ WidgetTag widgetTag = new WidgetTagImpl(new JpaUser(1L).getId(), new Date(), new JpaTag(1L, "news").getId());
+ JpaWidgetTag jpaWidgetTag = jpaWidgetTagConverter.convert(widgetTag, widget.getId());
assertNotNull(jpaWidgetTag);
assertEquals(widgetTag.getCreatedDate(), jpaWidgetTag.getCreatedDate());
- assertSame(widgetTag.getTag(), jpaWidgetTag.getTag());
- assertSame(widgetTag.getUser(), jpaWidgetTag.getUser());
- assertEquals(widgetTag.getWidgetId(), jpaWidgetTag.getWidgetId());
+ assertEquals(widgetTag.getTagId(), jpaWidgetTag.getTagId());
+ assertEquals(widgetTag.getUserId(), jpaWidgetTag.getUserId());
+ assertEquals(widget.getId(), jpaWidgetTag.getWidgetId());
}
@Test
public void convert_valid_jpaWidgetTaq(){
- JpaWidgetTag widgetTag = new JpaWidgetTag();
+ JpaWidgetTag widgetTag = new JpaWidgetTag(3);
widgetTag.setCreatedDate(new Date());
- widgetTag.setUser(new JpaUser());
- widgetTag.setWidgetId(3L);
- widgetTag.setTag(new JpaTag(1L, "news"));
- JpaWidgetTag jpaWidgetTag = jpaWidgetTagConverter.convert(widgetTag);
+ widgetTag.setUserEntityId(new JpaUser(1L).getEntityId());
+ widgetTag.setTagEntityId(new JpaTag(1L, "news").getEntityId());
+ JpaWidgetTag jpaWidgetTag = jpaWidgetTagConverter.convert(widgetTag, "3");
assertNotNull(jpaWidgetTag);
assertSame(widgetTag, jpaWidgetTag);
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java Mon Oct 29 03:59:56 2012
@@ -74,13 +74,13 @@ public class JpaApplicationDataRepositor
@Test
public void get_valid() {
- JpaApplicationData applicationData = (JpaApplicationData) repository.get(VALID_APPLICATION_DATA_ID);
+ JpaApplicationData applicationData = (JpaApplicationData) repository.get(VALID_APPLICATION_DATA_ID.toString());
validateApplicationData(applicationData);
}
@Test
public void get_invalid() {
- ApplicationData applicationData = repository.get(-1L);
+ ApplicationData applicationData = repository.get("-1");
assertThat(applicationData, is(nullValue()));
}
@@ -149,10 +149,10 @@ public class JpaApplicationDataRepositor
@Transactional(readOnly=false)
@Rollback(true)
public void delete_jpaObject() {
- ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID.toString());
assertThat(applicationData, is(notNullValue()));
repository.delete(applicationData);
- applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ applicationData = repository.get(VALID_APPLICATION_DATA_ID.toString());
assertThat(applicationData, is(nullValue()));
}
@@ -160,11 +160,11 @@ public class JpaApplicationDataRepositor
@Transactional(readOnly=false)
@Rollback(true)
public void delete_implObject() {
- ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID.toString());
assertThat(applicationData, is(notNullValue()));
ApplicationDataImpl impl = new ApplicationDataImpl(applicationData.getId());
repository.delete(impl);
- applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ applicationData = repository.get(VALID_APPLICATION_DATA_ID.toString());
assertThat(applicationData, is(nullValue()));
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java Mon Oct 29 03:59:56 2012
@@ -66,7 +66,7 @@ public class JpaAuthorityRepositoryTest
@Test
public void getById_validId() {
- final JpaAuthority authority = (JpaAuthority)repository.get(VALID_ID);
+ final JpaAuthority authority = (JpaAuthority)repository.get(VALID_ID.toString());
assertNotNull(authority);
assertEquals(VALID_ID, authority.getEntityId());
}
@@ -103,7 +103,7 @@ public class JpaAuthorityRepositoryTest
final String authorityName = "guest";
Authority authority = new JpaAuthority();
authority.setAuthority(authorityName);
- User user = userRepository.get(1L);
+ User user = userRepository.get("1");
Assert.assertNotNull("User is null", user);
Assert.assertTrue("User has no authorities", user.getAuthorities().isEmpty());
@@ -121,7 +121,7 @@ public class JpaAuthorityRepositoryTest
repository.delete(authority);
assertNull("No authority guest", repository.getByAuthority(authorityName));
- user = userRepository.get(1L);
+ user = userRepository.get("1");
Assert.assertNotNull("User should not be deleted after removing an authority", user);
Assert.assertTrue("User should have no authorities", user.getAuthorities().isEmpty());
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java Mon Oct 29 03:59:56 2012
@@ -72,13 +72,13 @@ public class JpaCategoryRepositoryTest {
@Test
public void getById_validId() {
- JpaCategory category = (JpaCategory) repository.get(VALID_ENTITY_ID);
+ JpaCategory category = (JpaCategory) repository.get(VALID_ENTITY_ID.toString());
assertThat(category.getEntityId(), is(equalTo(VALID_ENTITY_ID)));
}
@Test
public void getById_invalidId() {
- assertThat(repository.get(INVALID_ENTITY_ID), is(nullValue()));
+ assertThat(repository.get(INVALID_ENTITY_ID.toString()), is(nullValue()));
}
@Test
@@ -88,10 +88,10 @@ public class JpaCategoryRepositoryTest {
Date now = new Date();
JpaCategory category = new JpaCategory();
category.setLastModifiedDate(now);
- category.setLastModifiedUser(validUser);
+ category.setLastModifiedUserId(VALID_USER_ID.toString());
category.setText(NEW_TEXT);
category.setCreatedDate(now);
- category.setCreatedUser(validUser);
+ category.setCreatedUserId(VALID_USER_ID.toString());
assertThat(category.getEntityId(), is(nullValue()));
repository.save(category);
@@ -99,29 +99,29 @@ public class JpaCategoryRepositoryTest {
Long newEntityId = category.getEntityId();
assertThat(newEntityId, is(notNullValue()));
// verify that it persisted ok
- assertThat((JpaCategory)repository.get(newEntityId), is(category));
+ assertThat((JpaCategory)repository.get(newEntityId.toString()), is(category));
}
@Test
@Rollback(true)
public void save_existingEntity() {
final String UPDATED_TEXT = "changed the text";
- Category category = repository.get(VALID_ENTITY_ID);
+ Category category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category.getText(), is(not(UPDATED_TEXT)));
category.setText(UPDATED_TEXT);
repository.save(category);
// fetch again and verify update
- Category modCategory = repository.get(VALID_ENTITY_ID);
+ Category modCategory = repository.get(VALID_ENTITY_ID.toString());
assertThat(modCategory.getText(), is(UPDATED_TEXT));
}
@Test
@Rollback(true)
public void delete() {
- Category entity = repository.get(VALID_ENTITY_ID);
+ Category entity = repository.get(VALID_ENTITY_ID.toString());
assertThat(entity, is(notNullValue()));
repository.delete(entity);
- assertThat(repository.get(VALID_ENTITY_ID), is(nullValue()));
+ assertThat(repository.get(VALID_ENTITY_ID.toString()), is(nullValue()));
}
@Test
@@ -149,9 +149,9 @@ public class JpaCategoryRepositoryTest {
JpaCategory wc = new JpaCategory();
wc.setText(DUPLICATE_TEXT_VALUE);
wc.setCreatedDate(now);
- wc.setCreatedUser(user);
+ wc.setCreatedUserId(user.getId());
wc.setLastModifiedDate(now);
- wc.setLastModifiedUser(user);
+ wc.setLastModifiedUserId(user.getId());
boolean gotExpectedException = false;
try {
@@ -176,10 +176,10 @@ public class JpaCategoryRepositoryTest {
@Transactional(readOnly=false)
@Rollback(true)
public void delete_jpaObject() {
- Category category = repository.get(VALID_ENTITY_ID);
+ Category category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category, is(notNullValue()));
repository.delete(category);
- category = repository.get(VALID_ENTITY_ID);
+ category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category, is(nullValue()));
}
@@ -187,11 +187,11 @@ public class JpaCategoryRepositoryTest {
@Transactional(readOnly=false)
@Rollback(true)
public void delete_implObject() {
- Category category = repository.get(VALID_ENTITY_ID);
+ Category category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category, is(notNullValue()));
CategoryImpl impl = new CategoryImpl(category.getId());
repository.delete(impl);
- category = repository.get(VALID_ENTITY_ID);
+ category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category, is(nullValue()));
}
@@ -199,6 +199,6 @@ public class JpaCategoryRepositoryTest {
@Transactional(readOnly=false)
@Rollback(true)
public void removeFromCreatedOrModifiedFields() {
- assertThat(repository.removeFromCreatedOrModifiedFields(VALID_USER_ID), is(5));
+ assertThat(repository.removeFromCreatedOrModifiedFields(VALID_USER_ID.toString()), is(5));
}
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java Mon Oct 29 03:59:56 2012
@@ -65,7 +65,7 @@ public class JpaOAuthConsumerStoreReposi
@Test
public void get() {
- JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID);
+ JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID.toString());
assertThat(oAuthConsumerStore.getEntityId(), is(VALID_ID));
assertThat(oAuthConsumerStore.getGadgetUri(), is(GADGET_URI));
assertThat(oAuthConsumerStore.getServiceName(), is(SERVICE_NAME_GOOGLE));
@@ -97,9 +97,9 @@ public class JpaOAuthConsumerStoreReposi
assertThat(oAuthConsumerStore.getEntityId(), is(nullValue()));
repository.save(oAuthConsumerStore);
- long newId = oAuthConsumerStore.getEntityId();
+ Long newId = oAuthConsumerStore.getEntityId();
assertThat(newId > 0, is(true));
- JpaOAuthConsumerStore newOAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(newId);
+ JpaOAuthConsumerStore newOAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(newId.toString());
assertThat(newOAuthConsumerStore.getServiceName(), is(NEW_SERVICE_NAME));
assertThat(newOAuthConsumerStore.getCallbackUrl(), is(NEW_URL));
}
@@ -109,21 +109,21 @@ public class JpaOAuthConsumerStoreReposi
@Rollback(true)
public void save_existing() {
final String UPDATED_SERVICE_NAME = "updated service name";
- JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID);
+ JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID.toString());
assertThat(oAuthConsumerStore.getServiceName(), is(not(UPDATED_SERVICE_NAME)));
oAuthConsumerStore.setServiceName(UPDATED_SERVICE_NAME);
repository.save(oAuthConsumerStore);
- assertThat(repository.get(VALID_ID).getServiceName(), is(UPDATED_SERVICE_NAME));
+ assertThat(repository.get(VALID_ID.toString()).getServiceName(), is(UPDATED_SERVICE_NAME));
}
@Test
@Transactional(readOnly=false)
@Rollback(true)
public void delete() {
- OAuthConsumerStore oAuthConsumerStore = repository.get(VALID_ID);
+ OAuthConsumerStore oAuthConsumerStore = repository.get(VALID_ID.toString());
assertThat(oAuthConsumerStore, is(notNullValue()));
repository.delete(oAuthConsumerStore);
- oAuthConsumerStore = repository.get(VALID_ID);
+ oAuthConsumerStore = repository.get(VALID_ID.toString());
assertThat(oAuthConsumerStore, is(nullValue()));
}
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepositoryTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepositoryTest.java Mon Oct 29 03:59:56 2012
@@ -67,7 +67,7 @@ public class JpaOAuthTokenInfoRepository
@Test
public void get() {
- JpaOAuthTokenInfo oAuthTokenInfo = (JpaOAuthTokenInfo) repository.get(VALID_ID);
+ JpaOAuthTokenInfo oAuthTokenInfo = (JpaOAuthTokenInfo) repository.get(VALID_ID.toString());
assertThat(oAuthTokenInfo.getEntityId(), is(VALID_ID));
assertThat(oAuthTokenInfo.getAppUrl(), is(APP_URL));
assertThat(oAuthTokenInfo.getTokenName(), is(TOKEN_NAME));
@@ -113,9 +113,9 @@ public class JpaOAuthTokenInfoRepository
assertThat(oAuthTokenInfo.getEntityId(), is(nullValue()));
repository.save(oAuthTokenInfo);
- long newId = oAuthTokenInfo.getEntityId();
+ Long newId = oAuthTokenInfo.getEntityId();
assertThat(newId > 0, is(true));
- JpaOAuthTokenInfo newOAuthTokenInfo = (JpaOAuthTokenInfo) repository.get(newId);
+ JpaOAuthTokenInfo newOAuthTokenInfo = (JpaOAuthTokenInfo) repository.get(newId.toString());
assertThat(newOAuthTokenInfo.getServiceName(), is(NEW_SERVICE_NAME));
assertThat(newOAuthTokenInfo.getAppUrl(), is(NEW_URL));
}
@@ -125,10 +125,10 @@ public class JpaOAuthTokenInfoRepository
@Rollback(true)
public void save_existing() {
final String UPDATED_SERVICE_NAME = "updated service name";
- OAuthTokenInfo oAuthTokenInfo = repository.get(VALID_ID);
+ OAuthTokenInfo oAuthTokenInfo = repository.get(VALID_ID.toString());
assertThat(oAuthTokenInfo.getServiceName(), is(not(UPDATED_SERVICE_NAME)));
oAuthTokenInfo.setServiceName(UPDATED_SERVICE_NAME);
repository.save(oAuthTokenInfo);
- assertThat(repository.get(VALID_ID).getServiceName(), is(UPDATED_SERVICE_NAME));
+ assertThat(repository.get(VALID_ID.toString()).getServiceName(), is(UPDATED_SERVICE_NAME));
}
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepositoryTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepositoryTest.java Mon Oct 29 03:59:56 2012
@@ -61,7 +61,7 @@ public class JpaPageLayoutRepositoryTest
@Test
public void get() {
- JpaPageLayout p = (JpaPageLayout) repository.get(VALID_ID);
+ JpaPageLayout p = (JpaPageLayout) repository.get(VALID_ID.toString());
assertThat(p.getEntityId(), is(VALID_ID));
assertThat(p.getCode(), is(VALID_LAYOUT_CODE));
}
@@ -124,9 +124,9 @@ public class JpaPageLayoutRepositoryTest
assertThat(pageLayout.getEntityId(), is(nullValue()));
repository.save(pageLayout);
- long newId = pageLayout.getEntityId();
+ Long newId = pageLayout.getEntityId();
assertThat(newId > 0, is(true));
- PageLayout newLayout = repository.get(newId);
+ PageLayout newLayout = repository.get(newId.toString());
assertThat(newLayout.getCode(), is(newCode));
assertThat(newLayout.getRenderSequence(), is(newRenderSeq));
assertThat(newLayout.getNumberOfRegions(), is(newNumRegions));
@@ -138,11 +138,11 @@ public class JpaPageLayoutRepositoryTest
@Rollback(true)
public void save_existing() {
final String UPDATED_CODE = "updated code";
- PageLayout pageLayout = repository.get(VALID_ID);
+ PageLayout pageLayout = repository.get(VALID_ID.toString());
assertThat(pageLayout.getCode(), is(not(UPDATED_CODE)));
pageLayout.setCode(UPDATED_CODE);
repository.save(pageLayout);
- PageLayout updatedPageLayout = repository.get(VALID_ID);
+ PageLayout updatedPageLayout = repository.get(VALID_ID.toString());
assertThat(updatedPageLayout.getCode(), is(UPDATED_CODE));
}
@@ -150,10 +150,10 @@ public class JpaPageLayoutRepositoryTest
@Transactional(readOnly = false)
@Rollback(true)
public void delete() {
- PageLayout pl = repository.get(VALID_ID);
+ PageLayout pl = repository.get(VALID_ID.toString());
assertThat(pl, is(notNullValue()));
repository.delete(pl);
- pl = repository.get(VALID_ID);
+ pl = repository.get(VALID_ID.toString());
assertThat(pl, is(nullValue()));
}
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java Mon Oct 29 03:59:56 2012
@@ -23,6 +23,7 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.PageTemplateRepository;
import org.apache.rave.portal.repository.UserRepository;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,13 +46,13 @@ import static org.junit.Assert.*;
@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"})
public class JpaPageRepositoryTest {
- private static final Long USER_ID = 1L;
- private static final Long CREATED_USER_ID = 6L;
- private static final Long INVALID_USER = -1L;
+ private static final String USER_ID = "1";
+ private static final String CREATED_USER_ID = "6";
+ private static final String INVALID_USER = "-1";
private static final String WIDGET_URL = "http://www.widget-dico.com/wikipedia/google/wikipedia.xml";
- private static final Long USER_PAGE_ID = 1L;
- private static final Long PERSON_PROFILE_PAGE_ID = 3L;
- private static final Long SUB_PAGE_ID = 4L;
+ private static final String USER_PAGE_ID = "1";
+ private static final String PERSON_PROFILE_PAGE_ID = "3";
+ private static final String SUB_PAGE_ID = "4";
private static final Long VALID_PARENT_PAGE_ID = 3L;
private static final Long INVALID_PARENT_PAGE_ID = -1L;
@@ -68,6 +69,9 @@ public class JpaPageRepositoryTest {
@Autowired
private PageTemplateRepository pageTemplateRepository;
+ @Autowired
+ private WidgetRepository widgetRepository;
+
private JpaUser user;
private PageTemplate defaultPageTemplate;
@@ -84,7 +88,9 @@ public class JpaPageRepositoryTest {
assertThat(pages.size(), equalTo(2));
assertThat(pages.get(0).getRegions().size(), equalTo(2));
assertThat(pages.get(0).getRegions().get(0).getRegionWidgets().size(), equalTo(2));
- assertThat(pages.get(0).getRegions().get(0).getRegionWidgets().get(0).getWidget().getUrl(), equalTo(WIDGET_URL));
+ Widget widget = widgetRepository.get(pages.get(0).getRegions().get(0).getRegionWidgets().get(0).getWidgetId());
+ assertThat(widget, is(notNullValue()));
+ assertThat(widget.getUrl(), equalTo(WIDGET_URL));
List<PageUser> pageUserPages = repository.getPagesForUser(USER_ID, PageType.USER);
// test that the query returns the pages in proper render sequence order
@@ -119,7 +125,7 @@ public class JpaPageRepositoryTest {
assertThat(pages, is(notNullValue()));
assertThat(pages.size(), is(2));
assertThat(pages.get(0).getRegions().size(), is(1));
- assertThat(pages.get(0).getParentPage().getId(), is(3L));
+ assertThat(pages.get(0).getParentPage().getId(), is("3"));
List<PageUser> pageUserPages = repository.getPagesForUser(USER_ID, PageType.SUB_PAGE);
// test that the query returns the pages in proper render sequence order
@@ -171,7 +177,7 @@ public class JpaPageRepositoryTest {
Long lastRenderSequence = -1L;
PageUser pageUser;
for (Page subPage : p.getSubPages()) {
- pageUser = repository.getSingleRecord(p.getOwner().getId(), subPage.getId());
+ pageUser = repository.getSingleRecord(p.getOwnerId(), subPage.getId());
Long currentRenderSequence = pageUser.getRenderSequence();
assertThat(currentRenderSequence > lastRenderSequence, is(true));
lastRenderSequence = currentRenderSequence;
@@ -191,7 +197,7 @@ public class JpaPageRepositoryTest {
@Test
public void getById_invalid() {
- Page p = repository.get(-1L);
+ Page p = repository.get("-1");
assertThat(p, is(nullValue()));
}
@@ -214,7 +220,7 @@ public class JpaPageRepositoryTest {
Page p = repository.get(PERSON_PROFILE_PAGE_ID);
assertThat(p, is(notNullValue()));
// grab all the sub page ids
- List<Long> subPageIds = new ArrayList<Long>();
+ List<String> subPageIds = new ArrayList<String>();
assertThat(p.getSubPages().isEmpty(), is(false));
for (Page subPage : p.getSubPages()) {
subPageIds.add(subPage.getId());
@@ -224,7 +230,7 @@ public class JpaPageRepositoryTest {
p = repository.get(PERSON_PROFILE_PAGE_ID);
// verify page is deleted along with all sub pages
assertThat(p, is(nullValue()));
- for (Long i : subPageIds){
+ for (String i : subPageIds){
assertThat(repository.get(i), is(nullValue()));
}
}
@@ -247,7 +253,7 @@ public class JpaPageRepositoryTest {
@Rollback(true)
public void createPageForUser_validUser(){
Page page = repository.createPageForUser(user, defaultPageTemplate);
- assertSame(user, page.getOwner());
+ assertEquals(user.getId(), page.getOwnerId());
assertEquals(page.getName(), defaultPageTemplate.getName());
assertNull(page.getParentPage());
assertEquals(2, page.getSubPages().size());
@@ -273,8 +279,8 @@ public class JpaPageRepositoryTest {
assertEquals(defaultPageTemplate.getSubPageTemplates().get(0).getName(), subPage1.getName());
assertEquals(PageType.SUB_PAGE, subPage2.getPageType());
assertEquals(defaultPageTemplate.getSubPageTemplates().get(1).getName(), subPage2.getName());
- assertSame(user, subPage1.getOwner());
- assertSame(user, subPage2.getOwner());
+ assertEquals(user.getId(), subPage1.getOwnerId());
+ assertEquals(user.getId(), subPage2.getOwnerId());
}
@Test