svn commit: r915152 [2/2] - in /shindig/trunk/java: common/conf/ gadgets/src/main/java/org/apache/shindig/gadgets/render/ gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ gadgets/src/test/java/org/apache/shindig/gadgets/render/ gadgets/src/tes...

[johnh]

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingLinkRewriterTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingLinkRewriterTest.java?rev=915152&r1=915151&r2=915152&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingLinkRewriterTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingLinkRewriterTest.java
 Tue Feb 23 03:06:18 2010
@@ -21,8 +21,6 @@
 
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * Test of proxying rewriter
  */
@@ -35,68 +33,66 @@
   @Test
   public void testAbsoluteRewrite() {
     String val = "http://a.b.com";;
-    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fa.b.com&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-182800334&refresh=86400";,
+    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fa.b.com&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-1311250572&refresh=86400";,
         rewrite(val));
   }
 
   @Test
   public void testAbsoluteRewriteNoCache() {
     String val = "http://a.b.com";;
-    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fa.b.com&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-182800334&nocache=1&refresh=86400";,
+    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fa.b.com&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-1311250572&nocache=1&refresh=86400";,
         defaultLinkRewriterNoCache.rewrite(val, SPEC_URL));
   }
 
   @Test
   public void testAbsoluteRewriteNoCacheAndDebug() {
     String val = "http://a.b.com";;
-    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fa.b.com&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-182800334&debug=1&nocache=1&refresh=86400";,
+    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fa.b.com&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-1311250572&debug=1&nocache=1&refresh=86400";,
         defaultLinkRewriterNoCacheAndDebug.rewrite(val, SPEC_URL));
   }
 
   @Test
   public void testHostRelativeRewrite() {
     String val = "/somepath/test.gif";
-    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fsomepath%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-182800334&refresh=86400";,
+    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fsomepath%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-1311250572&refresh=86400";,
         rewrite(val));
   }
 
   @Test
   public void testPathRelativeRewrite() {
     String val = "test.gif";
-    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fdir%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-182800334&refresh=86400";,
+    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fdir%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-1311250572&refresh=86400";,
         rewrite(val));
   }
 
   @Test
   public void testLeadingAndTrailingSpace() {
     String val = " test.gif ";
-    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fdir%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-182800334&refresh=86400";,
+    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fdir%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-1311250572&refresh=86400";,
         rewrite(val));
   }
 
   @Test
   public void testWithRefresh() throws Exception {
-    ContentRewriterFeature contentRewriterFeature = new ContentRewriterFeature(
-        createSpecWithoutRewrite(), ".*", "", "3600",
-        ImmutableSet.of("embed", "img", "script", "link", "style"), false);
+    ContentRewriterFeature.Config contentRewriterFeature = new 
ContentRewriterFeature.DefaultConfig(
+        ".*", "", "3600", "embed,img,script,link,style", "false", "false");
     ProxyingLinkRewriter rewriter = new DefaultProxyingLinkRewriterFactory(
         defaultContainerRewriterUris).create(SPEC_URL, contentRewriterFeature,
         "default", false, false);
     String val = " test.gif ";
-    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fdir%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-182800334&refresh=3600";,
+    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fdir%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-1311250572&refresh=3600";,
         rewriter.rewrite(val, SPEC_URL));
   }
 
   @Test
   public void testWithBadRefresh() throws Exception {
-    ContentRewriterFeature contentRewriterFeature = new ContentRewriterFeature(
-        createSpecWithoutRewrite(), ".*", "", "HTTP",
-        ImmutableSet.of("embed", "img", "script", "link", "style"), false);
+    ContentRewriterFeature.Config contentRewriterFeature = new 
ContentRewriterFeature.DefaultConfig(
+        ".*", "", "HTTP", "embed,img,script,link,style", "false", "false");
     ProxyingLinkRewriter rewriter = new DefaultProxyingLinkRewriterFactory(
         defaultContainerRewriterUris).create(SPEC_URL, contentRewriterFeature,
         "default", false, false);
     String val = " test.gif ";
-    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fdir%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-182800334";,
+    
assertEquals("http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.example.org%2Fdir%2Ftest.gif&gadget=http%3A%2F%2Fwww.example.org%2Fdir%2Fg.xml&fp=-1311250572";,
         rewriter.rewrite(val, SPEC_URL));
   }