Author: lindner
Date: Mon Jan 12 01:38:01 2009
New Revision: 733661
URL: http://svn.apache.org/viewvc?rev=733661&view=rev
Log:
SHINDIG-809 | Patch from Vincent Siveton | Some test classes should extends
EasyMockTestCase instead of TestCase
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=733661&r1=733660&r2=733661&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
Mon Jan 12 01:38:01 2009
@@ -25,6 +25,7 @@
import junit.framework.TestCase;
import org.apache.shindig.common.testing.FakeGadgetToken;
+import org.apache.shindig.social.EasyMockTestCase;
import org.apache.shindig.social.SocialApiTestsGuiceModule;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
@@ -55,7 +56,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-public abstract class AbstractLargeRestfulTests extends TestCase {
+public abstract class AbstractLargeRestfulTests extends EasyMockTestCase {
protected static final String XMLSCHEMA = "
xmlns=\"http://ns.opensocial.org/2008/opensocial\"; \n"
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; \n"
+ " xsi:schemaLocation=\"http://ns.opensocial.org/2008/opensocial
classpath:opensocial.xsd\" ";
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=733661&r1=733660&r2=733661&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
Mon Jan 12 01:38:01 2009
@@ -20,10 +20,9 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
-import junit.framework.TestCase;
-
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
+import org.apache.shindig.social.EasyMockTestCase;
import org.apache.shindig.social.core.model.ActivityImpl;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.opensocial.model.Activity;
@@ -34,11 +33,12 @@
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
import org.easymock.classextension.EasyMock;
+import org.junit.Test;
import java.util.List;
import java.util.Set;
-public class ActivityHandlerTest extends TestCase {
+public class ActivityHandlerTest extends EasyMockTestCase {
private BeanJsonConverter converter;
@@ -63,12 +63,14 @@
handler = new ActivityHandler(activityService);
}
- private void replay() {
+ @Override
+ protected void replay() {
EasyMock.replay(converter);
EasyMock.replay(activityService);
}
- private void verify() {
+ @Override
+ protected void verify() {
EasyMock.verify(converter);
EasyMock.verify(activityService);
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=733661&r1=733660&r2=733661&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
Mon Jan 12 01:38:01 2009
@@ -20,10 +20,9 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import junit.framework.TestCase;
-
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
+import org.apache.shindig.social.EasyMockTestCase;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.opensocial.spi.AppDataService;
import org.apache.shindig.social.opensocial.spi.DataCollection;
@@ -37,7 +36,7 @@
import java.util.Map;
import java.util.Set;
-public class AppDataHandlerTest extends TestCase {
+public class AppDataHandlerTest extends EasyMockTestCase {
private BeanJsonConverter converter;
@@ -63,12 +62,14 @@
handler = new AppDataHandler(appDataService);
}
- private void replay() {
+ @Override
+ protected void replay() {
EasyMock.replay(converter);
EasyMock.replay(appDataService);
}
- private void verify() {
+ @Override
+ protected void verify() {
EasyMock.verify(converter);
EasyMock.verify(appDataService);
}
@@ -227,7 +228,7 @@
verify();
}
-
+
public void testHandleDelete() throws Exception {
Map<String, String> params = Maps.newHashMap();
params.put("fields", "pandas");
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java?rev=733661&r1=733660&r2=733661&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
Mon Jan 12 01:38:01 2009
@@ -20,24 +20,20 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.testing.FakeHttpServletRequest;
import org.apache.shindig.common.util.ImmediateFuture;
+import org.apache.shindig.social.EasyMockTestCase;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.SocialApiTestsGuiceModule;
-import org.apache.shindig.social.core.util.BeanAtomConverter;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
import org.apache.shindig.social.core.util.BeanXStreamConverter;
-import org.apache.shindig.social.core.util.BeanXmlConverter;
-import org.apache.shindig.social.core.util.xstream.GuiceBeanProvider;
import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import junit.framework.TestCase;
import org.easymock.classextension.EasyMock;
import java.io.IOException;
@@ -48,7 +44,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-public class DataServiceServletTest extends TestCase {
+public class DataServiceServletTest extends EasyMockTestCase {
private static final FakeGadgetToken FAKE_GADGET_TOKEN = new
FakeGadgetToken()
.setOwnerId("john.doe").setViewerId("john.doe");
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java?rev=733661&r1=733660&r2=733661&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
Mon Jan 12 01:38:01 2009
@@ -19,18 +19,15 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.core.util.BeanAtomConverter;
+import org.apache.shindig.social.EasyMockTestCase;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
import org.apache.shindig.social.core.util.BeanXStreamConverter;
-import org.apache.shindig.social.core.util.BeanXmlConverter;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
import com.google.inject.Provider;
-import junit.framework.TestCase;
import org.easymock.classextension.EasyMock;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -47,7 +44,7 @@
/**
*
*/
-public class JsonRpcServletTest extends TestCase {
+public class JsonRpcServletTest extends EasyMockTestCase {
private static final FakeGadgetToken FAKE_GADGET_TOKEN = new
FakeGadgetToken()
.setOwnerId("john.doe").setViewerId("john.doe");
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=733661&r1=733660&r2=733661&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
Mon Jan 12 01:38:01 2009
@@ -19,6 +19,7 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
+import org.apache.shindig.social.EasyMockTestCase;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.core.model.PersonImpl;
import org.apache.shindig.social.opensocial.model.Person;
@@ -34,15 +35,13 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import junit.framework.TestCase;
import org.easymock.classextension.EasyMock;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ExecutionException;
-public class PersonHandlerTest extends TestCase {
+public class PersonHandlerTest extends EasyMockTestCase {
private PersonService personService;
private PersonHandler handler;
private FakeGadgetToken token;
@@ -75,11 +74,13 @@
handler = new PersonHandler(personService);
}
- private void replay() {
+ @Override
+ protected void replay() {
EasyMock.replay(personService);
}
- private void verify() {
+ @Override
+ protected void verify() {
EasyMock.verify(personService);
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java?rev=733661&r1=733660&r2=733661&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
Mon Jan 12 01:38:01 2009
@@ -18,6 +18,7 @@
package org.apache.shindig.social.opensocial.service;
import org.apache.shindig.common.testing.FakeGadgetToken;
+import org.apache.shindig.social.EasyMockTestCase;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.PersonService;
@@ -29,13 +30,11 @@
import org.easymock.classextension.EasyMock;
-import junit.framework.TestCase;
-
import java.util.Collections;
import javax.servlet.http.HttpServletRequest;
-public class RestfulRequestItemTest extends TestCase {
+public class RestfulRequestItemTest extends EasyMockTestCase {
private static final FakeGadgetToken FAKE_TOKEN = new FakeGadgetToken();
@@ -126,26 +125,26 @@
assertEquals("path", RestfulRequestItem.getServiceFromPath("/path/fun"));
assertEquals("path",
RestfulRequestItem.getServiceFromPath("/path/fun/yes"));
}
-
+
public static class InputData {
String name;
int id;
-
+
public void setName(String name) {
this.name = name;
}
-
+
public void setId(int id) {
this.id = id;
}
}
-
+
public void testGetTypedParameter() throws Exception {
InputData input = request.getTypedParameter("anykey", InputData.class);
assertEquals("Bob", input.name);
assertEquals(1234, input.id);
}
-
+
public void testGetTypedParameters() throws Exception {
InputData input = request.getTypedParameters(InputData.class);
assertEquals("Bob", input.name);
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java?rev=733661&r1=733660&r2=733661&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
Mon Jan 12 01:38:01 2009
@@ -20,15 +20,14 @@
import com.google.inject.Provider;
-import junit.framework.TestCase;
-
+import org.apache.shindig.social.EasyMockTestCase;
import org.easymock.classextension.IMocksControl;
import org.easymock.classextension.EasyMock;
/**
* Tests StandardHandlerDispatcher.
*/
-public class StandardHandlerDispatcherTest extends TestCase {
+public class StandardHandlerDispatcherTest extends EasyMockTestCase {
private Provider<PersonHandler> personHandlerProvider;
private Provider<AppDataHandler> appDataHandlerProvider;
