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 02:28:16 UTC
svn commit: r1354782 - in /rave/trunk/rave-components:
rave-core/src/main/java/org/apache/rave/portal/model/impl/
rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/
rave-jpa/src/test/resources/
Author: carlucci
Date: Thu Jun 28 00:28:15 2012
New Revision: 1354782
URL: http://svn.apache.org/viewvc?rev=1354782&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/ApplicationDataImpl.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.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/ApplicationDataImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java?rev=1354782&r1=1354781&r2=1354782&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java Thu Jun 28 00:28:15 2012
@@ -30,6 +30,10 @@ public class ApplicationDataImpl impleme
public ApplicationDataImpl() {}
+ public ApplicationDataImpl(Long id) {
+ this.id = id;
+ }
+
public ApplicationDataImpl(Long id, String userId, String appUrl, Map<String, String> data) {
this.id = id;
this.userId = userId;
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=1354782&r1=1354781&r2=1354782&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 Thu Jun 28 00:28:15 2012
@@ -20,6 +20,7 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.ApplicationData;
import org.apache.rave.portal.model.JpaApplicationData;
+import org.apache.rave.portal.model.impl.ApplicationDataImpl;
import org.apache.rave.portal.repository.ApplicationDataRepository;
import org.junit.Before;
import org.junit.Test;
@@ -67,6 +68,11 @@ public class JpaApplicationDataRepositor
}
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaApplicationData.class);
+ }
+
+ @Test
public void get_valid() {
JpaApplicationData applicationData = (JpaApplicationData) repository.get(VALID_APPLICATION_DATA_ID);
validateApplicationData(applicationData);
@@ -139,6 +145,29 @@ public class JpaApplicationDataRepositor
assertThat(saved.getEntityId(), is(equalTo(applicationData.getEntityId())));
}
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete_jpaObject() {
+ ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ assertThat(applicationData, is(notNullValue()));
+ repository.delete(applicationData);
+ applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ assertThat(applicationData, is(nullValue()));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete_implObject() {
+ ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ assertThat(applicationData, is(notNullValue()));
+ ApplicationDataImpl impl = new ApplicationDataImpl(applicationData.getId());
+ repository.delete(impl);
+ applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ assertThat(applicationData, is(nullValue()));
+ }
+
private void validateApplicationData(JpaApplicationData applicationData) {
assertThat(applicationData, is(not(nullValue())));
assertThat(applicationData.getEntityId(), is(equalTo(VALID_APPLICATION_DATA_ID)));
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=1354782&r1=1354781&r2=1354782&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 Thu Jun 28 00:28:15 2012
@@ -60,6 +60,11 @@ public class JpaAuthorityRepositoryTest
private static final Long VALID_ID = 1L;
@Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaAuthority.class);
+ }
+
+ @Test
public void getById_validId() {
final JpaAuthority authority = (JpaAuthority)repository.get(VALID_ID);
assertNotNull(authority);
@@ -126,15 +131,15 @@ public class JpaAuthorityRepositoryTest
List<Authority> allAuthorities = repository.getAll();
assertFalse("Found authorities", allAuthorities.isEmpty());
}
-
+
@Test
public void getAllDefault() {
List<Authority> allAuthorities = repository.getAllDefault();
assertThat(allAuthorities.isEmpty(), is(false));
for (Authority authority : allAuthorities) {
assertThat(authority.isDefaultForNewUser(), is(true));
- }
- }
+ }
+ }
@Test
public void countAll() {
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=1354782&r1=1354781&r2=1354782&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 Thu Jun 28 00:28:15 2012
@@ -21,6 +21,7 @@ package org.apache.rave.portal.repositor
import org.apache.openjpa.persistence.PersistenceException;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.repository.CategoryRepository;
import org.junit.Before;
import org.junit.Ignore;
@@ -126,7 +127,7 @@ public class JpaCategoryRepositoryTest {
@Test
public void getAll() {
List<Category> list = repository.getAll();
- assertThat(list.size(), is(4));
+ assertThat(list.size(), is(6));
// verify proper sorting alphabetical by text attribute
String lastText = "";
for (Category wc : list) {
@@ -165,4 +166,39 @@ public class JpaCategoryRepositoryTest {
}
}
}
+
+ @Test
+ public void getType() {
+ assertEquals(repository.getType(), JpaCategory.class);
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete_jpaObject() {
+ Category category = repository.get(VALID_ENTITY_ID);
+ assertThat(category, is(notNullValue()));
+ repository.delete(category);
+ category = repository.get(VALID_ENTITY_ID);
+ assertThat(category, is(nullValue()));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void delete_implObject() {
+ Category category = repository.get(VALID_ENTITY_ID);
+ assertThat(category, is(notNullValue()));
+ CategoryImpl impl = new CategoryImpl(category.getId());
+ repository.delete(impl);
+ category = repository.get(VALID_ENTITY_ID);
+ assertThat(category, is(nullValue()));
+ }
+
+ @Test
+ @Transactional(readOnly=false)
+ @Rollback(true)
+ public void removeFromCreatedOrModifiedFields() {
+ assertThat(repository.removeFromCreatedOrModifiedFields(VALID_USER_ID), is(5));
+ }
}
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=1354782&r1=1354781&r2=1354782&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 Thu Jun 28 00:28:15 2012
@@ -1082,6 +1082,16 @@ insert into category (entity_id, text, c
values (@category_id4, 'Technology Category', @user_id_1, '2012-01-19', @user_id_2, '2012-01-19');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @category_seq;
+set @category_id5 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @category_seq);
+insert into category (entity_id, text, created_user_id, created_date, last_modified_user_id, last_modified_date)
+values (@category_id5, 'no people', null, '2012-01-19', null, '2012-01-19');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @category_seq;
+
+set @category_id6 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @category_seq);
+insert into category (entity_id, text, created_user_id, created_date, last_modified_user_id, last_modified_date)
+values (@category_id6, 'Cat99', @user_id_5, '2012-01-19', @user_id_1, '2012-01-19');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @category_seq;
+
-- widget category
insert into widget_category (widget_id, category_id)
values (@wikipedia_widget_id, @category_id4);