Author: beaton
Date: Sun Jul 20 15:32:56 2008
New Revision: 678327
URL: http://svn.apache.org/viewvc?rev=678327&view=rev
Log:
Fix build warnings for unused imports and variables.
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.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/oauth/OAuthProtocolExceptionTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMergerTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
Sun Jul 20 15:32:56 2008
@@ -38,7 +38,6 @@
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java
Sun Jul 20 15:32:56 2008
@@ -154,8 +154,7 @@
json.put(PARENT_KEY, "bad bad bad parent!");
json.put(ARRAY_NAME, ARRAY_ALT_VALUE);
- ContainerConfig config
- = new ContainerConfig(createContainer(json).getAbsolutePath());
+ new ContainerConfig(createContainer(json).getAbsolutePath());
}
public void testPathQuery() throws Exception {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
Sun Jul 20 15:32:56 2008
@@ -18,30 +18,21 @@
*/
package org.apache.shindig.gadgets;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
import org.apache.shindig.common.util.ResourceLoader;
-import org.apache.shindig.gadgets.http.BasicHttpCache;
-import org.apache.shindig.gadgets.http.BasicHttpFetcher;
-import org.apache.shindig.gadgets.http.ContentFetcherFactory;
-import org.apache.shindig.gadgets.http.HttpCache;
-import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.http.HttpResponse;
-import org.apache.shindig.gadgets.http.RemoteContentFetcherFactory;
-import org.apache.shindig.gadgets.oauth.OAuthFetcherFactory;
-import org.apache.shindig.gadgets.rewrite.ContentRewriter;
-import org.apache.shindig.gadgets.rewrite.DefaultContentRewriter;
import com.google.inject.AbstractModule;
import com.google.inject.CreationException;
import com.google.inject.name.Names;
import com.google.inject.spi.Message;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
/**
* Creates a module to supply all of the Basic* classes
*/
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
Sun Jul 20 15:32:56 2008
@@ -43,16 +43,18 @@
private static final int CONNECT_TIMEOUT_MS = 5000;
private static final int DEFAULT_MAX_OBJECT_SIZE = 1024 * 1024;
- private final int maxObjSize;
private final HttpCache cache;
/**
- * Creates a new fetcher capable of retrieving objects [EMAIL PROTECTED]
maxObjSize}
- * bytes or smaller in size.
- * @param maxObjSize Maximum size, in bytes, of object to fetch
+ * Creates a new fetcher for fetching HTTP objects. Not really suitable
+ * for production use. Someone should probably go and implement maxObjSize,
+ * for one thing. Use of an HTTP proxy for security is also necessary
+ * for production deployment.
+ *
+ * @param maxObjSize Maximum size, in bytes, of object to fetch. Except this
+ * isn't actually implemented.
*/
public BasicHttpFetcher(HttpCache cache, int maxObjSize) {
- this.maxObjSize = maxObjSize;
this.cache = cache;
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriter.java
Sun Jul 20 15:32:56 2008
@@ -21,10 +21,6 @@
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.spec.GadgetSpec;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URI;
-
import com.google.inject.ImplementedBy;
/**
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java
Sun Jul 20 15:32:56 2008
@@ -39,8 +39,6 @@
import java.io.Reader;
import java.io.StringReader;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
public class CajaContentFilter implements GadgetContentFilter {
private final URI retrievedUri;
@@ -88,7 +86,6 @@
throws GadgetException {
StringBuilder errbuilder = new StringBuilder();
MessageContext mc = new MessageContext();
- List<GadgetException> exceptions = new ArrayList<GadgetException>();
if (cause != null) {
errbuilder.append(cause).append('\n');
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
Sun Jul 20 15:32:56 2008
@@ -261,7 +261,6 @@
// Inline any libs that weren't forced
for (JsLibrary library : gadget.getJsLibraries()) {
- JsLibrary.Type type = library.getType();
if (library.getType().equals(JsLibrary.Type.URL)) {
externJs.append(String.format(externFmt, library.getContent()));
} else {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
Sun Jul 20 15:32:56 2008
@@ -248,7 +248,6 @@
String paramName = paramNames.nextElement();
if (paramName.startsWith(USERPREF_PARAM_PREFIX)) {
String prefName = paramName.substring(USERPREF_PARAM_PREFIX.length());
- String escapedParam =
prefs.put(prefName, req.getParameter(paramName));
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
Sun Jul 20 15:32:56 2008
@@ -20,8 +20,6 @@
import org.apache.shindig.gadgets.DefaultGuiceModule;
-import com.google.inject.Scopes;
-
import java.util.Properties;
/**
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
Sun Jul 20 15:32:56 2008
@@ -79,7 +79,7 @@
public void testInvalidRegularExpression() throws Exception {
try {
- GadgetBlacklist bl = createBlacklist("REGEXP +http://bla.com/.*";);
+ createBlacklist("REGEXP +http://bla.com/.*";);
fail();
} catch (PatternSyntaxException ex) {
// success
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java
Sun Jul 20 15:32:56 2008
@@ -197,7 +197,7 @@
expect(fetcher.fetch(request)).andReturn(HttpResponse.error());
replay(fetcher);
- GadgetSpec spec = specFactory.getGadgetSpec(SPEC_URL, true);
+ specFactory.getGadgetSpec(SPEC_URL, true);
}
@Test(expected = GadgetException.class)
@@ -209,7 +209,7 @@
expect(fetcher.fetch(viewRequest)).andReturn(HttpResponse.error());
replay(fetcher);
- GadgetSpec spec = specFactory.getGadgetSpec(SPEC_URL, true);
+ specFactory.getGadgetSpec(SPEC_URL, true);
}
@Test(expected = GadgetException.class)
@@ -219,7 +219,7 @@
new GadgetException(GadgetException.Code.FAILED_TO_RETRIEVE_CONTENT));
replay(fetcher);
- GadgetSpec spec = specFactory.getGadgetSpec(SPEC_URL, true);
+ specFactory.getGadgetSpec(SPEC_URL, true);
}
private static class CaptureRewriter implements ContentRewriter {
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
Sun Jul 20 15:32:56 2008
@@ -121,6 +121,7 @@
"<msg name='" + MSG_0_NAME + "'>" + MSG_0_VALUE + "</msg>" +
"</Locale>";
LocaleSpec locale = new LocaleSpec(XmlUtil.parse(localeXml), SPEC_URI);
+ assertEquals("all", locale.getLanguage());
Map<String, List<String>> headers = Maps.newHashMap();
headers.put("Pragma", Arrays.asList("no-cache"));
HttpResponse expiredResponse = new HttpResponse(
@@ -134,11 +135,11 @@
replay(fetcher);
MessageBundle bundle = bundleFactory.getBundle(BUNDLE_URI, true);
- MessageBundle bundle2 = bundleFactory.getBundle(BUNDLE_URI, false);
+ bundle = bundleFactory.getBundle(BUNDLE_URI, false);
verify(fetcher);
- assertEquals(MSG_0_VALUE, bundle2.getMessages().get(MSG_0_NAME));
+ assertEquals(MSG_0_VALUE, bundle.getMessages().get(MSG_0_NAME));
}
@Test
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FeedProcessorTest.java
Sun Jul 20 15:32:56 2008
@@ -129,7 +129,7 @@
@Test
public void parseRssNoSummaries() throws Exception {
JSONObject feed = processor.process(URL_RSS, DATA_RSS, false, 1);
- JSONArray entryArray = feed.getJSONArray("Entry");
+ feed.getJSONArray("Entry");
JSONObject entry = feed.getJSONArray("Entry").getJSONObject(0);
assertNull("Summary should not be returned when getSummaries is false",
entry.optString("Summary", null));
@@ -170,7 +170,7 @@
@Test
public void parseAtomNoSummaries() throws Exception {
JSONObject feed = processor.process(URL_ATOM, DATA_ATOM, false, 1);
- JSONArray entryArray = feed.getJSONArray("Entry");
+ feed.getJSONArray("Entry");
JSONObject entry = feed.getJSONArray("Entry").getJSONObject(0);
assertNull("Summary should not be returned when getSummaries is false",
entry.optString("Summary", null));
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java
Sun Jul 20 15:32:56 2008
@@ -98,7 +98,7 @@
replay();
try {
- Gadget gadget = gadgetServer.processGadget(BASIC_CONTEXT);
+ gadgetServer.processGadget(BASIC_CONTEXT);
fail("Expected a GadgetException for a failed http fetch.");
} catch (GadgetException e) {
// Expected for a bad gadget spec URI.
@@ -149,13 +149,6 @@
HttpResponse spec = new HttpResponse(gadgetXml);
- GadgetContext context = new GadgetContext() {
- @Override
- public URI getUrl() {
- return SPEC_URL;
- }
- };
-
expect(fetcher.fetch(SPEC_REQUEST)).andReturn(spec);
replay();
@@ -270,9 +263,6 @@
public void testNoSignedPreloadWithoutToken() throws Exception {
String preloadUrl = "http://example.org/preload.txt";;
- String preloadData = "Preload Data";
- HttpRequest preloadRequest
- = new HttpRequest(URI.create(preloadUrl));
String gadgetXml
= "<Module>" +
@@ -381,7 +371,7 @@
replay();
try {
- Gadget gadget = gadgetServer.processGadget(BASIC_CONTEXT);
+ gadgetServer.processGadget(BASIC_CONTEXT);
fail("Expected a GadgetException for a failed http fetch of remote
gadget content.");
} catch (GadgetException e) {
// Expected for a bad content href URI.
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=678327&r1=678326&r2=678327&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
Sun Jul 20 15:32:56 2008
@@ -142,7 +142,7 @@
public void testCacheHit() throws Exception {
HttpRequest unsigned = makeHttpRequest("GET", "http://test";, null);
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
HttpRequest unsigned2 = makeHttpRequest("GET", "http://test";, null);
interceptor.interceptedRequest = null;
@@ -153,7 +153,7 @@
public void testCacheMiss_noOwner() throws Exception {
HttpRequest unsigned = makeHttpRequest("GET", "http://test";, null);
unsigned.getOptions().ownerSigned = false;
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
HttpRequest unsigned2 = makeHttpRequest("GET", "http://test";, null);
interceptor.interceptedRequest = null;
@@ -164,7 +164,7 @@
public void testCacheHit_ownerOnly() throws Exception {
HttpRequest unsigned = makeHttpRequest("GET", "http://test";, null);
unsigned.getOptions().viewerSigned = false;
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
HttpRequest unsigned2 = makeHttpRequest("GET", "http://test";, null);
unsigned2.getOptions().viewerSigned = false;
@@ -176,7 +176,7 @@
public void testCacheMiss_bypassCache() throws Exception {
HttpRequest unsigned = makeHttpRequest("GET", "http://test";, null);
unsigned.getOptions().viewerSigned = false;
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
HttpRequest unsigned2 = makeHttpRequest("GET", "http://test";, null);
unsigned2.getOptions().ignoreCache = true;
@@ -191,7 +191,7 @@
HttpRequest unsigned
= makeHttpRequest("GET", "http://test?"; + tricky, null);
try {
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good.
@@ -203,7 +203,7 @@
HttpRequest unsigned
= makeHttpRequest("POST", "http://test";, tricky.getBytes());
try {
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good.
@@ -211,14 +211,12 @@
}
public void testGetNoQuery() throws Exception {
- HttpRequest unsigned
- = makeHttpRequest("GET", "http://test";, null);
- HttpRequest out = signAndInspect(unsigned);
+ HttpRequest unsigned = makeHttpRequest("GET", "http://test";, null);
+ signAndInspect(unsigned);
}
public void testGetWithQuery() throws Exception {
- HttpRequest unsigned
- = makeHttpRequest("GET", "http://test?a=b";, null);
+ HttpRequest unsigned = makeHttpRequest("GET", "http://test?a=b";, null);
HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
@@ -247,7 +245,7 @@
public void testPostNoQueryNoData() throws Exception {
HttpRequest unsigned = makeHttpRequest("GET", "http://test";);
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
}
public void testPostWithQueryNoData() throws Exception {
@@ -281,7 +279,7 @@
HttpRequest unsigned = makeHttpRequest(
"POST", "http://test?opensocial_foo=bar";);
try {
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good
@@ -292,7 +290,7 @@
HttpRequest unsigned = makeHttpRequest(
"POST", "http://test?oauth_foo=bar";, "name=value".getBytes());
try {
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good
@@ -303,7 +301,7 @@
HttpRequest unsigned = makeHttpRequest(
"POST", "http://test";, "opensocial_foo=bar".getBytes());
try {
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good.
@@ -314,7 +312,7 @@
HttpRequest unsigned = makeHttpRequest(
"POST", "http://test";, "oauth_foo=bar".getBytes());
try {
- HttpRequest out = signAndInspect(unsigned);
+ signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good.
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthProtocolExceptionTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthProtocolExceptionTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthProtocolExceptionTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthProtocolExceptionTest.java
Sun Jul 20 15:32:56 2008
@@ -19,7 +19,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import java.util.Map;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssRewriterTest.java
Sun Jul 20 15:32:56 2008
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import org.apache.shindig.gadgets.EasyMockTestCase;
-
import java.net.URI;
/**
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java
Sun Jul 20 15:32:56 2008
@@ -18,8 +18,6 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import org.apache.shindig.gadgets.EasyMockTestCase;
-
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMergerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMergerTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMergerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMergerTest.java
Sun Jul 20 15:32:56 2008
@@ -18,8 +18,6 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import org.apache.shindig.gadgets.EasyMockTestCase;
-
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriterTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriterTest.java
Sun Jul 20 15:32:56 2008
@@ -18,8 +18,6 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import org.apache.shindig.gadgets.EasyMockTestCase;
-
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
Sun Jul 20 15:32:56 2008
@@ -37,11 +37,9 @@
import org.json.JSONObject;
import java.net.URI;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.List;
// TODO: Migrate this to new Servlet testing setup.
public class GadgetRenderingTaskTest extends HttpTestFixture {
@@ -137,7 +135,6 @@
@SuppressWarnings("unchecked")
public void testForcedLibsIncluded() throws Exception {
String jsLibs = "http://example.org/js/foo:bar.js";;
- List<String> libs = Arrays.asList(LIBS.split(":"));
expect(urlGenerator.getBundledJsUrl(isA(Collection.class),
isA(GadgetContext.class))).andReturn(jsLibs);
String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
@@ -250,19 +247,19 @@
}
public void testRenderSetsProperCacheControlHeaders() throws Exception {
- String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
+ parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
fixture.checkCacheControlHeaders(GadgetRenderingTask.DEFAULT_CACHE_TTL,
true);
}
public void testRenderSetsLongLivedCacheControlHeadersWhenVParamIsSet()
throws Exception {
expect(fixture.request.getParameter("v")).andReturn("some value");
- String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
+ parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
fixture.checkCacheControlHeaders(HttpUtil.DEFAULT_TTL, true);
}
public void testRenderSetsNoCacheHeadersWhenNoCacheParamIsSet() throws
Exception {
expect(fixture.request.getParameter("nocache")).andReturn("1");
- String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
+ parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
fixture.checkCacheControlHeaders(0, true);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
Sun Jul 20 15:32:56 2008
@@ -81,8 +81,6 @@
.put("context", createContext("en", "US"))
.put("gadgets", gadgets);
- GadgetSpec spec = new GadgetSpec(SPEC_URL, SPEC_XML);
-
expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new HttpResponse(SPEC_XML));
expect(urlGenerator.getIframeUrl(isA(Gadget.class)))
.andReturn(SPEC_URL.toString());
@@ -113,9 +111,6 @@
.put("context", createContext("en", "US"))
.put("gadgets", gadgets);
- GadgetSpec spec = new GadgetSpec(SPEC_URL, SPEC_XML);
- GadgetSpec spec2 = new GadgetSpec(SPEC_URL2, SPEC_XML2);
-
expect(fetcher.fetch(SPEC_REQUEST))
.andReturn(new HttpResponse(SPEC_XML));
expect(fetcher.fetch(SPEC_REQUEST2))
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
Sun Jul 20 15:32:56 2008
@@ -55,7 +55,7 @@
public void testDoesNotLikeUnnamedFeatures() throws Exception {
String xml = "<Require/>";
try {
- Feature feature = new Feature(XmlUtil.parse(xml));
+ new Feature(XmlUtil.parse(xml));
fail("No exception thrown when an unnamed feature is passed.");
} catch (SpecParserException e) {
// Ok
@@ -65,7 +65,7 @@
public void testEnforceParamNames() throws Exception {
String xml = "<Require feature=\"foo\"><Param>Test</Param></Require>";
try {
- Feature feature = new Feature(XmlUtil.parse(xml));
+ new Feature(XmlUtil.parse(xml));
fail("No exception thrown when an unnamed parameter is passed.");
} catch (SpecParserException e) {
// OK.
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java
Sun Jul 20 15:32:56 2008
@@ -60,7 +60,7 @@
"<Content type=\"html\"/>" +
"</Module>";
try {
- GadgetSpec spec = new GadgetSpec(SPEC_URL, xml);
+ new GadgetSpec(SPEC_URL, xml);
fail("No exception thrown when ModulePrefs is missing.");
} catch (SpecParserException e) {
// OK
@@ -74,7 +74,7 @@
"<Content type=\"html\"/>" +
"</Module>";
try {
- GadgetSpec spec = new GadgetSpec(SPEC_URL, xml);
+ new GadgetSpec(SPEC_URL, xml);
fail("No exception thrown when more than 1 ModulePrefs is specified.");
} catch (SpecParserException e) {
// OK
@@ -84,7 +84,7 @@
public void testMalformedXml() throws Exception {
String xml = "<Module><ModulePrefs/>";
try {
- GadgetSpec spec = new GadgetSpec(SPEC_URL, xml);
+ new GadgetSpec(SPEC_URL, xml);
fail("No exception thrown on malformed XML.");
} catch (SpecParserException e) {
// OK
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java
Sun Jul 20 15:32:56 2008
@@ -36,7 +36,7 @@
public void testInvalidMode() throws Exception {
String xml = "<Icon type=\"foo\" mode=\"broken\"/>";
try {
- Icon icon = new Icon(XmlUtil.parse(xml));
+ new Icon(XmlUtil.parse(xml));
fail("No exception thrown when an invalid mode attribute is passed.");
} catch (SpecParserException e) {
// OK
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java
Sun Jul 20 15:32:56 2008
@@ -65,13 +65,13 @@
@Test(expected = SpecParserException.class)
public void invalidLanguageDirection() throws Exception {
String xml = "<Locale language_direction=\"invalid\"/>";
- LocaleSpec locale = new LocaleSpec(XmlUtil.parse(xml), SPEC_URL);
+ new LocaleSpec(XmlUtil.parse(xml), SPEC_URL);
}
@Test(expected = SpecParserException.class)
public void invalidMessagesUrl() throws Exception {
String xml = "<Locale messages=\"[EMAIL PROTECTED]"/>";
- LocaleSpec locale = new LocaleSpec(XmlUtil.parse(xml), SPEC_URL);
+ new LocaleSpec(XmlUtil.parse(xml), SPEC_URL);
}
@Test
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java
Sun Jul 20 15:32:56 2008
@@ -58,13 +58,13 @@
@Test(expected = SpecParserException.class)
public void missingNameThrows() throws SpecParserException {
String xml = "<messagebundle><msg>foo</msg></messagebundle>";
- MessageBundle bundle = new MessageBundle(BUNDLE_URL, xml);
+ new MessageBundle(BUNDLE_URL, xml);
}
@Test(expected = SpecParserException.class)
public void malformedXmlThrows() throws SpecParserException {
String xml = "</messagebundle>";
- MessageBundle bundle = new MessageBundle(BUNDLE_URL, xml);
+ new MessageBundle(BUNDLE_URL, xml);
}
@Test
@@ -78,7 +78,7 @@
public void extractFromElementsWithNoName() throws Exception {
String xml = "<messagebundle><msg>foo</msg></messagebundle>";
Element element = XmlUtil.parse(xml);
- MessageBundle bundle = new MessageBundle(element);
+ new MessageBundle(element);
}
@Test
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/OAuthServiceTest.java
Sun Jul 20 15:32:56 2008
@@ -87,7 +87,8 @@
public void testParseEndPoint_badlocation() throws Exception {
try {
String xml = "<Request url='http://www.example.com' method='GET'
param_location='body'/>";
- OAuthService.EndPoint ep = service.parseEndPoint("Request",
XmlUtil.parse(xml));
+ service.parseEndPoint("Request", XmlUtil.parse(xml));
+ fail("Should have thrown");
} catch (SpecParserException e) {
assertEquals("Unknown OAuth param_location: body", e.getMessage());
}
@@ -146,7 +147,7 @@
public void testParseService_nodata() throws Exception {
String xml = "<Service/>";
try {
- OAuthService s = new OAuthService(XmlUtil.parse(xml));
+ new OAuthService(XmlUtil.parse(xml));
} catch (SpecParserException e) {
assertEquals("/OAuth/Service/Request is required", e.getMessage());
}
@@ -158,7 +159,7 @@
"<Request url='http://www.example.com/request'/>" +
"</Service>";
try {
- OAuthService s = new OAuthService(XmlUtil.parse(xml));
+ new OAuthService(XmlUtil.parse(xml));
} catch (SpecParserException e) {
assertEquals("/OAuth/Service/Access is required", e.getMessage());
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
Sun Jul 20 15:32:56 2008
@@ -76,7 +76,7 @@
public void testMissingName() throws Exception {
String xml = "<UserPref datatype=\"string\"/>";
try {
- UserPref pref = new UserPref(XmlUtil.parse(xml));
+ new UserPref(XmlUtil.parse(xml));
fail("No exception thrown when name is missing");
} catch (SpecParserException e) {
// OK
@@ -94,7 +94,7 @@
" <EnumValue/>" +
"</UserPref>";
try {
- UserPref pref = new UserPref(XmlUtil.parse(xml));
+ new UserPref(XmlUtil.parse(xml));
fail("No exception thrown when [EMAIL PROTECTED] is missing");
} catch (SpecParserException e) {
// OK
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
Sun Jul 20 15:32:56 2008
@@ -76,7 +76,7 @@
= "<Content type=\"url\" href=\"http://example.org/\"/>";
try {
- View view = new View("test", Arrays.asList(XmlUtil.parse(content1),
+ new View("test", Arrays.asList(XmlUtil.parse(content1),
XmlUtil.parse(content2)));
fail("No exception thrown with conflicting type attributes.");
} catch (SpecParserException e) {
@@ -87,7 +87,7 @@
public void testHrefOnTypeUrl() throws Exception {
String xml = "<Content type=\"url\"/>";
try {
- View view = new View("dummy", Arrays.asList(XmlUtil.parse(xml)));
+ new View("dummy", Arrays.asList(XmlUtil.parse(xml)));
fail("No exception thrown when href attribute is missing for type=url.");
} catch (SpecParserException e) {
// Ok
@@ -99,7 +99,7 @@
// most anything will pass. urn:isbn:0321146530 is valid here.
String xml = "<Content type=\"url\" href=\"[EMAIL PROTECTED]"/>";
try {
- View view = new View("dummy", Arrays.asList(XmlUtil.parse(xml)));
+ new View("dummy", Arrays.asList(XmlUtil.parse(xml)));
fail("No exception thrown when href attribute is not a valid uri.");
} catch (SpecParserException e) {
// Ok
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
Sun Jul 20 15:32:56 2008
@@ -212,7 +212,6 @@
pojo = (T) json; // This is a weird cast...
} else if (pojo instanceof Map) {
- Type[] types = pojo.getClass().getTypeParameters();
// TODO: Figure out how to get the actual generic type for the
// second Map parameter. Right now we are hardcoding to String
Class<?> mapValueClass = String.class;
Modified:
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=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
Sun Jul 20 15:32:56 2008
@@ -24,14 +24,10 @@
import com.google.inject.AbstractModule;
import com.google.inject.name.Names;
-import java.util.logging.Logger;
-
/**
* Provides social api component injection for all large tests
*/
public class SocialApiTestsGuiceModule extends AbstractModule {
- private static Logger logger =
- Logger.getLogger(SocialApiTestsGuiceModule.class.getName());
@Override
protected void configure() {
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataServiceServletTest.java
Sun Jul 20 15:32:56 2008
@@ -39,7 +39,6 @@
import java.io.PrintWriter;
import java.io.IOException;
import java.util.Collections;
-import java.util.Enumeration;
import java.util.StringTokenizer;
import java.util.concurrent.Future;
import java.util.concurrent.ExecutionException;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
Sun Jul 20 15:32:56 2008
@@ -410,11 +410,6 @@
assertEquals(expected.intValue(), result.getInt(field.toString()));
}
- private void assertDateField(JSONObject result, Date expected,
- Object field) throws JSONException {
- assertEquals(expected.toString(), result.getString(field.toString()));
- }
-
private void assertStringField(JSONObject result, String expected,
Object field) throws JSONException {
assertEquals(expected, result.getString(field.toString()));
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java?rev=678327&r1=678326&r2=678327&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
Sun Jul 20 15:32:56 2008
@@ -135,7 +135,7 @@
String xml = beanXmlConverter.convertToXml(map);
// TODO: Change this test to use parsing once we have the right format
- Element element = XmlUtil.parse(xml);
+ XmlUtil.parse(xml);
// TODO: I don't believe this is the output we are looking for for app
// data... we will probably have to tweak this.
