You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2012/02/27 00:43:33 UTC
svn commit: r1293966 [8/12] - in /shindig/trunk:
extras/src/main/java/org/apache/shindig/extras/
java/common/src/main/java/org/apache/shindig/auth/
java/common/src/main/java/org/apache/shindig/common/
java/common/src/main/java/org/apache/shindig/common...
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractSocialMarkupHtmlParserTest.java Sun Feb 26 23:43:20 2012
@@ -42,7 +42,7 @@ public abstract class AbstractSocialMark
private Document document;
protected abstract GadgetHtmlParser makeParser();
-
+
@Before
public void setUp() throws Exception {
parser = makeParser();
@@ -56,7 +56,7 @@ public abstract class AbstractSocialMark
// Verify elements are preserved in social data
List<Element> scripts = SocialDataTags.getTags(document, SocialDataTags.OSML_DATA_TAG);
assertEquals(1, scripts.size());
-
+
NodeList viewerRequests = scripts.get(0).getElementsByTagNameNS(
PipelinedData.OPENSOCIAL_NAMESPACE, "ViewerRequest");
assertEquals(1, viewerRequests.getLength());
@@ -70,16 +70,16 @@ public abstract class AbstractSocialMark
// Verify elements and text content are preserved in social templates
List<Element> scripts = SocialDataTags.getTags(document, SocialDataTags.OSML_TEMPLATE_TAG);
assertEquals(1, scripts.size());
-
+
assertEquals("template-id", scripts.get(0).getAttribute("id"));
assertEquals("template-name", scripts.get(0).getAttribute("name"));
assertEquals("template-tag", scripts.get(0).getAttribute("tag"));
-
+
NodeList boldElements = scripts.get(0).getElementsByTagName("b");
assertEquals(1, boldElements.getLength());
Element boldElement = (Element) boldElements.item(0);
assertEquals("Some ${viewer} content", boldElement.getTextContent());
-
+
NodeList osHtmlElements = scripts.get(0).getElementsByTagNameNS(
"http://ns.opensocial.org/2008/markup", "Html");
assertEquals(1, osHtmlElements.getLength());
@@ -96,7 +96,7 @@ public abstract class AbstractSocialMark
public void testJavascript() {
// Verify text content is unmodified in javascript blocks
List<Element> scripts = SocialDataTags.getTags(document, "script");
-
+
// Remove any OpenSocial-specific nodes.
Iterator<Element> scriptIt = scripts.iterator();
while (scriptIt.hasNext()) {
@@ -104,9 +104,9 @@ public abstract class AbstractSocialMark
scriptIt.remove();
}
}
-
+
assertEquals(1, scripts.size());
-
+
NodeList boldElements = scripts.get(0).getElementsByTagName("b");
assertEquals(0, boldElements.getLength());
@@ -128,26 +128,26 @@ public abstract class AbstractSocialMark
assertEquals(1, divElements.getLength());
NodeList children = divElements.item(0).getChildNodes();
assertEquals(3, children.getLength());
-
+
// Should be comment/text/comment, not comment/comment/text
assertEquals(Node.COMMENT_NODE, children.item(0).getNodeType());
assertEquals(Node.TEXT_NODE, children.item(1).getNodeType());
assertEquals(Node.COMMENT_NODE, children.item(2).getNodeType());
}
-
+
@Test
public void testInvalid() throws Exception {
String content =
"<html><div id=\"div_super\" class=\"div_super\" valign:\"middle\"></div></html>";
Document doc = parser.parseDom(content);
-
+
// Returns a bare Document with error text in it.
Node body = doc.getElementsByTagName("body").item(0);
-
+
assertTrue(body.getTextContent().contains("INVALID_CHARACTER_ERR"));
assertTrue(body.getTextContent().contains(
"Around ...<div id=\"div_super\" class=\"div_super\"..."));
- // Verify Serialization:
+ // Verify Serialization:
assertTrue(HtmlSerialization.serialize(doc).contains("INVALID_CHARACTER_ERR"));
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/CompactHtmlSerializerTest.java Sun Feb 26 23:43:20 2012
@@ -33,7 +33,7 @@ import java.io.StringWriter;
* Test cases for CompactHtmlSerializer.
*/
public abstract class CompactHtmlSerializerTest extends AbstractParsingTestBase {
-
+
protected abstract GadgetHtmlParser makeParser();
private GadgetHtmlParser full = makeParser();
@@ -55,7 +55,7 @@ public abstract class CompactHtmlSeriali
"org/apache/shindig/gadgets/parse/test-with-specialtags-expected.html");
parseAndCompareBalanced(content, expected, full);
}
-
+
@Test
public void ieConditionalCommentNotRemoved() throws Exception {
String content = loadFile("org/apache/shindig/gadgets/parse/test-with-iecond-comments.html");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java Sun Feb 26 23:43:20 2012
@@ -52,7 +52,7 @@ public class DefaultHtmlSerializerTest {
@Test
public void testComments() throws Exception {
-
+
Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
doc.appendChild(doc.createElement("ABC"));
doc.appendChild(doc.createComment("XYZ"));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java Sun Feb 26 23:43:20 2012
@@ -70,7 +70,7 @@ public class HtmlParserTest extends Asse
@Test
public void testParseNestedContentWithNoCloseForBrAndHr() throws Exception {
parseNestedContentWithNoCloseForBrAndHr(nekoParser);
- }
+ }
void parseNestedContentWithNoCloseForBrAndHr(GadgetHtmlParser htmlParser) throws Exception {
Document doc = htmlParser.parseDom("<div>x and y<br> and <hr>z</div>");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlSerializationTest.java Sun Feb 26 23:43:20 2012
@@ -40,7 +40,7 @@ public class HtmlSerializationTest {
doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
GadgetHtmlParser neko = new NekoSimplifiedHtmlParser(
new ParseModule.DOMImplementationProvider().get());
-
+
GadgetHtmlParser caja = new CajaHtmlParser(
new ParseModule.DOMImplementationProvider().get());
@@ -62,14 +62,14 @@ public class HtmlSerializationTest {
+ " </li></ul>"
+ "</script>"
+ "</body></html>";
-
+
for(GadgetHtmlParser parser : parsers) {
Document doc = parser.parseDom(markup);
String result = HtmlSerialization.serialize(doc);
assertEquals(markup, result);
}
}
-
+
@Test
public void testSerializeHtml() throws Exception {
String markup = "<!DOCTYPE html>\n"
@@ -81,7 +81,7 @@ public class HtmlSerializationTest {
+ "</osx:NavigateToApp>\n"
+ "</div>"
+ "</body></html>";
-
+
for(GadgetHtmlParser parser : parsers) {
Document doc = parser.parseDom(markup);
String result = HtmlSerialization.serialize(doc);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java Sun Feb 26 23:43:20 2012
@@ -46,7 +46,7 @@ public class ParseTreeSerializerBenchmar
private GadgetHtmlParser cajaParser = new CajaHtmlParser(
DOCUMENT_PROVIDER);
-
+
private boolean warmup;
private static final DOMImplementation DOCUMENT_PROVIDER =
@@ -133,7 +133,7 @@ public class ParseTreeSerializerBenchmar
output("Serializing DOM Transformer [" + parseMillis + " ms total: " +
((double) parseMillis) / numRuns + "ms/run]");
-
+
} catch (Exception e) {
throw new GadgetException(GadgetException.Code.HTML_PARSE_ERROR, e);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParserTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParserTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParserTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssLexerParserTest.java Sun Feb 26 23:43:20 2012
@@ -45,7 +45,7 @@ public class CajaCssLexerParserTest exte
public void testBasicCssParse() throws Exception {
String css = ".xyz { font : bold; } A { color : #7f7f7f }";
List<Object> styleSheet = cajaCssParser.parse(css);
- assertEquals(cajaCssParser.serialize(styleSheet), css);
+ assertEquals(cajaCssParser.serialize(styleSheet), css);
}
@Test
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java Sun Feb 26 23:43:20 2012
@@ -30,7 +30,7 @@ public class CajaSocialMarkupHtmlParserT
protected GadgetHtmlParser makeParser() {
return new CajaHtmlParser(new ParseModule.DOMImplementationProvider().get());
}
-
+
@Test
@Override
@Ignore("Look into treating DOMException in Caja parser as Error not Warning")
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoParserAndSerializeTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoParserAndSerializeTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoParserAndSerializeTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/NekoParserAndSerializeTest.java Sun Feb 26 23:43:20 2012
@@ -33,7 +33,7 @@ public class NekoParserAndSerializeTest
return new NekoSimplifiedHtmlParser(
new ParseModule.DOMImplementationProvider().get());
}
-
+
// Neko-specific tests.
@Test
public void scriptPushedToBody() throws Exception {
@@ -41,7 +41,7 @@ public class NekoParserAndSerializeTest
String expected =
loadFile("org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html");
parseAndCompareBalanced(content, expected, parser);
- }
+ }
// Neko overridden tests (due to Neko quirks)
@Override
@@ -52,7 +52,7 @@ public class NekoParserAndSerializeTest
String expected = loadFile("org/apache/shindig/gadgets/parse/nekohtml/test-fragment-expected.html");
parseAndCompareBalanced(content, expected, parser);
}
-
+
@Override
@Test
public void noBody() throws Exception {
@@ -75,7 +75,7 @@ public class NekoParserAndSerializeTest
assertNull(parser.parseDom(content).getDoctype());
parseAndCompareBalanced(content, expected, parser);
}
-
+
@Test
public void textBeforeScript() throws Exception {
// Doesn't work in "native" form due to Neko's internals. Upon finding first text, then a
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java Sun Feb 26 23:43:20 2012
@@ -109,7 +109,7 @@ public class HttpPreloaderTest extends P
assertFalse("request should not ignore cache", plainFetcher.requests.get(0).getIgnoreCache());
checkResults(data.toJson().iterator().next());
}
-
+
@Test
public void ignoreCachePreloads() throws Exception {
String xml =
@@ -118,9 +118,9 @@ public class HttpPreloaderTest extends P
"</ModulePrefs><Content/></Module>";
GadgetSpec spec = new GadgetSpec(GADGET_URL, xml);
Preloader preloader = new HttpPreloader(requestPipeline);
-
+
ignoreCache = true;
-
+
Gadget gadget = new Gadget()
.setContext(context)
.setSpec(spec)
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java Sun Feb 26 23:43:20 2012
@@ -61,7 +61,7 @@ public class PipelineExecutorTest {
private PreloaderService preloaderService;
private GadgetContext context;
private PipelineExecutor executor;
-
+
private static final Uri GADGET_URI = Uri.parse("http://example.org/gadget.php");
private static final String CONTENT =
@@ -89,7 +89,7 @@ public class PipelineExecutorTest {
preloader = control.createMock(PipelinedDataPreloader.class);
preloaderService = new ConcurrentPreloaderService(Executors.newSingleThreadExecutor(), null);
executor = new PipelineExecutor(preloader, preloaderService, Expressions.forTesting());
-
+
context = new GadgetContext(){};
}
@@ -97,16 +97,16 @@ public class PipelineExecutorTest {
Element element = XmlUtil.parseSilent(pipelineXml);
return new PipelinedData(element, GADGET_URI);
}
-
+
@Test
public void execute() throws Exception {
PipelinedData pipeline = getPipelinedData(CONTENT);
Capture<PipelinedData.Batch> batchCapture =
new Capture<PipelinedData.Batch>();
-
+
JSONObject expectedData = new JSONObject("{result: {foo: 'bar'}}");
-
+
// Dummy return results (the "real" return would have two values)
Callable<PreloadedData> callable = createPreloadTask("key", expectedData.toString());
@@ -119,17 +119,17 @@ public class PipelineExecutorTest {
PipelineExecutor.Results results = executor.execute(context,
ImmutableList.of(pipeline));
-
+
// Verify the data set is injected, and the os-data was deleted
assertTrue(batchCapture.getValue().getPreloads().containsKey("me"));
assertTrue(batchCapture.getValue().getPreloads().containsKey("json"));
-
+
JsonAssert.assertJsonEquals("[{id: 'key', result: {foo: 'bar'}}]",
JsonSerializer.serialize(results.results));
JsonAssert.assertJsonEquals("{foo: 'bar'}",
JsonSerializer.serialize(results.keyedResults.get("key")));
assertTrue(results.remainingPipelines.isEmpty());
-
+
control.verify();
}
@@ -153,13 +153,13 @@ public class PipelineExecutorTest {
new Capture<PipelinedData.Batch>();
Callable<PreloadedData> firstTask = createPreloadTask("json",
"{result: {user: 'canonical'}}");
-
+
// Second batch, the user fetch
Capture<PipelinedData.Batch> secondBatch =
new Capture<PipelinedData.Batch>();
Callable<PreloadedData> secondTask = createPreloadTask("me",
"{result: {'id':'canonical'}}");
-
+
// First, a batch with an HTTP request
expect(
preloader.createPreloadTasks(same(context),
@@ -181,7 +181,7 @@ public class PipelineExecutorTest {
JsonSerializer.serialize(results.results));
assertEquals(ImmutableSet.of("json", "me"), results.keyedResults.keySet());
assertTrue(results.remainingPipelines.isEmpty());
-
+
control.verify();
// Verify the data set is injected, and the os-data was deleted
@@ -190,7 +190,7 @@ public class PipelineExecutorTest {
RequestAuthenticationInfo request = (RequestAuthenticationInfo)
firstBatch.getValue().getPreloads().get("json").getData();
assertEquals("http://example.org/test.json", request.getHref().toString());
-
+
// Check the evaluated person request
JSONObject personRequest = (JSONObject) secondBatch.getValue().getPreloads().get("me").getData();
assertEquals("canonical", personRequest.getJSONObject("params").getJSONArray("userId").get(0));
@@ -213,19 +213,19 @@ public class PipelineExecutorTest {
assertTrue(results.keyedResults.isEmpty());
assertEquals(1, results.remainingPipelines.size());
assertSame(pipeline, results.remainingPipelines.iterator().next());
-
+
control.verify();
}
-
+
@Test
public void executeError() throws Exception {
PipelinedData pipeline = getPipelinedData(CONTENT);
Capture<PipelinedData.Batch> batchCapture =
new Capture<PipelinedData.Batch>();
-
+
JSONObject expectedData = new JSONObject("{error: {message: 'NO!', code: 500}}");
-
+
// Dummy return results (the "real" return would have two values)
Callable<PreloadedData> callable = createPreloadTask("key", expectedData.toString());
@@ -238,17 +238,17 @@ public class PipelineExecutorTest {
PipelineExecutor.Results results = executor.execute(context,
ImmutableList.of(pipeline));
-
+
// Verify the data set is injected, and the os-data was deleted
assertTrue(batchCapture.getValue().getPreloads().containsKey("me"));
assertTrue(batchCapture.getValue().getPreloads().containsKey("json"));
-
+
JsonAssert.assertJsonEquals("[{id: 'key', error: {message: 'NO!', code: 500}}]",
JsonSerializer.serialize(results.results));
JsonAssert.assertJsonEquals("{message: 'NO!', code: 500}",
JsonSerializer.serialize(results.keyedResults.get("key")));
assertTrue(results.remainingPipelines.isEmpty());
-
+
control.verify();
}
@@ -256,7 +256,7 @@ public class PipelineExecutorTest {
public void executePreloadException() throws Exception {
PipelinedData pipeline = getPipelinedData(CONTENT);
final PreloadedData willThrow = control.createMock(PreloadedData.class);
-
+
Callable<PreloadedData> callable = new Callable<PreloadedData>() {
public PreloadedData call() throws Exception {
return willThrow;
@@ -279,7 +279,7 @@ public class PipelineExecutorTest {
assertEquals(0, results.results.size());
assertTrue(results.keyedResults.isEmpty());
assertTrue(results.remainingPipelines.isEmpty());
-
+
control.verify();
}
@@ -288,7 +288,7 @@ public class PipelineExecutorTest {
reportMatcher(new BatchMatcher(socialCount, httpCount));
return null;
}
-
+
private static class BatchMatcher implements IArgumentMatcher {
private final int socialCount;
private final int httpCount;
@@ -297,7 +297,7 @@ public class PipelineExecutorTest {
this.socialCount = socialCount;
this.httpCount = httpCount;
}
-
+
public void appendTo(StringBuffer buffer) {
buffer.append("eqBuffer[social=").append(socialCount).append(",http=").append(httpCount).append(']');
}
@@ -306,7 +306,7 @@ public class PipelineExecutorTest {
if (!(obj instanceof PipelinedData.Batch)) {
return false;
}
-
+
PipelinedData.Batch batch = (PipelinedData.Batch) obj;
int actualSocialCount = 0;
int actualHttpCount = 0;
@@ -317,10 +317,10 @@ public class PipelineExecutorTest {
actualSocialCount++;
}
}
-
+
return socialCount == actualSocialCount && httpCount == actualHttpCount;
}
-
+
}
/** Create a mock Callable for a single preload task */
private Callable<PreloadedData> createPreloadTask(final String key, String jsonResult)
@@ -336,7 +336,7 @@ public class PipelineExecutorTest {
Callable<PreloadedData> callable = new Callable<PreloadedData>() {
public PreloadedData call() throws Exception {
return preloadResult;
- }
+ }
};
return callable;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java Sun Feb 26 23:43:20 2012
@@ -225,13 +225,13 @@ public class PipelinedDataPreloaderTest
}
@Test
- /**
+ /**
* Verify that social preloads where the request doesn't contain a token
* serve up 403s for the preloaded data, instead of failing the whole request.
*/
public void testSocialPreloadWithoutToken() throws Exception {
GadgetSpec spec = new GadgetSpec(GADGET_URL, XML);
-
+
RecordingRequestPipeline pipeline = new RecordingRequestPipeline("");
PipelinedDataPreloader preloader = new PipelinedDataPreloader(pipeline, containerConfig);
view = "profile";
@@ -262,7 +262,7 @@ public class PipelinedDataPreloaderTest
resultsById.put((String) JsonUtil.getProperty(o, "id"),
JsonSerializer.serialize(o));
}
-
+
return resultsById;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java Sun Feb 26 23:43:20 2012
@@ -68,7 +68,7 @@ public class PreloaderTestFixture {
public String getParameter(String name) {
return contextParams.get(name);
}
-
+
@Override
public boolean getIgnoreCache() {
return ignoreCache;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -79,6 +79,6 @@ public class CajaResponseRewriterTest ex
req.setCajaRequested(true);
HttpResponse response = new HttpResponseBuilder().setResponseString("<html></html>").create();
- assertEquals("", rewrite(req, response));
+ assertEquals("", rewrite(req, response));
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java Sun Feb 26 23:43:20 2012
@@ -32,7 +32,7 @@ import org.junit.Before;
import org.junit.Test;
public class DefaultRpcServiceLookupTest extends Assert {
-
+
private DefaultRpcServiceLookup svcLookup;
private String socialEndpoint;
private String host;
@@ -76,25 +76,25 @@ public class DefaultRpcServiceLookupTest
@Test
public void testGetServicesForContainer_OneContainerTwoServices() throws Exception {
- Set<String> expectedServiceMethods = Sets.newHashSet("system.listMethods", "people.get",
+ Set<String> expectedServiceMethods = Sets.newHashSet("system.listMethods", "people.get",
"people.update", "people.create", "people.delete");
-
+
LinkedHashMultimap<String, String> expectedServices = LinkedHashMultimap.create();
expectedServices.putAll(socialEndpoint, expectedServiceMethods);
String container = "ig";
- svcLookup.setServicesFor(container, expectedServices);
+ svcLookup.setServicesFor(container, expectedServices);
- assertServiceHasCorrectConfig(socialEndpoint, expectedServiceMethods, container, 1);
+ assertServiceHasCorrectConfig(socialEndpoint, expectedServiceMethods, container, 1);
}
@Test
public void testGetServiceForContainer_TwoContainersOneEndpoint() throws Exception {
String socialEndpoint2 = "http://localhost:8080/api/rpc";
- Set<String> expectedServiceMethods = Sets.newHashSet("system.listMethods", "people.get",
+ Set<String> expectedServiceMethods = Sets.newHashSet("system.listMethods", "people.get",
"people.update", "people.create", "people.delete");
Set<String> expectedServiceMethods2 = Sets.newHashSet("cache.invalidate");
-
+
LinkedHashMultimap<String, String> expectedServices = LinkedHashMultimap.create();
expectedServices.putAll(socialEndpoint, expectedServiceMethods);
@@ -105,8 +105,8 @@ public class DefaultRpcServiceLookupTest
String container2 = "gm";
svcLookup.setServicesFor(container, expectedServices);
svcLookup.setServicesFor(container2, expectedServices2);
-
- assertServiceHasCorrectConfig(socialEndpoint, expectedServiceMethods, container, 1);
+
+ assertServiceHasCorrectConfig(socialEndpoint, expectedServiceMethods, container, 1);
assertServiceHasCorrectConfig(socialEndpoint2, expectedServiceMethods2, container2, 1);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -43,7 +43,7 @@ public class OpenSocialI18NGadgetRewrite
assertEquals("en",
i18nRewriter.getLocaleNameForLoadingI18NConstants(localeAtRendering));
}
-
+
@Test
public void localeNameForEnglishUS() throws Exception {
localeAtRendering = new Locale("en", "US");
@@ -85,14 +85,14 @@ public class OpenSocialI18NGadgetRewrite
assertEquals("en",
i18nRewriter.getLocaleNameForLoadingI18NConstants(localeAtRendering));
}
-
+
@Test
public void localeNameForInvalidCountry() throws Exception {
localeAtRendering = new Locale("zh", "foo");
assertEquals("zh",
i18nRewriter.getLocaleNameForLoadingI18NConstants(localeAtRendering));
}
-
+
@Test
public void localeNameForInvalidLanguage() throws Exception {
localeAtRendering = new Locale("foo", "CN");
@@ -106,7 +106,7 @@ public class OpenSocialI18NGadgetRewrite
assertEquals("en",
i18nRewriter.getLocaleNameForLoadingI18NConstants(localeAtRendering));
}
-
+
private static class FakeOpenSocialI18NGadgetRewriter extends OpenSocialI18NGadgetRewriter {
private Map<String, String> resources = new HashMap<String,String>();
public FakeOpenSocialI18NGadgetRewriter() {
@@ -124,7 +124,7 @@ public class OpenSocialI18NGadgetRewrite
} else {
throw new IOException("Resource Unavailable.");
}
- }
+ }
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java Sun Feb 26 23:43:20 2012
@@ -66,11 +66,11 @@ public class ProxyRendererTest {
public SecurityToken getToken() {
return new AnonymousSecurityToken();
}
-
+
@Override
public String getUserAgent() {
return USER_AGENT;
- }
+ }
};
private final FakeHttpCache cache = new FakeHttpCache();
@@ -102,7 +102,7 @@ public class ProxyRendererTest {
HttpRequest request = new HttpRequest(EXPECTED_PROXIED_HTML_HREF);
HttpResponse response = new HttpResponse(PROXIED_HTML_CONTENT);
pipeline.plainResponses.put(EXPECTED_PROXIED_HTML_HREF, response);
-
+
String content = proxyRenderer.render(makeHrefGadget("none"));
assertEquals(PROXIED_HTML_CONTENT, content);
assertEquals(response, cache.getResponse(request));
@@ -206,7 +206,7 @@ public class ProxyRendererTest {
@Test
public void renderProxiedWithPreload() throws Exception {
List<JSONObject> prefetchedJson = ImmutableList.of(new JSONObject("{id: 'foo', data: 'bar'}"));
-
+
pipelineExecutor.results = new PipelineExecutor.Results(null, prefetchedJson, null);
pipeline.plainResponses.put(EXPECTED_PROXIED_HTML_HREF, new HttpResponse(PROXIED_HTML_CONTENT));
@@ -222,13 +222,13 @@ public class ProxyRendererTest {
JsonAssert.assertJsonEquals(JsonSerializer.serialize(prefetchedJson), postBody);
assertTrue(pipelineExecutor.wasPreloaded);
}
-
+
@Test
public void appendUserAgent() throws Exception {
String expectedUA = USER_AGENT + " Shindig";
HttpResponse response = new HttpResponse(PROXIED_HTML_CONTENT);
pipeline.plainResponses.put(EXPECTED_PROXIED_HTML_HREF, response);
-
+
proxyRenderer.render(makeHrefGadget("none"));
String actualUA = pipeline.lastHttpRequest.getHeader("User-Agent");
assertEquals(expectedUA, actualUA);
@@ -289,7 +289,7 @@ public class ProxyRendererTest {
}
assertTrue(request.getOAuthArguments().isProxiedContentRequest());
-
+
HttpResponse response;
switch (request.getAuthType()) {
case NONE:
@@ -320,11 +320,11 @@ public class ProxyRendererTest {
private static class FakePipelineExecutor extends PipelineExecutor {
protected boolean wasPreloaded;
protected Results results;
-
+
public FakePipelineExecutor() {
super(null, null, null);
}
-
+
@Override
public Results execute(GadgetContext context, Collection<PipelinedData> pipelines) {
wasPreloaded = true;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RendererTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RendererTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RendererTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RendererTest.java Sun Feb 26 23:43:20 2012
@@ -75,7 +75,7 @@ public class RendererTest {
containerConfig = new FakeContainerConfig();
renderer = new Renderer(processor, htmlRenderer, containerConfig, lockedDomainService);
}
-
+
private GadgetContext makeContext(final String view) {
return makeContext(view, null, null);
}
@@ -114,7 +114,7 @@ public class RendererTest {
assertEquals(RenderingResults.Status.MUST_REDIRECT, results.getStatus());
assertEquals(TYPE_URL_HREF, results.getRedirect());
}
-
+
@Test
public void renderTypeUrlRequiresCajaIncompatible() {
processor.setGadgetData(GADGET_CAJA);
@@ -122,14 +122,14 @@ public class RendererTest {
assertEquals(RenderingResults.Status.ERROR, results.getStatus());
assertEquals(HttpServletResponse.SC_BAD_REQUEST, results.getHttpStatusCode());
}
-
+
@Test
public void renderTypeUrlCajaParamIncompatible() {
RenderingResults results = renderer.render(makeContext("url", null, "1"));
assertEquals(RenderingResults.Status.ERROR, results.getStatus());
assertEquals(HttpServletResponse.SC_BAD_REQUEST, results.getHttpStatusCode());
}
-
+
@Test
public void renderTypeUrlSanitizedIncompatible() {
RenderingResults results = renderer.render(makeContext("url", "1", null));
@@ -143,7 +143,7 @@ public class RendererTest {
RenderingResults results = renderer.render(makeContext("html"));
assertEquals(RenderingResults.Status.ERROR, results.getStatus());
assertEquals("foo", results.getErrorMessage());
- assertEquals(HttpServletResponse.SC_FORBIDDEN, results.getHttpStatusCode());
+ assertEquals(HttpServletResponse.SC_FORBIDDEN, results.getHttpStatusCode());
}
@Test
@@ -152,7 +152,7 @@ public class RendererTest {
RenderingResults results = renderer.render(makeContext("html"));
assertEquals(RenderingResults.Status.ERROR, results.getStatus());
assertEquals("four-oh-four", results.getErrorMessage());
- assertEquals(HttpServletResponse.SC_NOT_FOUND, results.getHttpStatusCode());
+ assertEquals(HttpServletResponse.SC_NOT_FOUND, results.getHttpStatusCode());
}
@Test
@@ -245,7 +245,7 @@ public class RendererTest {
super(null, null, null, null, null);
this.gadgetData = GADGET;
}
-
+
public void setGadgetData(String gadgetData) {
this.gadgetData = gadgetData;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -56,7 +56,7 @@ public class SanitizingGadgetRewriterTes
public String getParameter(String name) {
return Param.SANITIZE.getKey().equals(name) ? "1" : null;
}
-
+
@Override
public String getContainer() {
return MOCK_CONTAINER;
@@ -81,7 +81,7 @@ public class SanitizingGadgetRewriterTes
@Override
public void setUp() throws Exception {
super.setUp();
-
+
gadget = new Gadget().setContext(unsanitaryGadgetContext);
gadget.setSpec(new GadgetSpec(Uri.parse("http://www.example.org/gadget.xml"),
"<Module><ModulePrefs title=''/><Content type='x-html-sanitized'/></Module>"));
@@ -92,7 +92,7 @@ public class SanitizingGadgetRewriterTes
"<Module><ModulePrefs title=''/><Content type='x-html-sanitized'/></Module>"));
gadgetNoCacheAndDebug.setCurrentView(gadgetNoCacheAndDebug.getSpec().getViews().values().iterator().next());
}
-
+
@Override
protected Class<? extends GadgetHtmlParser> getParserClass() {
return CajaHtmlParser.class;
@@ -156,7 +156,7 @@ public class SanitizingGadgetRewriterTes
+ "href=\"http://www.test.com/dir/proxy?"
+ "url=http%3A%2F%2Fwww.evil.com%2Fx.css&gadget=www.example.org%2Fgadget.xml&"
+ "fp=45508&rewriteMime=text/css\"/>";
- String sanitized =
+ String sanitized =
"<html><head><link href=\"http://host.com/proxy?url=http%3A%2F%2Fwww.test.com%2Fdir%2F" +
"proxy%3Furl%3Dhttp%253A%252F%252Fwww.evil.com%252Fx.css%26gadget%3Dwww.example.org%252F" +
"gadget.xml%26fp%3D45508%26rewriteMime%3Dtext%2Fcss&sanitize=1&rewriteMime=text%2Fcss\" " +
@@ -172,7 +172,7 @@ public class SanitizingGadgetRewriterTes
+ "href=\"http://www.test.com/dir/proxy?"
+ "url=http%3A%2F%2Fwww.evil.com%2Fx.css&gadget=www.example.org%2Fgadget.xml&"
+ "fp=45508&rewriteMime=text/css\"/>";
- String sanitized =
+ String sanitized =
"<html><head><link href=\"http://host.com/proxy?url=http%3A%2F%2Fwww.test.com%2F"
+ "dir%2Fproxy%3Furl%3Dhttp%253A%252F%252Fwww.evil.com%252Fx.css%26gadget%3D"
+ "www.example.org%252Fgadget.xml%26fp%3D45508%26rewriteMime%3Dtext%2Fcss&"
@@ -206,7 +206,7 @@ public class SanitizingGadgetRewriterTes
"<style type=\"text/css\">@import url('www.evil.com/x.js');</style>";
// The caja css sanitizer does *not* remove the initial colon in urls
// since this does not work in IE
- String sanitized =
+ String sanitized =
"<html><head><style>"
+ "@import url('http://host.com/proxy?url=http%3A%2F%2Fwww.example.org%2Fwww.evil.com%2Fx.js&"
+ "sanitize=1&rewriteMime=text%2Fcss');"
@@ -221,7 +221,7 @@ public class SanitizingGadgetRewriterTes
"<style type=\"text/css\">@import url('www.evil.com/x.js');</style>";
// The caja css sanitizer does *not* remove the initial colon in urls
// since this does not work in IE
- String sanitized =
+ String sanitized =
"<html><head><style>"
+ "@import url('http://host.com/proxy?url=http%3A%2F%2Fwww.example.org%2Fwww.evil.com%2Fx.js&sanitize=1"
+ "&rewriteMime=text%2Fcss');</style></head><body></body></html>";
@@ -299,16 +299,16 @@ public class SanitizingGadgetRewriterTes
// Force the content to get re-serialized
MutableContent.notifyEdit(document);
String fullMarkup = mc.getContent();
-
+
Element paragraphTag = (Element) document.getElementsByTagName("p").item(0);
// Mark the paragraph tag element as trusted
SanitizingGadgetRewriter.bypassSanitization(paragraphTag, true);
rewriter.rewrite(gadget, mc);
-
+
// The document should be unchanged
assertEquals(fullMarkup, mc.getContent());
}
-
+
@Test
public void sanitizationBypassOnlySelf() throws Exception {
String markup = "<p foo=\"bar\"><b>Parag</b><!--raph--></p>";
@@ -317,19 +317,19 @@ public class SanitizingGadgetRewriterTes
MutableContent mc = new MutableContent(parser, markup);
Document document = mc.getDocument();
-
+
Element paragraphTag = (Element) document.getElementsByTagName("p").item(0);
// Mark the paragraph tag element as trusted
SanitizingGadgetRewriter.bypassSanitization(paragraphTag, false);
rewriter.rewrite(gadget, mc);
-
+
// The document should be unchanged
String content = mc.getContent();
Matcher matcher = BODY_REGEX.matcher(content);
matcher.matches();
assertEquals("<p foo=\"bar\"></p>", matcher.group(1));
}
-
+
@Test
public void sanitizationBypassPreservedAcrossClone() throws Exception {
String markup = "<p foo=\"bar\"><b>Parag</b><!--raph--></p>";
@@ -338,7 +338,7 @@ public class SanitizingGadgetRewriterTes
MutableContent mc = new MutableContent(parser, markup);
Document document = mc.getDocument();
-
+
Element paragraphTag = (Element) document.getElementsByTagName("p").item(0);
// Mark the paragraph tag element as trusted
SanitizingGadgetRewriter.bypassSanitization(paragraphTag, false);
@@ -348,7 +348,7 @@ public class SanitizingGadgetRewriterTes
paragraphTag.getParentNode().replaceChild(cloned, paragraphTag);
rewriter.rewrite(gadget, mc);
-
+
// The document should be unchanged
String content = mc.getContent();
Matcher matcher = BODY_REGEX.matcher(content);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java Sun Feb 26 23:43:20 2012
@@ -44,28 +44,28 @@ public class SanitizingProxyUriManagerTe
private ProxyUriManager uriManager;
private Uri uri;
private ProxyUri proxyUri;
-
+
@Before
public void setUp() throws Exception {
uriManager = createMock(ProxyUriManager.class);
uri = new UriBuilder().setScheme("http").setAuthority("host.com").setPath("/path").toUri();
proxyUri = createMock(ProxyUri.class);
}
-
+
@Test
public void processPassesThrough() throws Exception {
Capture<Uri> uriCapture = new Capture<Uri>();
expect(uriManager.process(capture(uriCapture))).andReturn(proxyUri).once();
replay(uriManager);
-
+
SanitizingProxyUriManager rewriter = makeRewriter(null);
ProxyUri returned = rewriter.process(uri);
-
+
verify(uriManager);
assertSame(uri, uriCapture.getValue());
assertSame(returned, proxyUri);
}
-
+
@Test
public void makeSingleNoMime() throws Exception {
Capture<List<ProxyUri>> uriCapture = new Capture<List<ProxyUri>>();
@@ -78,17 +78,17 @@ public class SanitizingProxyUriManagerTe
replay(uriManager);
expect(proxyUri.setSanitizeContent(true)).andReturn(proxyUri).once();
replay(proxyUri);
-
+
SanitizingProxyUriManager rewriter = makeRewriter(null);
List<Uri> returned = rewriter.make(input, refresh);
-
+
verify(uriManager);
assertSame(uriCapture.getValue(), input);
assertSame(intCapture.getValue(), refresh);
assertEquals(1, returned.size());
verify(proxyUri);
}
-
+
@Test
public void makeSingleExpectedMime() throws Exception {
Capture<List<ProxyUri>> uriCapture = new Capture<List<ProxyUri>>();
@@ -103,17 +103,17 @@ public class SanitizingProxyUriManagerTe
expect(proxyUri.setSanitizeContent(true)).andReturn(proxyUri).once();
expect(proxyUri.setRewriteMimeType(mime)).andReturn(proxyUri).once();
replay(proxyUri);
-
+
SanitizingProxyUriManager rewriter = makeRewriter(mime);
List<Uri> returned = rewriter.make(input, refresh);
-
+
verify(uriManager);
assertSame(uriCapture.getValue(), input);
assertSame(intCapture.getValue(), refresh);
assertEquals(1, returned.size());
verify(proxyUri);
}
-
+
@Test
public void makeList() throws Exception {
Capture<List<ProxyUri>> uriCapture = new Capture<List<ProxyUri>>();
@@ -132,17 +132,17 @@ public class SanitizingProxyUriManagerTe
expect(proxyUri2.setSanitizeContent(true)).andReturn(proxyUri2).once();
expect(proxyUri2.setRewriteMimeType(mime)).andReturn(proxyUri2).once();
replay(proxyUri, proxyUri2);
-
+
SanitizingProxyUriManager rewriter = makeRewriter(mime);
List<Uri> returned = rewriter.make(input, refresh);
-
+
verify(uriManager);
assertSame(uriCapture.getValue(), input);
assertSame(intCapture.getValue(), refresh);
assertEquals(2, returned.size());
verify(proxyUri, proxyUri2);
}
-
+
private SanitizingProxyUriManager makeRewriter(String mime) {
return new SanitizingProxyUriManager(uriManager, mime);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -83,7 +83,7 @@ public class SanitizingResponseRewriterT
"@import url('http://www.evil.com/more.css'); A { font : BOLD }").create();
// The caja css sanitizer does *not* remove the initial colon in urls
// since this does not work in IE
- String sanitized =
+ String sanitized =
// Resultant URL is just the "sanitized" version of same, since we're using
// PassthruUriManager for testing purposes.
"@import url('http://" + PROXY_BASE + "?url="
@@ -104,7 +104,7 @@ public class SanitizingResponseRewriterT
"@import url('http://www.evil.com/more.css'); A { font : BOLD }").create();
// The caja css sanitizer does *not* remove the initial colon in urls
// since this does not work in IE
- String sanitized =
+ String sanitized =
"@import url('http://" + PROXY_BASE + "?url="
+ "http%3A%2F%2Fwww.evil.com%2Fmore.css&sanitize=1&rewriteMime=text%2Fcss');\n"
+ "A {\n"
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java Sun Feb 26 23:43:20 2012
@@ -206,12 +206,12 @@ public class AbsolutePathReferenceVisito
Element lcValidRelative = elem(lcTag, validAttr, RELATIVE_URI.toString());
assertEquals(VisitStatus.MODIFY, getVisitStatus(lcValidRelative));
assertEquals(RELATIVE_RESOLVED_URI.toString(), lcValidRelative.getAttribute(validAttr));
-
+
Element lcValidPathRelative = elem(lcTag, validAttr, PATH_RELATIVE_URI.toString());
assertEquals(VisitStatus.MODIFY, getVisitStatus(lcValidPathRelative));
assertEquals(PATH_RELATIVE_RESOLVED_URI.toString(),
lcValidPathRelative.getAttribute(validAttr));
-
+
// uppercase, same
Element ucValidRelative = elem(ucTag, validAttr, RELATIVE_URI.toString());
assertEquals(VisitStatus.MODIFY, getVisitStatus(ucValidRelative));
@@ -226,23 +226,23 @@ public class AbsolutePathReferenceVisito
Element lcValidInvalid = elem(lcTag, validAttr, INVALID_URI_STRING);
assertEquals(VisitStatus.BYPASS, getVisitStatus(lcValidRelative));
assertEquals(INVALID_URI_STRING, lcValidInvalid.getAttribute(validAttr));
-
+
// lowercase, correct attrib, absolute URL
Element lcValidAbsolute = elem(lcTag, validAttr, ABSOLUTE_URI.toString());
assertEquals(VisitStatus.BYPASS, getVisitStatus(lcValidAbsolute));
assertEquals(ABSOLUTE_URI.toString(), lcValidAbsolute.getAttribute(validAttr));
-
+
// lowercase, invalid attrib, relative-possible URL
Element lcInvalidRelative = elem(lcTag, invalidAttr, RELATIVE_URI.toString());
assertEquals(VisitStatus.BYPASS, getVisitStatus(lcInvalidRelative));
assertEquals(RELATIVE_URI.toString(), lcInvalidRelative.getAttribute(invalidAttr));
-
+
// lowercase, valid attrib, absolute (JS) URL
Element lcValidJs = elem(lcTag, validAttr, JS_URI_STR);
assertEquals(VisitStatus.BYPASS, getVisitStatus(lcValidJs));
assertEquals(JS_URI_STR, lcValidJs.getAttribute(validAttr));
}
-
+
private VisitStatus getVisitStatus(Node node) throws Exception {
return visitorForAllTags().visit(gadget(), node);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java Sun Feb 26 23:43:20 2012
@@ -81,7 +81,7 @@ public abstract class BaseRewriterTestCa
.setResponse(new byte[]{ (byte)0xFE, (byte)0xFF});
control = EasyMock.createControl();
}
-
+
private Module getParseModule() {
return Modules.override(new ParseModule()).with(new AbstractModule() {
@Override
@@ -90,7 +90,7 @@ public abstract class BaseRewriterTestCa
}
});
}
-
+
protected Class<? extends GadgetHtmlParser> getParserClass() {
return NekoSimplifiedHtmlParser.class;
}
@@ -177,7 +177,7 @@ public abstract class BaseRewriterTestCa
final String container) throws Exception {
return rewriteContent(rewriter, s, container, false, false);
}
-
+
protected MutableContent rewriteContent(GadgetRewriter rewriter, String s,
final String container, final boolean debug, final boolean ignoreCache)
throws Exception {
@@ -196,12 +196,12 @@ public abstract class BaseRewriterTestCa
public String getContainer() {
return container;
}
-
+
@Override
public boolean getDebug() {
return debug;
}
-
+
@Override
public boolean getIgnoreCache() {
return ignoreCache;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -49,11 +49,11 @@ public class BaseTagRemoverRewriterTest
public void testRemoveBaseTag() throws Exception {
String content = "<html><head><base href='http://www.ppq.com/'>"
+ "</head><body>"
- + "<img src='/img1.png'>"
+ + "<img src='/img1.png'>"
+ "</body></html>";
String expected = "<html><head>"
+ "</head><body>"
- + "<img src=\"/img1.png\">"
+ + "<img src=\"/img1.png\">"
+ "</body></html>";
HttpRequest req = new HttpRequest(Uri.parse("http://www.google.com/"));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CacheEnforcementVisitorTest.java Sun Feb 26 23:43:20 2012
@@ -77,7 +77,7 @@ public class CacheEnforcementVisitorTest
GadgetSpec gadgetSpec = createMock(GadgetSpec.class);
expect(gadgetSpec.getUrl()).andReturn(uri);
expect(gadget.getSpec()).andReturn(gadgetSpec);
-
+
GadgetContext context = createMock(GadgetContext.class);
expect(context.getContainer()).andReturn(CONTAINER);
expect(gadget.getContext()).andReturn(context);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -94,7 +94,7 @@ public class CssResponseRewriterTest ext
return overrideFeature;
}
};
-
+
rewriter = new CssResponseRewriter(new CajaCssParser(),
proxyUriManager, factory);
dummyUri = Uri.parse("http://www.w3c.org");
@@ -173,7 +173,7 @@ public class CssResponseRewriterTest ext
expected = expected.replace("container=default", "container=" + MOCK_CONTAINER);
rewriter = new CssResponseRewriter(new CajaCssParser(),
proxyUriManager, factory);
-
+
HttpRequest request = new HttpRequest(Uri.parse("http://www.example.org/path/rewritebasic.css"));
request.setMethod("GET");
request.setGadget(SPEC_URL);
@@ -223,7 +223,7 @@ public class CssResponseRewriterTest ext
+ "&url=http%3A%2F%2Fa.b.com%2Fbullet.gif');\n"
+ "list-style-position:outside;margin:5px;padding:0}\n"
+ ".someid {background-image:url('//www.test.com/dir/proxy?container=default"
- + "&gadget=http%3A%2F%2Fwww.w3c.org&debug=0&nocache=0"
+ + "&gadget=http%3A%2F%2Fwww.w3c.org&debug=0&nocache=0"
+ "&url=http%3A%2F%2Fa.b.com%2Fbigimg.png');\n"
+ "float:right;width:165px;height:23px;margin-top:4px;margin-left:5px}";
validateRewritten(original, rewritten);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java Sun Feb 26 23:43:20 2012
@@ -75,7 +75,7 @@ public class DefaultContentRewriterRegis
public void rewrite(HttpRequest request, HttpResponseBuilder response)
throws RewritingException {
// Do nothing.
- }
+ }
});
registry = new DefaultResponseRewriterRegistry(rewriters, parser);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java Sun Feb 26 23:43:20 2012
@@ -45,7 +45,7 @@ import com.google.inject.util.Modules;
public class DomWalkerTestBase {
protected static final Uri GADGET_URI = Uri.parse("http://example.com/gadget.xml");
protected static final String CONTAINER = "container";
-
+
protected Document doc;
@Before
@@ -62,7 +62,7 @@ public class DomWalkerTestBase {
DOMImplementation domImpl = injector.getInstance(DOMImplementation.class);
doc = domImpl.createDocument(null, null, null);
}
-
+
protected Element elem(String tag, String... attrStrs) {
Element elem = doc.createElement(tag);
for (int i = 0; attrStrs != null && i < attrStrs.length; i += 2) {
@@ -72,13 +72,13 @@ public class DomWalkerTestBase {
}
return elem;
}
-
+
protected Element htmlDoc(Node[] headNodes, Node... bodyNodes) {
// Clear document of all nodes.
while (doc.hasChildNodes()) {
doc.removeChild(doc.getFirstChild());
}
-
+
// Recreate document with valid HTML structure.
Element html = elem("html");
Element head = elem("head");
@@ -88,26 +88,26 @@ public class DomWalkerTestBase {
html.appendChild(head);
html.appendChild(body);
doc.appendChild(html);
-
+
return html;
}
-
+
private void appendAll(Node parent, Node[] children) {
if (children == null || children.length == 0) return;
-
+
for (Node child : children) {
parent.appendChild(child);
}
}
-
+
protected Gadget gadget() {
return gadget(false, false);
}
-
+
protected Gadget gadget(boolean debug, boolean ignoreCache) {
return gadget(debug, ignoreCache, null);
}
-
+
protected Gadget gadget(boolean debug, boolean ignoreCache, Uri curviewHref) {
GadgetSpec spec = createMock(GadgetSpec.class);
expect(spec.getUrl()).andReturn(GADGET_URI).anyTimes();
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -116,7 +116,7 @@ public class ImageAttributeRewriterTest
.andReturn(reqCxtImg1.getHttpResp());
expect(requestPipeline.execute(eq(reqCxtImg2.getHttpReq())))
.andReturn(reqCxtImg2.getHttpResp());
-
+
Node html = htmlDoc(new Node[] {}, img1, img2);
String expectedContent = new StringBuilder()
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -53,7 +53,7 @@ public class ImageResizeRewriterTest {
config = EasyMock.createMock(ContainerConfig.class);
factory = EasyMock.createMock(ContentRewriterFeature.Factory.class);
featureConfig = EasyMock.createMock(ContentRewriterFeature.Config.class);
-
+
ProxyUriManager proxyUriManager = new DefaultProxyUriManager(config, null);
rewriter = new ImageResizeRewriter(proxyUriManager, factory);
domImpl = new ParseModule.DOMImplementationProvider();
@@ -75,7 +75,7 @@ public class ImageResizeRewriterTest {
+ "<img src=\"shindig.com/proxy?container=test&url=1.jpg\">"
+ "<img height=\"50px\" id=\"img\" src=\"shindig.com/proxy?container=test&url=2.jpg\">"
+ "<img src=\"shindig.com/proxy?container=test&url=3.jpg\" width=\"50px\">"
- + "<img height=\"50px\" id=\"id\" src=\"shindig.com/proxy?container=test&url=4.jpg\""
+ + "<img height=\"50px\" id=\"id\" src=\"shindig.com/proxy?container=test&url=4.jpg\""
+ " width=\"110px\">"
+ "<img height=\"5\" src=\"shindig.com/proxy?container=test&url=5.jpg\" width=\"10em\">"
+ "<img height=\"50\" src=\"shindig.com/proxy?container=test&url=6.jpg\" width=\"110px\">"
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java Sun Feb 26 23:43:20 2012
@@ -76,7 +76,7 @@ public class MutableContentTest {
mhc.documentChanged();
assertEquals(2, mhc.getNumChanges());
}
-
+
@Test
public void modifyContentReflectedInTreeUtf8() throws Exception {
String theContent = "N\uFFFDW C\uFFFDNT\uFFFDNT";
@@ -91,7 +91,7 @@ public class MutableContentTest {
mhc.documentChanged();
assertEquals(2, mhc.getNumChanges());
}
-
+
@Test
public void modifyBytesReflectedInContentAndTree() throws Exception {
assertEquals(0, mhc.getNumChanges());
@@ -106,7 +106,7 @@ public class MutableContentTest {
assertEquals("NEW CONTENT", new String(IOUtils.toByteArray(is), "UTF8"));
assertEquals(1, mhc.getNumChanges());
}
-
+
@Test
public void modifyTreeReflectedInContent() throws Exception {
Document document = mhc.getDocument();
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -60,7 +60,7 @@ public class OsTemplateXmlLoaderRewriter
private DOMImplementation domImpl;
private Document doc;
private Converter converter;
-
+
@Before
public void setUp() {
Injector injector = Guice.createInjector(new ParseModule(), new PropertiesModule());
@@ -69,7 +69,7 @@ public class OsTemplateXmlLoaderRewriter
doc = domImpl.createDocument(null, null, null);
converter = new Converter(parser, domImpl);
}
-
+
@Test
public void convertSingleElement() throws Exception {
String xml = "<os:elem id=\"id\" foo=\"bar\">String value</os:elem>";
@@ -78,7 +78,7 @@ public class OsTemplateXmlLoaderRewriter
"{n:\"id\",v:\"id\"}],c:[\"String value\"]}]}").toString(),
converter.domToJson(xml));
}
-
+
@Test
public void convertMixedTreeWithIgnorables() throws Exception {
String xml = "<b>Some ${viewer} content</b> <img/><!-- comment --><os:Html/>";
@@ -88,19 +88,19 @@ public class OsTemplateXmlLoaderRewriter
"{n:\"os:Html\",a:[],c:[]}]}").toString(),
converter.domToJson(xml));
}
-
+
@Test
public void visitNonElement() throws Exception {
assertEquals(VisitStatus.BYPASS, visit(doc.createTextNode("text")));
assertEquals(VisitStatus.BYPASS, visit(doc.createAttribute("foo")));
assertEquals(VisitStatus.BYPASS, visit(doc.createComment("comment")));
}
-
+
@Test
public void visitDivSansType() throws Exception {
assertEquals(VisitStatus.BYPASS, visit(doc.createElement("div")));
}
-
+
@Test
public void visitDivMismatchingType() throws Exception {
Element div = doc.createElement("div");
@@ -108,7 +108,7 @@ public class OsTemplateXmlLoaderRewriter
div.setAttribute("type", "os/template-but-not");
assertEquals(VisitStatus.BYPASS, visit(div));
}
-
+
@Test
public void visitDivMatchingTypeNoId() throws Exception {
Element div = doc.createElement("div");
@@ -124,13 +124,13 @@ public class OsTemplateXmlLoaderRewriter
div.setAttribute("type", OsTemplateXmlLoaderRewriter.OS_TEMPLATE_MIME);
assertEquals(VisitStatus.BYPASS, visit(div));
}
-
+
@Test
public void visitDivMatchingTypeWithId() throws Exception {
Element div = createRewritableDiv();
assertEquals(VisitStatus.RESERVE_NODE, visit(div));
}
-
+
@Test
public void visitDivMatchingCaseMixedWithId() throws Exception {
Element div = doc.createElement("dIv");
@@ -146,7 +146,7 @@ public class OsTemplateXmlLoaderRewriter
div.setAttribute("type", OsTemplateXmlLoaderRewriter.OS_TEMPLATE_MIME);
assertEquals(VisitStatus.RESERVE_NODE, visit(div));
}
-
+
@Test
public void visitDivMatchingCaseMixedWithName() throws Exception {
Element div = doc.createElement("dIv");
@@ -154,22 +154,22 @@ public class OsTemplateXmlLoaderRewriter
div.setAttribute("type", OsTemplateXmlLoaderRewriter.OS_TEMPLATE_MIME.toUpperCase());
assertEquals(VisitStatus.RESERVE_NODE, visit(div));
}
-
+
private VisitStatus visit(Node node) throws Exception {
return new OsTemplateXmlLoaderRewriter.GadgetHtmlVisitor(null).visit(null, node);
}
-
+
@Test
public void revisitWithoutOsTemplates() throws Exception {
assertFalse(revisit(mockGadget("foo", "bar"), null));
}
-
+
@Test(expected = RewritingException.class)
public void revisitWithoutValidDocument() throws Exception {
revisit(mockGadget(OsTemplateXmlLoaderRewriter.OS_TEMPLATES_FEATURE_NAME, "foo"),
null, createRewritableDiv());
}
-
+
@Test(expected = RewritingException.class)
public void revisitWithoutHeadNode() throws Exception {
Node html = doc.createElement("html");
@@ -178,13 +178,13 @@ public class OsTemplateXmlLoaderRewriter
revisit(mockGadget(OsTemplateXmlLoaderRewriter.OS_TEMPLATES_FEATURE_NAME, "foo"),
null, createRewritableDiv());
}
-
+
@Test
public void revisitWithIdDivSingle() throws Exception {
Element tpl = createRewritableDiv("tpl_id");
checkRevisitSingle(tpl, "tpl_id");
}
-
+
@Test
public void revisitWithNameDivSingle() throws Exception {
Element tpl = createRewritableDiv();
@@ -192,14 +192,14 @@ public class OsTemplateXmlLoaderRewriter
tpl.setAttribute("name", "otherid");
checkRevisitSingle(tpl, "otherid");
}
-
+
@Test
public void revisitWithBothLabeledDivSingle() throws Exception {
Element tpl = createRewritableDiv();
tpl.setAttribute("name", "otherid");
checkRevisitSingle(tpl, "otherid");
}
-
+
private void checkRevisitSingle(Element tpl, String id) throws Exception {
Gadget gadget = mockGadget(OsTemplateXmlLoaderRewriter.OS_TEMPLATES_FEATURE_NAME, "another");
String xmlVal = "xml";
@@ -217,7 +217,7 @@ public class OsTemplateXmlLoaderRewriter
assertEquals("script", addedScript.getNodeName());
assertEquals("gadgets.jsondom.preload_('" + id + "',{thejson});", addedScript.getTextContent());
}
-
+
@Test
public void revisitMultiples() throws Exception {
Element tplId = createRewritableDiv("tpl_id");
@@ -243,37 +243,37 @@ public class OsTemplateXmlLoaderRewriter
"gadgets.jsondom.preload_('tpl_id',{thejson});gadgets.jsondom.preload_('otherid',{thejson});",
addedScript.getTextContent());
}
-
+
private boolean revisit(Gadget gadget, Converter converter, Node... nodes) throws Exception {
return new OsTemplateXmlLoaderRewriter.GadgetHtmlVisitor(converter)
.revisit(gadget, Arrays.asList(nodes));
}
-
+
private Gadget mockGadget(String... features) {
Gadget gadget = createMock(Gadget.class);
expect(gadget.getAllFeatures()).andReturn(Arrays.asList(features)).once();
replay(gadget);
return gadget;
}
-
+
private Converter mockConverter(String xml, String result, int times) {
Converter converter = createMock(Converter.class);
expect(converter.domToJson(xml)).andReturn(result).times(times);
replay(converter);
return converter;
}
-
+
private Element createRewritableDiv() {
return createRewritableDiv("id");
}
-
+
private Element createRewritableDiv(String id) {
Element div = doc.createElement("div");
div.setAttribute("type", OsTemplateXmlLoaderRewriter.OS_TEMPLATE_MIME);
div.setAttribute("id", id);
return div;
}
-
+
private void completeDocAsHtml(Node... nodes) {
Node html = doc.createElement("html");
Node head = doc.createElement("head");
@@ -290,32 +290,32 @@ public class OsTemplateXmlLoaderRewriter
}
doc.appendChild(html);
}
-
+
@Test
public void rewriteHttpNoMime() throws Exception {
checkRewriteHttp(null, null, false);
}
-
+
@Test
public void rewriteHttpMismatchedMime() throws Exception {
checkRewriteHttp("os/template-not!", null, false);
}
-
+
@Test
public void rewriteHttpMimeMatchOverride() throws Exception {
checkRewriteHttp(OsTemplateXmlLoaderRewriter.OS_TEMPLATE_MIME, "os/template-not!", true);
}
-
+
@Test
public void rewriteHttpMimeMatchOriginal() throws Exception {
checkRewriteHttp(null, OsTemplateXmlLoaderRewriter.OS_TEMPLATE_MIME, true);
}
-
+
@Test
public void rewriteHttpMimeMatchOverrideMismatchOriginal() throws Exception {
checkRewriteHttp("foo", OsTemplateXmlLoaderRewriter.OS_TEMPLATE_MIME, false);
}
-
+
private void checkRewriteHttp(String reqMime, String origMime, boolean expectRewrite)
throws Exception {
HttpRequest req = new HttpRequest(Uri.parse("http://dummy.com")).setRewriteMimeType(reqMime);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -117,7 +117,7 @@ public class PipelineDataGadgetRewriterT
Capture<PipelinedData.Batch> batchCapture =
new Capture<PipelinedData.Batch>();
-
+
// Dummy return results (the "real" return would have two values)
Callable<PreloadedData> callable = createPreloadTask(
"key", "{result: {foo: 'bar'}}");
@@ -138,7 +138,7 @@ public class PipelineDataGadgetRewriterT
assertTrue(batchCapture.getValue().getPreloads().containsKey("me"));
assertTrue(batchCapture.getValue().getPreloads().containsKey("json"));
-
+
assertFalse(gadget.getDirectFeatureDeps().contains("opensocial-data"));
assertTrue(gadget.getDirectFeatureDeps().contains("opensocial-data-context"));
@@ -156,7 +156,7 @@ public class PipelineDataGadgetRewriterT
control.replay();
rewriter.rewrite(gadget, content);
-
+
control.verify();
// Check there is no DataContext inserted
@@ -166,13 +166,13 @@ public class PipelineDataGadgetRewriterT
assertTrue("os-data was deleted",
content.getContent().indexOf("type=\"text/os-data\"") > 0);
}
-
+
/** Match a batch with the specified count of social and HTTP data items */
private PipelinedData.Batch eqBatch(int socialCount, int httpCount) {
reportMatcher(new BatchMatcher(socialCount, httpCount));
return null;
}
-
+
private static class BatchMatcher implements IArgumentMatcher {
private final int socialCount;
private final int httpCount;
@@ -181,7 +181,7 @@ public class PipelineDataGadgetRewriterT
this.socialCount = socialCount;
this.httpCount = httpCount;
}
-
+
public void appendTo(StringBuffer buffer) {
buffer.append("eqBuffer[social=" + socialCount + ",http=" + httpCount + ']');
}
@@ -190,7 +190,7 @@ public class PipelineDataGadgetRewriterT
if (!(obj instanceof PipelinedData.Batch)) {
return false;
}
-
+
PipelinedData.Batch batch = (PipelinedData.Batch) obj;
int actualSocialCount = 0;
int actualHttpCount = 0;
@@ -201,12 +201,12 @@ public class PipelineDataGadgetRewriterT
actualSocialCount++;
}
}
-
+
return socialCount == actualSocialCount && httpCount == actualHttpCount;
}
-
+
}
-
+
@Test
public void rewriteWithoutPipeline() throws Exception {
setupGadget(XML_WITHOUT_PIPELINE);
@@ -247,7 +247,7 @@ public class PipelineDataGadgetRewriterT
Map<String, PipelinedData.BatchItem> preloads = batch.getPreloads();
assertTrue(preloads.containsKey("me"));
assertEquals(PipelinedData.BatchType.SOCIAL, preloads.get("me").getType());
-
+
JsonAssert.assertObjectEquals(
"{params: {userId: 'canonical'}, method: 'people.get', id: 'me'}",
preloads.get("me").getData());
@@ -267,7 +267,7 @@ public class PipelineDataGadgetRewriterT
Callable<PreloadedData> callable = new Callable<PreloadedData>() {
public PreloadedData call() throws Exception {
return preloadResult;
- }
+ }
};
return callable;
}
@@ -278,5 +278,5 @@ public class PipelineDataGadgetRewriterT
+ "<Content>"
+ " <![CDATA[" + content + "]]>"
+ "</Content></Module>";
- }
+ }
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java Sun Feb 26 23:43:20 2012
@@ -149,7 +149,7 @@ public class ProxyingVisitorTest extends
return status != VisitStatus.BYPASS;
}
-
+
@Test
public void revisitModifyValidSkipInvalid() throws Exception {
// Batch test: ensures in-order modification.
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java Sun Feb 26 23:43:20 2012
@@ -81,7 +81,7 @@ public abstract class RewriterTestBase {
.setResponse(new byte[]{ (byte)0xFE, (byte)0xFF});
control = EasyMock.createControl();
}
-
+
private Module getParseModule() {
return Modules.override(new ParseModule()).with(new AbstractModule() {
@Override
@@ -90,7 +90,7 @@ public abstract class RewriterTestBase {
}
});
}
-
+
protected Class<? extends GadgetHtmlParser> getParserClass() {
return NekoSimplifiedHtmlParser.class;
}
@@ -172,7 +172,7 @@ public abstract class RewriterTestBase {
final String container) throws Exception {
return rewriteContent(rewriter, s, container, false, false);
}
-
+
protected MutableContent rewriteContent(GadgetRewriter rewriter, String s,
final String container, final boolean debug, final boolean ignoreCache)
throws Exception {
@@ -191,12 +191,12 @@ public abstract class RewriterTestBase {
public String getContainer() {
return container;
}
-
+
@Override
public boolean getDebug() {
return debug;
}
-
+
@Override
public boolean getIgnoreCache() {
return ignoreCache;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java Sun Feb 26 23:43:20 2012
@@ -37,25 +37,25 @@ public class StyleAdjacencyVisitorTest e
Node node = elem("style");
assertEquals(VisitStatus.RESERVE_TREE, visit(node));
}
-
+
@Test
public void visitLinkWithRel() throws Exception {
Node node = elem("link", "rel", "stylesheet");
assertEquals(VisitStatus.RESERVE_TREE, visit(node));
}
-
+
@Test
public void visitLinkWithType() throws Exception {
Node node = elem("link", "type", "text/css");
assertEquals(VisitStatus.RESERVE_TREE, visit(node));
}
-
+
@Test
public void visitStyleCaseInsensitive() throws Exception {
Node node = elem("sTYlE");
assertEquals(VisitStatus.RESERVE_TREE, visit(node));
}
-
+
@Test
public void visitLinkCaseInsensitive() throws Exception {
Node node = elem("lINK", "REL", "stYlEsheet");
@@ -63,19 +63,19 @@ public class StyleAdjacencyVisitorTest e
node = elem("LINk", "tyPe", "text/csS");
assertEquals(VisitStatus.RESERVE_TREE, visit(node));
}
-
+
@Test
public void visitStyleWithAttribs() throws Exception {
Node node = elem("style", "foo", "bar");
assertEquals(VisitStatus.RESERVE_TREE, visit(node));
}
-
+
@Test
public void bypassUnknownElement() throws Exception {
Node node = elem("div");
assertEquals(VisitStatus.BYPASS, visit(node));
}
-
+
@Test
public void bypassLinkWithoutAttribs() throws Exception {
Node node = elem("link");
@@ -93,46 +93,46 @@ public class StyleAdjacencyVisitorTest e
Node node = doc.createTextNode("text");
assertEquals(VisitStatus.BYPASS, visit(node));
}
-
+
@Test
public void bypassComment() throws Exception {
Node node = doc.createComment("comment");
assertEquals(VisitStatus.BYPASS, visit(node));
}
-
+
@Test
public void reshuffleSingleNodeInHead() throws Exception {
Node style = elem("style");
Node html = htmlDoc(new Node[] { elem("script"), doc.createTextNode("foo"),
style, doc.createComment("comment") });
assertTrue(revisit(style));
-
+
// Document structure sanity tests.
assertEquals(2, html.getChildNodes().getLength());
Node head = html.getFirstChild();
assertEquals("head", head.getNodeName());
Node body = html.getLastChild();
assertEquals("body", body.getNodeName());
-
+
// Reshuffling validation.
assertEquals(4, head.getChildNodes().getLength());
assertSame(style, head.getChildNodes().item(0)); // First.
}
-
+
@Test
public void reshuffleSingleNodeFromBody() throws Exception {
Node style = elem("style");
Node html = htmlDoc(new Node[] { elem("foo") }, elem("script"), doc.createTextNode("foo"),
style, doc.createComment("comment"));
assertTrue(revisit(style));
-
+
// Document structure sanity tests.
assertEquals(2, html.getChildNodes().getLength());
Node head = html.getFirstChild();
assertEquals("head", head.getNodeName());
Node body = html.getLastChild();
assertEquals("body", body.getNodeName());
-
+
// Reshuffling validation.
assertEquals(2, head.getChildNodes().getLength());
assertSame(style, head.getChildNodes().item(0)); // First.
@@ -171,7 +171,7 @@ public class StyleAdjacencyVisitorTest e
Node style1 = elem("style");
Node style2 = elem("style");
Node style3 = elem("style");
-
+
// Some in head, some in body.
Node html = htmlDoc(new Node[] { elem("script"), style1, elem("foo") },
doc.createTextNode("text1"), style2, doc.createComment("comment"), elem("div"),
@@ -184,7 +184,7 @@ public class StyleAdjacencyVisitorTest e
assertEquals("head", head.getNodeName());
Node body = html.getLastChild();
assertEquals("body", body.getNodeName());
-
+
// Reshuffling validation.
assertEquals(5, head.getChildNodes().getLength());
assertSame(style1, head.getChildNodes().item(0));
@@ -192,13 +192,13 @@ public class StyleAdjacencyVisitorTest e
assertSame(style3, head.getChildNodes().item(2));
assertEquals(3, body.getChildNodes().getLength());
}
-
+
@Test
public void reshuffleMultipleLinkNodes() throws Exception {
Node link1 = elem("link", "rel", "stylesheet");
Node link2 = elem("link", "rel", "stylesheet");
Node link3 = elem("link", "rel", "stylesheet");
-
+
// Some in head, some in body.
Node html = htmlDoc(new Node[] { link1, elem("script"), elem("foo") },
doc.createTextNode("text1"), link2, doc.createComment("comment"), elem("div"),
@@ -211,7 +211,7 @@ public class StyleAdjacencyVisitorTest e
assertEquals("head", head.getNodeName());
Node body = html.getLastChild();
assertEquals("body", body.getNodeName());
-
+
// Reshuffling validation.
assertEquals(5, head.getChildNodes().getLength());
assertSame(link1, head.getChildNodes().item(0));
@@ -219,14 +219,14 @@ public class StyleAdjacencyVisitorTest e
assertSame(link3, head.getChildNodes().item(2));
assertEquals(3, body.getChildNodes().getLength());
}
-
+
@Test
public void reshuffleMultiMatchedNodes() throws Exception {
Node style1 = elem("style");
Node style2 = elem("style");
Node link1 = elem("link", "rel", "stylesheet");
Node link2 = elem("link", "type", "text/css");
-
+
// Some in head, some in body, one embedded.
Node div = elem("div");
div.appendChild(style2);
@@ -241,7 +241,7 @@ public class StyleAdjacencyVisitorTest e
assertEquals("head", head.getNodeName());
Node body = html.getLastChild();
assertEquals("body", body.getNodeName());
-
+
// Reshuffling validation.
assertEquals(8, head.getChildNodes().getLength());
assertSame(style1, head.getChildNodes().item(0));
@@ -251,7 +251,7 @@ public class StyleAdjacencyVisitorTest e
assertEquals(0, div.getChildNodes().getLength());
assertEquals(3, body.getChildNodes().getLength());
}
-
+
@Test
public void avoidReshufflingInHeadlessDocument() throws Exception {
Node style = elem("style");
@@ -260,9 +260,9 @@ public class StyleAdjacencyVisitorTest e
body.appendChild(style);
html.appendChild(body);
doc.appendChild(html);
-
+
assertFalse(revisit(style));
-
+
// Document structure sanity tests.
assertEquals(1, html.getChildNodes().getLength());
assertSame(body, html.getFirstChild());
@@ -291,7 +291,7 @@ public class StyleAdjacencyVisitorTest e
private VisitStatus visit(Node node) throws Exception {
return new StyleAdjacencyVisitor().visit(gadget(), node);
}
-
+
private boolean revisit(Node... nodes) throws Exception {
return new StyleAdjacencyVisitor().revisit(gadget(), ImmutableList.<Node>copyOf(nodes));
}