Author: lindner
Date: Mon Jan 12 02:27:20 2009
New Revision: 733673
URL: http://svn.apache.org/viewvc?rev=733673&view=rev
Log:
SHINDIG-825 | Patch from Vincent Siveton | tools-maven-plugin should fail if
legal files are missing
SHINDIG-809 | Patch from Vincent Siveton | Some test classes should extends
EasyMockTestCase instead of TestCase
SHINDIG-825 | Patch from Vincent Siveton | tools-maven-plugin should fail if
legal files are missing
SHINDIG-802 | Patch from Vincent Siveton | Using
org.apache.commons.io.IOUtils#closeQuietly()
SHINDIG-793 | Patch from Yoichiro Tanaka | Invalid getter method is called when
getter method to have one or more args is exists
Modified:
incubator/shindig/branches/1.0.x-incubating/ (props changed)
incubator/shindig/branches/1.0.x-incubating/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
incubator/shindig/branches/1.0.x-incubating/java/common/src/test/java/org/apache/shindig/common/AllTests.java
(props changed)
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
incubator/shindig/branches/1.0.x-incubating/pom.xml
Propchange: incubator/shindig/branches/1.0.x-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 02:27:20 2009
@@ -1 +1 @@
-/incubator/shindig/trunk:724511-724522,724874,724915,724939,726597,727032-727033,727048,733593,733596-733657
+/incubator/shindig/trunk:724511-724522,724874,724915,724939,726597,727032-727033,727048,733593,733596-733666
Modified:
incubator/shindig/branches/1.0.x-incubating/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
Mon Jan 12 02:27:20 2009
@@ -24,6 +24,7 @@
import com.google.inject.name.Names;
import com.google.inject.spi.Message;
+import org.apache.commons.io.IOUtils;
import org.apache.shindig.common.util.ResourceLoader;
import java.io.IOException;
@@ -38,9 +39,9 @@
public class PropertiesModule extends AbstractModule {
private final static String DEFAULT_PROPERTIES = "shindig.properties";
-
+
private final Properties properties;
-
+
public PropertiesModule() {
this.properties = readPropertyFile(DEFAULT_PROPERTIES);
}
@@ -48,7 +49,7 @@
public PropertiesModule(String propertyFile) {
this.properties = readPropertyFile(propertyFile);
}
-
+
public PropertiesModule(Properties properties) {
this.properties = properties;
}
@@ -68,15 +69,9 @@
throw new CreationException(Arrays.asList(
new Message("Unable to load properties: " + propertyFile)));
} finally {
- try {
- if (is != null) {
- is.close();
- }
- } catch (IOException e) {
- // weird
- }
+ IOUtils.closeQuietly( is );
}
-
+
return properties;
}
Propchange:
incubator/shindig/branches/1.0.x-incubating/java/common/src/test/java/org/apache/shindig/common/AllTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 02:27:20 2009
@@ -1 +1 @@
-/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java:733619-733657
+/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java:733619-733666
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java
Mon Jan 12 02:27:20 2009
@@ -23,8 +23,7 @@
import com.google.inject.name.Names;
import com.google.inject.spi.Message;
-import org.apache.shindig.common.util.ResourceLoader;
-import org.apache.shindig.social.opensocial.jpa.PersonDb;
+import org.apache.commons.io.IOUtils;
import
org.apache.shindig.social.opensocial.jpa.eclipselink.EclipseEntityManagerProvider;
import org.apache.shindig.social.opensocial.spi.ActivityService;
import org.apache.shindig.social.opensocial.spi.AppDataService;
@@ -38,7 +37,7 @@
import javax.persistence.EntityManager;
/**
- *
+ *
*/
public class JPASocialModule extends AbstractModule {
@@ -46,7 +45,7 @@
private Properties properties;
/**
- *
+ *
*/
public JPASocialModule() {
InputStream is = null;
@@ -62,19 +61,13 @@
throw new CreationException(Arrays.asList(new Message(
"Unable to load properties: " + DEFAULT_PROPERTIES)));
} finally {
- try {
- if (is != null) {
- is.close();
- }
- } catch (IOException e) {
- // dont care about this.
- }
+ IOUtils.closeQuietly( is );
}
}
/**
* {...@inheritdoc}
- *
+ *
* @see com.google.inject.AbstractModule#configure()
*/
@Override
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
Mon Jan 12 02:27:20 2009
@@ -149,7 +149,7 @@
availableGetters = GETTER_METHODS.get(pojo.getClass());
if (availableGetters == null) {
- availableGetters = getMatchingMethods(pojo, GETTER_PREFIX);
+ availableGetters = getMatchingMethods(pojo, GETTER_PREFIX, false);
GETTER_METHODS.putIfAbsent(pojo.getClass(), availableGetters);
}
@@ -186,7 +186,7 @@
}
- private List<MethodPair> getMatchingMethods(Object pojo, String prefix) {
+ private List<MethodPair> getMatchingMethods(Object pojo, String prefix,
boolean allowHaveArgs) {
List<MethodPair> availableGetters = Lists.newArrayList();
Method[] methods = pojo.getClass().getMethods();
@@ -203,6 +203,11 @@
if (EXCLUDED_FIELDS.contains(fieldName.toLowerCase())) {
continue;
}
+ if (!allowHaveArgs) {
+ if (method.getParameterTypes().length != 0) {
+ continue;
+ }
+ }
availableGetters.add(new MethodPair(method, fieldName));
}
return availableGetters;
@@ -257,7 +262,7 @@
List<MethodPair> methods;
methods = SETTER_METHODS.get(pojo.getClass());
if (methods == null) {
- methods = getMatchingMethods(pojo, SETTER_PREFIX);
+ methods = getMatchingMethods(pojo, SETTER_PREFIX, true);
SETTER_METHODS.putIfAbsent(pojo.getClass(), methods);
}
Modified:
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
Mon Jan 12 02:27:20 2009
@@ -26,6 +26,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;
@@ -59,7 +60,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/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
Mon Jan 12 02:27:20 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;
@@ -33,11 +32,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;
@@ -62,12 +62,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/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
Mon Jan 12 02:27:20 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/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
Mon Jan 12 02:27:20 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/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
Mon Jan 12 02:27:20 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/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
Mon Jan 12 02:27:20 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/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
Mon Jan 12 02:27:20 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/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
Mon Jan 12 02:27:20 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;
Modified: incubator/shindig/branches/1.0.x-incubating/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/pom.xml?rev=733673&r1=733672&r2=733673&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/pom.xml Mon Jan 12 02:27:20 2009
@@ -765,6 +765,66 @@
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/jsunit/**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ <!-- Misc -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.14</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
