You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/06/28 01:31:58 UTC
svn commit: r1354775 - in /rave/trunk/rave-components/rave-jpa/src/test:
java/org/apache/rave/portal/repository/impl/ resources/
Author: carlucci
Date: Wed Jun 27 23:31:55 2012
New Revision: 1354775
URL: http://svn.apache.org/viewvc?rev=1354775&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-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
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=1354775&r1=1354774&r2=1354775&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 Wed Jun 27 23:31:55 2012
@@ -25,6 +25,7 @@ import org.apache.rave.portal.repository
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +34,9 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import static junit.framework.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
/**
* Test for {@link org.apache.rave.portal.repository.impl.JpaOAuthConsumerStoreRepository}
@@ -42,6 +46,7 @@ import static junit.framework.Assert.*;
@ContextConfiguration(locations = {"classpath:test-applicationContext.xml",
"classpath:test-dataContext.xml"})
public class JpaOAuthConsumerStoreRepositoryTest {
+ private static final Long VALID_ID = 1L;
private static final String GADGET_URI = "http://localhost:8080/samplecontainer/examples/oauth.xml";
private static final String SERVICE_NAME_GOOGLE = "Google";
private static final String SERVICE_NAME_FOO = "Foo";
@@ -54,6 +59,19 @@ public class JpaOAuthConsumerStoreReposi
OAuthConsumerStoreRepository repository;
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaOAuthConsumerStore.class);
+ }
+
+ @Test
+ public void get() {
+ JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID);
+ assertThat(oAuthConsumerStore.getEntityId(), is(VALID_ID));
+ assertThat(oAuthConsumerStore.getGadgetUri(), is(GADGET_URI));
+ assertThat(oAuthConsumerStore.getServiceName(), is(SERVICE_NAME_GOOGLE));
+ }
+
+ @Test
public void testFindByUriAndServiceName() throws Exception {
final OAuthConsumerStore store = repository.findByUriAndServiceName(GADGET_URI, SERVICE_NAME_GOOGLE);
assertNotNull("OAuthConsumerStore In test db", store);
@@ -66,4 +84,46 @@ public class JpaOAuthConsumerStoreReposi
final OAuthConsumerStore store = repository.findByUriAndServiceName(GADGET_URI, SERVICE_NAME_FOO);
assertNull(store);
}
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_new() {
+ final String NEW_URL = "testurl";
+ final String NEW_SERVICE_NAME = "testservice";
+ JpaOAuthConsumerStore oAuthConsumerStore = new JpaOAuthConsumerStore();
+ oAuthConsumerStore.setCallbackUrl(NEW_URL);
+ oAuthConsumerStore.setServiceName(NEW_SERVICE_NAME);
+
+ assertThat(oAuthConsumerStore.getEntityId(), is(nullValue()));
+ repository.save(oAuthConsumerStore);
+ long newId = oAuthConsumerStore.getEntityId();
+ assertThat(newId > 0, is(true));
+ JpaOAuthConsumerStore newOAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(newId);
+ assertThat(newOAuthConsumerStore.getServiceName(), is(NEW_SERVICE_NAME));
+ assertThat(newOAuthConsumerStore.getCallbackUrl(), is(NEW_URL));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_existing() {
+ final String UPDATED_SERVICE_NAME = "updated service name";
+ JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID);
+ 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));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete() {
+ OAuthConsumerStore oAuthConsumerStore = repository.get(VALID_ID);
+ assertThat(oAuthConsumerStore, is(notNullValue()));
+ repository.delete(oAuthConsumerStore);
+ oAuthConsumerStore = repository.get(VALID_ID);
+ 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=1354775&r1=1354774&r2=1354775&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 Wed Jun 27 23:31:55 2012
@@ -20,7 +20,9 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.JpaOAuthTokenInfo;
+import org.apache.rave.portal.model.JpaPerson;
import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.portal.model.Person;
import org.apache.rave.portal.repository.OAuthTokenInfoRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,6 +36,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
/**
* Test class for {@link org.apache.rave.portal.repository.impl.JpaOAuthTokenInfoRepository}
@@ -44,6 +47,7 @@ import static org.junit.Assert.*;
"classpath:test-dataContext.xml"})
public class JpaOAuthTokenInfoRepositoryTest {
+ private static final Long VALID_ID = 1L;
private static final String INVALID_USER = "Invalid user";
private static final String VALID_USER = "john.doe";
private static final String APP_URL = "http://localhost:8080/samplecontainer/examples/oauth.xml";
@@ -57,6 +61,20 @@ public class JpaOAuthTokenInfoRepository
OAuthTokenInfoRepository repository;
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaOAuthTokenInfo.class);
+ }
+
+ @Test
+ public void get() {
+ JpaOAuthTokenInfo oAuthTokenInfo = (JpaOAuthTokenInfo) repository.get(VALID_ID);
+ assertThat(oAuthTokenInfo.getEntityId(), is(VALID_ID));
+ assertThat(oAuthTokenInfo.getAppUrl(), is(APP_URL));
+ assertThat(oAuthTokenInfo.getTokenName(), is(TOKEN_NAME));
+ assertThat(oAuthTokenInfo.getServiceName(), is(SERVICE_NAME));
+ }
+
+ @Test
public void testFindOAuthTokenInfo() throws Exception {
OAuthTokenInfo tokenInfo = repository.findOAuthTokenInfo(VALID_USER,
APP_URL, JpaOAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
@@ -83,4 +101,34 @@ public class JpaOAuthTokenInfoRepository
assertNull(tokenInfo);
}
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_new() {
+ final String NEW_URL = "testurl";
+ final String NEW_SERVICE_NAME = "testservice";
+ JpaOAuthTokenInfo oAuthTokenInfo = new JpaOAuthTokenInfo();
+ oAuthTokenInfo.setAppUrl(NEW_URL);
+ oAuthTokenInfo.setServiceName(NEW_SERVICE_NAME);
+
+ assertThat(oAuthTokenInfo.getEntityId(), is(nullValue()));
+ repository.save(oAuthTokenInfo);
+ long newId = oAuthTokenInfo.getEntityId();
+ assertThat(newId > 0, is(true));
+ JpaOAuthTokenInfo newOAuthTokenInfo = (JpaOAuthTokenInfo) repository.get(newId);
+ assertThat(newOAuthTokenInfo.getServiceName(), is(NEW_SERVICE_NAME));
+ assertThat(newOAuthTokenInfo.getAppUrl(), is(NEW_URL));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_existing() {
+ final String UPDATED_SERVICE_NAME = "updated service name";
+ OAuthTokenInfo oAuthTokenInfo = repository.get(VALID_ID);
+ 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));
+ }
}
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=1354775&r1=1354774&r2=1354775&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 Wed Jun 27 23:31:55 2012
@@ -20,10 +20,12 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.JpaPageLayout;
import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +35,8 @@ import javax.persistence.PersistenceCont
import java.util.List;
import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@Transactional
@@ -40,6 +44,7 @@ import static org.junit.Assert.assertTha
@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"})
public class JpaPageLayoutRepositoryTest {
+ private static final Long VALID_ID = 2L;
private static final String VALID_LAYOUT_CODE = "columns_2";
private static final String INVALID_LAYOUT_CODE = "invalid_layout";
@@ -47,13 +52,25 @@ public class JpaPageLayoutRepositoryTest
private EntityManager manager;
@Autowired
- private PageLayoutRepository repository;
+ private PageLayoutRepository repository;
+
+ @Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaPageLayout.class);
+ }
+
+ @Test
+ public void get() {
+ JpaPageLayout p = (JpaPageLayout) repository.get(VALID_ID);
+ assertThat(p.getEntityId(), is(VALID_ID));
+ assertThat(p.getCode(), is(VALID_LAYOUT_CODE));
+ }
@Test
public void getAll() {
List<PageLayout> pageLayouts = repository.getAll();
assertThat(pageLayouts.size(), is(8));
-
+
// test that the query returns the pages in proper render sequence order
Long lastRenderSequence = -1L;
for (PageLayout pl : pageLayouts) {
@@ -75,8 +92,8 @@ public class JpaPageLayoutRepositoryTest
lastRenderSequence = currentRenderSequence;
assertThat(pl.isUserSelectable(), is(true));
}
- }
-
+ }
+
@Test
public void getByPageLayoutCode() {
JpaPageLayout pageLayout = (JpaPageLayout)repository.getByPageLayoutCode(VALID_LAYOUT_CODE);
@@ -88,5 +105,55 @@ public class JpaPageLayoutRepositoryTest
@Test
public void getByPageLayoutCode_invalidCode() {
assertThat((JpaPageLayout)repository.getByPageLayoutCode(INVALID_LAYOUT_CODE), is(nullValue(JpaPageLayout.class)));
- }
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_new() {
+ final Long newNumRegions = 3L;
+ final String newCode = "new_code";
+ final Long newRenderSeq = 22L;
+ final boolean newUserSelectable = true;
+
+ JpaPageLayout pageLayout = new JpaPageLayout();
+ pageLayout.setNumberOfRegions(newNumRegions);
+ pageLayout.setCode(newCode);
+ pageLayout.setRenderSequence(newRenderSeq);
+ pageLayout.setUserSelectable(newUserSelectable);
+
+ assertThat(pageLayout.getEntityId(), is(nullValue()));
+ repository.save(pageLayout);
+ long newId = pageLayout.getEntityId();
+ assertThat(newId > 0, is(true));
+ PageLayout newLayout = repository.get(newId);
+ assertThat(newLayout.getCode(), is(newCode));
+ assertThat(newLayout.getRenderSequence(), is(newRenderSeq));
+ assertThat(newLayout.getNumberOfRegions(), is(newNumRegions));
+ assertThat(newLayout.isUserSelectable(), is(newUserSelectable));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_existing() {
+ final String UPDATED_CODE = "updated code";
+ PageLayout pageLayout = repository.get(VALID_ID);
+ assertThat(pageLayout.getCode(), is(not(UPDATED_CODE)));
+ pageLayout.setCode(UPDATED_CODE);
+ repository.save(pageLayout);
+ PageLayout updatedPageLayout = repository.get(VALID_ID);
+ assertThat(updatedPageLayout.getCode(), is(UPDATED_CODE));
+ }
+
+ @Test
+ @Transactional(readOnly = false)
+ @Rollback(true)
+ public void delete() {
+ PageLayout pl = repository.get(VALID_ID);
+ assertThat(pl, is(notNullValue()));
+ repository.delete(pl);
+ pl = repository.get(VALID_ID);
+ assertThat(pl, is(nullValue()));
+ }
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java?rev=1354775&r1=1354774&r2=1354775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java Wed Jun 27 23:31:55 2012
@@ -19,19 +19,28 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
+import org.apache.rave.portal.model.JpaPerson;
+import org.apache.rave.portal.model.JpaWidgetComment;
import org.apache.rave.portal.model.Person;
+import org.apache.rave.portal.model.WidgetComment;
+import org.apache.rave.portal.model.impl.PersonImpl;
import org.apache.rave.portal.repository.PersonRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.util.List;
import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@RunWith(SpringJUnit4ClassRunner.class)
@@ -39,6 +48,7 @@ import static org.junit.Assert.assertTha
"classpath:test-dataContext.xml"})
public class JpaPersonRepositoryTest {
+ private static final Long VALID_ID = 1L;
private static final String VALID_USER = "canonical";
private static final String VALID_USER2 = "john.doe";
private static final String VALID_USER3 = "jane.doe";
@@ -54,6 +64,18 @@ public class JpaPersonRepositoryTest {
private PersonRepository repository;
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaPerson.class);
+ }
+
+ @Test
+ public void get() {
+ JpaPerson p = (JpaPerson) repository.get(VALID_ID);
+ assertThat(p.getEntityId(), is(VALID_ID));
+ assertThat(p.getUsername(), is(VALID_USER));
+ }
+
+ @Test
public void findByUsername_valid() {
Person person = repository.findByUsername(VALID_USER);
assertThat(person, is(not(nullValue())));
@@ -107,5 +129,89 @@ public class JpaPersonRepositoryTest {
assertThat(connected.isEmpty(), is(true));
}
+ @Test(expected = NotSupportedException.class)
+ public void findAllConnectedPeople_2param() {
+ repository.findAllConnectedPeople("asdf", "asdf");
+ }
+
+ @Test(expected = NotSupportedException.class)
+ public void findAllConnectedPeopleWithFriend() {
+ repository.findAllConnectedPeopleWithFriend("asdf", "asdf");
+ }
+
+ @Test(expected = NotSupportedException.class)
+ public void findFriends() {
+ repository.findFriends("asdf", "asdf");
+ }
+
+ @Test(expected = NotSupportedException.class)
+ public void findFriendsWithFriend() {
+ repository.findFriendsWithFriend("asdf", "asdf");
+ }
+
+ @Test(expected = NotSupportedException.class)
+ public void findByGroup() {
+ repository.findByGroup("asdf", "asdf");
+ }
+
+ @Test(expected = NotSupportedException.class)
+ public void findByGroupWithFriend() {
+ repository.findByGroupWithFriend("asdf", "asdf");
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_new() {
+ final String NEW_USERNAME = "test123";
+ final String NEW_ABOUT_ME = "about me blah blah";
+ JpaPerson person = new JpaPerson();
+ person.setUsername(NEW_USERNAME);
+ person.setAboutMe(NEW_ABOUT_ME);
+
+ assertThat(person.getEntityId(), is(nullValue()));
+ repository.save(person);
+ long newId = person.getEntityId();
+ assertThat(newId > 0, is(true));
+ JpaPerson newPerson = (JpaPerson) repository.get(newId);
+ assertThat(newPerson.getAboutMe(), is(NEW_ABOUT_ME));
+ assertThat(newPerson.getUsername(), is(NEW_USERNAME));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void save_existing() {
+ final String UPDATED_ABOUT_ME = "updated about me";
+ Person person = repository.get(VALID_ID);
+ assertThat(person.getAboutMe(), is(not(UPDATED_ABOUT_ME)));
+ person.setAboutMe(UPDATED_ABOUT_ME);
+ repository.save(person);
+ assertThat(repository.get(VALID_ID).getAboutMe(), is(UPDATED_ABOUT_ME));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete_jpaObject() {
+ Person person = repository.get(VALID_ID);
+ assertThat(person, is(notNullValue()));
+ repository.delete(person);
+ person = repository.get(VALID_ID);
+ assertThat(person, is(nullValue()));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete_implObject() {
+ Person person = repository.get(VALID_ID);
+ assertThat(person, is(notNullValue()));
+ PersonImpl impl = new PersonImpl();
+ impl.setUsername(person.getUsername());
+ repository.delete(impl);
+ person = repository.get(VALID_ID);
+ assertThat(person, is(nullValue()));
+ }
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java?rev=1354775&r1=1354774&r2=1354775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java Wed Jun 27 23:31:55 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
import org.junit.Test;
@@ -34,10 +35,8 @@ import javax.persistence.PersistenceCont
import java.util.ArrayList;
import java.util.List;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
/**
* Test class for {@link JpaPortalPreferenceRepository}
@@ -47,6 +46,8 @@ import static junit.framework.Assert.ass
@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"})
public class JpaPortalPreferenceRepositoryTest {
+ private final Long VALID_ID = 1L;
+
@PersistenceContext
private EntityManager manager;
@@ -54,6 +55,19 @@ public class JpaPortalPreferenceReposito
private PortalPreferenceRepository repository;
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaPortalPreference.class);
+ }
+
+ @Test
+ public void get() {
+ JpaPortalPreference p = (JpaPortalPreference) repository.get(VALID_ID);
+ assertThat(p.getEntityId(), is(VALID_ID));
+ assertThat(p.getKey(), is("color"));
+ assertThat(p.getValues().size(), is(3));
+ }
+
+ @Test
public void testGetAll() {
final List<PortalPreference> preferences = repository.getAll();
assertTrue(preferences.size() == 2);
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java?rev=1354775&r1=1354774&r2=1354775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java Wed Jun 27 23:31:55 2012
@@ -23,6 +23,7 @@ import org.apache.rave.portal.model.JpaR
import org.apache.rave.portal.model.JpaRegionWidgetPreference;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,6 +38,7 @@ import javax.persistence.PersistenceCont
import java.util.ArrayList;
import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@Transactional
@@ -55,6 +57,11 @@ public class JpaRegionWidgetRepositoryTe
private RegionWidgetRepository repository;
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaRegionWidget.class);
+ }
+
+ @Test
public void getById_validId() {
RegionWidget regionWidget = repository.get(VALID_REGION_WIDGET_ID);
assertThat(regionWidget, is(notNullValue()));
@@ -149,6 +156,27 @@ public class JpaRegionWidgetRepositoryTe
assertThat(preference, is(nullValue()));
}
+ @Test
+ @Rollback(true)
+ public void delete_jpaObject() {
+ RegionWidget regionWidget = repository.get(VALID_REGION_WIDGET_ID);
+ assertThat(regionWidget, is(notNullValue()));
+ repository.delete(regionWidget);
+ regionWidget = repository.get(VALID_REGION_WIDGET_ID);
+ assertThat(regionWidget, is(nullValue()));
+ }
+
+ @Test
+ @Rollback(true)
+ public void delete_implObject() {
+ RegionWidget regionWidget = repository.get(VALID_REGION_WIDGET_ID);
+ assertThat(regionWidget, is(notNullValue()));
+ RegionWidgetImpl impl = new RegionWidgetImpl(regionWidget.getId());
+ repository.delete(impl);
+ regionWidget = repository.get(VALID_REGION_WIDGET_ID);
+ assertThat(regionWidget, is(nullValue()));
+ }
+
private long addPreferenceToRegionWidget(long validRegionWidgetId) {
RegionWidget regionWidget = repository.get(validRegionWidgetId);
RegionWidgetPreference regionWidgetPreference = new JpaRegionWidgetPreference(null, validRegionWidgetId,
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java?rev=1354775&r1=1354774&r2=1354775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java Wed Jun 27 23:31:55 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.JpaTag;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.Tag;
import org.apache.rave.portal.model.impl.TagImpl;
import org.apache.rave.portal.model.WidgetTag;
@@ -57,6 +58,11 @@ public class JpaTagRepositoryTest {
private static final Long VALID_ID = 1L;
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaTag.class);
+ }
+
+ @Test
public void getById_validId() {
final Tag tag = repository.get(VALID_ID);
assertNotNull(tag);
@@ -92,6 +98,8 @@ public class JpaTagRepositoryTest {
tag = repository.getByKeyword(" news ");
assertNotNull(tag);
assertTrue(((JpaTag)tag).getEntityId() == 1);
+ tag = repository.getByKeyword(null);
+ assertNull(tag);
}
@Test
@@ -154,4 +162,10 @@ public class JpaTagRepositoryTest {
repository.delete(tag);
}
+ @Test
+ public void getAvailableTagsByWidgetId() {
+ final Long WIDGET_ID = 3L;
+ List<Tag> list = repository.getAvailableTagsByWidgetId(WIDGET_ID);
+ assertTrue(list.size() == 2);
+ }
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java?rev=1354775&r1=1354774&r2=1354775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java Wed Jun 27 23:31:55 2012
@@ -22,6 +22,7 @@ package org.apache.rave.portal.repositor
import junit.framework.Assert;
import org.apache.rave.portal.model.Authority;
import org.apache.rave.portal.model.JpaUser;
+import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.repository.AuthorityRepository;
import org.apache.rave.portal.repository.UserRepository;
@@ -176,4 +177,16 @@ public class JpaUserRepositoryTest {
previousFamilyName = familyName;
}
}
+
+ @Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaUser.class);
+ }
+
+ @Test
+ public void getByForgotPasswordHash() {
+ User user = repository.getByForgotPasswordHash("ABC123");
+ assertThat(user.getId(), is(4L));
+ }
+
}
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=1354775&r1=1354774&r2=1354775&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 23:31:55 2012
@@ -140,8 +140,8 @@ values (@user_id_3, 'jane.doe', '$2a$10$
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_4 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_4, 'george.doe', '$2a$10$0bcOUkQgAwE/qmdc1NcUveNzx/IYIcOUu4ydyT8DEicTCxGJF/vcW', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id, 'User', 'Doe', 'George');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, forgotPasswordHash)
+values (@user_id_4, 'george.doe', '$2a$10$0bcOUkQgAwE/qmdc1NcUveNzx/IYIcOUu4ydyT8DEicTCxGJF/vcW', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id, 'User', 'Doe', 'George', 'ABC123');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_5 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);