Author: etnu
Date: Wed Apr 1 22:52:05 2009
New Revision: 761099
URL: http://svn.apache.org/viewvc?rev=761099&view=rev
Log:
Fixed some import order issues.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java?rev=761099&r1=761098&r2=761099&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
Wed Apr 1 22:52:05 2009
@@ -17,16 +17,17 @@
*/
package org.apache.shindig.gadgets.spec;
+import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.common.util.HashUtil;
+import org.apache.shindig.common.xml.XmlUtil;
+import org.apache.shindig.gadgets.variables.Substitutions;
+
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.MapMaker;
import com.google.common.collect.Maps;
-import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.common.util.HashUtil;
-import org.apache.shindig.common.xml.XmlUtil;
-import org.apache.shindig.gadgets.variables.Substitutions;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=761099&r1=761098&r2=761099&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
Wed Apr 1 22:52:05 2009
@@ -31,6 +31,10 @@
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import org.apache.shindig.gadgets.http.RequestPipeline;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Test;
@@ -41,9 +45,6 @@
import java.util.Map.Entry;
import java.util.concurrent.Callable;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-
/**
* Tests for HttpPreloader.
*/
@@ -254,4 +255,4 @@
.create();
}
}
-}
\ No newline at end of file
+}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java?rev=761099&r1=761098&r2=761099&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
Wed Apr 1 22:52:05 2009
@@ -33,6 +33,9 @@
import org.apache.shindig.gadgets.http.RequestPipeline;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.PipelinedData;
+
+import com.google.common.collect.Lists;
+
import org.easymock.EasyMock;
import org.json.JSONObject;
import org.junit.Before;
@@ -43,14 +46,12 @@
import java.util.List;
import java.util.concurrent.Callable;
-import com.google.common.collect.Lists;
-
/**
* Test for PipelinedDataPreloader.
*/
public class PipelinedDataPreloaderTest extends PreloaderTestFixture {
private ContainerConfig containerConfig;
- private Expressions expressions = new Expressions();
+ private final Expressions expressions = new Expressions();
private static final String XML = "<Module xmlns:os=\"" +
PipelinedData.OPENSOCIAL_NAMESPACE
+ "\">" + "<ModulePrefs title=\"Title\"/>"
@@ -61,7 +62,7 @@
private static final String HTTP_REQUEST_URL =
"http://example.org/preload.html";;
private static final String PARAMS = "a=b&c=d";
private static final String XML_PARAMS = "a=b&c=d";
-
+
private static final String XML_WITH_HTTP_REQUEST = "<Module xmlns:os=\""
+ PipelinedData.OPENSOCIAL_NAMESPACE + "\">"
+ "<ModulePrefs title=\"Title\"/>"
@@ -91,7 +92,7 @@
+ " <os:HttpRequest key=\"p\" href=\"" + HTTP_REQUEST_URL + "\" "
+ " method=\"GET\" params=\"" + XML_PARAMS + "\"/>"
+ "</Content></Module>";
-
+
private static final String XML_IN_DEFAULT_CONTAINER = "<Module xmlns:os=\""
+ PipelinedData.OPENSOCIAL_NAMESPACE + "\">" + "<ModulePrefs
title=\"Title\"/>"
+ "<Content href=\"http://example.org/proxied.php\";>"
@@ -114,7 +115,7 @@
RecordingRequestPipeline pipeline = new
RecordingRequestPipeline(socialResult);
PipelinedDataPreloader preloader = new PipelinedDataPreloader(pipeline,
containerConfig,
expressions);
-
+
view = "profile";
contextParams.put("st", "token");
@@ -122,7 +123,7 @@
.setContext(context)
.setSpec(spec)
.setCurrentView(spec.getView("profile"));
-
+
Collection<Callable<PreloadedData>> tasks =
preloader.createPreloadTasks(gadget,
PreloaderService.PreloadPhase.PROXY_FETCH);
assertEquals(1, tasks.size());
@@ -166,10 +167,10 @@
.addHeader("set-cookie", "cookiecookie")
.addHeader("not-ok", "shouldn'tbehere")
.create();
-
+
String expectedResult = "{data: {status: 200, headers:" +
- "{'content-type': ['application/json; charset=UTF-8'],
'set-cookie': ['cookiecookie']}," +
- "content: [1, 2]}, id: 'p'}";
+ "{'content-type': ['application/json; charset=UTF-8'], 'set-cookie':
['cookiecookie']}," +
+ "content: [1, 2]}, id: 'p'}";
verifyHttpPreload(response, expectedResult);
}
@@ -181,9 +182,9 @@
.addHeader("content-type", "text/html")
.setHttpStatusCode(HttpResponse.SC_NOT_FOUND)
.create();
-
+
String expectedResult = "{error: {code: 404, data:" +
- "{headers: {'content-type': ['text/html; charset=UTF-8']}," +
+ "{headers: {'content-type': ['text/html; charset=UTF-8']}," +
"content: 'not found'}}, id: 'p'}";
verifyHttpPreload(response, expectedResult);
@@ -198,7 +199,7 @@
JSONObject result = new JSONObject(executeHttpPreload(response,
XML_WITH_HTTP_REQUEST));
assertFalse(result.has("data"));
-
+
JSONObject error = result.getJSONObject("error");
assertEquals(HttpResponse.SC_NOT_ACCEPTABLE, error.getInt("code"));
}
@@ -223,7 +224,7 @@
String resultString = executeHttpPreload(response, XML_WITH_HTTP_REQUEST);
JsonAssert.assertJsonEquals(expectedJson, resultString);
}
-
+
/**
* Run an HTTP Preload test, returning the String result.
*/
@@ -256,7 +257,7 @@
assertEquals(HTTP_REQUEST_URL, request.getUri().toString());
assertEquals("POST", request.getMethod());
assertEquals(60, request.getCacheTtl());
-
+
return result.iterator().next().toString();
}
@@ -334,7 +335,7 @@
assertTrue(tasks.isEmpty());
}
- /**
+ /**
* Verify that social preloads pay attention to view resolution by
* using gadget.getCurrentView().
*/
@@ -346,7 +347,7 @@
RecordingRequestPipeline pipeline = new
RecordingRequestPipeline(socialResult);
PipelinedDataPreloader preloader = new PipelinedDataPreloader(pipeline,
containerConfig,
expressions);
-
+
view = "profile";
contextParams.put("st", "token");
@@ -355,7 +356,7 @@
.setSpec(spec)
// Assume view resolution has behaved correctly
.setCurrentView(spec.getView(GadgetSpec.DEFAULT_VIEW));
-
+
Collection<Callable<PreloadedData>> tasks =
preloader.createPreloadTasks(gadget,
PreloaderService.PreloadPhase.PROXY_FETCH);
assertEquals(1, tasks.size());
