Author: mfranklin
Date: Wed Dec 12 13:00:51 2012
New Revision: 1420651
URL: http://svn.apache.org/viewvc?rev=1420651&view=rev
Log:
Applied Patch from Danny Sullivan RAVE-849
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongDbConverterTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverterTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRatingRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetTagRepositoryTest.java
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
Wed Dec 12 13:00:51 2012
@@ -58,18 +58,14 @@ public class MongoDbRegionWidgetReposito
@Override
public void delete(RegionWidget item) {
Page page = getPageByRegionWidgetId(item.getId());
- if(replaceOrRemoveWidget(page, item, false) == -1){
- throw new IllegalStateException("Widget does not exist in parent
page regions");
- }
+ replaceOrRemoveWidget(page, item, false);
template.save(page);
}
private RegionWidget updateRegionWidget(RegionWidget item) {
RegionWidget savedWidget;
Page page = getPageByRegionWidgetId(item.getId());
- if(replaceOrRemoveWidget(page, item, true) == -1){
- throw new IllegalStateException("Widget does not exist in parent
page regions");
- }
+ replaceOrRemoveWidget(page, item, true);
Page saved = template.save(page);
savedWidget = getRegionWidgetById(saved, item.getId());
return savedWidget;
@@ -108,7 +104,7 @@ public class MongoDbRegionWidgetReposito
}
}
}
- return -1;
+ throw new IllegalStateException("Widget does not exist in parent page
regions");
}
private Region getRegionById(Long id, List<Region> regions) {
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java
Wed Dec 12 13:00:51 2012
@@ -15,6 +15,7 @@ import static org.easymock.EasyMock.repl
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -62,7 +63,24 @@ public class MongoDbCategoryTest {
}
@Test
- public void getLastModiefiedUser_lastModifier_Null(){
+ public void getCreatedUser_creater_Valid(){
+ User user = new UserImpl();
+ category.setCreatedUser(user);
+ assertThat(category.getCreatedUser(), is(sameInstance(user)));
+ }
+
+ @Test
+ public void getCreatedUser_lastModiefiedUser_Valid(){
+ category.setUserRepository(null);
+ User user = new UserImpl();
+ category.setCreatedUser(user);
+ category.setLastModifiedUser(new UserImpl());
+
+ assertThat(category.getCreatedUser(), is(sameInstance(user)));
+ }
+
+ @Test
+ public void getLastModifiedUser_lastModifier_Null(){
category.setLastModifiedUserId((long)321);
User user = new UserImpl();
expect(userRepository.get((long)321)).andReturn(user);
@@ -72,6 +90,22 @@ public class MongoDbCategoryTest {
}
@Test
+ public void getLastModifiedUser_lastModifier_Set(){
+ User user = new UserImpl();
+ category.setLastModifiedUser(user);
+
+ User result = category.getLastModifiedUser();
+ assertThat(result, is(sameInstance(user)));
+ }
+
+ @Test
+ public void getLastModifiedUser_lastModifier_Set_Id_Null(){
+
+ User result = category.getLastModifiedUser();
+ assertNull(result);
+ }
+
+ @Test
public void getWidgets_Widgets_Null(){
List<Widget> widgets = new ArrayList<Widget>();
expect(widgetOperations.find(query(where("categoryIds").is(category.getId())))).andReturn(widgets);
@@ -79,4 +113,12 @@ public class MongoDbCategoryTest {
assertThat(category.getWidgets(), is(sameInstance(widgets)));
}
+
+ @Test
+ public void getWidgets_Widgets_Set(){
+ List<Widget> widgets = new ArrayList<Widget>();
+ category.setWidgets(widgets);
+
+ assertThat(category.getWidgets(), is(sameInstance(widgets)));
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageTest.java
Wed Dec 12 13:00:51 2012
@@ -37,6 +37,14 @@ public class MongoDbPageTest {
}
@Test
+ public void getOwner_Owner_Set(){
+ User user = new UserImpl();
+ page.setOwner(user);
+
+ assertThat(page.getOwner(), is(sameInstance(user)));
+ }
+
+ @Test
public void equals_Same(){
assertTrue(page.equals(page));
}
@@ -66,6 +74,14 @@ public class MongoDbPageTest {
}
@Test
+ public void equals_Valid_Null_Id(){
+ page.setId(null);
+ MongoDbPage r = new MongoDbPage();
+ r.setId(null);
+ assertTrue(page.equals(r));
+ }
+
+ @Test
public void hashCode_Valid(){
assertNotNull(page.hashCode());
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongDbConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongDbConverterTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongDbConverterTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongDbConverterTest.java
Wed Dec 12 13:00:51 2012
@@ -54,16 +54,24 @@ public class MongDbConverterTest {
expectLastCall();
replay(mock1);
converter.setConverters(converterList);
- long exceptionSource = 432;
- Class<Long> exceptionClass = Long.class;
converter.hydrate(source, clazz);
verify(mock1);
+
+ }
+
+ @Test
+ public void hydrate_Null(){
+ converter.setConverters(converterList);
+ long exceptionSource = 432;
+ Class<Long> exceptionClass = Long.class;
+
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("No ModelConverter found for type
"+exceptionClass);
converter.hydrate(exceptionSource, exceptionClass);
+
}
@Test
@@ -71,18 +79,25 @@ public class MongDbConverterTest {
String source = "blah";
Class<String> clazz = String.class;
long returned = 123;
- long exceptionSource = 432;
- Class<Long> exceptionClass = Long.class;
+
expect(mock1.convert(source)).andReturn(returned);
replay(mock1);
converter.setConverters(converterList);
assertThat(converter.<String, Long>convert(source,
clazz),is(sameInstance(returned)));
+ }
+
+ @Test
+ public void convert_Exception(){
+ long exceptionSource = 432;
+ Class<Long> exceptionClass = Long.class;
+
+ converter.setConverters(converterList);
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("No ModelConverter found for type
"+exceptionClass);
- converter.hydrate(exceptionSource, exceptionClass);
+ converter.convert(exceptionSource, exceptionClass);
}
@Test
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java
Wed Dec 12 13:00:51 2012
@@ -1,21 +1,19 @@
package org.apache.rave.portal.model.conversion.impl;
import org.apache.rave.portal.model.*;
-import org.apache.rave.portal.model.impl.PageTemplateRegionImpl;
-import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.portal.repository.WidgetRepository;
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
/**
* Created with IntelliJ IDEA.
@@ -122,19 +120,89 @@ public class MongoDbPageTemplateConverte
}
@Test
- public void convert_Valid(){ /*
+ public void convert_Not_InstanceOf(){
PageTemplate pageTemplate = new PageTemplateImpl();
- MongoDbPageTemplate mongoDbPageTemplate1 =
pageTemplateConverter.convert(pageTemplate);
+ pageTemplate.setPageLayout(new PageLayoutImpl());
+ MongoDbPageTemplate subPage = new MongoDbPageTemplate();
+ subPage.setPageLayout(new PageLayoutImpl());
+ ArrayList<PageTemplate> subPages = new ArrayList<PageTemplate>();
+ subPages.add(subPage);
+ pageTemplate.setSubPageTemplates(subPages);
+ PageTemplateRegion region = createNewPageTemplateRegion();
+ ArrayList<PageTemplateRegion> regions = new
ArrayList<PageTemplateRegion>();
+ regions.add(region);
+ pageTemplate.setPageTemplateRegions(regions);
+
+ MongoDbPageTemplate converted =
pageTemplateConverter.convert(pageTemplate);
+
+ assertNotNull(converted.getId());
+ assertNotNull(converted.getPageTemplateRegions());
+ assertNotNull(converted.getSubPageTemplates());
+ }
+
+ private PageTemplateRegion createNewPageTemplateRegion() {
+ return new PageTemplateRegion() {
+ @Override
+ public Long getId() {
+ return null; //To change body of implemented methods use
File | Settings | File Templates.
+ }
+
+ @Override
+ public long getRenderSequence() {
+ return 0; //To change body of implemented methods use
File | Settings | File Templates.
+ }
+
+ @Override
+ public void setRenderSequence(long renderSequence) {
+ //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ @Override
+ public PageTemplate getPageTemplate() {
+ return null; //To change body of implemented methods use
File | Settings | File Templates.
+ }
+
+ @Override
+ public void setPageTemplate(PageTemplate pageTemplate) {
+ //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ @Override
+ public List<PageTemplateWidget> getPageTemplateWidgets() {
+ return null; //To change body of implemented methods use
File | Settings | File Templates.
+ }
+
+ @Override
+ public void setPageTemplateWidgets(List<PageTemplateWidget>
pageTemplateWidgets) {
+ //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ @Override
+ public boolean isLocked() {
+ return false; //To change body of implemented methods use
File | Settings | File Templates.
+ }
+
+ @Override
+ public void setLocked(boolean locked) {
+ //To change body of implemented methods use File |
Settings | File Templates.
+ }
+ };
+ }
+
+ @Test
+ public void convert_PageTemplateWidgets_Null(){
+ PageTemplate pageTemplate = new PageTemplateImpl();
+ pageTemplate.setPageLayout(new PageLayoutImpl());
+ PageTemplateRegion pageTemplateRegion = new PageTemplateRegionImpl();
+ pageTemplate.setPageTemplateRegions(Arrays.asList(pageTemplateRegion));
+
+ MongoDbPageTemplate converted =
pageTemplateConverter.convert(pageTemplate);
- assertNotNull(mongoDbPageTemplate1.getId());
- assertThat(mongoDbPageTemplate1.getName(), is(pageTemplate.getName()));
- assertThat(mongoDbPageTemplate1.getDescription(),
is(pageTemplate.getDescription()));
- assertThat(mongoDbPageTemplate1.getPageType(),
is(pageTemplate.getPageType()));
- assertNull(mongoDbPageTemplate1.getParentPageTemplate());
- assertThat(mongoDbPageTemplate1.getPageLayoutCode(),
is(pageTemplate.getPageLayout().getCode()));
- assertNull(mongoDbPageTemplate1.getPageLayout());
- assertThat(mongoDbPageTemplate1.getRenderSequence(),
is(pageTemplate.getRenderSequence()));
- assertThat(mongoDbPageTemplate1.isDefaultTemplate(),
is(pageTemplate.isDefaultTemplate()));*/
+ assertNotNull(converted.getId());
+ }
+
+ @Test
+ public void convert_Valid(){
PageTemplate mongoPageTemplate1 = new MongoDbPageTemplate();
PageTemplate mongoPageTemplate2 = new MongoDbPageTemplate();
@@ -259,10 +327,20 @@ public class MongoDbPageTemplateConverte
assertThat(widgetConverted.isLocked(),
is(widgetSource.isLocked()));
}
}
+ }
+ @Test
+ public void convert_Valid_Null_WidgetID(){
+ PageTemplate source = new PageTemplateImpl();
+ PageTemplateRegion pageTemplateRegion = new PageTemplateRegionImpl();
+ source.setPageTemplateRegions(Arrays.asList(pageTemplateRegion));
+ PageTemplateWidget pageTemplateWidget = new PageTemplateWidgetImpl();
+
pageTemplateRegion.setPageTemplateWidgets(Arrays.asList(pageTemplateWidget));
+ source.setPageLayout(new PageLayoutImpl());
+ pageTemplateWidget.setWidget(new WidgetImpl());
-
-
+ MongoDbPageTemplate converted = pageTemplateConverter.convert(source);
+ assertTrue(converted instanceof MongoDbPageTemplate);
}
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverterTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverterTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverterTest.java
Wed Dec 12 13:00:51 2012
@@ -1,5 +1,6 @@
package org.apache.rave.portal.model.conversion.impl;
+import com.google.common.collect.Lists;
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.repository.PageLayoutRepository;
@@ -37,6 +38,11 @@ public class MongoDbUserConverterTest {
}
@Test
+ public void getType_Valid(){
+ assertThat(userConverter.getSourceType(), is(equalTo(User.class)));
+ }
+
+ @Test
public void hydrate_Valid() {
MongoDbUser user = new MongoDbUser();
userConverter.hydrate(user);
@@ -50,6 +56,18 @@ public class MongoDbUserConverterTest {
}
@Test
+ public void hydrate_Null(){
+ MongoDbUser user = new MongoDbUser();
+ user.setFriends(Lists.<MongoDbPersonAssociation>newArrayList());
+ user.setAuthorityCodes(Lists.<String>newArrayList());
+ userConverter.hydrate(user);
+
+ assertNotNull(user.getFriends());
+ assertNotNull(user.getAuthorityCodes());
+ assertThat(user.getPageLayoutRepository(),
is(sameInstance(userConverter.getPageLayoutRepository())));
+ }
+
+ @Test
public void convert_Valid() {
User source = new MongoDbUser((long) 1234);
PageLayoutRepository pageLayoutRepository =
createMock(PageLayoutRepository.class);
@@ -153,4 +171,13 @@ public class MongoDbUserConverterTest {
assertNull(source.getDefaultPageLayout());
}
+
+ @Test
+ public void convert_Null_DefaultPageLayoutCode(){
+ User source = new UserImpl();
+
+ User converted = userConverter.convert(source);
+
+ assertNull(converted.getDefaultPageLayoutCode());
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -91,6 +91,19 @@ public class MongoDbApplicationDataRepos
}
@Test
+ public void save_Id_Set(){
+ ApplicationData item = new ApplicationDataImpl();
+ item.setId((long)123);
+
+ template.save(item, CollectionNames.APP_DATA_COLLECTION);
+ expectLastCall();
+ replay(template);
+
+ ApplicationData saved = applicationDataRepository.save(item);
+ assertThat(saved, is(sameInstance(item)));
+ }
+
+ @Test
public void delete_Valid(){
ApplicationData item = new ApplicationDataImpl();
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -3,6 +3,7 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.Category;
import org.apache.rave.portal.model.MongoDbCategory;
import org.apache.rave.portal.model.conversion.HydratingConverterFactory;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.repository.util.CollectionNames;
import org.apache.rave.util.CollectionUtils;
import org.junit.Before;
@@ -11,6 +12,7 @@ import org.springframework.data.mongodb.
import org.springframework.data.mongodb.core.query.Criteria;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import static org.easymock.EasyMock.*;
@@ -79,6 +81,20 @@ public class MongoDbCategoryRepositoryTe
}
@Test
+ public void removeFromCreatedOrModifiedFields_NotUpdated(){
+ long userId = 54321;
+ MongoDbCategory category = new MongoDbCategory();
+ List<MongoDbCategory> categories = Arrays.asList(category);
+ category.setCreatedUserId((long)234);
+ category.setLastModifiedUserId((long)234);
+
expect(template.find(query(Criteria.where("lastModifiedUserId").is(userId).orOperator(Criteria.where("createdUserId").is(userId))),
categoryRepository.CLASS,
CollectionNames.CATEGORY_COLLECTION)).andReturn(categories);
+ replay(template);
+
+ int count =
categoryRepository.removeFromCreatedOrModifiedFields(userId);
+ assertThat(count, is(equalTo(0)));
+ }
+
+ @Test
public void getType_Valid(){
assertThat((Class<MongoDbCategory>)categoryRepository.getType(),
is(equalTo(categoryRepository.CLASS)));
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -74,6 +74,19 @@ public class MongoDbOauthConsumerStoreRe
}
@Test
+ public void save_Null_Id(){
+ OAuthConsumerStore item = new OAuthConsumerStoreImpl();
+ item.setId((long)1232);
+ template.save(item, CollectionNames.OAUTH_CONSUMER_COLLECTION);
+ expectLastCall();
+ replay(template);
+
+ OAuthConsumerStore returned = oauthConsumerStoreRepository.save(item);
+
+ assertThat(item, is(sameInstance(returned)));
+ }
+
+ @Test
public void delete_Valid() {
OAuthConsumerStore item = new OAuthConsumerStoreImpl();
item.setId((long)123);
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -103,6 +103,27 @@ public class MongoDbPageLayoutRepository
}
@Test
+ public void save_Null(){
+ PageLayout item1 = new MongoDbPageLayout();
+ item1.setCode("blah1");
+ item1.setNumberOfRegions((long)123);
+ item1.setRenderSequence((long)432);
+ item1.setUserSelectable(true);
+ MongoDbPageLayout toSave = new MongoDbPageLayout();
+ expect(template.findOne(new Query(where("code").is(item1.getCode())),
pageLayoutRepository.CLASS,
CollectionNames.PAGE_LAYOUT_COLLECTION)).andReturn(toSave);
+ template.save(isA(MongoDbPageLayout.class),
eq(CollectionNames.PAGE_LAYOUT_COLLECTION));
+ expectLastCall();
+ replay(template);
+
+ PageLayout saved = pageLayoutRepository.save(item1);
+
+ assertThat(saved.getCode(), is(sameInstance(item1.getCode())));
+ assertThat(saved.getNumberOfRegions(),
is(sameInstance(item1.getNumberOfRegions())));
+ assertThat(saved.getRenderSequence(),
is(sameInstance(item1.getRenderSequence())));
+ assertThat(saved.isUserSelectable(),
is(sameInstance(item1.isUserSelectable())));
+ }
+
+ @Test
public void delete_Valid(){
PageLayout item = new MongoDbPageLayout();
item.setCode("123");
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -13,6 +13,7 @@ import org.springframework.data.mongodb.
import java.util.ArrayList;
import java.util.List;
+import static
org.apache.rave.portal.repository.util.CollectionNames.PREFERENCE_COLLECTION;
import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertNotNull;
@@ -94,6 +95,23 @@ public class MongoDbPortalPreferenceRepo
}
@Test
+ public void save_Null(){
+ PortalPreference item = new PortalPreferenceImpl();
+ item.setKey("123");
+ PortalPreference converted = new MongoDbPortalPreference();
+ expect(template.findOne(query(where("key").is("123")),
preferenceRepository.CLASS,
CollectionNames.PREFERENCE_COLLECTION)).andReturn(null);
+ expect(converter.convert(item,
PortalPreference.class)).andReturn(converted);
+ template.save(converted, PREFERENCE_COLLECTION);
+ expectLastCall();
+ converter.hydrate(converted, PortalPreference.class);
+ expectLastCall();
+ replay(template, converter);
+
+ PortalPreference result = preferenceRepository.save(item);
+ assertThat(result, is(sameInstance(converted)));
+ }
+
+ @Test
public void delete_Valid(){
PortalPreference item = new PortalPreferenceImpl();
item.setKey("123");
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -4,6 +4,7 @@ import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.repository.MongoPageOperations;
import org.junit.Before;
import org.junit.Rule;
@@ -45,6 +46,25 @@ public class MongoDbRegionWidgetReposito
}
@Test
+ public void get_DifferentId() {
+ long id = 234;
+ Page page = new PageImpl();
+ Region region = new RegionImpl();
+ RegionWidget widget = new RegionWidgetImpl();
+ widget.setId((long) 123);
+ page.setRegions(Arrays.asList(region));
+ region.setPage(page);
+ region.setRegionWidgets(Arrays.asList(widget));
+ widget.setRegion(region);
+
+ expect(template.findOne(new
Query(where("regions").elemMatch(where("regionWidgets").elemMatch(where("_id").is(id)))))).andReturn(page);
+ replay(template);
+ RegionWidget result = widgetRepository.get(id);
+ assertNull(result);
+
+ }
+
+ @Test
public void get_Valid() {
long id = 123;
Page found = new MongoDbPage();
@@ -99,7 +119,7 @@ public class MongoDbRegionWidgetReposito
}
@Test
- public void save_Id_Valid_Page_Null(){
+ public void save_Id_Valid_Page_Null() {
RegionWidget item = new RegionWidgetImpl();
long id = 123;
item.setId(id);
@@ -142,6 +162,29 @@ public class MongoDbRegionWidgetReposito
}
@Test
+ public void save_Id_Null_Page_Valid_Regions_Valid_Diff_Id() {
+ RegionWidget item = new RegionWidgetImpl();
+ Region region = new RegionImpl();
+ item.setRegion(region);
+ Page item_Page = new PageImpl();
+ region.setPage(item_Page);
+ item_Page.setId((long) 3333);
+ region.setId((long)2222);
+
+ Page page = new PageImpl();
+ ArrayList<Region> regions = new ArrayList<Region>();
+ regions.add(new RegionImpl());
+ page.setRegions(regions);
+
expect(template.get(item.getRegion().getPage().getId())).andReturn(page);
+ replay(template);
+
+ thrown.expect(IllegalStateException.class);
+ thrown.expectMessage("Unable to find parent for page");
+
+ widgetRepository.save(item);
+ }
+
+ @Test
public void save_Id_Null_Page_Null_Region_Null() {
RegionWidget widget = new RegionWidgetImpl();
@@ -152,6 +195,32 @@ public class MongoDbRegionWidgetReposito
}
@Test
+ public void save_Id_Null_Page_Null_Region_Valid_Page_Null() {
+ RegionWidget widget = new RegionWidgetImpl();
+ Region region = new RegionImpl();
+ widget.setRegion(region);
+
+ thrown.expect(IllegalStateException.class);
+ thrown.expectMessage("Unable to find page for region");
+
+ widgetRepository.save(widget);
+ }
+
+ @Test
+ public void save_Id_Null_Page_Null_Region_Valid_Page_Valid_Id_Null() {
+ RegionWidget widget = new RegionWidgetImpl();
+ Region region = new RegionImpl();
+ widget.setRegion(region);
+ Page page = new PageImpl();
+ region.setPage(page);
+
+ thrown.expect(IllegalStateException.class);
+ thrown.expectMessage("Unable to find page for region");
+
+ widgetRepository.save(widget);
+ }
+
+ @Test
public void save_Id_Null_Page_Valid_Region_Null() {
RegionWidget item = new RegionWidgetImpl();
Region region = new RegionImpl();
@@ -195,7 +264,7 @@ public class MongoDbRegionWidgetReposito
}
@Test
- public void delete_Null(){
+ public void delete_Null() {
RegionWidget item = new RegionWidgetImpl();
long id = 123;
item.setId(id);
@@ -211,4 +280,27 @@ public class MongoDbRegionWidgetReposito
widgetRepository.delete(item);
}
+ @Test
+ public void delete_DifferentId() {
+ RegionWidget widget = new RegionWidgetImpl();
+ Region region = new RegionImpl();
+ Page page = new PageImpl();
+ page.setRegions(Arrays.asList(region));
+ region.setRegionWidgets(Arrays.asList(widget));
+ widget.setId((long) 345345);
+
+ RegionWidget item = new RegionWidgetImpl();
+ long id = 4344;
+ item.setId(id);
+
+ expect(template.findOne(new
Query(where("regions").elemMatch(where("regionWidgets").elemMatch(where("_id").is(id)))))).andReturn(page);
+ replay(template);
+
+ thrown.expect(IllegalStateException.class);
+ thrown.expectMessage("Widget does not exist in parent page regions");
+
+ widgetRepository.delete(item);
+
+ }
+
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -124,6 +124,27 @@ public class MongoDbUserRepositoryTest {
}
@Test
+ public void getAllByAddedWidget_ContainsOwner(){
+ long widgetId = 123;
+ List<Page> pages = new ArrayList<Page>();
+ Page page = new PageImpl();
+ Page page_2 = new PageImpl();
+ User owner = new UserImpl();
+ page.setOwner(owner);
+ page_2.setOwner(owner);
+ pages.add(page);
+ pages.add(page_2);
+
expect(pageTemplate.find(query(where("regions").elemMatch(where("regionWidgets").elemMatch(where("widgetId").is(widgetId)))))).andReturn(pages);
+ replay(pageTemplate);
+
+ List<User> users = userRepository.getAllByAddedWidget(widgetId);
+
+ assertTrue(users.size() == 1);
+ assertTrue(users.contains(owner));
+
+ }
+
+ @Test
public void getByForgotPasswordHash_Valid(){
String hash = "hashbrown";
User found = new UserImpl();
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRatingRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRatingRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRatingRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRatingRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -62,6 +62,19 @@ public class MongoDbWidgetRatingReposito
}
@Test
+ public void getByWidgetIdAndUserId_Diff_Id(){
+ long widgetId = 222;
+ long userId = 334;
+ Widget widget = new WidgetImpl();
+ WidgetRating widgetRating = new WidgetRatingImpl();
+ widgetRating.setUserId((long)444);
+ widget.setRatings(Arrays.asList(widgetRating));
+ expect(template.get(widgetId)).andReturn(widget);
+ replay(template);
+ assertNull(ratingRepository.getByWidgetIdAndUserId(widgetId,userId));
+ }
+
+ @Test
public void deleteAll_Valid(){
long userId = 233;
List<Widget> widgets = new ArrayList<Widget>();
@@ -82,6 +95,21 @@ public class MongoDbWidgetRatingReposito
}
@Test
+ public void deleteAll_Diff_Id(){
+ long userId = 111;
+ Widget widget = new WidgetImpl();
+ List<Widget> widgets = Arrays.asList(widget);
+ WidgetRating rating = new WidgetRatingImpl();
+ rating.setUserId((long)222);
+ widget.setRatings(Arrays.asList(rating));
+
expect(template.find(query(where("ratings").elemMatch(where("userId").is(userId))))).andReturn(widgets);
+ replay(template);
+
+ int count = ratingRepository.deleteAll(userId);
+ assertThat(count, is(0));
+ }
+
+ @Test
public void getType_Valid(){
assertThat((Class<WidgetRating>)ratingRepository.getType(),is(equalTo(WidgetRating.class)));
}
@@ -111,6 +139,19 @@ public class MongoDbWidgetRatingReposito
}
@Test
+ public void get_Diff_Id(){
+ Widget widget = new WidgetImpl();
+ long id = 555;
+ WidgetRating rating = new WidgetRatingImpl();
+ rating.setId((long)444);
+ widget.setRatings(Arrays.asList(rating));
+
expect(template.findOne(query(where("ratings").elemMatch(where("_id").is(id))))).andReturn(widget);
+ replay(template);
+
+ assertNull(ratingRepository.get(id));
+ }
+
+ @Test
public void save_Id_Valid(){
WidgetRating item = new WidgetRatingImpl();
WidgetRating lookup = new WidgetRatingImpl();
@@ -174,6 +215,23 @@ public class MongoDbWidgetRatingReposito
}
@Test
+ public void save_Diff_Id(){
+ WidgetRating item = new WidgetRatingImpl();
+ item.setWidgetId((long)3333);
+ item.setId((long)123);
+ Widget widget = new WidgetImpl();
+ WidgetRating exist = new WidgetRatingImpl();
+ exist.setId((long)4444);
+ widget.setRatings(Arrays.asList(exist));
+
+ expect(template.get(item.getWidgetId())).andReturn(widget);
+ expect(template.save(widget)).andReturn(widget);
+ replay(template);
+
+ assertNull(ratingRepository.save(item));
+ }
+
+ @Test
public void delete_Valid(){
WidgetRating item = new WidgetRatingImpl();
long widgetId = 387383;
@@ -192,4 +250,21 @@ public class MongoDbWidgetRatingReposito
assertFalse(ratings.contains(item));
verify(template);
}
+
+ @Test
+ public void delete_Id_Not_Equals(){
+ WidgetRating item = new WidgetRatingImpl();
+ item.setWidgetId((long)32323);
+ item.setId((long)333333);
+ Widget widget = new WidgetImpl();
+ WidgetRating exist = new WidgetRatingImpl();
+ exist.setId((long) 323);
+ widget.setRatings(Arrays.asList(exist));
+ expect(template.get(item.getWidgetId())).andReturn(widget);
+ expect(template.save(widget)).andReturn(null);
+ replay(template);
+
+ ratingRepository.delete(item);
+ verify(template);
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetTagRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetTagRepositoryTest.java?rev=1420651&r1=1420650&r2=1420651&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetTagRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetTagRepositoryTest.java
Wed Dec 12 13:00:51 2012
@@ -72,6 +72,22 @@ public class MongoDbWidgetTagRepositoryT
}
@Test
+ public void getByWidgetIdAndTag_Diff_Keyword(){
+ long widgetId = 3874;
+ String keyword = "booger";
+ Widget widget = new WidgetImpl();
+ WidgetTag widgetTag = new WidgetTagImpl();
+ Tag tag = new TagImpl();
+ tag.setKeyword("blah");
+ widgetTag.setTag(tag);
+ widget.setTags(Arrays.asList(widgetTag));
+ expect(template.get(widgetId)).andReturn(widget);
+ replay(template);
+
+ assertNull(tagRepository.getByWidgetIdAndTag(widgetId, keyword));
+ }
+
+ @Test
public void getType_Valid() {
assertThat((Class<WidgetTag>) tagRepository.getType(),
is(equalTo(WidgetTag.class)));
}
