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 [9/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/rewrite/StyleTagExtractorVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java Sun Feb 26 23:43:20 2012
@@ -51,67 +51,67 @@ import java.util.List;
public class StyleTagExtractorVisitorTest extends DomWalkerTestBase {
private ProxyUriManager proxyUriManager;
-
+
@Override
@Before
public void setUp() throws Exception {
super.setUp();
proxyUriManager = new PassthruManager();
}
-
+
@Test
public void visitBypassesComment() throws Exception {
Comment comment = doc.createComment("comment");
assertEquals(VisitStatus.BYPASS, getVisitStatus(comment));
}
-
+
@Test
public void visitBypassesText() throws Exception {
Text text = doc.createTextNode("text");
assertEquals(VisitStatus.BYPASS, getVisitStatus(text));
}
-
+
@Test
public void visitBypassesNonStyle() throws Exception {
Node node = elem("div");
assertEquals(VisitStatus.BYPASS, getVisitStatus(node));
}
-
+
@Test
public void visitBypassesStyleWhenRewriterOff() throws Exception {
assertEquals(VisitStatus.BYPASS, getVisitStatus(config(false, true, true), elem("style")));
}
-
+
@Test
public void visitBypassesStyleWhenStyleTagNotIncluded() throws Exception {
assertEquals(VisitStatus.BYPASS, getVisitStatus(config(true, false, true), elem("style")));
}
-
+
@Test
public void visitReservesStyleNode() throws Exception {
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatus(elem("style")));
}
-
+
@Test
public void visitReservesCasedStyleNode() throws Exception {
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatus(elem("sTyLE")));
}
-
+
@Test
public void revisitNothingExtracted() throws Exception {
Gadget gadget = gadget();
CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
replay(cssRewriter);
-
+
// Tag name isn't inspected since visit() filters this.
List<Node> nodes = ImmutableList.of();
Node head = addNodesToHtml(nodes);
-
+
assertFalse(getRevisitStatus(gadget, true, cssRewriter, nodes));
verify(cssRewriter);
assertEquals(0, head.getChildNodes().getLength());
}
-
+
@Test
public void revisitExtractSpecRelative() throws Exception {
Uri base = GADGET_URI;
@@ -128,11 +128,11 @@ public class StyleTagExtractorVisitorTes
expect(cssRewriter.rewrite(eq(elem2), eq(base), isA(UriMaker.class), eq(true), eq(gadget.getContext())))
.andReturn(extractedUrls2).once();
replay(cssRewriter);
-
+
// Tag name isn't inspected since visit() filters this.
List<Node> nodes = ImmutableList.<Node>of(elem1, elem2);
Node head = addNodesToHtml(nodes);
-
+
assertTrue(getRevisitStatus(gadget, true, cssRewriter, nodes));
verify(cssRewriter);
assertEquals(2, head.getChildNodes().getLength());
@@ -149,7 +149,7 @@ public class StyleTagExtractorVisitorTes
// PassthruManager doesn't modify the inbound URI.
assertEquals(urlStr2, child2.getAttribute("href"));
}
-
+
@Test
public void revisitExtractViewHrefRelative() throws Exception {
Uri base = Uri.parse("http://view.com/viewbase.xml");
@@ -166,11 +166,11 @@ public class StyleTagExtractorVisitorTes
expect(cssRewriter.rewrite(eq(elem2), eq(base), isA(UriMaker.class), eq(true), eq(gadget.getContext())))
.andReturn(extractedUrls2).once();
replay(cssRewriter);
-
+
// Tag name isn't inspected since visit() filters this.
List<Node> nodes = ImmutableList.<Node>of(elem1, elem2);
Node head = addNodesToHtml(nodes);
-
+
assertTrue(getRevisitStatus(gadget, true, cssRewriter, nodes));
verify(cssRewriter);
assertEquals(2, head.getChildNodes().getLength());
@@ -187,7 +187,7 @@ public class StyleTagExtractorVisitorTes
// PassthruManager doesn't modify the inbound URI.
assertEquals(urlStr2, child2.getAttribute("href"));
}
-
+
@Test
public void revisitExtractSpecRelativeDisabled() throws Exception {
Uri base = GADGET_URI;
@@ -202,16 +202,16 @@ public class StyleTagExtractorVisitorTes
expect(cssRewriter.rewrite(eq(elem2), eq(base), isA(UriMaker.class), eq(true), eq(gadget.getContext())))
.andReturn(extractedUrls2).once();
replay(cssRewriter);
-
+
// Tag name isn't inspected since visit() filters this.
List<Node> nodes = ImmutableList.<Node>of(elem1, elem2);
Node head = addNodesToHtml(nodes);
-
+
assertFalse(getRevisitStatus(gadget, false, cssRewriter, nodes));
verify(cssRewriter);
assertEquals(0, head.getChildNodes().getLength());
}
-
+
private VisitStatus getVisitStatus(Node node) throws Exception {
return getVisitStatus(config(true, true, true), node);
}
@@ -221,7 +221,7 @@ public class StyleTagExtractorVisitorTes
// Pass null for all unused (viz. visitor()) APIs to underscore their lack of use.
return new StyleTagExtractorVisitor(config, null, null).visit(null, node);
}
-
+
private boolean getRevisitStatus(
Gadget gadget, boolean shouldRewriteUrl, CssResponseRewriter cssRewriter, List<Node> nodes)
throws Exception {
@@ -229,7 +229,7 @@ public class StyleTagExtractorVisitorTes
config(true, true, shouldRewriteUrl), cssRewriter, proxyUriManager)
.revisit(gadget, nodes);
}
-
+
private ContentRewriterFeature.Config config(
boolean enabled, boolean styleInc, boolean rewriteUrl) {
ContentRewriterFeature.Config config = createMock(ContentRewriterFeature.Config.class);
@@ -240,7 +240,7 @@ public class StyleTagExtractorVisitorTes
replay(config);
return config;
}
-
+
private Node addNodesToHtml(List<Node> nodes) throws Exception {
Node html = elem("html");
Node head = elem("head");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java Sun Feb 26 23:43:20 2012
@@ -113,11 +113,11 @@ public class StyleTagProxyEmbeddedUrlsVi
@Test
public void testImportsAndBackgroundUrlsInStyleTagMockContainer() throws Exception {
testImportsAndBackgroundUrlsInStyleTag(ORIGINAL, EXPECTED.replace(
- "localhost:8080/gadgets/proxy?container=default", "www.mock.com/gadgets/proxy?container=mock"),
+ "localhost:8080/gadgets/proxy?container=default", "www.mock.com/gadgets/proxy?container=mock"),
MOCK_CONTAINER);
}
-
- private void testImportsAndBackgroundUrlsInStyleTag(String html, String expected, String container)
+
+ private void testImportsAndBackgroundUrlsInStyleTag(String html, String expected, String container)
throws Exception {
Document doc = htmlParser.parseDom(html);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -56,37 +56,37 @@ import org.w3c.dom.Node;
import java.util.Map;
import java.util.Set;
-/**
+/**
* Tests for TemplateRewriter
*/
public class TemplateRewriterTest {
-
+
private GadgetSpec gadgetSpec;
private Gadget gadget;
private MutableContent content;
private TemplateRewriter rewriter;
private final Map<String, Object> data = Maps.newHashMap();
-
+
private static final Uri GADGET_URI = Uri.parse("http://example.org/gadget.php");
-
+
private static final String CONTENT_PLAIN =
- "<script type='text/os-template'>Hello, ${user.name}</script>";
+ "<script type='text/os-template'>Hello, ${user.name}</script>";
private static final String CONTENT_WITH_MESSAGE =
- "<script type='text/os-template'>Hello, ${Msg.name}</script>";
+ "<script type='text/os-template'>Hello, ${Msg.name}</script>";
private static final String CONTENT_REQUIRE =
- "<script type='text/os-template' require='user'>Hello, ${user.name}</script>";
-
+ "<script type='text/os-template' require='user'>Hello, ${user.name}</script>";
+
private static final String CONTENT_REQUIRE_MISSING =
- "<script type='text/os-template' require='foo'>Hello, ${user.name}</script>";
+ "<script type='text/os-template' require='foo'>Hello, ${user.name}</script>";
private static final String CONTENT_WITH_TAG =
"<script type='text/os-template' xmlns:foo='#foo' tag='foo:Bar'>Hello, ${user.name}</script>";
-
+
private static final String CONTENT_WITH_AUTO_UPDATE =
"<script type='text/os-template' autoUpdate='true'>Hello, ${user.name}</script>";
-
+
private static final String TEMPLATE_LIBRARY =
"<Templates xmlns:my='#my'>" +
" <Namespace prefix='my' url='#my'/>" +
@@ -119,11 +119,11 @@ public class TemplateRewriterTest {
},
new FakeMessageBundleFactory(),
Expressions.forTesting(),
- new DefaultTagRegistry(handlers),
+ new DefaultTagRegistry(handlers),
new FakeTemplateLibraryFactory(),
new ContainerTagLibraryFactory(new FakeContainerConfig()));
}
-
+
private static TagHandler testTagHandler(String name, final String content) {
return new AbstractTagHandler("#my", name) {
public void process(Node result, Element tag, TemplateProcessor processor) {
@@ -131,54 +131,54 @@ public class TemplateRewriterTest {
}
};
}
-
+
@Test
public void simpleTemplate() throws Exception {
// Render a simple template
testExpectingTransform(getGadgetXml(CONTENT_PLAIN), "simple");
testFeatureRemoved();
}
-
+
@Test
public void noTemplateFeature() throws Exception {
// Without opensocial-templates feature, shouldn't render
testExpectingNoTransform(getGadgetXml(CONTENT_PLAIN, false), "no feature");
}
-
+
@Test
public void requiredDataPresent() throws Exception {
- // Required data is present - render
+ // Required data is present - render
testExpectingTransform(getGadgetXml(CONTENT_REQUIRE), "required data");
testFeatureRemoved();
}
-
+
@Test
public void requiredDataMissing() throws Exception {
// Required data is missing - don't render
testExpectingNoTransform(getGadgetXml(CONTENT_REQUIRE_MISSING), "missing data");
testFeatureNotRemoved();
}
-
+
@Test
public void tagAttributePresent() throws Exception {
// Don't render templates with a @tag
testExpectingNoTransform(getGadgetXml(CONTENT_WITH_TAG), "with @tag");
testFeatureRemoved();
}
-
+
@Test
public void templateUsingMessage() throws Exception {
// Render a simple template
testExpectingTransform(getGadgetXml(CONTENT_WITH_MESSAGE), "simple");
testFeatureRemoved();
}
-
+
@Test
public void autoUpdateTemplate() throws Exception {
setupGadget(getGadgetXml(CONTENT_WITH_AUTO_UPDATE));
rewriter.rewrite(gadget, content);
// The template should get transformed, but not removed
- assertTrue("Template wasn't transformed",
+ assertTrue("Template wasn't transformed",
content.getContent().indexOf("Hello, John") > 0);
assertTrue("Template tag was removed",
content.getContent().contains("text/os-template"));
@@ -197,7 +197,7 @@ public class TemplateRewriterTest {
"<style type=\"text/css\">style</style>") > 0);
assertTrue("Tag not executed", content.getContent().indexOf(
"external4") > 0);
-
+
testFeatureRemoved();
}
@@ -210,7 +210,7 @@ public class TemplateRewriterTest {
testFeatureRemoved();
}
-
+
@Test
public void tagPrecedenceRules() throws Exception {
// Tag definitions include:
@@ -218,7 +218,7 @@ public class TemplateRewriterTest {
// OSML: tag1 osml1 tag2 osml2
// inline tags: tag1 inline1 tag2 inline2 tag3 inline3
// External tags: tag1 external1 tag2 external2 tag3 external3 tag4 external4
-
+
data.put("${Cur['gadgets.features'].osml.library}",
"org/apache/shindig/gadgets/rewrite/OSML_test.xml");
@@ -226,7 +226,7 @@ public class TemplateRewriterTest {
rewriter.rewrite(gadget, content);
assertTrue("Precedence rules violated",
content.getContent().indexOf("default1osml2inline3external4") > 0);
-
+
testFeatureRemoved();
}
@@ -247,7 +247,7 @@ public class TemplateRewriterTest {
testFeatureRemoved();
}
-
+
@Test
public void tagPrecedenceRulesWithoutOSML() throws Exception {
// Tag definitions include:
@@ -263,21 +263,21 @@ public class TemplateRewriterTest {
rewriter.rewrite(gadget, content);
assertTrue("Precedence rules violated",
content.getContent().indexOf("default1inline2inline3external4") > 0);
-
+
testFeatureRemoved();
}
-
+
@Test
public void testClientOverride() throws Exception {
// Should normally remove feature
testExpectingTransform(getGadgetXml(CONTENT_PLAIN, true, "true"), "keep client");
testFeatureNotRemoved();
-
+
// Should normally keep feature
testExpectingNoTransform(getGadgetXml(CONTENT_WITH_TAG, true, "false"), "remove client");
testFeatureRemoved();
}
-
+
private void testFeatureRemoved() {
assertFalse("Feature wasn't removed",
gadget.getDirectFeatureDeps().contains("opensocial-templates"));
@@ -305,7 +305,7 @@ public class TemplateRewriterTest {
assertTrue("Template tag was removed (" + condition + ')',
content.getContent().indexOf("text/os-template") > 0);
}
-
+
private void setupGadget(String gadgetXml) throws SpecParserException, JSONException {
gadgetSpec = new GadgetSpec(GADGET_URI, gadgetXml);
gadget = new Gadget();
@@ -323,26 +323,26 @@ public class TemplateRewriterTest {
new ParseModule.DOMImplementationProvider().get()), gadget.getCurrentView().getContent());
putPipelinedData("user", new JSONObject("{ name: 'John'}"));
}
-
+
private void putPipelinedData(String key, JSONObject data) {
content.addPipelinedData(key, data);
}
-
+
private static String getGadgetXml(String content) {
return getGadgetXml(content, true);
}
-
+
private static String getGadgetXml(String content, boolean requireFeature) {
return getGadgetXml(content, requireFeature, null);
}
-
- private static String getGadgetXml(String content, boolean requireFeature,
+
+ private static String getGadgetXml(String content, boolean requireFeature,
String clientParam) {
String feature = requireFeature ?
- "<Require feature='opensocial-templates'" +
- (clientParam != null ?
- ("><Param name='client'>" + clientParam + "</Param></Require>")
- : "/>")
+ "<Require feature='opensocial-templates'" +
+ (clientParam != null ?
+ ("><Param name='client'>" + clientParam + "</Param></Require>")
+ : "/>")
: "";
return "<Module>" + "<ModulePrefs title='Title'>"
+ feature
@@ -354,7 +354,7 @@ public class TemplateRewriterTest {
+ " <![CDATA[" + content + "]]>"
+ "</Content></Module>";
}
-
+
private static String getGadgetXmlWithLibrary(String content) {
return getGadgetXmlWithLibrary(content, "opensocial-templates");
}
@@ -381,16 +381,16 @@ public class TemplateRewriterTest {
public TemplateLibrary loadTemplateLibrary(GadgetContext context, Uri uri)
throws GadgetException {
assertEquals(TEMPLATE_LIBRARY_URI, uri.toString());
- return new XmlTemplateLibrary(uri, XmlUtil.parseSilent(TEMPLATE_LIBRARY),
+ return new XmlTemplateLibrary(uri, XmlUtil.parseSilent(TEMPLATE_LIBRARY),
TEMPLATE_LIBRARY);
}
}
-
+
private class FakeContainerConfig extends BasicContainerConfig {
@Override
public Object getProperty(String container, String name) {
return data.get(name);
}
-
+
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/ImageRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -56,7 +56,7 @@ public class ImageRewriterTest extends A
/** A 600 x 400 image whose size used to cause trouble with rounding when resizing to 171 x 171 */
private static final String RATIO_IMAGE = "org/apache/shindig/gadgets/rewrite/image/ratio.gif";
-
+
/**
* This image has a huge memory footprint that the rewriter should refuse to resize, but not
* refuse to render. The response containing this image should not be rewritten.
@@ -95,7 +95,7 @@ public class ImageRewriterTest extends A
assertNotNull(imageBytes);
return imageBytes;
}
-
+
private BufferedImage getResizedHttpResponseContent(String sourceContentType,
String targetContentType, String imageName, Integer width, Integer height, Integer quality)
throws Exception {
@@ -294,12 +294,12 @@ public class ImageRewriterTest extends A
assertEquals(HttpResponse.SC_OK, response.getHttpStatusCode());
assertTrue(Arrays.equals(imageBytes, IOUtils.toByteArray(response.getContentBytes())));
}
-
+
@Test
public void testResize_avoidFloatingPointRoundingProblems() throws Exception {
BufferedImage image = getResizedHttpResponseContent(
CONTENT_TYPE_GIF, CONTENT_TYPE_PNG, RATIO_IMAGE, 171, 171, null, true);
assertEquals(171, image.getWidth());
- assertEquals(114, image.getHeight());
+ assertEquals(114, image.getHeight());
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtilsTest.java Sun Feb 26 23:43:20 2012
@@ -65,5 +65,5 @@ public class JpegImageUtilsTest extends
InputStream is = getClass().getClassLoader().getResourceAsStream(resource);
JpegImageUtils.JpegImageParams imageParams = JpegImageUtils.getJpegImageData(is, resource);
assertEquals(false, imageParams.isHuffmanOptimized());
- }
+ }
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompilerTest.java Sun Feb 26 23:43:20 2012
@@ -78,7 +78,7 @@ public class DefaultJsCompilerTest {
@Test
public void testCompile() throws Exception {
- JsResponse actual = compiler.compile(null,
+ JsResponse actual = compiler.compile(null,
ImmutableList.of(JsContent.fromText(COMPILE_CONTENT, "js")), null);
assertEquals(COMPILE_CONTENT, actual.toJsString());
assertEquals(0, actual.getErrors().size());
@@ -108,7 +108,7 @@ public class DefaultJsCompilerTest {
replay(result);
return result;
}
-
+
private String getContent(Iterable<JsContent> jsContent) {
StringBuilder sb = new StringBuilder();
for (JsContent js : jsContent) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/CajaContentRewriterTest.java Sun Feb 26 23:43:20 2012
@@ -53,7 +53,7 @@ public class CajaContentRewriterTest ext
private List<GadgetHtmlParser> parsers;
private CajaContentRewriter rewriter;
private ProxyUriManager proxyUriManager;
-
+
@Before
public void setUp() throws Exception {
super.setUp();
@@ -110,7 +110,7 @@ public class CajaContentRewriterTest ext
"css property top has bad value: ==>expression(alert(0), 0)");
testMarkup(markup, expected, messages);
}
-
+
@Test
public void testRewrite() throws Exception {
String markup = "<script>var a=0;</script>";
@@ -129,7 +129,7 @@ public class CajaContentRewriterTest ext
String uri = "http://www.example.com/";
String unproxied = uri;
String proxied = "http://shindig.com/gadgets/proxy?url=" + uri;
-
+
expect(proxyUriManager.make(EasyMock.anyObject(List.class), EasyMock.isNull(Integer.class)))
.andReturn(ImmutableList.<Uri>of(Uri.parse(proxied))).anyTimes();
replay(proxyUriManager);
@@ -137,17 +137,17 @@ public class CajaContentRewriterTest ext
// Uris that transistion the page
assertUrlRewritten("a", "href", uri, unproxied);
assertUrlRewritten("area", "href", uri, unproxied);
-
+
// Uris that load media
assertUrlRewritten("img", "src", uri, proxied);
-
+
// Uris that have no effect on the document
assertUrlRewritten("blockquote", "cite", uri, unproxied);
assertUrlRewritten("q", "cite", uri, unproxied);
assertUrlRewritten("del", "cite", uri, unproxied);
assertUrlRewritten("ins", "cite", uri, unproxied);
}
-
+
private void testMarkup(String markup, String expected) throws GadgetException{
testMarkup(markup, expected, null);
}
@@ -158,7 +158,7 @@ public class CajaContentRewriterTest ext
String expected = attr + "=\"" + rewritten + "\"";
testMarkup(markUp, expected);
}
-
+
private void testMarkup(String markup, String expected, List<String> msgs) throws GadgetException{
Gadget gadget = makeGadget();
for (GadgetHtmlParser parser : parsers) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java Sun Feb 26 23:43:20 2012
@@ -53,7 +53,7 @@ public class ConcatProxyServletTest exte
private static final String SCRT3 = "var v3 = \"world\";";
private static final String SCRT1_ESCAPED = "var v1 = 1;";
- private static final String SCRT2_ESCAPED =
+ private static final String SCRT2_ESCAPED =
"var v2 = { \\\"a-b\\\": 1 , c: \\\"hello!,\\\" };";
private static final String SCRT3_ESCAPED = "var v3 = \\\"world\\\";";
@@ -68,7 +68,7 @@ public class ConcatProxyServletTest exte
servlet.setRequestPipeline(pipeline);
uriManager = new TestConcatUriManager();
servlet.setConcatUriManager(uriManager);
-
+
expect(request.getHeader("Host")).andReturn(REQUEST_DOMAIN).anyTimes();
expect(lockedDomainService.isSafeForOpenProxy(REQUEST_DOMAIN))
.andReturn(true).anyTimes();
@@ -126,7 +126,7 @@ public class ConcatProxyServletTest exte
private void runConcat(ExecutorService exec, String result, String tok, Uri... uris)
throws Exception {
expectRequestWithUris(Lists.newArrayList(uris), tok);
-
+
// Run the servlet
servlet.setExecutor(exec);
servlet.doGet(request, recorder);
@@ -134,7 +134,7 @@ public class ConcatProxyServletTest exte
assertEquals(result, recorder.getResponseAsString());
assertEquals(200, recorder.getHttpStatusCode());
}
-
+
@Test
public void testSimpleConcat() throws Exception {
String results = addComment(SCRT1, URL1.toString()) + addComment(SCRT2,URL2.toString());
@@ -146,7 +146,7 @@ public class ConcatProxyServletTest exte
String results = addComment(SCRT1, URL1.toString()) + addComment(SCRT2,URL2.toString());
runConcat(threadedExecutor, results, null, URL1, URL2);
}
-
+
@Test
public void testThreeConcat() throws Exception {
String results = addComment(SCRT1, URL1.toString()) + addComment(SCRT2,URL2.toString())
@@ -160,7 +160,7 @@ public class ConcatProxyServletTest exte
+ addComment(SCRT3, URL3.toString());
runConcat(threadedExecutor, results, null, URL1, URL2, URL3);
}
-
+
@Test
public void testConcatBadException() throws Exception {
final Uri URL4 = Uri.parse("http://example.org/4.js");
@@ -170,7 +170,7 @@ public class ConcatProxyServletTest exte
new GadgetException(GadgetException.Code.HTML_PARSE_ERROR)).anyTimes();
expectRequestWithUris(Lists.newArrayList(URL1, URL4));
-
+
// Run the servlet
servlet.doGet(request, recorder);
verify();
@@ -178,7 +178,7 @@ public class ConcatProxyServletTest exte
String results = addComment(SCRT1, URL1.toString())
+ addConcatErrComment(GadgetException.Code.HTML_PARSE_ERROR, URL4.toString());
assertEquals(results, recorder.getResponseAsString());
-
+
assertEquals(400, recorder.getHttpStatusCode());
}
@@ -188,12 +188,12 @@ public class ConcatProxyServletTest exte
HttpRequest req = new HttpRequest(Uri.parse(url));
HttpResponse resp = new HttpResponseBuilder().setHttpStatusCode(404).create();
expect(pipeline.execute(req)).andReturn(resp).anyTimes();
-
+
expectRequestWithUris(Lists.newArrayList(URL1, Uri.parse(url)));
-
+
servlet.doGet(request, recorder);
verify();
-
+
String results = addComment(SCRT1, URL1.toString()) + addErrComment(url,404);
assertEquals(results, recorder.getResponseAsString());
assertEquals(200, recorder.getHttpStatusCode());
@@ -217,7 +217,7 @@ public class ConcatProxyServletTest exte
+ "};\r\n";
runConcat(sequentialExecutor, results, "_js", URL1, URL2, URL3);
}
-
+
@Test
public void testBadJsonVarConcat() throws Exception {
expectRequestWithUris(Lists.<Uri>newArrayList(), "bad code;");
@@ -242,7 +242,7 @@ public class ConcatProxyServletTest exte
+ "};\r\n";
runConcat(sequentialExecutor, results, "_js", URL1, URL4);
}
-
+
@Test
public void testAsJsonConcatException() throws Exception {
final Uri URL4 = Uri.parse("http://example.org/4.js");
@@ -274,7 +274,7 @@ public class ConcatProxyServletTest exte
+ addConcatErrComment(GadgetException.Code.HTML_PARSE_ERROR, URL4.toString()) + "};\r\n";
expectRequestWithUris(Lists.newArrayList(URL1, URL4), "_js");
-
+
// Run the servlet
servlet.doGet(request, recorder);
verify();
@@ -328,7 +328,7 @@ public class ConcatProxyServletTest exte
}
/**
- * Returns cache control max age from HttpServletResponseRecorder
+ * Returns cache control max age from HttpServletResponseRecorder
*/
private int getCacheControlMaxAge(HttpServletResponseRecorder recorder) {
String cacheControl = recorder.getHeader("Cache-Control");
@@ -336,11 +336,11 @@ public class ConcatProxyServletTest exte
String cacheValue = cacheControl.substring(cacheControl.indexOf('=') + 1);
return Integer.decode(cacheValue);
}
-
+
private void expectRequestWithUris(List<Uri> uris) {
expectRequestWithUris(uris, null);
}
-
+
private void expectRequestWithUris(List<Uri> uris, String tok) {
expect(request.getScheme()).andReturn("http").anyTimes();
expect(request.getServerPort()).andReturn(80).anyTimes();
@@ -355,11 +355,11 @@ public class ConcatProxyServletTest exte
private static class TestConcatUriManager implements ConcatUriManager {
private final Map<Uri, ConcatUri> uriMap;
-
+
private TestConcatUriManager() {
this.uriMap = Maps.newHashMap();
}
-
+
public List<ConcatData> make(List<ConcatUri> resourceUris, boolean isAdjacent) {
// Not used by ConcatProxyServlet
throw new UnsupportedOperationException();
@@ -368,11 +368,11 @@ public class ConcatProxyServletTest exte
public ConcatUri process(Uri uri) {
return uriMap.get(uri);
}
-
+
private void expect(Uri orig, UriStatus status, Type type, List<Uri> uris, String json) {
uriMap.put(orig, new ConcatUri(status, uris, json, type, null));
}
-
+
private void expect(Uri orig, List<Uri> uris, String tok) {
expect(orig, UriStatus.VALID_UNVERSIONED, Type.JS, uris, tok);
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ETaggingHttpResponseTest.java Sun Feb 26 23:43:20 2012
@@ -55,7 +55,7 @@ public class ETaggingHttpResponseTest {
private static final String SECOND_ETAG = "b6e56fb0129c3530f23dbb795daa3200";
private static final String BAD_ETAG = "some bogus etag";
private static final String EMPTY_CONTENT_ETAG = "d41d8cd98f00b204e9800998ecf8427e";
-
+
private static final Function<String, String> ETAG_QUOTER = new Function<String, String>() {
public String apply(String input) {
return '"' + input + '"';
@@ -88,14 +88,14 @@ public class ETaggingHttpResponseTest {
expectRequestETag();
expectFullResponse();
control.replay();
-
+
response.getWriter().print(RESPONSE_BODY);
response.flushBuffer();
assertResponseHasBody();
control.verify();
}
-
+
@Test
public void testNotModifiedWithPrint() throws Exception {
expectRequestETag(GOOD_ETAG);
@@ -108,7 +108,7 @@ public class ETaggingHttpResponseTest {
assertResponseBodyIsEmpty();
control.verify();
}
-
+
@Test
public void testNotModifiedWithManyETagsInRequest() throws Exception {
expectRequestETag(SECOND_ETAG, GOOD_ETAG, BAD_ETAG);
@@ -134,7 +134,7 @@ public class ETaggingHttpResponseTest {
assertResponseHasBody();
control.verify();
}
-
+
@Test
public void testNonMatchingETagWithManyETagsInRequest() throws Exception {
expectRequestETag(BAD_ETAG, SECOND_ETAG, EMPTY_CONTENT_ETAG);
@@ -156,7 +156,7 @@ public class ETaggingHttpResponseTest {
response.getOutputStream().write(RESPONSE_BODY_BYTES);
response.flushBuffer();
-
+
assertResponseHasBody();
control.verify();
}
@@ -169,7 +169,7 @@ public class ETaggingHttpResponseTest {
response.getOutputStream().write(RESPONSE_BODY_BYTES);
response.flushBuffer();
-
+
assertResponseBodyIsEmpty();
control.verify();
}
@@ -182,7 +182,7 @@ public class ETaggingHttpResponseTest {
response.getOutputStream().write(RESPONSE_BODY_BYTES);
response.flushBuffer();
-
+
assertResponseHasBody();
control.verify();
}
@@ -193,7 +193,7 @@ public class ETaggingHttpResponseTest {
origResponse.setHeader(ETaggingHttpResponse.RESPONSE_HEADER, '"' + EMPTY_CONTENT_ETAG + '"');
origResponse.setContentLength(0);
control.replay();
-
+
response.getOutputStream();
response.flushBuffer();
@@ -205,40 +205,40 @@ public class ETaggingHttpResponseTest {
public void testStreamingMode() throws Exception {
expectRequestETag();
control.replay();
-
+
response.getWriter().print(RESPONSE_BODY);
assertEquals(0, stream.getBuffer().length);
-
+
response.startStreaming();
assertArrayEquals(RESPONSE_BODY_BYTES, stream.getBuffer());
-
+
response.getOutputStream().write(SECOND_RESPONSE_BODY.getBytes("UTF-8"));
- assertArrayEquals(AFTER_SECOND_RESPONSE_BODY_BYTES, stream.getBuffer());
+ assertArrayEquals(AFTER_SECOND_RESPONSE_BODY_BYTES, stream.getBuffer());
}
-
+
@Test
public void testCanCalculateHashSeveralTimes() throws Exception {
expectRequestETag(GOOD_ETAG);
expectNotModifiedResponse(GOOD_ETAG);
control.replay();
-
+
response.getOutputStream().write(RESPONSE_BODY.getBytes("UTF-8"));
String hash = ((BufferServletOutputStream) response.getOutputStream()).getContentHash();
assertEquals(GOOD_ETAG, hash);
hash = ((BufferServletOutputStream) response.getOutputStream()).getContentHash();
assertEquals(GOOD_ETAG, hash);
-
+
response.flushBuffer();
assertResponseBodyIsEmpty();
control.verify();
}
-
+
@Test
public void testHashVariesAsDataIsAdded() throws Exception {
expectRequestETag(SECOND_ETAG);
expectNotModifiedResponse(SECOND_ETAG);
control.replay();
-
+
response.getOutputStream().write(RESPONSE_BODY.getBytes("UTF-8"));
String hash = ((BufferServletOutputStream) response.getOutputStream()).getContentHash();
assertEquals(GOOD_ETAG, hash);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java Sun Feb 26 23:43:20 2012
@@ -52,7 +52,7 @@ public class GadgetRenderingServletTest
public final HttpServletResponseRecorder recorder = new HttpServletResponseRecorder(response);
private final GadgetRenderingServlet servlet = new GadgetRenderingServlet();
private final IframeUriManager iframeUriManager = control.createMock(IframeUriManager.class);
-
+
@Before
public void setUpUrlGenerator() {
expect(iframeUriManager.validateRenderingUri(isA(Uri.class))).andReturn(UriStatus.VALID_UNVERSIONED);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java Sun Feb 26 23:43:20 2012
@@ -337,7 +337,7 @@ public class HtmlAccelServletTest extend
assertEquals(recorder.getHeader("Set-Cookie2"), "name2=value2");
assertEquals(REWRITE_CONTENT, recorder.getResponseAsString());
assertEquals(200, recorder.getHttpStatusCode());
- assertTrue(rewriter.responseWasRewritten());
+ assertTrue(rewriter.responseWasRewritten());
}
@Test
@@ -371,7 +371,7 @@ public class HtmlAccelServletTest extend
verify();
for (Map.Entry<String, String> header : headersMap.entrySet()) {
assertEquals(recorder.getHeader(header.getKey()), header.getValue());
- }
+ }
assertEquals(REWRITE_CONTENT, recorder.getResponseAsString());
assertEquals(200, recorder.getHttpStatusCode());
assertTrue(rewriter.responseWasRewritten());
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java Sun Feb 26 23:43:20 2012
@@ -85,7 +85,7 @@ public class HttpGadgetContextTest exten
GadgetContext context = new HttpGadgetContext(request);
assertEquals(expected, context.getToken());
}
-
+
@Test
public void testGetUserAgent() throws Exception {
expect(request.getHeader("User-Agent")).andReturn("Mozilla/4.0");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -90,7 +90,7 @@ public class HttpRequestHandlerTest exte
return new FeedProcessorImpl();
}
};
-
+
@Before
public void setUp() throws Exception {
token = new FakeGadgetToken();
@@ -430,7 +430,7 @@ public class HttpRequestHandlerTest exte
oauthArgs.setServiceName("oauthService");
httpRequest.setOAuthArguments(oauthArgs);
httpRequest.setPostBody("POSTBODY".getBytes());
-
+
Capture<HttpRequest> requestCapture = new Capture<HttpRequest>();
expect(pipeline.execute(capture(requestCapture))).andReturn(builder.create());
replay();
@@ -438,7 +438,7 @@ public class HttpRequestHandlerTest exte
operation.execute(emptyFormItems, token, converter).get();
verify();
-
+
assertEquals(httpRequest.getOAuthArguments(),
requestCapture.getValue().getOAuthArguments());
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java Sun Feb 26 23:43:20 2012
@@ -41,13 +41,13 @@ public class OAuthCallbackServletTest ex
String body = this.recorder.getResponseAsString();
Assert.assertNotSame("body is " + body, body.indexOf("window.close()"), -1);
}
-
+
@Test
public void testServletWithCallback() throws Exception {
BlobCrypter crypter = new BasicBlobCrypter("00000000000000000000".getBytes());
OAuthCallbackState state = new OAuthCallbackState(crypter);
OAuthCallbackServlet servlet = new OAuthCallbackServlet();
- servlet.setStateCrypter(crypter);
+ servlet.setStateCrypter(crypter);
state.setRealCallbackUrl("http://www.example.com/callback");
expect(request.getParameter("cs")).andReturn(state.getEncryptedState());
expect(request.getQueryString()).andReturn("cs=foo&bar=baz");
@@ -59,13 +59,13 @@ public class OAuthCallbackServletTest ex
String cacheControl = this.recorder.getHeader("Cache-Control");
assertEquals("private,max-age=3600", cacheControl);
}
-
+
@Test
public void testServletWithCallback_noQueryParams() throws Exception {
BlobCrypter crypter = new BasicBlobCrypter("00000000000000000000".getBytes());
OAuthCallbackState state = new OAuthCallbackState(crypter);
OAuthCallbackServlet servlet = new OAuthCallbackServlet();
- servlet.setStateCrypter(crypter);
+ servlet.setStateCrypter(crypter);
state.setRealCallbackUrl("http://www.example.com/callback");
expect(request.getParameter("cs")).andReturn(state.getEncryptedState());
expect(request.getQueryString()).andReturn("cs=foo");
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java Sun Feb 26 23:43:20 2012
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRes
/**
* Tests for ProxyServlet.
- *
+ *
* Tests are trivial; real tests are in ProxyHandlerTest.
*/
public class ProxyServletTest extends ServletTestFixture {
@@ -49,7 +49,7 @@ public class ProxyServletTest extends Se
private static final String ERROR_MESSAGE = "Broken!";
private static final String POST_CONTENT = "my post stuff";
private static final String POST_METHOD = "POST";
-
+
private ServletInputStream postContentStream = new ServletInputStream() {
InputStream is = new ByteArrayInputStream(POST_CONTENT.getBytes());
@Override
@@ -165,7 +165,7 @@ public class ProxyServletTest extends Se
public void testDoPostNormal() throws Exception {
setupRequest(BASIC_SYNTAX_URL);
expect(request.getInputStream()).andReturn(postContentStream);
- expect(request.getMethod()).andReturn(POST_METHOD);
+ expect(request.getMethod()).andReturn(POST_METHOD);
expect(proxyHandler.fetch(proxyUri, POST_CONTENT)).andReturn(new HttpResponse(RESPONSE_BODY));
replay();
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java Sun Feb 26 23:43:20 2012
@@ -123,17 +123,17 @@ public class ServletUtilTest {
public void testValidateUrlNullInput() throws Exception {
ServletUtil.validateUrl(null);
}
-
+
@Test
public void testOutputDataUri() throws Exception {
checkOutputDataUri("text/foo", "text/foo", "UTF-8");
}
-
+
@Test
public void testOutputDataUriWithCharset() throws Exception {
checkOutputDataUri("text/bar; charset=ISO-8859-1", "text/bar", "ISO-8859-1");
}
-
+
@Test
public void testOutputDataUriWithEmptyCharset() throws Exception {
checkOutputDataUri("text/bar; charset=", "text/bar", "UTF-8");
@@ -155,7 +155,7 @@ public class ServletUtilTest {
HttpResponse jsonified = ServletUtil.convertToJsonResponse(response);
assertEquals("application/json; charset=UTF-8", jsonified.getHeader("Content-Type"));
-
+
String emitted = jsonified.getResponseAsString();
JSONObject js = new JSONObject(emitted);
assertEquals(mv1, js.getString(mk1));
@@ -164,11 +164,11 @@ public class ServletUtilTest {
assertEquals("data:" + expectedType + ";base64;charset=" + expectedEncoding + "," + content64,
js.getString(ServletUtil.DATA_URI_KEY));
}
-
+
private String getBase64(String input) throws Exception {
return new String(Base64.encodeBase64(input.getBytes("UTF8")), "UTF8");
}
-
+
@Test
public void testFromHttpServletRequest() throws Exception {
HttpServletRequest original = EasyMock.createMock(HttpServletRequest.class);
@@ -195,11 +195,11 @@ public class ServletUtilTest {
};
EasyMock.expect(original.getInputStream()).andReturn(sis);
EasyMock.expect(original.getRemoteAddr()).andReturn("1.2.3.4");
-
+
EasyMock.replay(original);
HttpRequest request = ServletUtil.fromHttpServletRequest(original);
EasyMock.verify(original);
-
+
assertEquals(Uri.parse("https://www.example.org:444/path/foo?one=two&three=four"),
request.getUri());
assertEquals(3, request.getHeaders().size());
@@ -211,7 +211,7 @@ public class ServletUtilTest {
assertEquals("post body", request.getPostBodyAsString());
assertEquals("1.2.3.4", request.getParam(ServletUtil.REMOTE_ADDR_KEY));
}
-
+
@Test
public void testCopyToServletResponseAndOverrideCacheHeadersForPublic() throws Exception {
FakeTimeSource fakeTime = new FakeTimeSource();
@@ -223,9 +223,9 @@ public class ServletUtilTest {
HttpServletResponse servletResponse = EasyMock.createMock(HttpServletResponse.class);
HttpServletResponseRecorder recorder = new HttpServletResponseRecorder(servletResponse);
-
+
ServletUtil.copyToServletResponseAndOverrideCacheHeaders(response, recorder);
-
+
assertEquals(200, recorder.getHttpStatusCode());
assertEquals("response string", recorder.getResponseAsString());
assertEquals("v1", recorder.getHeader("h1"));
@@ -268,7 +268,7 @@ public class ServletUtilTest {
HttpServletResponseRecorder recorder = new HttpServletResponseRecorder(servletResponse);
long testStartTime = fakeTime.currentTimeMillis();
ServletUtil.copyToServletResponseAndOverrideCacheHeaders(response, recorder);
- assertEquals(200, recorder.getHttpStatusCode());
+ assertEquals(200, recorder.getHttpStatusCode());
assertEquals("response string", recorder.getResponseAsString());
assertEquals("v1", recorder.getHeader("h1"));
assertEquals("v2", recorder.getHeader("h2"));
@@ -277,7 +277,7 @@ public class ServletUtilTest {
assertGreater(testStartTime - 2000L, expires);
assertLesser(testStartTime + 2000L, expires);
}
-
+
@Test
public void testCopyToServletResponseAndOverrideCacheHeadersForStrictNoCache()
throws Exception {
@@ -287,11 +287,11 @@ public class ServletUtilTest {
HttpServletResponse servletResponse = EasyMock.createMock(HttpServletResponse.class);
HttpServletResponseRecorder recorder = new HttpServletResponseRecorder(servletResponse);
-
+
FakeTimeSource fakeTime = new FakeTimeSource();
HttpUtil.setTimeSource(fakeTime);
ServletUtil.copyToServletResponseAndOverrideCacheHeaders(response, recorder);
-
+
assertEquals(200, recorder.getHttpStatusCode());
assertEquals("response string", recorder.getResponseAsString());
assertEquals("v1", recorder.getHeader("h1"));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java Sun Feb 26 23:43:20 2012
@@ -81,8 +81,8 @@ public class FeatureTest extends Assert
assertTrue(params.get("foobar").isEmpty());
assertNull(feature.getParam("foobar"));
}
-
-
+
+
@Test
public void testViews() throws Exception {
String xml = "<Require feature=\"foo\" views=\"view1\">" +
@@ -91,7 +91,7 @@ public class FeatureTest extends Assert
Set<String> views = feature.getViews();
assertTrue(views.size() == 1);
assertTrue(views.contains("view1"));
-
+
xml = "<Require feature=\"foo\" views=\"view1, view2\">" +
"</Require>";
feature = new Feature(XmlUtil.parse(xml));
@@ -99,7 +99,7 @@ public class FeatureTest extends Assert
assertTrue(views.size() == 2);
assertTrue(views.contains("view1"));
assertTrue(views.contains("view2"));
-
+
xml = "<Require feature=\"foo\">" +
"</Require>";
feature = new Feature(XmlUtil.parse(xml));
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/LocaleSpecTest.java Sun Feb 26 23:43:20 2012
@@ -43,7 +43,7 @@ public class LocaleSpecTest {
assertEquals("http://example.org/msgs.xml", locale.getMessages().toString());
assertEquals(0, locale.getViews().size());
}
-
+
@Test
public void viewLocale() throws Exception {
String xml = "<Locale" +
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java Sun Feb 26 23:43:20 2012
@@ -83,7 +83,7 @@ public class MessageBundleTest {
MessageBundle bundle = new MessageBundle(locale, duplicateKeyXml);
assertEquals(ImmutableMap.of("key", "value"), bundle.getMessages());
}
-
+
@Test
public void containsCdataSection() throws Exception {
String cdataXml =
@@ -93,7 +93,7 @@ public class MessageBundleTest {
MessageBundle bundle = new MessageBundle(locale, cdataXml);
assertEquals(ImmutableMap.of("key", "<span id='foo'>data</span>"), bundle.getMessages());
}
-
+
@Test(expected = SpecParserException.class)
public void missingNameThrows() throws SpecParserException {
String xml = "<messagebundle><msg>foo</msg></messagebundle>";
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java Sun Feb 26 23:43:20 2012
@@ -59,7 +59,7 @@ public class PipelinedDataTest {
elResolver = new RootELResolver(elValues);
expressions = Expressions.forTesting();
}
-
+
@Test
public void testDataRequest() throws Exception {
String xml = "<Content><DataRequest xmlns=\"" + PipelinedData.OPENSOCIAL_NAMESPACE + "\" "
@@ -74,7 +74,7 @@ public class PipelinedDataTest {
elValues.put("startIndex", 10);
// Test a param that evaluates to null
elValues.put("params", ImmutableMap.of());
- elValues.put("userIds", Lists.newArrayList("first", "second"));
+ elValues.put("userIds", Lists.newArrayList("first", "second"));
elValues.put("fields", new JSONArray("['name','id']"));
PipelinedData socialData = new PipelinedData(XmlUtil.parse(xml), null);
assertFalse(socialData.needsOwner());
@@ -123,7 +123,7 @@ public class PipelinedDataTest {
JsonAssert.assertObjectEquals(expected, batchItem.getData());
assertNull(batch.getNextBatch(elResolver));
}
-
+
@Test
public void testPeopleRequestWithExpressions() throws Exception {
String xml = "<Content><PeopleRequest xmlns=\"" + PipelinedData.OPENSOCIAL_NAMESPACE + "\" "
@@ -255,7 +255,7 @@ public class PipelinedDataTest {
assertEquals(PipelinedData.BatchType.SOCIAL, batchItem.getType());
JsonAssert.assertObjectEquals(expected, batchItem.getData());
}
-
+
@Test
public void testActivityStreamsRequest() throws Exception {
String xml = "<Content><ActivityStreamsRequest xmlns=\"" + PipelinedData.OPENSOCIAL_NAMESPACE + "\" "
@@ -307,7 +307,7 @@ public class PipelinedDataTest {
new PipelinedData(XmlUtil.parse(xml), null);
}
-
+
@Test
public void testBatching() throws Exception {
String xml = "<Content xmlns=\"" + PipelinedData.OPENSOCIAL_NAMESPACE + "\">"
@@ -316,7 +316,7 @@ public class PipelinedDataTest {
+ "</Content>";
PipelinedData socialData = new PipelinedData(XmlUtil.parse(xml), GADGET_URI);
-
+
PipelinedData.Batch batch = socialData.getBatch(expressions, elResolver);
assertTrue(batch.getPreloads().isEmpty());
@@ -332,7 +332,7 @@ public class PipelinedDataTest {
batch = batch.getNextBatch(elResolver);
assertEquals(1, batch.getPreloads().size());
assertTrue(batch.getPreloads().containsKey("key2"));
-
+
// And the final batch should be empty
assertNull(batch.getNextBatch(elResolver));
}
@@ -345,11 +345,11 @@ public class PipelinedDataTest {
+ "</Content>";
PipelinedData pipelinedData = new PipelinedData(XmlUtil.parse(xml), GADGET_URI);
-
+
PipelinedData.Batch batch = pipelinedData.getBatch(expressions, elResolver);
assertFalse(pipelinedData.needsViewer());
assertFalse(pipelinedData.needsOwner());
-
+
assertEquals(1, batch.getPreloads().size());
BatchItem output = batch.getPreloads().get("key");
assertEquals(BatchType.VARIABLE, output.getType());
@@ -367,13 +367,13 @@ public class PipelinedDataTest {
PipelinedData.Batch batch = pipelinedData.getBatch(expressions, elResolver);
assertFalse(pipelinedData.needsViewer());
assertFalse(pipelinedData.needsOwner());
-
+
assertEquals(1, batch.getPreloads().size());
BatchItem output = batch.getPreloads().get("key");
assertEquals(BatchType.HTTP, output.getType());
RequestAuthenticationInfo preload = (RequestAuthenticationInfo) output.getData();
assertEquals(AuthType.NONE, preload.getAuthType());
- assertEquals(Uri.parse("http://example.org/example.html"), preload.getHref());
+ assertEquals(Uri.parse("http://example.org/example.html"), preload.getHref());
}
@Test
@@ -407,7 +407,7 @@ public class PipelinedDataTest {
PipelinedData.Batch batch = pipelinedData.getBatch(expressions, elResolver);
assertTrue(pipelinedData.needsViewer());
assertFalse(pipelinedData.needsOwner());
-
+
assertEquals(1, batch.getPreloads().size());
BatchItem output = batch.getPreloads().get("key");
assertEquals(BatchType.HTTP, output.getType());
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ViewTest.java Sun Feb 26 23:43:20 2012
@@ -206,7 +206,7 @@ public class ViewTest {
View view = new View("test", Arrays.asList(XmlUtil.parse(xml)), SPEC_URL);
assertEquals(Uri.parse(href), view.getHref());
}
-
+
@Test
public void authAttributes() throws Exception {
String xml = "<Content type='html' sign_owner='false' sign_viewer='false' foo='bar' " +
@@ -234,7 +234,7 @@ public class ViewTest {
View view = new View("test", Arrays.asList(XmlUtil.parse(xml)), SPEC_URL);
PipelinedData.Batch batch = view.getPipelinedData().getBatch(
Expressions.forTesting(), new RootELResolver());
-
+
assertEquals(1, batch.getPreloads().size());
assertTrue(batch.getPreloads().containsKey("key"));
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java Sun Feb 26 23:43:20 2012
@@ -60,7 +60,7 @@ import javax.el.ELResolver;
* Unit tests for DefaultTemplateProcessor.
* TODO: Refactor to remove boilerplate.
* TODO: Add tests for special vars.
- * TODO: Add test for @var in @repeat loops.
+ * TODO: Add test for @var in @repeat loops.
*/
public class DefaultTemplateProcessorTest {
@@ -73,7 +73,7 @@ public class DefaultTemplateProcessorTes
private TagRegistry registry;
private NekoSimplifiedHtmlParser parser;
-
+
private static final String TEST_NS = "http://example.com";
protected SingletonElementHandler singletonElementHandler;
@@ -91,7 +91,7 @@ public class DefaultTemplateProcessorTes
resolver = new RootELResolver();
parser = new NekoSimplifiedHtmlParser(new ParseModule.DOMImplementationProvider().get());
context = new TemplateContext(new Gadget(), variables);
-
+
variables.put("foo", new JSONObject("{ title: 'bar' }"));
variables.put("user", new JSONObject("{ id: '101', name: { first: 'John', last: 'Doe' }}"));
variables.put("toys", new JSONObject("{ list: [{name: 'Ball'}, {name: 'Car'}]}"));
@@ -105,27 +105,27 @@ public class DefaultTemplateProcessorTes
String output = executeTemplate("${foo.title}");
assertEquals("bar", output);
}
-
+
@Test
public void testTopVariable() throws Exception {
String output = executeTemplate("${Top.foo.title}");
assertEquals("bar", output);
}
-
+
@Test
public void testCurVariable() throws Exception {
// Cur starts as Top
String output = executeTemplate("${Cur.foo.title}");
assertEquals("bar", output);
}
-
+
@Test
public void testMyVariable() throws Exception {
// My starts as null
String output = executeTemplate("${My.foo.title}");
assertEquals("", output);
}
-
+
@Test
public void testPlainText() throws Exception {
// Verify that plain text is not interfered with, or incorrectly escaped
@@ -138,19 +138,19 @@ public class DefaultTemplateProcessorTes
String output = executeTemplate("${xss.script}");
assertFalse("Escaping not performed: \"" + output + '\"', output.contains("<script>alert("));
}
-
+
@Test
public void testAppending() throws Exception {
String output = executeTemplate("${user.id}${user.name.first}");
assertEquals("101John", output);
-
+
output = executeTemplate("foo${user.id}bar${user.name.first}baz");
assertEquals("foo101barJohnbaz", output);
output = executeTemplate("foo${user.nope}bar${user.nor}baz");
assertEquals("foobarbaz", output);
}
-
+
@Test
public void testEscapedExpressions() throws Exception {
String output = executeTemplate("\\${escaped}");
@@ -183,13 +183,13 @@ public class DefaultTemplateProcessorTes
String output = executeTemplate("<span repeat=\"${countries}\">${Cur}</span>");
assertEquals("<span>Ireland</span><span>France</span>", output);
}
-
+
@Test
public void testCurAttribute() throws Exception {
String output = executeTemplate("<span cur=\"${user.name}\">${first}</span>");
assertEquals("<span>John</span>", output);
}
-
+
@Test
public void testConditional() throws Exception {
String output = executeTemplate(
@@ -199,10 +199,10 @@ public class DefaultTemplateProcessorTes
"</span>");
assertEquals("<span><span>Not Car</span></span><span><span>Car</span></span>", output);
}
-
+
@Test
public void testCustomTag() throws Exception {
- String output = executeTemplate("<test:Foo text='${foo.title}' data='${user}'/>",
+ String output = executeTemplate("<test:Foo text='${foo.title}' data='${user}'/>",
"xmlns:test='" + TEST_NS + '\'');
assertEquals("<b>BAR</b>", output);
}
@@ -219,17 +219,17 @@ public class DefaultTemplateProcessorTes
String output = executeTemplate("<span oncreate=\"foo\"></span>");
assertEquals("<span id=\"ostid0\"></span><script type=\"text/javascript\">" +
"(function(){foo}).apply(document.getElementById('ostid0'));</script>", output);
-
+
output = executeTemplate("<span x-oncreate=\"foo\"></span>");
assertEquals("<span id=\"ostid1\"></span><script type=\"text/javascript\">" +
"(function(){foo}).apply(document.getElementById('ostid1'));</script>", output);
-
+
output = executeTemplate("<span id=\"bar\" oncreate=\"foo\"></span>");
assertEquals("<span id=\"bar\"></span><script type=\"text/javascript\">" +
"(function(){foo}).apply(document.getElementById('bar'));</script>", output);
}
-
+
/**
* Ensure that the element cloning handling of processChildren correctly
* copies and element to the target element, including making sure that
@@ -271,19 +271,19 @@ public class DefaultTemplateProcessorTes
private String executeTemplate(String markup) throws Exception {
return executeTemplate(markup, "");
}
-
+
private String executeTemplate(String markup, String extra) throws Exception {
Element template = prepareTemplate(markup, extra);
DocumentFragment result = processor.processTemplate(template, context, resolver, registry);
return serialize(result);
}
-
- private Element prepareTemplate(String markup, String extra) throws GadgetException {
+
+ private Element prepareTemplate(String markup, String extra) throws GadgetException {
String content = "<script type=\"text/os-template\"" + extra + '>' + markup + "</script>";
Document document = parser.parseDom(content);
return SocialDataTags.getTags(document, SocialDataTags.OSML_TEMPLATE_TAG).get(0);
}
-
+
private String serialize(Node node) throws IOException {
StringBuilder sb = new StringBuilder();
NodeList children = node.getChildNodes();
@@ -293,24 +293,24 @@ public class DefaultTemplateProcessorTes
}
return sb.toString();
}
-
+
/**
* A dummy custom tag.
* Expects a @text attribute equal to "bar", and a @data attribute that
* evaluates to a JSONObject with an id property equal to "101".
- * If these conditions are met, returns <code><b>BAR</b></code>
+ * If these conditions are met, returns <code><b>BAR</b></code>
*/
private static class TestTagHandler extends AbstractTagHandler {
-
+
public TestTagHandler() {
super(TEST_NS, "Foo");
}
-
- public void process(Node result, Element tag, TemplateProcessor processor) {
+
+ public void process(Node result, Element tag, TemplateProcessor processor) {
Object data = getValueFromTag(tag, "data", processor, Object.class);
assertTrue(data instanceof JSONObject);
assertEquals("101", ((JSONObject) data).optString("id"));
-
+
String text = getValueFromTag(tag, "text", processor, String.class);
text = text.toUpperCase();
Document doc = result.getOwnerDocument();
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java Sun Feb 26 23:43:20 2012
@@ -36,7 +36,7 @@ import com.google.common.collect.Maps;
public class FakeTemplateProcessor implements TemplateProcessor {
public Map<String, ? extends Object> expressionResults = Maps.newHashMap();
public TemplateContext context;
-
+
public final <T extends Object> T evaluate(String expression, Class<T> type, T defaultValue) {
// Some quick-and-dirty mocking: put a List in the map, and
// you get one result per-entry
@@ -46,7 +46,7 @@ public class FakeTemplateProcessor imple
}
return type.cast(result);
}
-
+
public TemplateContext getTemplateContext() {
return context;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/MessageELResolverTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/MessageELResolverTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/MessageELResolverTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/MessageELResolverTest.java Sun Feb 26 23:43:20 2012
@@ -35,7 +35,7 @@ public class MessageELResolverTest {
"<messagebundle>" +
"<msg name='hello'>world</msg>" +
"<msg name='number'>${1+1}</msg>" +
- "<msg name='concat'>${Msg.hello} ${Msg.number}</msg>" +
+ "<msg name='concat'>${Msg.hello} ${Msg.number}</msg>" +
"<msg name='multiLevel'>${Msg.concat} ${Msg.concat}</msg>" +
// Self-recursive EL, should fail
"<msg name='recurse'>${Msg.recurse}</msg>" +
@@ -46,7 +46,7 @@ public class MessageELResolverTest {
private MessageBundle messageBundle;
private Expressions expressions;
private ELContext context;
-
+
@Before
public void setUp() throws Exception {
messageBundle = new MessageBundle(XmlUtil.parse(MESSAGE_BUNDLE));
@@ -56,36 +56,36 @@ public class MessageELResolverTest {
@Test
public void basicExpression() {
- assertEquals("world", expressions.parse("${Msg.hello}", String.class).getValue(context));
+ assertEquals("world", expressions.parse("${Msg.hello}", String.class).getValue(context));
}
-
+
@Test
public void nullForMissingProperty() {
- assertNull(expressions.parse("${Msg.notThere}", Object.class).getValue(context));
+ assertNull(expressions.parse("${Msg.notThere}", Object.class).getValue(context));
}
-
+
@Test
public void innerEvaluation() {
- assertEquals(2, expressions.parse("${Msg.number}", Integer.class).getValue(context));
+ assertEquals(2, expressions.parse("${Msg.number}", Integer.class).getValue(context));
}
@Test
public void recursiveEvaluation() {
- assertEquals("world 2", expressions.parse("${Msg.concat}", String.class).getValue(context));
+ assertEquals("world 2", expressions.parse("${Msg.concat}", String.class).getValue(context));
}
@Test
public void multiLevelRecursiveEvaluation() {
- assertEquals("world 2 world 2", expressions.parse("${Msg.multiLevel}", String.class).getValue(context));
+ assertEquals("world 2 world 2", expressions.parse("${Msg.multiLevel}", String.class).getValue(context));
}
@Test(expected = ELException.class)
public void failsInsteadOfInfiniteRecursion() {
- expressions.parse("${Msg.recurse}", String.class).getValue(context);
+ expressions.parse("${Msg.recurse}", String.class).getValue(context);
}
@Test(expected = ELException.class)
public void failsInsteadOfMutualInfiniteRecursion() {
- expressions.parse("${Msg.mutual1}", String.class).getValue(context);
+ expressions.parse("${Msg.mutual1}", String.class).getValue(context);
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java Sun Feb 26 23:43:20 2012
@@ -35,12 +35,12 @@ import com.google.common.collect.Immutab
/**
* Test for TemplateLibrary parsing.
- *
+ *
* TODO: Parse failure tests
*/
public class XmlTemplateLibraryTest {
- public static final String LIB_MARKUP =
+ public static final String LIB_MARKUP =
"<Templates xmlns:my='#my'>" +
" <Namespace prefix='my' url='#my'/>" +
" <JavaScript>libscript</JavaScript>" +
@@ -54,17 +54,17 @@ public class XmlTemplateLibraryTest {
" <Style>tagstyle</Style>" +
" </TemplateDef>" +
"</Templates>";
-
+
private static TemplateLibrary lib;
private static Element doc;
-
+
@BeforeClass
public static void createDefaultLibrary() throws Exception {
doc = XmlUtil.parse(LIB_MARKUP);
lib = new XmlTemplateLibrary(Uri.parse("http://example.com/my"), doc, LIB_MARKUP);
}
-
+
@Test
public void testTemplateElement() throws Exception {
TagRegistry registry = lib.getTagRegistry();
@@ -91,17 +91,17 @@ public class XmlTemplateLibraryTest {
@Override
public TemplateContext getTemplateContext() {
return context;
- }
+ }
};
-
+
TagHandler handlerWithResources = lib.getTagRegistry()
.getHandlerFor(new TagRegistry.NSName("#my", "Def"));
TagHandler handlerWithNoResources = lib.getTagRegistry()
.getHandlerFor(new TagRegistry.NSName("#my", "Flat"));
-
+
Node result = doc.getOwnerDocument().createDocumentFragment();
Element tag = doc.getOwnerDocument().createElement("test");
-
+
// Script and style elements for the library should get registered
// with the first tag for the whole library
handlerWithNoResources.process(result, tag, processor);
@@ -125,18 +125,18 @@ public class XmlTemplateLibraryTest {
"<STYLE>tagstyle</STYLE>",
serializeResources(context));
}
-
+
private String serializeResources(TemplateContext context) {
StringBuilder builder = new StringBuilder();
for (TemplateResource resource : context.getResources()) {
builder.append(resource);
}
-
+
return builder.toString();
}
@Test
public void testSerialize() {
assertEquals(LIB_MARKUP, lib.serialize());
}
-
+
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -50,26 +50,26 @@ public class AbstractTagHandlerTest {
document = documentProvider.createDocument(null, null, null);
handler = new AbstractTagHandler(null, null) {
public void process(Node result, Element tag, TemplateProcessor processor) {
- }
+ }
};
-
+
templateProcessor = createMock(TemplateProcessor.class);
}
-
+
@Test
public void getValueFromTag() {
Element element = document.createElement("test");
element.setAttribute("key", "expression");
-
+
expect(templateProcessor.evaluate(eq("expression"), eq(String.class), (String) isNull()))
.andReturn("evaluated");
replay(templateProcessor);
-
+
assertEquals("evaluated",
handler.getValueFromTag(element, "key", templateProcessor, String.class));
verify(templateProcessor);
}
-
+
@Test
public void getValueFromTagNoAttribute() {
Element element = document.createElement("test");
@@ -77,5 +77,5 @@ public class AbstractTagHandlerTest {
replay(templateProcessor);
assertNull(handler.getValueFromTag(element, "notthere", templateProcessor, String.class));
verify(templateProcessor);
- }
+ }
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java Sun Feb 26 23:43:20 2012
@@ -47,13 +47,13 @@ public class CompositeTagRegistryTest {
fooTag = createTagHandler("foo");
fooTag2 = createTagHandler("foo");
barTag = createTagHandler("bar");
-
+
TagRegistry first = new DefaultTagRegistry(ImmutableSet.of(fooTag, barTag));
TagRegistry second = new DefaultTagRegistry(ImmutableSet.of(fooTag2));
-
+
registry = new CompositeTagRegistry(ImmutableList.of(first, second));
}
-
+
@Test
public void firstRegistryWins() {
TagRegistry.NSName foo = new TagRegistry.NSName(TEST_NAMESPACE, "foo");
@@ -77,6 +77,6 @@ public class CompositeTagRegistryTest {
public void process(Node result, Element tag, TemplateProcessor processor) {
}
};
-
+
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java Sun Feb 26 23:43:20 2012
@@ -39,14 +39,14 @@ public class DefaultTagRegistryTest {
public static final String TEST_NAME = "Tag";
private TagHandler tag;
private DefaultTagRegistry registry;
-
+
@Before
public void setUp() {
tag = new AbstractTagHandler(TEST_NAMESPACE, TEST_NAME) {
public void process(Node result, Element tag, TemplateProcessor processor) {
}
};
-
+
registry = new DefaultTagRegistry(ImmutableSet.of(tag));
}
@@ -67,7 +67,7 @@ public class DefaultTagRegistryTest {
Element el = XmlUtil.parseSilent("<tag xmlns='#test'/>");
assertNull(registry.getHandlerFor(el));
}
-
+
@Test
public void getHandlerForWithNSName() {
TagRegistry.NSName nsName = new TagRegistry.NSName(TEST_NAMESPACE, TEST_NAME);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -99,7 +99,7 @@ public class FlashTagHandlerTest extends
.getFeatureResources(isA(GadgetContext.class), eq(ImmutableSet.of("swfobject")),
EasyMock.<List<String>>isNull())).andReturn(lr);
}
-
+
private static class SwfResource extends FeatureResource.Default {
public String getContent() {
return "swfobject()";
@@ -108,7 +108,7 @@ public class FlashTagHandlerTest extends
public String getDebugContent() {
return "swfobject";
}
-
+
public String getName() {
return "swfname";
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -38,14 +38,14 @@ public class HtmlTagHandlerTest {
private FakeTemplateProcessor processor;
private DOMImplementation documentProvider;
private HtmlTagHandler handler;
-
+
@Before
public void setUp() throws Exception {
processor = new FakeTemplateProcessor();
documentProvider = new ParseModule.DOMImplementationProvider().get();
handler = new HtmlTagHandler(new NekoSimplifiedHtmlParser(documentProvider));
}
-
+
@Test
public void testHtmlTag() throws Exception {
Document doc = documentProvider.createDocument(null, null, null);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -41,23 +41,23 @@ public class IfTagHandlerTest {
private FakeTemplateProcessor processor;
private DOMImplementation documentProvider;
private TagHandler handler;
-
+
@Before
public void setUp() throws Exception {
processor = EasyMock.createMock(FakeTemplateProcessor.class);
documentProvider = new ParseModule.DOMImplementationProvider().get();
handler = new IfTagHandler();
}
-
+
@Test
public void conditionIsFalse() throws Exception {
Document doc = documentProvider.createDocument(null, null, null);
// Create a mock tag; the name doesn't truly matter
Element tag = doc.createElement("if");
-
+
tag.setAttribute(IfTagHandler.CONDITION_ATTR, "fakeExpression");
processor.expressionResults = ImmutableMap.of("fakeExpression", false);
-
+
replay(processor);
handler.process(null, tag, processor);
verify(processor);
@@ -69,10 +69,10 @@ public class IfTagHandlerTest {
// Create a mock tag; the name doesn't truly matter
Element tag = doc.createElement("if");
tag.setAttribute(IfTagHandler.CONDITION_ATTR, "fakeExpression");
-
+
processor.expressionResults = ImmutableMap.of("fakeExpression", true);
processor.processChildNodes((Node) isNull(), same(tag));
-
+
replay(processor);
handler.process(null, tag, processor);
verify(processor);
@@ -83,7 +83,7 @@ public class IfTagHandlerTest {
Document doc = documentProvider.createDocument(null, null, null);
// Create a mock tag; the name doesn't truly matter
Element tag = doc.createElement("if");
-
+
replay(processor);
handler.process(null, tag, processor);
verify(processor);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -50,7 +50,7 @@ import java.util.Map;
import java.util.Set;
public class RenderTagHandlerTest {
-
+
private Expressions expressions;
private TemplateContext context;
@@ -60,9 +60,9 @@ public class RenderTagHandlerTest {
private TagRegistry registry;
private NekoSimplifiedHtmlParser parser;
-
+
private static final String TEST_NS = "http://example.com";
-
+
@Before
public void setUp() throws Exception {
expressions = Expressions.forTesting();
@@ -76,7 +76,7 @@ public class RenderTagHandlerTest {
Gadget gadget = new Gadget();
gadget.setContext(new GadgetContext());
context = new TemplateContext(gadget, variables);
-
+
addVariable("foo", new JSONObject("{ title: 'bar' }"));
}
@@ -86,7 +86,7 @@ public class RenderTagHandlerTest {
"[<os:Render/>]",
"<foo:Bar>Hello</foo:Bar>", "[Hello]");
}
-
+
@Test
public void renderSingleChildren() throws Exception {
runTest("Panel",
@@ -94,32 +94,32 @@ public class RenderTagHandlerTest {
"<foo:Panel><footer>Second</footer><header>First</header></foo:Panel>",
"First Second");
}
-
- private void runTest(String tagName, String tagMarkup, String templateMarkup,
+
+ private void runTest(String tagName, String tagMarkup, String templateMarkup,
String expectedResult) throws GadgetException, IOException {
Element templateDef = parseTemplate(templateMarkup);
Element tagInstance = parseTemplate(tagMarkup);
-
+
templateDef.getOwnerDocument().adoptNode(tagInstance);
- TagHandler tagHandler =
+ TagHandler tagHandler =
new TemplateBasedTagHandler(tagInstance, TEST_NS, tagName);
TagRegistry reg = new CompositeTagRegistry(ImmutableList.of(
registry,
new DefaultTagRegistry(ImmutableSet.of(tagHandler))));
-
+
DocumentFragment result = processor.processTemplate(templateDef, context, resolver, reg);
String output = serialize(result);
assertEquals(expectedResult, output);
}
-
- private Element parseTemplate(String markup) throws GadgetException {
- String content = "<script type=\"text/os-template\" xmlns:foo=\"" + TEST_NS +
+
+ private Element parseTemplate(String markup) throws GadgetException {
+ String content = "<script type=\"text/os-template\" xmlns:foo=\"" + TEST_NS +
"\" xmlns:os=\"" + TagHandler.OPENSOCIAL_NAMESPACE + "\">" + markup + "</script>";
Document document = parser.parseDom(content);
return SocialDataTags.getTags(document, SocialDataTags.OSML_TEMPLATE_TAG).get(0);
}
-
+
private String serialize(Node node) throws IOException {
StringBuilder sb = new StringBuilder();
NodeList children = node.getChildNodes();
@@ -129,9 +129,9 @@ public class RenderTagHandlerTest {
}
return sb.toString();
}
-
+
private void addVariable(String key, JSONObject value) {
variables.put(key, value);
}
-
+
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -42,27 +42,27 @@ public class RepeatTagHandlerTest {
private FakeTemplateProcessor processor;
private DOMImplementation documentProvider;
private TagHandler handler;
-
+
@Before
public void setUp() throws Exception {
processor = EasyMock.createMock(FakeTemplateProcessor.class);
documentProvider = new ParseModule.DOMImplementationProvider().get();
handler = new RepeatTagHandler();
}
-
+
@Test
public void repeat() throws Exception {
Document doc = documentProvider.createDocument(null, null, null);
// Create a mock tag; the name doesn't truly matter
Element tag = doc.createElement("repeat");
tag.setAttribute(RepeatTagHandler.EXPRESSION_ATTR, "fakeExpression");
-
+
List<String> mockList = ImmutableList.of("a", "b", "c");
processor.expressionResults = ImmutableMap.of("fakeExpression", mockList);
processor.processChildNodes(null, tag);
EasyMock.expectLastCall().times(3);
-
+
replay(processor);
handler.process(null, tag, processor);
verify(processor);
@@ -73,7 +73,7 @@ public class RepeatTagHandlerTest {
Document doc = documentProvider.createDocument(null, null, null);
// Create a mock tag; the name doesn't truly matter
Element tag = doc.createElement("repeat");
-
+
replay(processor);
handler.process(null, tag, processor);
verify(processor);
@@ -86,7 +86,7 @@ public class RepeatTagHandlerTest {
Element tag = doc.createElement("repeat");
tag.setAttribute(RepeatTagHandler.EXPRESSION_ATTR, "fakeExpression");
tag.setAttribute(RepeatTagHandler.IF_ATTR, "fakeIf");
-
+
List<String> mockList = ImmutableList.of("a", "b", "c");
processor.expressionResults = ImmutableMap.of("fakeExpression", mockList,
// Return "false", "true", and "false" for each step
@@ -95,7 +95,7 @@ public class RepeatTagHandlerTest {
processor.processChildNodes(null, tag);
// "if" should evaluate to true only once
EasyMock.expectLastCall().times(1);
-
+
replay(processor);
handler.process(null, tag, processor);
verify(processor);