Author: doll
Date: Fri May 9 08:59:36 2008
New Revision: 654864
URL: http://svn.apache.org/viewvc?rev=654864&view=rev
Log:
SHINDIG-256
Patch from Dave Smith. Added super.setUp calls and removed an unused tearDown
method.
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/RemoteContentTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/UserPrefSubstituterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java
Fri May 9 08:59:36 2008
@@ -42,12 +42,14 @@
@Override
public void setUp() throws Exception {
- cache = new BasicContentCache();
+ super.setUp();
+ cache = new BasicContentCache();
}
@Override
protected void tearDown() throws Exception {
cache = null;
+ super.tearDown();
}
private RemoteContentRequest createRequest(String method) {
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java
Fri May 9 08:59:36 2008
@@ -49,6 +49,7 @@
@Override
public void setUp() throws Exception {
+ super.setUp();
config = new ContainerConfig(null);
// We use a JSON Object here to guarantee that we're well formed up front.
JSONObject json = new JSONObject();
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
Fri May 9 08:59:36 2008
@@ -42,13 +42,14 @@
"feature0", "feature1", "feature2", "feature3"
};
private static final String UNREGISTERED_FEATURE = "unregistered";
+
@Override
public void setUp() throws Exception {
// TODO: Add a mock fetcher here and add tests for retrieving remote files
+ super.setUp();
registry = new GadgetFeatureRegistry(null, null);
}
-
public void testDependencyChain() throws Exception {
registry.register(FEATURE_NAME, Arrays.asList(DEP_NAME), DUMMY_FEATURE);
registry.register(DEP_NAME, null, DUMMY_FEATURE);
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
Fri May 9 08:59:36 2008
@@ -74,11 +74,6 @@
gadget = mock(Gadget.class);
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
public void testDisabledGlobally() {
domainLocker = new HashLockedDomainService(
containerRequiredConfig, "embed.com", false);
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
Fri May 9 08:59:36 2008
@@ -38,6 +38,7 @@
@Override
public void setUp() throws Exception {
+ super.setUp();
loader = new JsFeatureLoader(fetcher);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/RemoteContentTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/RemoteContentTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/RemoteContentTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/RemoteContentTest.java
Fri May 9 08:59:36 2008
@@ -32,7 +32,8 @@
private Map<String, List<String>> headers;
@Override
- public void setUp() {
+ public void setUp() throws Exception {
+ super.setUp();
headers = new HashMap<String, List<String>>();
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
Fri May 9 08:59:36 2008
@@ -73,6 +73,7 @@
@Override
public void setUp() throws Exception {
+ super.setUp();
cache = new BasicContentCache();
interceptor = new InterceptingContentFetcher();
authToken = new BasicGadgetToken("o", "v", "a", "d", "u", "m");
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/UserPrefSubstituterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/UserPrefSubstituterTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/UserPrefSubstituterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/UserPrefSubstituterTest.java
Fri May 9 08:59:36 2008
@@ -53,6 +53,7 @@
@Override
public void setUp() throws Exception {
+ super.setUp();
spec = new GadgetSpec(URI.create(""), DEFAULT_XML);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
Fri May 9 08:59:36 2008
@@ -49,6 +49,7 @@
@Override
@SuppressWarnings("unchecked")
protected void setUp() throws Exception {
+ super.setUp();
control = EasyMock.createStrictControl();
mockProviders = control.createMock(
new HashMap<OAuthStore.ProviderKey,
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
Fri May 9 08:59:36 2008
@@ -137,6 +137,7 @@
@Override
protected void setUp() throws Exception {
+ super.setUp();
control = EasyMock.createStrictControl();
mockStoreImpl = control.createMock(BasicOAuthStore.class);
store = new GadgetOAuthTokenStore(mockStoreImpl);
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=654864&r1=654863&r2=654864&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
Fri May 9 08:59:36 2008
@@ -44,6 +44,7 @@
@Override
public void setUp() throws Exception {
+ super.setUp();
johnDoe = new Person("johnDoeId", new Name("John Doe"));
List<Phone> phones = new ArrayList<Phone>();
phones.add(new Phone("+33H000000000", "home"));
