You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by do...@apache.org on 2008/05/19 16:32:34 UTC
svn commit: r657837 - in /incubator/shindig/trunk/java/social-api/src:
main/java/org/apache/shindig/social/
main/java/org/apache/shindig/social/abdera/
test/java/org/apache/shindig/social/
test/java/org/apache/shindig/social/abdera/
Author: doll
Date: Mon May 19 07:32:34 2008
New Revision: 657837
URL: http://svn.apache.org/viewvc?rev=657837&view=rev
Log:
SHINDIG-267
Modified patch from Vasu Nori. Fixes up the restful large tests so that they can actualy run with data now. Does so by mocking out the Basic* interfaces with static data. Changes the jetty setup and the guice setup to be able to do this.
This still needs to be cleaner but at least gets us some test coverage for the time being.
Added:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialApiProvider.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderLargeTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderTestFixture.java
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java?rev=657837&r1=657836&r2=657837&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/SocialApiGuiceModule.java Mon May 19 07:32:34 2008
@@ -18,13 +18,10 @@
*/
package org.apache.shindig.social;
-import org.apache.shindig.social.abdera.ActivitiesServiceAdapter;
-import org.apache.shindig.social.abdera.PeopleServiceAdapter;
import org.apache.shindig.social.opensocial.ActivitiesService;
import org.apache.shindig.social.opensocial.DataService;
import org.apache.shindig.social.opensocial.OpenSocialDataHandler;
import org.apache.shindig.social.opensocial.PeopleService;
-import org.apache.shindig.social.opensocial.util.BeanXmlConverter;
import org.apache.shindig.social.samplecontainer.BasicActivitiesService;
import org.apache.shindig.social.samplecontainer.BasicDataService;
import org.apache.shindig.social.samplecontainer.BasicPeopleService;
@@ -52,10 +49,6 @@
bind(new TypeLiteral<List<GadgetDataHandler>>() {})
.toProvider(GadgetDataHandlersProvider.class);
-
- bind(BeanXmlConverter.class);
- bind(PeopleServiceAdapter.class);
- bind(ActivitiesServiceAdapter.class);
}
public static class GadgetDataHandlersProvider
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialApiProvider.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialApiProvider.java?rev=657837&r1=657836&r2=657837&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialApiProvider.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/SocialApiProvider.java Mon May 19 07:32:34 2008
@@ -20,7 +20,6 @@
import org.apache.shindig.social.abdera.json.JSONFilter;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import org.apache.abdera.protocol.server.TargetType;
import org.apache.abdera.protocol.server.impl.DefaultProvider;
@@ -28,24 +27,24 @@
//TODO why is this hardcoded here. can't this be from servletContext?
private static final String BASE = "/social/rest/";
- private Provider<PeopleServiceAdapter> peopleAdapterProvider;
- private Provider<ActivitiesServiceAdapter> activitiesAdapterProvider;
- private Provider<FriendsServiceAdapter> friendsAdapterProvider;
- private Provider<DataServiceAdapter> dataAdapterProvider;
- private Provider<ActivityAdapter> activityAdapterProvider;
+ private PeopleServiceAdapter peopleAdapter;
+ private FriendsServiceAdapter friendsAdapter;
+ private ActivitiesServiceAdapter activitiesAdapter;
+ private DataServiceAdapter dataAdapter;
+ private ActivityAdapter activityAdapter;
@Inject
public void setAdapters(
- Provider<PeopleServiceAdapter> peopleAdapterProvider,
- Provider<FriendsServiceAdapter> friendsAdapterProvider,
- Provider<ActivitiesServiceAdapter> activitiesAdapterProvider,
- Provider<DataServiceAdapter> dataAdapterProvider,
- Provider<ActivityAdapter> activityAdapterProvider) {
- this.peopleAdapterProvider = peopleAdapterProvider;
- this.friendsAdapterProvider = friendsAdapterProvider;
- this.activitiesAdapterProvider = activitiesAdapterProvider;
- this.dataAdapterProvider = dataAdapterProvider;
- this.activityAdapterProvider = activityAdapterProvider;
+ PeopleServiceAdapter peopleAdapter,
+ FriendsServiceAdapter friendsAdapter,
+ ActivitiesServiceAdapter activitiesAdapter,
+ DataServiceAdapter dataAdapter,
+ ActivityAdapter activityAdapter) {
+ this.peopleAdapter = peopleAdapter;
+ this.friendsAdapter = friendsAdapter;
+ this.activitiesAdapter = activitiesAdapter;
+ this.dataAdapter = dataAdapter;
+ this.activityAdapter = activityAdapter;
}
/**
@@ -59,13 +58,6 @@
* TODO: Implement the group urls.
*/
public void initialize() {
- PeopleServiceAdapter peopleAdapter = peopleAdapterProvider.get();
- FriendsServiceAdapter friendsAdapter = friendsAdapterProvider.get();
- ActivitiesServiceAdapter activitiesAdapter
- = activitiesAdapterProvider.get();
- DataServiceAdapter dataAdapter = dataAdapterProvider.get();
- ActivityAdapter activityAdapter = activityAdapterProvider.get();
-
// Add the RouteManager that parses incoming and builds outgoing URLs
// {uid} is assumed to be a deterministic GUID for the service
routeManager = new SocialRouteManager(BASE)
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java?rev=657837&r1=657836&r2=657837&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JettyServer.java Mon May 19 07:32:34 2008
@@ -18,10 +18,9 @@
package org.apache.shindig.social;
import org.apache.shindig.common.servlet.GuiceServletContextListener;
+import org.apache.shindig.social.abdera.SocialApiProvider;
-import org.apache.abdera.protocol.server.Provider;
import org.apache.abdera.protocol.server.ServiceManager;
-import org.apache.abdera.protocol.server.servlet.AbderaServlet;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
@@ -29,57 +28,27 @@
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.Servlet;
-
public class JettyServer {
- //TODO such a hack. why have to specify the provider when using the Servlet?
- public static final int DEFAULT_PORT = 9002;
- public static final String PROVIDER_NAME =
- "org.apache.shindig.social.abdera.SocialApiProvider";
- public static final String GUICE_MODULES =
- "org.apache.shindig.common.CommonGuiceModule:" +
- "org.apache.shindig.social.SocialApiGuiceModule";
-
- private final int port;
- private Server server;
-
- public JettyServer() {
- this(DEFAULT_PORT);
- }
-
- public JettyServer(int port) {
- this.port = port;
- }
-
- public void start(Class<? extends Provider> _class, String mapBase)
- throws Exception {
- server = new Server(port);
- if (mapBase == null) {
- mapBase = "/*";
- }
- Context context = new Context(server, "/", Context.SESSIONS);
- ServletHolder servletHolder = new ServletHolder(new AbderaServlet());
- servletHolder.setInitParameter(ServiceManager.PROVIDER, _class.getName());
- context.addServlet(servletHolder, mapBase);
- server.start();
- }
+ private Server server = null;
- public void start(Servlet servlet, String mapBase) throws Exception {
+ public void start(int port, String mapBase) throws Exception {
server = new Server(port);
- if (mapBase == null) {
- mapBase = "/*";
- }
Context context = new Context(server, "/", Context.SESSIONS);
context.addEventListener(new GuiceServletContextListener());
+
Map<String, String> initParams = new HashMap<String, String>();
initParams.put(GuiceServletContextListener.MODULES_ATTRIBUTE,
- GUICE_MODULES);
+ SocialApiTestsGuiceModule.class.getName());
context.setInitParams(initParams);
- ServletHolder servletHolder = new ServletHolder(servlet);
- servletHolder.setInitParameter(ServiceManager.PROVIDER, PROVIDER_NAME);
+
+ ServletHolder servletHolder = new ServletHolder(new RestServerServlet());
+ servletHolder.setInitParameter(ServiceManager.PROVIDER,
+ SocialApiProvider.class.getName());
context.addServlet(servletHolder, mapBase);
+
server.start();
}
+
public void stop() throws Exception {
server.stop();
}
Added: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=657837&view=auto
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java (added)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java Mon May 19 07:32:34 2008
@@ -0,0 +1,185 @@
+/*
+ * 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.shindig.social;
+
+import org.apache.shindig.common.BasicSecurityTokenDecoder;
+import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.common.SecurityTokenDecoder;
+import org.apache.shindig.social.opensocial.ActivitiesService;
+import org.apache.shindig.social.opensocial.DataService;
+import org.apache.shindig.social.opensocial.PeopleService;
+import org.apache.shindig.social.opensocial.model.Activity;
+import org.apache.shindig.social.opensocial.model.Address;
+import org.apache.shindig.social.opensocial.model.ApiCollection;
+import org.apache.shindig.social.opensocial.model.Email;
+import org.apache.shindig.social.opensocial.model.IdSpec;
+import org.apache.shindig.social.opensocial.model.Name;
+import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.model.Phone;
+
+import com.google.inject.AbstractModule;
+import org.json.JSONException;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Provides social api component injection for all large tests
+ */
+public class SocialApiTestsGuiceModule extends AbstractModule {
+
+ @Override
+ protected void configure() {
+ bind(PeopleService.class).to(MockPeopleService.class);
+ bind(DataService.class).to(MockDataService.class);
+ bind(ActivitiesService.class).to(MockActivitiesService.class);
+
+ bind(SecurityTokenDecoder.class).to(BasicSecurityTokenDecoder.class);
+ }
+
+ // TODO: These 3 static classes with static params are definitely not the
+ // best way to do things. We need to make this integration with Jetty
+ // cleaner and easier.
+ public static class MockPeopleService implements PeopleService {
+ public static Person johnDoe;
+ public static Person janeDoe;
+ public static Person simpleDoe;
+ private static ResponseItem<ApiCollection<Person>> people;
+ private static ResponseItem<Person> person;
+
+ static {
+ // setup John Doe
+ johnDoe = new Person("john.doe", new Name("John Doe"));
+ List<Phone> phones = new ArrayList<Phone>();
+ phones.add(new Phone("+33H000000000", "home"));
+ phones.add(new Phone("+33M000000000", "mobile"));
+ phones.add(new Phone("+33W000000000", "work"));
+ johnDoe.setPhoneNumbers(phones);
+
+ List<Address> addresses = new ArrayList<Address>();
+ addresses.add(new Address("My home address"));
+ johnDoe.setAddresses(addresses);
+
+ List<Email> emails = new ArrayList<Email>();
+ emails.add(new Email("john.doe@work.bar", "work"));
+ emails.add(new Email("john.doe@home.bar", "home"));
+ johnDoe.setEmails(emails);
+ johnDoe.setUpdated(new Date());
+
+ // setup Jane Doe
+ janeDoe = new Person("jane.doe", new Name("Jane Doe"));
+ List<Phone> phones1 = new ArrayList<Phone>();
+ phones1.add(new Phone("+33H000000000", "home"));
+ phones1.add(new Phone("+33M000000000", "mobile"));
+ phones1.add(new Phone("+33W000000000", "work"));
+ janeDoe.setPhoneNumbers(phones1);
+
+ List<Address> addresses1 = new ArrayList<Address>();
+ addresses.add(new Address("My home address"));
+ janeDoe.setAddresses(addresses1);
+
+ List<Email> emails1 = new ArrayList<Email>();
+ emails1.add(new Email("jane.doe@work.bar", "work"));
+ emails1.add(new Email("jane.doe@home.bar", "home"));
+ janeDoe.setEmails(emails1);
+ janeDoe.setUpdated(new Date());
+
+ // setup Simple Doe
+ simpleDoe = new Person("simple.doe", new Name("Simple Doe"));
+ }
+
+ public static void setPeople(ResponseItem<ApiCollection<Person>>
+ peopleVal) {
+ people = peopleVal;
+ }
+
+ public static void setPerson(ResponseItem<Person> personVal) {
+ person = personVal;
+ }
+
+ public List<String> getIds(IdSpec idSpec, SecurityToken token)
+ throws JSONException {
+ // Not needed yet
+ return null;
+ }
+
+ public ResponseItem<ApiCollection<Person>> getPeople(List<String> ids,
+ SortOrder sortOrder, FilterType filter, int first, int max,
+ Set<String> profileDetails, SecurityToken token) {
+ return people;
+ }
+
+ public ResponseItem<Person> getPerson(String id, SecurityToken token) {
+ return person;
+ }
+ }
+
+ public static class MockDataService implements DataService {
+ private static ResponseItem<Map<String, Map<String, String>>> personData;
+
+ public static void setPersonData(ResponseItem<Map<String,
+ Map<String, String>>> personDataVal) {
+ personData = personDataVal;
+ }
+
+ public ResponseItem<Map<String, Map<String, String>>> getPersonData(
+ List<String> ids, List<String> keys, SecurityToken token) {
+ return personData;
+ }
+
+ public ResponseItem updatePersonData(String id, String key, String value,
+ SecurityToken token) {
+ // Not needed yet
+ return null;
+ }
+ }
+
+ public static class MockActivitiesService implements ActivitiesService {
+ public static ResponseItem<List<Activity>> activities;
+ public static ResponseItem<Activity> activity;
+
+ public static void setActivity(ResponseItem<Activity> activityVal) {
+ activity = activityVal;
+ }
+
+ public static void setActivities(ResponseItem<List<Activity>>
+ activitiesVal) {
+ activities = activitiesVal;
+ }
+
+ public ResponseItem<List<Activity>> getActivities(List<String> ids,
+ SecurityToken token) {
+ return activities;
+ }
+
+ public ResponseItem createActivity(String personId, Activity activity,
+ SecurityToken token) {
+ // Not needed yet
+ return null;
+ }
+
+ public ResponseItem<Activity> getActivity(String id, String activityId,
+ SecurityToken token) {
+ return activity;
+ }
+ }
+}
\ No newline at end of file
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderLargeTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderLargeTest.java?rev=657837&r1=657836&r2=657837&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderLargeTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderLargeTest.java Mon May 19 07:32:34 2008
@@ -17,14 +17,17 @@
*/
package org.apache.shindig.social.abdera;
-import junit.framework.Assert;
-
import org.apache.shindig.social.JettyServer;
-import org.apache.shindig.social.RestServerServlet;
+import org.apache.shindig.social.ResponseItem;
+import org.apache.shindig.social.SocialApiTestsGuiceModule;
+import org.apache.shindig.social.opensocial.model.ApiCollection;
+import org.apache.shindig.social.opensocial.model.Person;
+import junit.framework.Assert;
import org.apache.abdera.Abdera;
import org.apache.abdera.model.Base;
import org.apache.abdera.model.Document;
+import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.protocol.Response.ResponseType;
import org.apache.abdera.protocol.client.AbderaClient;
@@ -33,64 +36,96 @@
import org.apache.abdera.util.MimeTypeHelper;
import org.apache.abdera.writer.Writer;
import org.apache.abdera.writer.WriterFactory;
-
+import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
public class SocialApiProviderLargeTest extends Assert {
+ private static Logger logger =
+ Logger.getLogger(SocialApiProviderLargeTest.class.getName());
private static JettyServer server;
private static Abdera abdera = Abdera.getInstance();
private static AbderaClient client = new AbderaClient();
- private static String BASE = "http://localhost:9002/social/rest/";
+ private static int JETTY_PORT = 9002;
+ private static String BASE = "/social/rest";
+ private static String BASEURL = "http://localhost:" + JETTY_PORT + BASE;
+
+ private List<Person> people;
+ private ClientResponse resp;
@BeforeClass
- public static void setUp() throws Exception {
+ public static void setUpOnce() throws Exception {
try {
server = new JettyServer();
- server.start(new RestServerServlet(), "/social/rest/*");
+ server.start(JETTY_PORT, BASE + "/*");
} catch (Exception e) {
e.printStackTrace();
}
}
@AfterClass
- public static void tearDown() throws Exception {
+ public static void tearDownOnce() throws Exception {
server.stop();
}
-// TODO this test cannot pass without the state file resource.
-// the XmlStateFileFetcher needs to be mocked out
-//
+ @Before
+ public void setUp() throws Exception {
+ people = new ArrayList<Person>();
+ people.add(SocialApiTestsGuiceModule.MockPeopleService.janeDoe);
+ people.add(SocialApiTestsGuiceModule.MockPeopleService.simpleDoe);
+
+ SocialApiTestsGuiceModule.MockPeopleService.setPeople(
+ new ResponseItem<ApiCollection<Person>>(
+ new ApiCollection<Person>(people)));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ SocialApiTestsGuiceModule.MockPeopleService.setPeople(null);
+ resp.release();
+ }
+
@Test
public void testGetConnectionsForJohnDoe() throws IOException {
-// ClientResponse resp = client.get(BASE + "people");
-// checkForGoodAtomResponse(resp);
-// Document<Feed> doc = resp.getDocument();
-// Feed feed = doc.getRoot();
-// assertEquals(feed.getTitle(), "People Collection title");
-// //prettyPrint(doc);
-// resp.release();
- }
-
-// TODO this test cannot pass without the state file resource.
-// the XmlStateFileFetcher needs to be mocked out
-//
-// @Test
-// public void testGetJaneDoeProfileForJohnDoe() throws IOException {
-// ClientResponse resp = client.get(BASE + "people/john.doe/@all/jane.doe");
-// checkForGoodAtomResponse(resp);
-// Document<Entry> doc = resp.getDocument();
-// Entry entry = doc.getRoot();
-// assertEquals(entry.getTitle(), "Jane Doe");
-// prettyPrint(doc);
-// resp.release();
-// }
+ resp = client.get(BASEURL + "/people/john.doe/@all?format=atom");
+ checkForGoodAtomResponse(resp);
+
+ Document<Feed> doc = resp.getDocument();
+ prettyPrint(doc);
+ Feed feed = doc.getRoot();
+ assertEquals(2, feed.getEntries().size());
+ }
+
+ @Test
+ public void testGetJaneDoeProfileForJohnDoe() throws IOException {
+ resp = client.get(BASEURL + "/people/john.doe/@all/jane.doe?format=atom");
+ checkForGoodAtomResponse(resp);
+
+ Document<Entry> doc = resp.getDocument();
+ Entry entry = doc.getRoot();
+ prettyPrint(entry);
+
+ Person expectedJaneDoe = people.get(0);
+ assertEquals(expectedJaneDoe.getName().getUnstructured(), entry.getTitle());
+ }
+
+ @Test
+ public void testGetInvalidProfileForJohnDoe() throws IOException {
+ resp = client.get(BASEURL + "/people/john.doe/@all/nobody?format=atom");
+ checkForBadAtomResponse(resp);
+ }
protected void checkForGoodAtomResponse(ClientResponse response){
assertNotNull(response);
@@ -99,11 +134,17 @@
Constants.ATOM_MEDIA_TYPE));
}
+ protected void checkForBadAtomResponse(ClientResponse response){
+ assertNotNull(response);
+ assertEquals(ResponseType.CLIENT_ERROR, response.getType());
+ }
+
protected void prettyPrint(Base doc) throws IOException {
WriterFactory writerFactory = abdera.getWriterFactory();
Writer writer = writerFactory.getWriter("prettyxml");
- writer.writeTo(doc, System.out);
- System.out.println();
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ writer.writeTo(doc, os);
+ logger.fine(os.toString("utf8"));
}
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderTestFixture.java?rev=657837&r1=657836&r2=657837&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderTestFixture.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/SocialApiProviderTestFixture.java Mon May 19 07:32:34 2008
@@ -30,30 +30,9 @@
public final String base = "/social/rest/";
public final RequestContext request = mock(RequestContext.class);
- public final Provider<ActivitiesServiceAdapter> activitiesProvider =
- mock(Provider.class);
- public final Provider<PeopleServiceAdapter> peopleProvider =
- mock(Provider.class);
- public final Provider<FriendsServiceAdapter> friendsProvider =
- mock(Provider.class);
- public final Provider<DataServiceAdapter> dataProvider =
- mock(Provider.class);
public final SocialApiProvider provider = new SocialApiProvider();
- public final Provider<ActivityAdapter> activityProvider =
- mock(Provider.class);
-
+
public SocialApiProviderTestFixture() {
- provider.setAdapters(peopleProvider, friendsProvider, activitiesProvider,
- dataProvider, activityProvider);
- expect(activitiesProvider.get()).andReturn(null);
- expect(peopleProvider.get()).andReturn(null);
- expect(friendsProvider.get()).andReturn(null);
- expect(dataProvider.get()).andReturn(null);
- expect(activityProvider.get()).andReturn(null);
- org.easymock.EasyMock.replay(activitiesProvider);
- org.easymock.EasyMock.replay(peopleProvider);
- org.easymock.EasyMock.replay(friendsProvider);
- org.easymock.EasyMock.replay(dataProvider);
provider.initialize();
}
}