Author: carlucci
Date: Wed Jun 27 20:37:31 2012
New Revision: 1354713
URL: http://svn.apache.org/viewvc?rev=1354713&view=rev
Log:
improved unit test coverage of org.apache.rave.portal.repository.impl package
in rave-jpa module
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java?rev=1354713&r1=1354712&r2=1354713&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
Wed Jun 27 20:37:31 2012
@@ -31,6 +31,12 @@ public class WidgetCommentImpl implement
private Date lastModifiedDate;
private Date createdDate;
+ public WidgetCommentImpl() {}
+
+ public WidgetCommentImpl(Long id) {
+ this.id = id;
+ }
+
@Override
public Long getId() {
return id;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1354713&r1=1354712&r2=1354713&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
Wed Jun 27 20:37:31 2012
@@ -63,7 +63,7 @@ public class JpaPageRepository implement
@Override
public void delete(Page item) {
JpaPage jpaPage = item instanceof JpaPage ? (JpaPage)item :
(JpaPage)get(item.getId());
- for(Page p : item.getSubPages()) {
+ for(Page p : jpaPage.getSubPages()) {
delete(p);
}
//Must remove the page users from the page in order for OpenJpa to
persist change
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=1354713&r1=1354712&r2=1354713&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
Wed Jun 27 20:37:31 2012
@@ -256,17 +256,21 @@ public class JpaWidgetRepository impleme
@Override
public List<Widget> getWidgetsByTag(String tagKeyword, int offset, int
pageSize) {
- if (tagKeyword!=null) tagKeyword =tagKeyword.toLowerCase();
+ if (tagKeyword != null) {
+ tagKeyword = tagKeyword.toLowerCase();
+ }
TypedQuery<JpaWidget> query =
manager.createNamedQuery(JpaWidget.WIDGET_GET_BY_TAG, JpaWidget.class);
- query.setParameter(JpaWidget.PARAM_TAG, tagKeyword.toLowerCase());
+ query.setParameter(JpaWidget.PARAM_TAG, tagKeyword);
return
CollectionUtils.<Widget>toBaseTypedList(getPagedResultList(query, offset,
pageSize));
}
@Override
public int getCountByTag(String tagKeyword) {
- if (tagKeyword!=null) tagKeyword =tagKeyword.toLowerCase();
+ if (tagKeyword != null) {
+ tagKeyword = tagKeyword.toLowerCase();
+ }
Query query = manager.createNamedQuery(JpaWidget.WIDGET_COUNT_BY_TAG);
- query.setParameter(JpaWidget.PARAM_TAG,tagKeyword);
+ query.setParameter(JpaWidget.PARAM_TAG, tagKeyword);
Number countResult = (Number) query.getSingleResult();
return countResult.intValue();
}
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=1354713&r1=1354712&r2=1354713&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
Wed Jun 27 20:37:31 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.PageTemplateRepository;
import org.apache.rave.portal.repository.UserRepository;
@@ -33,6 +34,7 @@ import org.springframework.transaction.a
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import java.util.ArrayList;
import java.util.List;
import static org.hamcrest.CoreMatchers.*;
@@ -206,6 +208,41 @@ public class JpaPageRepositoryTest {
}
@Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void deletePage_pageWithSubPage() {
+ Page p = repository.get(PERSON_PROFILE_PAGE_ID);
+ assertThat(p, is(notNullValue()));
+ // grab all the sub page ids
+ List<Long> subPageIds = new ArrayList<Long>();
+ assertThat(p.getSubPages().isEmpty(), is(false));
+ for (Page subPage : p.getSubPages()) {
+ subPageIds.add(subPage.getId());
+ }
+
+ repository.delete(p);
+ p = repository.get(PERSON_PROFILE_PAGE_ID);
+ // verify page is deleted along with all sub pages
+ assertThat(p, is(nullValue()));
+ for (Long i : subPageIds){
+ assertThat(repository.get(i), is(nullValue()));
+ }
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void deletePage_implObject() {
+ Page p = repository.get(USER_ID);
+ assertThat(p, is(notNullValue()));
+ PageImpl impl = new PageImpl(p.getId());
+
+ repository.delete(impl);
+ p = repository.get(USER_ID);
+ assertThat(p, is(nullValue()));
+ }
+
+ @Test
@Transactional(readOnly = false)
@Rollback(true)
public void createPageForUser_validUser(){
@@ -249,4 +286,9 @@ public class JpaPageRepositoryTest {
public void hasPersonPage_false(){
assertFalse(repository.hasPersonPage(CREATED_USER_ID));
}
+
+ @Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaPage.class);
+ }
}
\ No newline at end of file
Modified:
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java?rev=1354713&r1=1354712&r2=1354713&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
Wed Jun 27 20:37:31 2012
@@ -23,7 +23,9 @@ import org.apache.rave.portal.model.JpaR
import org.apache.rave.portal.model.JpaRegionWidget;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.repository.RegionRepository;
+import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +39,7 @@ import javax.persistence.PersistenceCont
import java.util.ArrayList;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
@Transactional
@RunWith(SpringJUnit4ClassRunner.class)
@@ -91,6 +93,7 @@ public class JpaRegionRepositoryTest {
}
@Test
+ @Rollback(true)
public void save_cascadePersist() {
JpaRegion region = new JpaRegion();
region.setRegionWidgets(new ArrayList<RegionWidget>());
@@ -108,6 +111,7 @@ public class JpaRegionRepositoryTest {
}
@Test
+ @Rollback(true)
public void save_cascadeMerge() {
JpaRegion region = new JpaRegion();
@@ -128,6 +132,7 @@ public class JpaRegionRepositoryTest {
}
@Test
+ @Rollback(true)
public void save_cascadeOrphan() {
JpaRegion region = (JpaRegion)repository.get(1L);
long id = region.getRegionWidgets().get(0).getId();
@@ -141,4 +146,29 @@ public class JpaRegionRepositoryTest {
assertThat(widget, is(nullValue()));
}
+ @Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaRegion.class);
+ }
+
+ @Test
+ @Rollback(true)
+ public void delete_jpaObject() {
+ Region r = repository.get(REGION_ID);
+ assertThat(r, is(notNullValue()));
+ repository.delete(r);
+ r = repository.get(REGION_ID);
+ assertThat(r, is(nullValue()));
+ }
+
+ @Test
+ @Rollback(true)
+ public void delete_implObject() {
+ Region r = repository.get(REGION_ID);
+ assertThat(r, is(notNullValue()));
+ RegionImpl impl = new RegionImpl(r.getId());
+ repository.delete(impl);
+ r = repository.get(REGION_ID);
+ assertThat(r, is(nullValue()));
+ }
}
Modified:
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java?rev=1354713&r1=1354712&r2=1354713&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
Wed Jun 27 20:37:31 2012
@@ -19,6 +19,11 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.portal.model.JpaWidgetComment;
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.WidgetComment;
+import org.apache.rave.portal.model.impl.UserImpl;
+import org.apache.rave.portal.model.impl.WidgetCommentImpl;
import org.apache.rave.portal.repository.WidgetCommentRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,7 +36,10 @@ import org.springframework.transaction.a
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import java.util.Date;
+
import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
/**
@@ -41,8 +49,10 @@ import static org.junit.Assert.*;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:test-dataContext.xml",
"classpath:test-applicationContext.xml"})
public class JpaWidgetCommentRepositoryTest {
- private Long VALID_USER_ID = 1L;
-
+ private final Long VALID_USER_ID = 1L;
+ private final Long VALID_WIDGET_COMMENT_ID = 2L;
+ private final Long VALID_WIDGET_ID = 4L;
+
@PersistenceContext
private EntityManager sharedManager;
@@ -55,4 +65,73 @@ public class JpaWidgetCommentRepositoryT
public void deleteAll() {
assertThat(repository.deleteAll(VALID_USER_ID), is(2));
}
+
+ @Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaWidgetComment.class);
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_new() {
+ Date createdDate = new Date();
+ Date lastModDate = new Date();
+ String text = "my comment";
+ User user = new UserImpl(VALID_USER_ID);
+
+ WidgetComment wc = new JpaWidgetComment();
+ wc.setCreatedDate(createdDate);
+ wc.setWidgetId(VALID_WIDGET_ID);
+ wc.setLastModifiedDate(lastModDate);
+ wc.setText(text);
+ wc.setUser(user);
+ assertThat(wc.getId(), is(nullValue()));
+ repository.save(wc);
+ long newId = wc.getId();
+ assertThat(newId > 0, is(true));
+ WidgetComment newComment = repository.get(newId);
+ assertThat(newComment.getWidgetId(), is(VALID_WIDGET_ID));
+ assertThat(newComment.getUser().getId(), is(VALID_USER_ID));
+ assertThat(newComment.getText(), is(text));
+ assertThat(newComment.getCreatedDate(), is(createdDate));
+ assertThat(newComment.getLastModifiedDate(), is(lastModDate));
+ }
+
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_existing() {
+ final String UPDATED_TEXT = "updated comment";
+ WidgetComment widgetComment = repository.get(VALID_WIDGET_COMMENT_ID);
+ assertThat(widgetComment.getText(), is(not(UPDATED_TEXT)));
+ widgetComment.setText(UPDATED_TEXT);
+ repository.save(widgetComment);
+ WidgetComment updatedComment = repository.get(VALID_WIDGET_COMMENT_ID);
+ assertThat(updatedComment.getText(), is(UPDATED_TEXT));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete_jpaObject() {
+ WidgetComment wc = repository.get(VALID_WIDGET_COMMENT_ID);
+ assertThat(wc, is(notNullValue()));
+ repository.delete(wc);
+ wc = repository.get(VALID_WIDGET_COMMENT_ID);
+ assertThat(wc, is(nullValue()));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete_implObject() {
+ WidgetComment wc = repository.get(VALID_WIDGET_COMMENT_ID);
+ assertThat(wc, is(notNullValue()));
+ WidgetComment impl = new WidgetCommentImpl(wc.getId());
+ repository.delete(impl);
+ wc = repository.get(VALID_WIDGET_COMMENT_ID);
+ assertThat(wc, is(nullValue()));
+ }
}
\ No newline at end of file
Modified:
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java?rev=1354713&r1=1354712&r2=1354713&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
Wed Jun 27 20:37:31 2012
@@ -19,7 +19,9 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.portal.model.JpaPage;
import org.apache.rave.portal.model.JpaWidgetRating;
+import org.apache.rave.portal.model.WidgetRating;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +50,7 @@ public class JpaWidgetRatingRepositoryTe
private Long INVALID_WIDGET_ID = 123L;
private Long INVALID_USER_ID = 234L;
-
+
@PersistenceContext
private EntityManager sharedManager;
@@ -71,4 +73,53 @@ public class JpaWidgetRatingRepositoryTe
public void deleteAll() {
assertThat(repository.deleteAll(VALID_USER_ID), is(2));
}
+
+ @Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaWidgetRating.class);
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete() {
+ WidgetRating wr = repository.get(VALID_WIDGET_RATING_ID);
+ assertThat(wr, is(notNullValue()));
+ repository.delete(wr);
+ wr = repository.get(VALID_WIDGET_RATING_ID);
+ assertThat(wr, is(nullValue()));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_new() {
+ final int EXPECTED_SCORE = 1;
+
+ WidgetRating wr = new JpaWidgetRating();
+ wr.setScore(EXPECTED_SCORE);
+ wr.setUserId(VALID_USER_ID);
+ wr.setWidgetId(VALID_WIDGET_ID);
+ assertThat(wr.getId(), is(nullValue()));
+ repository.save(wr);
+ long newId = wr.getId();
+ assertThat(newId > 0, is(true));
+ WidgetRating newRating = repository.get(newId);
+ assertThat(newRating.getScore(), is(EXPECTED_SCORE));
+ assertThat(newRating.getUserId(), is(VALID_USER_ID));
+ assertThat(newRating.getWidgetId(), is(VALID_WIDGET_ID));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_existing() {
+ int EXPECTED_SCORE = 99;
+ WidgetRating wr = repository.get(VALID_WIDGET_RATING_ID);
+ assertThat(wr.getScore(), is(not(EXPECTED_SCORE)));
+ wr.setScore(99);
+ repository.save(wr);
+ WidgetRating updatedRating = repository.get(VALID_WIDGET_RATING_ID);
+ assertThat(updatedRating.getScore(), is(EXPECTED_SCORE));
+ }
}
Modified:
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java?rev=1354713&r1=1354712&r2=1354713&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
Wed Jun 27 20:37:31 2012
@@ -39,10 +39,8 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import static junit.framework.Assert.*;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
/**
* Test class for {@link
org.apache.rave.portal.repository.impl.JpaWidgetRepository}
@@ -61,6 +59,11 @@ public class JpaWidgetRepositoryTest {
private WidgetRepository repository;
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaWidget.class);
+ }
+
+ @Test
public void getById_valid() {
JpaWidget widget = (JpaWidget)repository.get(1L);
assertThat(widget, is(notNullValue()));
@@ -96,6 +99,8 @@ public class JpaWidgetRepositoryTest {
public void getByFreeTextSearch() {
List<Widget> widgets = repository.getByFreeTextSearch("gAdGet", 1, 1);
assertEquals(1, widgets.size());
+
+ assertThat(repository.getByFreeTextSearch("", 1, 1).isEmpty(),
is(true));
}
@Test
@@ -163,6 +168,10 @@ public class JpaWidgetRepositoryTest {
List<Widget> preview =
repository.getByStatusAndTypeAndFreeTextSearch(WidgetStatus.PREVIEW, type,
searchTerm, 0, 1);
assertEquals(0, preview.size());
+
+
assertThat(repository.getByStatusAndTypeAndFreeTextSearch(WidgetStatus.PREVIEW,
type, "", 0, 1).size(), is(1));
+
assertThat(repository.getByStatusAndTypeAndFreeTextSearch(WidgetStatus.PUBLISHED,
"", searchTerm, 0, 1).size(), is(1));
+ assertThat(repository.getByStatusAndTypeAndFreeTextSearch(null, type,
searchTerm, 0, 1).size(), is(1));
}
@Test
@@ -217,7 +226,7 @@ public class JpaWidgetRepositoryTest {
WidgetStatistics gadgetTwo = widgetStatistics.get(2L);
assertEquals(1, gadgetTwo.getTotalLike());
- assertEquals(0, gadgetTwo.getTotalDislike());
+ assertEquals(1, gadgetTwo.getTotalDislike());
assertEquals(10, gadgetTwo.getUserRating());
assertEquals(10, gadgetOne.getTotalUserCount());
}
@@ -266,12 +275,12 @@ public class JpaWidgetRepositoryTest {
Widget widget = repository.get(2L);
List<WidgetRating> ratings = widget.getRatings();
assertNotNull(ratings);
- assertEquals(1, ratings.size());
+ assertEquals(2, ratings.size());
WidgetStatistics widgetStatistics =
repository.getWidgetStatistics(widget.getId(), 1L);
assertNotNull(widgetStatistics);
assertEquals(1, widgetStatistics.getTotalLike());
- assertEquals(0, widgetStatistics.getTotalDislike());
+ assertEquals(1, widgetStatistics.getTotalDislike());
assertEquals(10, widgetStatistics.getTotalUserCount());
assertEquals(JpaWidgetRating.LIKE.intValue(),
widgetStatistics.getUserRating());
}
@@ -365,7 +374,7 @@ public class JpaWidgetRepositoryTest {
@Test
public void getWidgetsByTag() {
- String tag = "news";
+ String tag = "news";
List<Widget> widgets = repository.getWidgetsByTag(tag, 0, 10);
assertTrue(widgets.size() == 1);
assertTrue(widgets.iterator().next().getId() == 3);
@@ -386,6 +395,12 @@ public class JpaWidgetRepositoryTest {
assertTrue(widgets.size() == 1);
assertTrue(widgets.iterator().next().getId() == 3);
assertTrue(repository.getCountByTag("NEWS") == 1);
+
+ tag = null;
+ widgets = repository.getWidgetsByTag(tag, 0, 10);
+ assertTrue(widgets.isEmpty());
+ assertTrue(repository.getCountByTag(tag) == 0);
+
}
@Test
@@ -457,4 +472,16 @@ public class JpaWidgetRepositoryTest {
sharedManager.refresh(widget);
assertThat(widget.getOwner(), is(nullValue()));
}
+
+ @Test
+ @Transactional(readOnly = false)
+ @Rollback
+ public void delete() {
+ final long WIDGET_ID = 2L;
+
+ Widget widget = repository.get(WIDGET_ID);
+ assertThat(widget, is(notNullValue()));
+ repository.delete(widget);
+ assertThat(repository.get(WIDGET_ID), is(nullValue()));
+ }
}
Modified:
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java?rev=1354713&r1=1354712&r2=1354713&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
Wed Jun 27 20:37:31 2012
@@ -77,7 +77,14 @@ public class JpaWidgetTagRepositoryTest
JpaWidgetTag jpaWidgetTag =
(JpaWidgetTag)repository.getByWidgetIdAndTag(widgetId, keyword);
assertNull(jpaWidgetTag);
}
-
+
+ @Test
+ public void getByWidgetIdAndTag_null(){
+ Long widgetId = 3L;
+ JpaWidgetTag jpaWidgetTag =
(JpaWidgetTag)repository.getByWidgetIdAndTag(widgetId, null);
+ assertNull(jpaWidgetTag);
+ }
+
@Test
public void get_valid(){
Long id = 1L;
@@ -85,7 +92,7 @@ public class JpaWidgetTagRepositoryTest
assertNotNull(widgetTag);
assertEquals(id, widgetTag.getEntityId());
}
-
+
@Test
public void get_invalid(){
Long id = 1000291L;
@@ -94,7 +101,6 @@ public class JpaWidgetTagRepositoryTest
}
@Test
- @Transactional
@Rollback(true)
public void save() {
WidgetTag widgetTag = new JpaWidgetTag();
@@ -113,16 +119,14 @@ public class JpaWidgetTagRepositoryTest
}
@Test(expected = NullPointerException.class)
- @Transactional
@Rollback(true)
public void save_null() {
WidgetTag widgetTag = null;
JpaWidgetTag jpaWidgetTag = (JpaWidgetTag)repository.save(widgetTag);
assertNull(jpaWidgetTag);
}
-
+
@Test
- @Transactional
@Rollback(true)
public void delete_valid(){
Long id = 1L;
@@ -133,7 +137,6 @@ public class JpaWidgetTagRepositoryTest
}
@Test
- @Transactional
@Rollback(true)
public void delete_jpaWidgetTag_valid(){
Long id = 1L;
@@ -144,7 +147,6 @@ public class JpaWidgetTagRepositoryTest
}
@Test(expected = NullPointerException.class)
- @Transactional
@Rollback(true)
public void delete_invalid(){
Long id = 17827873261L;
@@ -153,4 +155,9 @@ public class JpaWidgetTagRepositoryTest
repository.delete(widgetTag);
assertNull(repository.get(id));
}
+
+ @Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaWidgetTag.class);
+ }
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql?rev=1354713&r1=1354712&r2=1354713&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
(original)
+++ rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql Wed
Jun 27 20:37:31 2012
@@ -355,6 +355,11 @@ INSERT INTO widget_rating(entity_id, wid
values (@next_widget_rating, 2, 1, 10);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@widget_rating_seq;
+set @next_widget_rating = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE
seq_name = @widget_rating_seq);
+INSERT INTO widget_rating(entity_id, widget_id, user_id, score)
+values (@next_widget_rating, 2, 2, 0);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@widget_rating_seq;
+
set @page_2_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name =
@page_seq);
INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id,
page_type)
values (@page_2_id, 'Social', @user_id_1, null, @two_col_id, 'USER');
