You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2010/03/09 01:58:13 UTC
svn commit: r920600 - in /shindig/trunk/java/gadgets/src/test:
java/org/apache/shindig/gadgets/rewrite/old/
resources/org/apache/shindig/gadgets/rewrite/old/
Author: johnh
Date: Tue Mar 9 00:58:13 2010
New Revision: 920600
URL: http://svn.apache.org/viewvc?rev=920600&view=rev
Log:
Fixing old CssRequestRewriterTest by copying "correct" expected values file over.
Added:
shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/old/
shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriterTest.java
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriterTest.java?rev=920600&r1=920599&r2=920600&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriterTest.java Tue Mar 9 00:58:13 2010
@@ -76,7 +76,7 @@
String content = IOUtils.toString(this.getClass().getClassLoader().
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic.css"));
String expected = IOUtils.toString(this.getClass().getClassLoader().
- getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css"));
+ getResourceAsStream("org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css"));
HttpRequest request = new HttpRequest(Uri.parse("http://www.example.org/path/rewritebasic.css"));
request.setMethod("GET");
request.setGadget(SPEC_URL);
@@ -96,7 +96,7 @@
String content = IOUtils.toString(this.getClass().getClassLoader().
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic.css"));
String expected = IOUtils.toString(this.getClass().getClassLoader().
- getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css"));
+ getResourceAsStream("org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css"));
expected = expected.replaceAll("refresh=3600", "refresh=86400");
HttpRequest request = new HttpRequest(Uri.parse("http://www.example.org/path/rewritebasic.css"));
request.setMethod("GET");
@@ -117,7 +117,7 @@
String content = IOUtils.toString(this.getClass().getClassLoader().
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic.css"));
String expected = IOUtils.toString(this.getClass().getClassLoader().
- getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css"));
+ getResourceAsStream("org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css"));
expected = expected.replaceAll("fp=1150739864", "fp=1150739864&nocache=1");
HttpRequest request = new HttpRequest(Uri.parse("http://www.example.org/path/rewritebasic.css"));
request.setMethod("GET");
@@ -139,7 +139,7 @@
String content = IOUtils.toString(this.getClass().getClassLoader().
getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic.css"));
String expected = IOUtils.toString(this.getClass().getClassLoader().
- getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css"));
+ getResourceAsStream("org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css"));
expected = replaceDefaultWithMockServer(expected);
HttpRequest request = new HttpRequest(Uri.parse("http://www.example.org/path/rewritebasic.css"));
Added: shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css?rev=920600&view=auto
==============================================================================
--- shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css (added)
+++ shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/old/rewritebasic-expected.css Tue Mar 9 00:58:13 2010
@@ -0,0 +1,12 @@
+
+/* Rewrite various url forms in input statements, absolute and host/path relative.
+ Test exclusions */
+@import url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fother1.css&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=1150739864&refresh=3600');
+@import url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fpath%2Frelative%2Fother2.css&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=1150739864&refresh=3600');
+@import url('http://www.example.org/hostrelative/excluded/other1.css');
+DiV {
+ font: arial;
+ background-image : url('http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.some.site%2Fimage.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=1150739864&refresh=3600');
+}
+
+/* A comment? */