You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by ds...@apache.org on 2013/11/19 21:39:45 UTC
svn commit: r1543564 - in
/incubator/streams/branches/webservice/streams-components/src:
main/java/org/apache/streams/components/activitysubscriber/impl/
main/java/org/apache/streams/components/service/
main/java/org/apache/streams/components/service/i...
Author: dsullivan
Date: Tue Nov 19 20:39:45 2013
New Revision: 1543564
URL: http://svn.apache.org/r1543564
Log:
additions to tests
Added:
incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/service/StreamsActivityRepositoryServiceTest.java
Modified:
incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/StreamsActivityRepositoryService.java
incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/ActivityRepositoryServiceImpl.java
incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriberWarehouseTest.java
Modified: incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java?rev=1543564&r1=1543563&r2=1543564&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java (original)
+++ incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberWarehouseImpl.java Tue Nov 19 20:39:45 2013
@@ -52,7 +52,7 @@ public class ActivityStreamsSubscriberWa
public synchronized void updateSubscriber(ActivityStreamsSubscription subscription) {
ActivityStreamsSubscriber subscriber = getSubscriber(subscription.getInRoute());
if (subscriber != null) {
- subscriber.receive(activityService.getActivitiesForProviders(subscription.getFilters(), subscriber.getLastUpdated()));
+ subscriber.receive(activityService.getActivitiesForFilters(subscription.getFilters(), subscriber.getLastUpdated()));
subscriber.setLastUpdated(new Date());
}
}
Modified: incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/StreamsActivityRepositoryService.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/StreamsActivityRepositoryService.java?rev=1543564&r1=1543563&r2=1543564&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/StreamsActivityRepositoryService.java (original)
+++ incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/StreamsActivityRepositoryService.java Tue Nov 19 20:39:45 2013
@@ -12,5 +12,5 @@ public interface StreamsActivityReposito
void receiveActivity(String activityJSON) throws Exception;
- List<ActivityStreamsEntry> getActivitiesForProviders(Set<String> providers, Date lastUpdated);
+ List<ActivityStreamsEntry> getActivitiesForFilters(Set<String> filters, Date lastUpdated);
}
Modified: incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/ActivityRepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/ActivityRepositoryServiceImpl.java?rev=1543564&r1=1543563&r2=1543564&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/ActivityRepositoryServiceImpl.java (original)
+++ incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/ActivityRepositoryServiceImpl.java Tue Nov 19 20:39:45 2013
@@ -41,7 +41,7 @@ public class ActivityRepositoryServiceIm
}
@Override
- public List<ActivityStreamsEntry> getActivitiesForProviders(Set<String> providers, Date lastUpdated){
- return activityStreamsRepository.getActivitiesForFilters(providers, lastUpdated);
+ public List<ActivityStreamsEntry> getActivitiesForFilters(Set<String> filters, Date lastUpdated){
+ return activityStreamsRepository.getActivitiesForFilters(filters, lastUpdated);
}
}
Modified: incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriberWarehouseTest.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriberWarehouseTest.java?rev=1543564&r1=1543563&r2=1543564&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriberWarehouseTest.java (original)
+++ incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriberWarehouseTest.java Tue Nov 19 20:39:45 2013
@@ -58,7 +58,7 @@ public class ActivityStreamsSubscriberWa
List<ActivityStreamsEntry> entryList = Arrays.asList(entry1, entry2);
- expect(activityRepositoryService.getActivitiesForProviders(eq(filters),isA(Date.class))).andReturn(entryList);
+ expect(activityRepositoryService.getActivitiesForFilters(eq(filters),isA(Date.class))).andReturn(entryList);
replay(activityRepositoryService);
warehouse.register(subscription);
Added: incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/service/StreamsActivityRepositoryServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/service/StreamsActivityRepositoryServiceTest.java?rev=1543564&view=auto
==============================================================================
--- incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/service/StreamsActivityRepositoryServiceTest.java (added)
+++ incubator/streams/branches/webservice/streams-components/src/test/java/org/apache/streams/components/service/StreamsActivityRepositoryServiceTest.java Tue Nov 19 20:39:45 2013
@@ -0,0 +1,80 @@
+package org.apache.streams.components.service;
+
+import org.apache.streams.components.service.impl.ActivityRepositoryServiceImpl;
+import org.apache.streams.persistence.model.ActivityStreamsEntry;
+import org.apache.streams.persistence.model.mongo.MongoActivityStreamsEntry;
+import org.apache.streams.persistence.repository.ActivityStreamsRepository;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.*;
+
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertThat;
+
+public class StreamsActivityRepositoryServiceTest {
+
+ private StreamsActivityRepositoryService activityRepositoryService;
+ private ActivityStreamsRepository activityStreamsRepository;
+
+ @Before
+ public void setup() {
+ activityStreamsRepository = createMock(ActivityStreamsRepository.class);
+
+ activityRepositoryService = new ActivityRepositoryServiceImpl(activityStreamsRepository, MongoActivityStreamsEntry.class);
+ }
+
+ @Test
+ public void receiveActivityTest() throws Exception {
+ String validActivity = "{\n" +
+ " \"id\": \"id\",\n" +
+ " \"verb\": \"verb\",\n" +
+ " \"provider\": {\n" +
+ " \"displayName\":\"danny\",\n" +
+ " \"url\": \"http.example.com:8888\"\n" +
+ " },\n" +
+ " \"actor\": {\n" +
+ " \"id\": \"actorid\",\n" +
+ " \"objectType\": \"actorobject\",\n" +
+ " \"displayName\": \"actorname\",\n" +
+ " \"url\": \"www.actorexampleurl.com\",\n" +
+ " \"image\": {\"url\":\"www.actorexampleurl.com\"}\n" +
+ " },\n" +
+ " \"target\": {\n" +
+ " \"id\": \"targetid\",\n" +
+ " \"displayName\": \"targetname\",\n" +
+ " \"url\": \"www.targeturl.com\"\n" +
+ " },\n" +
+ " \"object\": {\n" +
+ " \"id\": \"objectid\",\n" +
+ " \"displayName\": \"objectname\",\n" +
+ " \"objectType\": \"object\",\n" +
+ " \"url\": \"www.objecturl.org\"\n" +
+ " }\n" +
+ " }";
+
+ activityStreamsRepository.save(isA(ActivityStreamsEntry.class));
+ expectLastCall();
+ replay(activityStreamsRepository);
+
+ activityRepositoryService.receiveActivity(validActivity);
+ verify(activityStreamsRepository);
+ }
+
+ @Test
+ public void getActivitiesForFilters(){
+ ActivityStreamsEntry entry = new MongoActivityStreamsEntry();
+ List<ActivityStreamsEntry> activityList = Arrays.asList(entry);
+ Set<String> filters = new HashSet<String>();
+ Date lastUpdated = new Date(1234);
+
+ expect(activityStreamsRepository.getActivitiesForFilters(filters, lastUpdated)).andReturn(activityList);
+ replay(activityStreamsRepository);
+
+ List<ActivityStreamsEntry> returned = activityRepositoryService.getActivitiesForFilters(filters, lastUpdated);
+
+ assertThat(activityList, is(sameInstance(returned)));
+ }
+}