Author: mfranklin
Date: Wed Dec 12 13:58:58 2012
New Revision: 1420679
URL: http://svn.apache.org/viewvc?rev=1420679&view=rev
Log:
Applying patch from Carol Hansen RAVE-850
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverterTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverterTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepositoryTest.java
Modified:
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
Modified:
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
(original)
+++
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
Wed Dec 12 13:58:58 2012
@@ -44,4 +44,6 @@ public interface WidgetComment {
Date getCreatedDate();
void setCreatedDate(Date created);
+
+
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
Wed Dec 12 13:58:58 2012
@@ -38,6 +38,7 @@ public class MongoDbCategoryConverter im
@Autowired
private MongoWidgetOperations widgetOperations;
+
@Override
public void hydrate(MongoDbCategory dehydrated) {
if(dehydrated == null) {
@@ -67,4 +68,12 @@ public class MongoDbCategoryConverter im
category.setWidgets(null);
return category;
}
+
+ public void setUserRepository(UserRepository userRepository) {
+ this.userRepository = userRepository;
+ }
+
+ public void setMongoWidgetOperations(MongoWidgetOperations
mongoWidgetOperations) {
+ this.widgetOperations = mongoWidgetOperations;
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
Wed Dec 12 13:58:58 2012
@@ -194,4 +194,15 @@ public class MongoDbPageConverter implem
converted.setRenderOrder(source.getRenderOrder());
}
+ public void setWidgetRepository(WidgetRepository widgetRepository) {
+ this.widgetRepository = widgetRepository;
+ }
+
+ public void setUserRepository(UserRepository userRepository) {
+ this.userRepository = userRepository;
+ }
+
+ public void setPageLayoutRepository(PageLayoutRepository
pageLayoutRepository) {
+ this.pageLayoutRepository = pageLayoutRepository;
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
Wed Dec 12 13:58:58 2012
@@ -96,4 +96,20 @@ public class MongoDbAuthorityRepository
public void delete(Authority item) {
template.remove(getByAuthority(item.getAuthority()),
AUTHORITY_COLLECTION);
}
+
+ public void setTemplate(MongoOperations template) {
+ this.template = template;
+ }
+
+ public void setConverter(HydratingConverterFactory converter) {
+ this.converter = converter;
+ }
+
+ public MongoOperations getTemplate() {
+ return template;
+ }
+
+ public HydratingConverterFactory getConverter() {
+ return converter;
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
Wed Dec 12 13:58:58 2012
@@ -73,4 +73,8 @@ public class MongoDbOAuthTokenInfoReposi
public void delete(OAuthTokenInfo item) {
template.remove(get(item.getId()));
}
+
+ public void setTemplate(MongoOperations template) {
+ this.template = template;
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
Wed Dec 12 13:58:58 2012
@@ -257,4 +257,13 @@ public class MongoDbPageRepository imple
return pageType.getPageType().toUpperCase();
}
+ public MongoPageOperations getTemplate() {
+ return template;
+ }
+
+ public void setTemplate(MongoPageOperations template) {
+ this.template = template;
+ }
+
+
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
Wed Dec 12 13:58:58 2012
@@ -279,4 +279,8 @@ public class MongoDbPersonRepository imp
public void setPageTemplate(MongoPageOperations pageTemplate) {
this.pageTemplate = pageTemplate;
}
+
+ public void setWidgetOperations(MongoWidgetOperations widgetOperations) {
+ this.widgetOperations = widgetOperations;
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
Wed Dec 12 13:58:58 2012
@@ -111,4 +111,8 @@ public class MongoDbTagRepository implem
}
}
}
+
+ public void setWidgetTemplate(MongoWidgetOperations widgetTemplate) {
+ this.widgetTemplate = widgetTemplate;
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepository.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepository.java
Wed Dec 12 13:58:58 2012
@@ -97,9 +97,11 @@ public class MongoDbWidgetCommentReposit
}
private WidgetComment getCommentById(Widget widget, long id) {
- for(WidgetComment comment : widget.getComments()) {
- if(comment.getId().equals(id)) {
- return comment;
+ if(widget != null){
+ for(WidgetComment comment : widget.getComments()) {
+ if(comment.getId().equals(id)) {
+ return comment;
+ }
}
}
return null;
@@ -132,4 +134,9 @@ public class MongoDbWidgetCommentReposit
}
}
}
+
+ public void setTemplate(MongoWidgetOperations template) {
+ this.template = template;
+ }
+
}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java?rev=1420679&view=auto
==============================================================================
(empty)
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java?rev=1420679&view=auto
==============================================================================
(empty)
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverterTest.java?rev=1420679&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverterTest.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverterTest.java
Wed Dec 12 13:58:58 2012
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.portal.model.conversion.impl;
+
+
+import com.google.common.collect.Lists;
+import org.apache.rave.portal.model.MongoDbPortalPreference;
+import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.easymock.EasyMock.notNull;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+/**
+ * Test class for MongoDb Portal Preference Converter
+ */
+
+public class MongoDbPortalPreferenceConverterTest {
+
+ private MongoDbPortalPreferenceConverter converter;
+
+ @Before
+ public void setUp(){
+
+ converter = new MongoDbPortalPreferenceConverter();
+ }
+
+ @Test
+ public void convertPreference_valid(){
+
+ PortalPreference pp = new PortalPreferenceImpl();
+ pp.setKey("key");
+ pp.setValues(Lists.<String>newLinkedList());
+ MongoDbPortalPreference converted;
+ MongoDbPortalPreference mpp = new MongoDbPortalPreference();
+ mpp.setKey("carol");
+ mpp.setValues(Lists.<String>newLinkedList());
+
+ converted = converter.convert(pp);
+
+ assertThat(converted.getKey(), is(equalTo("key")));
+ assertTrue(converted.getValues().isEmpty());
+ assertNotNull(converted.getId());
+
+ converted = converter.convert(mpp);
+
+ assertThat(converted.getKey(), is(equalTo("carol")));
+ assertTrue(converted.getValues().isEmpty());
+ assertThat(converted, is(sameInstance(mpp)));
+ assertThat(converted.getId(), is(notNull()));
+
+ }
+
+ @Test
+ public void hydrate(){
+ MongoDbPortalPreference mpp = new MongoDbPortalPreference();
+ converter.hydrate(mpp);
+ assertNotNull(mpp);
+ }
+
+ @Test
+ public void getSourceType(){
+
+ assertThat(converter.getSourceType(),
is(equalTo(PortalPreference.class)));
+ }
+
+}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverterTest.java?rev=1420679&view=auto
==============================================================================
(empty)
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepositoryTest.java?rev=1420679&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepositoryTest.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepositoryTest.java
Wed Dec 12 13:58:58 2012
@@ -0,0 +1,222 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.portal.repository.impl;
+
+import com.google.common.collect.Lists;
+import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.MongoDbAuthority;
+import org.apache.rave.portal.model.conversion.HydratingConverterFactory;
+import org.apache.rave.util.CollectionUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.data.mongodb.core.MongoOperations;
+
+import java.util.List;
+
+import static
org.apache.rave.portal.repository.util.CollectionNames.AUTHORITY_COLLECTION;
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
+
+/**
+ * Test for MongoDb Authority Repository class
+ */
+public class MongoDbAuthorityRepositoryTest {
+
+ private MongoOperations template;
+ private MongoDbAuthorityRepository repo;
+ private HydratingConverterFactory converter;
+ public static final Class<MongoDbAuthority> CLASS = MongoDbAuthority.class;
+
+ @Before
+ public void setup() {
+ template = createMock(MongoOperations.class);
+ converter = createNiceMock(HydratingConverterFactory.class);
+ repo = new MongoDbAuthorityRepository();
+ repo.setTemplate(template);
+ repo.setConverter(converter);
+
+ }
+
+ @Test
+ public void save_validNew(){
+ Authority returnedAuth;
+ Authority savedAuth = new MongoDbAuthority();
+ savedAuth.setAuthority("test");
+
+ template.save(isA(Authority.class), eq(AUTHORITY_COLLECTION));
+ expectLastCall();
+ expect(template.findOne(query(where("authority").is("test")), CLASS,
AUTHORITY_COLLECTION)).andReturn(null);
+ replay(template);
+ expect(converter.convert(savedAuth,
Authority.class)).andReturn(savedAuth);
+ replay(converter);
+
+ returnedAuth = repo.save(savedAuth);
+ assertNotNull(template);
+ assertThat(returnedAuth, is(equalTo(savedAuth)));
+ verify(template);
+ }
+
+ @Test
+ public void save_valid(){
+ Authority savedAuth = new MongoDbAuthority();
+ Authority returnedAuth;
+ savedAuth.setAuthority("test");
+
+ expect(template.findOne(query(where("authority").is("test")), CLASS,
AUTHORITY_COLLECTION)).andReturn((MongoDbAuthority)savedAuth);
+ template.save(isA(Authority.class), eq(AUTHORITY_COLLECTION));
+ expectLastCall();
+
+ replay(template);
+
+ returnedAuth = repo.save(savedAuth);
+ assertThat(savedAuth.isDefaultForNewUser(),
is(equalTo(returnedAuth.isDefaultForNewUser())));
+ assertNotNull(template);
+ assertThat(savedAuth, is(sameInstance(returnedAuth)));
+ verify(template);
+
+ }
+
+ @Test
+ public void delete(){
+ Authority deleted = new MongoDbAuthority();
+ deleted.setAuthority("deleted");
+
+ template.remove(isA(Authority.class), eq(AUTHORITY_COLLECTION));
+ expectLastCall();
+ expect(template.findOne(query(where("authority").is("deleted")),
CLASS, AUTHORITY_COLLECTION)).andReturn((MongoDbAuthority)deleted);
+ replay(template);
+
+ repo.delete(deleted);
+
+ verify(template);
+ }
+
+ @Test
+ public void getByAuthority(){
+ Authority authority = new MongoDbAuthority();
+ authority.setAuthority("test");
+ Authority result;
+ template.save(authority, AUTHORITY_COLLECTION);
+
+ expect(template.findOne(query(where("authority").is("test")), CLASS,
AUTHORITY_COLLECTION)).andReturn((MongoDbAuthority)authority);
+ replay(template);
+
+ result = repo.getByAuthority("test");
+ assertThat(result, is(sameInstance(authority)));
+
+ }
+
+
+ @Test
+ public void getAll(){
+ List<Authority> allAuth = Lists.newLinkedList();
+ Authority authority = new MongoDbAuthority();
+ authority.setAuthority("test");
+ allAuth.add(authority);
+
+
expect(CollectionUtils.<Authority>toBaseTypedList(template.findAll(CLASS,
AUTHORITY_COLLECTION))).andReturn(allAuth);
+ replay(template);
+
+ List<Authority> result;
+
+ result = repo.getAll();
+ assertThat(result.size(), is(1));
+ assertThat(result.get(0), is(sameInstance(authority)));
+
+ }
+
+ @Test
+ public void getAllDefault(){
+ List<Authority> allDefaultAuth = Lists.newLinkedList();
+ Authority authority = new MongoDbAuthority();
+ authority.setAuthority("test");
+ authority.setDefaultForNewUser(true);
+ allDefaultAuth.add(authority);
+
+
expect(CollectionUtils.<Authority>toBaseTypedList(template.find(query(where("defaultForNewUser").is(true)),
CLASS, AUTHORITY_COLLECTION))).andReturn(allDefaultAuth);
+ replay(template);
+
+ List<Authority> result;
+
+ result = repo.getAllDefault();
+ assertThat(result.size(), is(1));
+ assertThat(result.get(0), is(sameInstance(authority)));
+ assertThat(result.get(0).getAuthority(), is(equalTo("test")));
+
+ }
+
+
+ @Test
+ public void getAllDefault_false(){
+ List<Authority> allDefaultAuth = Lists.newLinkedList();
+ Authority authority = new MongoDbAuthority();
+ authority.setDefaultForNewUser(false);
+ allDefaultAuth.add(authority);
+
+
expect(CollectionUtils.<Authority>toBaseTypedList(template.find(query(where("defaultForNewUser").is(true)),
CLASS, AUTHORITY_COLLECTION))).andReturn(null);
+ replay(template);
+
+ List<Authority> result;
+
+ result = repo.getAllDefault();
+ assertNull(result);
+ }
+
+
+ @Test
+ public void getTemplate(){
+ MongoOperations temp1;
+
+ temp1 = repo.getTemplate();
+ assertThat(temp1, is(sameInstance(template)));
+ }
+
+ @Test
+ public void setTemplate(){
+ MongoOperations temp1 = createNiceMock(MongoOperations.class);
+
+ repo.setTemplate(temp1);
+ assertThat(repo.getTemplate(), is(sameInstance(temp1)));
+
+ }
+
+ @Test
+ public void getConverter(){
+ HydratingConverterFactory converter1;
+
+ converter1 = repo.getConverter();
+ assertThat(converter1, is(sameInstance(converter)));
+ }
+
+ @Test
+ public void setConverter(){
+ HydratingConverterFactory converter1 =
createNiceMock(HydratingConverterFactory.class);
+
+ repo.setConverter(converter1);
+ assertThat(repo.getConverter(), is(sameInstance(converter1)));
+
+ }
+
+
+
+}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepositoryTest.java?rev=1420679&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepositoryTest.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepositoryTest.java
Wed Dec 12 13:58:58 2012
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.portal.repository.impl;
+
+import org.apache.rave.portal.model.OAuthTokenInfo;
+import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.data.mongodb.core.MongoOperations;
+
+import static
org.apache.rave.portal.repository.util.CollectionNames.OAUTH_TOKEN_COLLECTION;
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+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;
+
+/**
+ * Test for MongoDb OAuthTokenInfo Repository class.
+ */
+public class MongoDbOAuthTokenInfoRepositoryTest {
+
+ private MongoOperations template;
+ private MongoDbOAuthTokenInfoRepository repo;
+ private static final Class<OAuthTokenInfo> CLASS1 = OAuthTokenInfo.class;
+ public static final Class<OAuthTokenInfoImpl> CLASS2 =
OAuthTokenInfoImpl.class;
+
+ @Before
+ public void setUp(){
+ template = createMock(MongoOperations.class);
+ repo = new MongoDbOAuthTokenInfoRepository();
+ repo.setTemplate(template);
+ }
+
+ @Test
+ public void findOAuthTokenInfo(){
+ OAuthTokenInfo info = new OAuthTokenInfoImpl();
+ String userId = "1234";
+ String appUrl = "www.test.com";
+ String moduleId = "2222";
+ String tokenName = "token";
+ String serviceName = "service";
+ info.setUserId(userId);
+ info.setAppUrl(appUrl);
+ info.setModuleId(moduleId);
+ info.setTokenName(tokenName);
+ info.setServiceName(serviceName);
+ expect(template.findOne(query(where("userId").is(userId)
+ .andOperator(where("appUrl").is(appUrl))
+ .andOperator(where("moduleId").is(moduleId))
+ .andOperator(where("tokenName").is(tokenName))
+ .andOperator(where("serviceName").is(serviceName))
+ ), CLASS1, OAUTH_TOKEN_COLLECTION)).andReturn(info);
+ replay(template);
+
+ }
+
+ @Test
+ public void save_null(){
+ OAuthTokenInfo info = new OAuthTokenInfoImpl();
+ OAuthTokenInfo result;
+
+ template.save(isA(OAuthTokenInfo.class), eq(OAUTH_TOKEN_COLLECTION));
+ expectLastCall();
+
+ result = repo.save(info);
+ assertNotNull(result.getId());
+
+ }
+
+ @Test
+ public void save(){
+ OAuthTokenInfo item = new OAuthTokenInfoImpl("appUrl", "serviceName",
+ "tokenName", "accessToken", "sessionHandle",
+ "tokenSecret", "userId", 1111L);
+ OAuthTokenInfo result;
+ item.setId(1234L);
+
+ template.save(isA(OAuthTokenInfo.class), eq(OAUTH_TOKEN_COLLECTION));
+ expectLastCall();
+
+ result = repo.save(item);
+ assertNotNull(result.getId());
+ assertThat(result.getId(), is(equalTo(1234L)));
+
+ }
+
+ @Test
+ public void get(){
+ OAuthTokenInfo result;
+ OAuthTokenInfo item = new OAuthTokenInfoImpl("appUrl", "serviceName",
+ "tokenName", "accessToken", "sessionHandle",
+ "tokenSecret", "userId", 1111L);
+ item.setId(1234L);
+
+ expect(template.findById(1234L, CLASS2,
OAUTH_TOKEN_COLLECTION)).andReturn((OAuthTokenInfoImpl)item);
+ replay(template);
+
+ result = repo.get(1234L);
+ assertThat(result.getId(), is(equalTo(1234L)));
+
+ }
+
+ @Test
+ public void delete(){
+ OAuthTokenInfo item = new OAuthTokenInfoImpl("appUrl", "serviceName",
+ "tokenName", "accessToken", "sessionHandle",
+ "tokenSecret", "userId", 1111L);
+ item.setId(1234L);
+
+ template.remove(item);
+ expectLastCall();
+ expect(template.findById(1234L, CLASS2,
OAUTH_TOKEN_COLLECTION)).andReturn((OAuthTokenInfoImpl)item);
+ replay(template);
+
+ repo.delete(item);
+ verify(template);
+
+ }
+
+
+}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
Wed Dec 12 13:58:58 2012
@@ -20,114 +20,117 @@
package org.apache.rave.portal.repository.impl;
import com.google.common.collect.Lists;
-import com.mongodb.Mongo;
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.*;
-import org.apache.rave.portal.repository.PageLayoutRepository;
-import org.apache.rave.portal.repository.PageRepository;
-import org.apache.rave.portal.repository.UserRepository;
-import org.apache.rave.portal.repository.WidgetRepository;
-import org.junit.After;
-import org.junit.Ignore;
+import org.apache.rave.portal.repository.*;
+import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.core.query.Query;
+import java.util.List;
+
+import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.*;
+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;
-/**
- * Created with IntelliJ IDEA.
- * User: mfranklin
- * Date: 10/14/12
- * Time: 8:14 PM
- */
-@Ignore
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:test-applicationContext.xml"})
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
public class MongoDbPageRepositoryTest {
- @Autowired
- PageRepository repository;
+ private MongoPageOperations template;
+ private MongoDbPageRepository repo;
+
- @Autowired
- WidgetRepository widgetRepository;
+ @Before
+ public void setUp(){
+ template = createMock(MongoPageOperations.class);
+ repo = new MongoDbPageRepository();
+ repo.setTemplate(template);
+ }
- @Autowired
- PageLayoutRepository pageLayoutRepository;
+ @Test
+ public void deletePages(){
+ int resultCount;
+ long userID = 1111L;
+
+ expect((int)template.count(isA(Query.class))).andReturn(1);
+ template.remove(isA(Query.class));
+ expectLastCall();
+ replay(template);
+
+ resultCount = repo.deletePages(userID, PageType.USER);
+ assertThat(resultCount, is(equalTo(1)));
+ verify(template);
+ }
+
+ @Test
+ public void getPagesForUser(){
+ Page p = new PageImpl();
+ PageUser user1 = new PageUserImpl(1111L);
+ User user2 = new UserImpl(2222L);
+ user1.setUser(user2);
+ List<PageUser> pageUser = Lists.newArrayList();
+ pageUser.add(user1);
+ p.setMembers(pageUser);
+ List<Page> pages = Lists.newArrayList(p);
+
+ List<PageUser> result;
+ Long userId = 2222L;
+
+
expect(template.find(query(where("members").elemMatch(where("userId").is(userId)).andOperator(where("pageType").is("USER"))))).andReturn(pages);
+ replay(template);
+ result = repo.getPagesForUser(userId, PageType.USER);
+
+ assertThat(result.get(0).getUser(), is(equalTo(user2)));
+ assertThat(result.size(), is(equalTo(1)));
+ assertThat(result.get(0).getUser().getId(), is(equalTo(2222L)));
- @Autowired
- UserRepository userRepository;
-
- @Autowired
- Mongo mongo;
-
- @After
- public void tearDown() {
- mongo.dropDatabase("rave");
}
@Test
- public void save_basic() {
- Page page = new PageImpl();
+ public void getSingleRecord_valid(){
+ Long userId = 1111L;
+ Long pageId = 2222L;
+
+ Page testPage = new PageImpl(2222L);
+ PageUser pu = new PageUserImpl(3333L);
+ User u = new UserImpl(1111L);
+ pu.setUser(u);
+ List<PageUser> users = Lists.newArrayList();
+ users.add(pu);
+ testPage.setMembers(users);
+ PageUser result;
+
+ expect(template.get(pageId)).andReturn(testPage);
+ replay(template);
+
+ result = repo.getSingleRecord(userId, pageId);
+ assertThat(result, is(sameInstance(pu)));
+ assertThat(result.getId(), is(equalTo(3333L)));
+ assertThat(result.getUser().getId(), is(equalTo(1111L)));
- User user1 = new UserImpl(12345L);
- user1.setDisplayName("GEORGE DOE");
- userRepository.save(user1);
-
- User user2 = new UserImpl(12345L);
- user2.setDisplayName("JANE DOE");
- userRepository.save(user2);
-
- PageUser p = new PageUserImpl(user1, page);
- page.setName("PAGE NAME");
- page.setMembers(Lists.<PageUser>newLinkedList());
- page.getMembers().add(p);
- page.setOwner(user2);
- page.setRegions(Lists.<Region>newLinkedList());
-
- Region region = new RegionImpl();
- region.setPage(page);
- region.setRegionWidgets(Lists.<RegionWidget>newLinkedList());
- page.getRegions().add(region);
-
- RegionWidget regionWidget = new RegionWidgetImpl();
- regionWidget.setRegion(region);
-
regionWidget.setPreferences(Lists.<RegionWidgetPreference>newLinkedList());
- region.getRegionWidgets().add(regionWidget);
-
- RegionWidgetPreference preference = new RegionWidgetPreferenceImpl();
- preference.setName("PREF NAME");
- preference.setValue("PREF_VALUE");
- regionWidget.getPreferences().add(preference);
-
- Widget widget = new WidgetImpl(13223L);
- widget.setAuthor("FOO");
- widget.setDescription("BAR");
- widgetRepository.save(widget);
-
- regionWidget.setWidget(widget);
-
- page.setPageType(PageType.USER);
- PageLayout layout = new PageLayoutImpl("LAYOUT");
- page.setPageLayout(layout);
- layout.setNumberOfRegions(24L);
- pageLayoutRepository.save(layout);
-
- Page saved = repository.save(page);
- assertThat(saved, instanceOf(MongoDbPage.class));
-
- Page fromDb = repository.get(saved.getId());
- assertThat(fromDb.getMembers().get(0).getUser(),
is(equalTo(saved.getMembers().get(0).getUser())));
- assertThat(fromDb,
is(sameInstance(fromDb.getMembers().get(0).getPage())));
- assertThat(fromDb.getPageLayout(), is(equalTo(saved.getPageLayout())));
- assertThat(fromDb.getRegions().get(0),
is(equalTo(saved.getRegions().get(0))));
- assertThat(fromDb.getRegions().get(0).getRegionWidgets().get(0),
is(equalTo(saved.getRegions().get(0).getRegionWidgets().get(0))));
-
assertThat(fromDb.getRegions().get(0).getRegionWidgets().get(0).getWidget(),
is(equalTo(saved.getRegions().get(0).getRegionWidgets().get(0).getWidget())));
-
assertThat(fromDb.getRegions().get(0).getRegionWidgets().get(0).getPreferences().get(0),
is(equalTo(saved.getRegions().get(0).getRegionWidgets().get(0).getPreferences().get(0))));
}
+
+ @Test
+ public void getSingleRecord_null(){
+ Long userId = 1111L;
+ Long pageId = 2222L;
+
+ Page testPage = new PageImpl(2222L);
+ PageUser pu = new PageUserImpl(3333L);
+ User u = new UserImpl(1234L);
+ pu.setUser(u);
+ List<PageUser> users = Lists.newArrayList();
+ users.add(pu);
+ testPage.setMembers(users);
+ PageUser result;
+
+ expect(template.get(pageId)).andReturn(testPage);
+ replay(template);
+
+ result = repo.getSingleRecord(userId, pageId);
+ assertNull(result);
+ }
+
}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java?rev=1420679&view=auto
==============================================================================
(empty)
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java?rev=1420679&view=auto
==============================================================================
(empty)
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java?rev=1420679&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java
Wed Dec 12 13:58:58 2012
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.portal.repository.impl;
+
+import com.google.common.collect.Lists;
+import org.apache.rave.exception.NotSupportedException;
+import org.apache.rave.portal.model.Tag;
+import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.WidgetTag;
+import org.apache.rave.portal.model.impl.TagImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.apache.rave.portal.model.impl.WidgetTagImpl;
+import org.apache.rave.portal.repository.MongoWidgetOperations;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.data.mongodb.core.query.Query;
+
+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.assertThat;
+
+/**
+ * Test for MongoDb Tag Repository class
+ */
+public class MongoDbTagRepositoryTest {
+
+ private MongoWidgetOperations widgetTemplate;
+ private MongoDbTagRepository repo;
+
+ @Before
+ public void setUp(){
+ widgetTemplate = createMock(MongoWidgetOperations.class);
+ repo = new MongoDbTagRepository();
+ repo.setWidgetTemplate(widgetTemplate);
+
+ }
+
+ @Test
+ public void getAll(){
+ List<Widget> widgets = Lists.newArrayList();
+ List<WidgetTag> widget_tags = Lists.newArrayList();
+ WidgetTag wt = new WidgetTagImpl();
+ Tag tag = new TagImpl();
+ wt.setTag(tag);
+ widget_tags.add(wt);
+ Widget w = new WidgetImpl();
+ w.setTags(widget_tags);
+ widgets.add(w);
+
+ expect(widgetTemplate.find(new Query())).andReturn(widgets);
+ expect(widgetTemplate.find(new Query())).andReturn(widgets);
+ replay(widgetTemplate);
+
+ List<Tag> result = repo.getAll();
+ assertNotNull(result);
+ assertThat(result.get(0), is(sameInstance(tag)));
+
+ int count = repo.getCountAll();
+ assertThat(count, is(equalTo(1)));
+
+ }
+
+ @Test
+ public void getAll_null(){
+ List<Widget> widgets = Lists.newArrayList();
+ Widget w = new WidgetImpl();
+ widgets.add(w);
+
+ expect(widgetTemplate.find(new Query())).andReturn(widgets);
+ replay(widgetTemplate);
+
+ List<Tag> result = repo.getAll();
+ assertThat(result.size(), is(equalTo(0)));
+
+ }
+
+ @Test (expected = NotSupportedException.class)
+ public void save(){
+ Tag tag = new TagImpl();
+ repo.save(tag);
+
+ }
+
+ @Test (expected = NotSupportedException.class)
+ public void delete(){
+ Tag tag = new TagImpl();
+ repo.delete(tag);
+
+ }
+
+// @Test
+// public void getAvailableTagsByWidgetId(){
+// List<Widget> widgets = Lists.newArrayList();
+// List<WidgetTag> widget_tags = Lists.newArrayList();
+// WidgetTag wt = new WidgetTagImpl();
+// wt.setWidgetId(1111L);
+// Tag tag = new TagImpl();
+// wt.setTag(tag);
+// widget_tags.add(wt);
+// Widget w = new WidgetImpl(1234L);
+// w.setTags(widget_tags);
+// widgets.add(w);
+//
+// expect(widgetTemplate.find(new Query())).andReturn(widgets);
+// // The following expect is getting this error...
+// // Method threw 'java.lang.NullPointerException' exception.
+// // Cannot evaluate org.easymock.internal.Invocation.toString()
+// expect(widgetTemplate.get(1234L).getTags()).andReturn(widget_tags);
+// replay(widgetTemplate);
+//
+// List<Tag> result = repo.getAvailableTagsByWidgetId(1234L);
+// assertThat(result.size(), is(equalTo(1)));
+// }
+
+
+}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepositoryTest.java?rev=1420679&view=auto
==============================================================================
(empty)
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java?rev=1420679&r1=1420678&r2=1420679&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
Wed Dec 12 13:58:58 2012
@@ -1,129 +1,112 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
package org.apache.rave.portal.repository.impl;
-import com.mongodb.Mongo;
-import org.apache.rave.portal.model.*;
-import org.apache.rave.portal.model.impl.*;
-import org.apache.rave.portal.repository.CategoryRepository;
-import org.apache.rave.portal.repository.UserRepository;
-import org.apache.rave.portal.repository.WidgetRepository;
-import org.junit.After;
import org.junit.Ignore;
-import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
/**
- * Created with IntelliJ IDEA.
- * User: mfranklin
- * Date: 10/14/12
- * Time: 8:14 PM
- */
+* Created with IntelliJ IDEA.
+* User: mfranklin
+* Date: 10/14/12
+* Time: 8:14 PM
+*/
@Ignore
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:test-applicationContext.xml"})
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
public class MongoDbWidgetRepositoryTest {
- @Autowired
- WidgetRepository widgetRepository;
-
- @Autowired
- UserRepository userRepository;
-
- @Autowired
- CategoryRepository categoryRepository;
-
- @Autowired
- Mongo mongo;
-
- @After
- public void tearDown() {
- mongo.dropDatabase("rave");
- }
-
- @Test
- public void save_basic() {
- List<Category> categoryList = Arrays.asList((Category)new
CategoryImpl("GOO"), new CategoryImpl("FOO"));
- categoryRepository.save(categoryList.get(0));
- categoryRepository.save(categoryList.get(1));
-
- User user1 = new MongoDbUser(12345L);
- user1.setDisplayName("GEORGE DOE");
- userRepository.save(user1);
-
- User user2 = new MongoDbUser(12345L);
- user2.setDisplayName("JANE DOE");
- userRepository.save(user2);
-
- Widget widget = new WidgetImpl();
- widget.setUrl("http://localhost:8080/demogadgets/test.xml";);
- widget.setAuthor("mfranklin");
- widget.setAuthorEmail("[email protected]");
- widget.setDescription("DESCRIPTION");
- widget.setCategories(categoryList);
- widget.setOwner(user2);
- widget.setTitle("TITLE");
- widget.setTitleUrl("http://title.com";);
- widget.setType("OpenSocial");
- widget.setWidgetStatus(WidgetStatus.PUBLISHED);
-
- WidgetComment widgetComment = new WidgetCommentImpl();
- widgetComment.setText("BOO HOO");
- widgetComment.setCreatedDate(new Date());
- widgetComment.setLastModifiedDate(new Date());
- widgetComment.setUser(user1);
- widget.setComments(Arrays.asList(widgetComment));
-
- WidgetRating rating = new WidgetRatingImpl();
- rating.setScore(10);
- rating.setUserId(user2.getId());
- widget.setRatings(Arrays.asList(rating));
-
- WidgetTag tag = new WidgetTagImpl();
- tag.setCreatedDate(new Date());
- tag.setUser(user2);
- tag.setTag(new TagImpl("TEST"));
- widget.setTags(Arrays.asList(tag));
-
- Widget saved = widgetRepository.save(widget);
-
- Widget fromDb = widgetRepository.get(saved.getId());
- assertThat(fromDb.getOwner().getId(),
is(equalTo(widget.getOwner().getId())));
- assertThat(fromDb.getRatings().get(0).getScore(),
is(equalTo(widget.getRatings().get(0).getScore())));
- assertThat(fromDb.getComments().get(0).getUser().getId(),
is(equalTo(widget.getComments().get(0).getUser().getId())));
- assertThat(fromDb.getComments().get(0).getText(),
is(equalTo(widget.getComments().get(0).getText())));
- assertThat(fromDb.getTags().get(0).getUser().getId(),
is(equalTo(widget.getTags().get(0).getUser().getId())));
- assertThat(fromDb.getTags().get(0).getTag().getKeyword(),
is(equalTo(widget.getTags().get(0).getTag().getKeyword())));
-
- }
+// @Autowired
+// WidgetRepository widgetRepository;
+//
+// @Autowired
+// UserRepository userRepository;
+//
+// @Autowired
+// CategoryRepository categoryRepository;
+//
+// @Autowired
+// Mongo mongo;
+//
+// @After
+// public void tearDown() {
+// mongo.dropDatabase("rave");
+// }
+//
+// @Test
+// public void save_basic() {
+// List<Category> categoryList = Arrays.asList((Category)new
CategoryImpl("GOO"), new CategoryImpl("FOO"));
+// categoryRepository.save(categoryList.get(0));
+// categoryRepository.save(categoryList.get(1));
+//
+// User user1 = new MongoDbUser(12345L);
+// user1.setDisplayName("GEORGE DOE");
+// userRepository.save(user1);
+//
+// User user2 = new MongoDbUser(12345L);
+// user2.setDisplayName("JANE DOE");
+// userRepository.save(user2);
+//
+// Widget widget = new WidgetImpl();
+// widget.setUrl("http://localhost:8080/demogadgets/test.xml";);
+// widget.setAuthor("mfranklin");
+// widget.setAuthorEmail("[email protected]");
+// widget.setDescription("DESCRIPTION");
+// widget.setCategories(categoryList);
+// widget.setOwner(user2);
+// widget.setTitle("TITLE");
+// widget.setTitleUrl("http://title.com";);
+// widget.setType("OpenSocial");
+// widget.setWidgetStatus(WidgetStatus.PUBLISHED);
+//
+// WidgetComment widgetComment = new WidgetCommentImpl();
+// widgetComment.setText("BOO HOO");
+// widgetComment.setCreatedDate(new Date());
+// widgetComment.setLastModifiedDate(new Date());
+// widgetComment.setUser(user1);
+// widget.setComments(Arrays.asList(widgetComment));
+//
+// WidgetRating rating = new WidgetRatingImpl();
+// rating.setScore(10);
+// rating.setUserId(user2.getId());
+// widget.setRatings(Arrays.asList(rating));
+//
+// WidgetTag tag = new WidgetTagImpl();
+// tag.setCreatedDate(new Date());
+// tag.setUser(user2);
+// tag.setTag(new TagImpl("TEST"));
+// widget.setTags(Arrays.asList(tag));
+//
+// Widget saved = widgetRepository.save(widget);
+//
+// Widget fromDb = widgetRepository.get(saved.getId());
+// assertThat(fromDb.getOwner().getId(),
is(equalTo(widget.getOwner().getId())));
+// assertThat(fromDb.getRatings().get(0).getScore(),
is(equalTo(widget.getRatings().get(0).getScore())));
+// assertThat(fromDb.getComments().get(0).getUser().getId(),
is(equalTo(widget.getComments().get(0).getUser().getId())));
+// assertThat(fromDb.getComments().get(0).getText(),
is(equalTo(widget.getComments().get(0).getText())));
+// assertThat(fromDb.getTags().get(0).getUser().getId(),
is(equalTo(widget.getTags().get(0).getUser().getId())));
+// assertThat(fromDb.getTags().get(0).getTag().getKeyword(),
is(equalTo(widget.getTags().get(0).getTag().getKeyword())));
+//
+// }
}
