You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/06/23 08:23:59 UTC
svn commit: r957119 [5/6] - in /shindig/branches/2.0.x: ./
assembly/src/main/assembly/ config/
extras/src/main/java/org/apache/shindig/extras/as/sample/
extras/src/main/javascript/features-extras/ features/
features/src/main/javascript/features/ featur...
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java Wed Jun 23 06:23:54 2010
@@ -33,8 +33,7 @@ public class ContentRewriterFeatureTestC
public void testContainerDefaultIncludeAll() throws Exception {
defaultRewriterFeature =
new ContentRewriterFeature.Config(createSpecWithoutRewrite(),
- new ContentRewriterFeature.DefaultConfig(
- ".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -43,8 +42,7 @@ public class ContentRewriterFeatureTestC
public void testContainerDefaultIncludeNone() throws Exception {
defaultRewriterFeature =
new ContentRewriterFeature.Config(createSpecWithoutRewrite(),
- new ContentRewriterFeature.DefaultConfig(
- "", ".*", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", ".*", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -52,8 +50,7 @@ public class ContentRewriterFeatureTestC
@Test
public void testContainerDefaultExcludeOverridesInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(createSpecWithoutRewrite(),
- new ContentRewriterFeature.DefaultConfig(
- ".*", ".*", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", ".*", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -62,8 +59,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOverridesContainerDefaultInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("", ".*", "0", tags),
- new ContentRewriterFeature.DefaultConfig(
- ".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -72,8 +68,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOnlyOverridesContainerDefaultInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, ".*", null, null),
- new ContentRewriterFeature.DefaultConfig(
- ".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -82,8 +77,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOverridesContainerDefaultExclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(".*", "", "0", tags),
- new ContentRewriterFeature.DefaultConfig(
- "", ".*", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", ".*", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -92,7 +86,7 @@ public class ContentRewriterFeatureTestC
public void testExcludeOverridesInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "test", "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -101,7 +95,7 @@ public class ContentRewriterFeatureTestC
public void testIncludeOnlyMatch() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://testx.test.com"));
@@ -111,7 +105,7 @@ public class ContentRewriterFeatureTestC
public void testTagRewrite() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.shouldRewriteTag("IFRAME"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("img"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("ScripT"));
@@ -122,7 +116,7 @@ public class ContentRewriterFeatureTestC
Set<String> newTags = Sets.newHashSet("iframe");
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "0", newTags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.shouldRewriteTag("IFRAME"));
assertFalse(defaultRewriterFeature.shouldRewriteTag("img"));
assertFalse(defaultRewriterFeature.shouldRewriteTag("ScripT"));
@@ -133,7 +127,7 @@ public class ContentRewriterFeatureTestC
public void testExpiresTimeParse() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "12345", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 12345);
}
@@ -142,7 +136,7 @@ public class ContentRewriterFeatureTestC
public void testExpiresHTTPParse() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "htTp ", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "12345", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "12345", TAGS, false, false));
assertEquals(ContentRewriterFeature.EXPIRES_DEFAULT, defaultRewriterFeature.getExpires());
}
@@ -150,7 +144,7 @@ public class ContentRewriterFeatureTestC
public void testExpiresInvalidParse() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "junk", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "12345", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "12345", TAGS, false, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 12345);
}
@@ -159,7 +153,7 @@ public class ContentRewriterFeatureTestC
public void testSpecEmptyContainerWithExclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, null, null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -169,7 +163,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOnlyOverridesContainerWithExclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, "", null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -179,7 +173,7 @@ public class ContentRewriterFeatureTestC
public void testSpecEmptyDoesNotOverridesContainerDefaultNoInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -189,7 +183,7 @@ public class ContentRewriterFeatureTestC
public void testSpecIncludeOnlyOverridesContainerDefaultNoInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(".*", null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -198,14 +192,14 @@ public class ContentRewriterFeatureTestC
@Test
public void testSplitJsSupported() throws Exception {
defaultRewriterFeature =
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "true");
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, true);
assertTrue(defaultRewriterFeature.isSplitJsEnabled());
}
@Test
public void testSplitJsNotSupported() throws Exception {
defaultRewriterFeature =
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false");
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false);
assertFalse(defaultRewriterFeature.isSplitJsEnabled());
}
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.java Wed Jun 23 06:23:54 2010
@@ -36,7 +36,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "" }, new String[] { "*" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -46,7 +46,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, new String[] { "foo", "bar" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.foo.com"));
@@ -58,7 +58,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, new String[] { "*" }, null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -68,7 +68,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "*" }, new String[] { "" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig("", ".*", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", ".*", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -77,7 +77,7 @@ public class ContentRewriterFeatureTestC
public void testExcludeOverridesInclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "test.com" }, new String[] { "test" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
}
@@ -86,7 +86,7 @@ public class ContentRewriterFeatureTestC
public void testIncludeOnlyMatch() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "test.com" }, new String[] { "testx" }, "0", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
assertFalse(defaultRewriterFeature
@@ -97,7 +97,7 @@ public class ContentRewriterFeatureTestC
public void testSpecEmptyContainerWithExclude() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, null, null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -108,7 +108,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, new String[] { "" }, null, null),
- new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -119,7 +119,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertFalse(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature
.shouldRewriteURL("http://www.foobar.com"));
@@ -131,7 +131,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "*" }, null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foobar.com"));
assertFalse(defaultRewriterFeature.shouldRewriteURL("http://www.test.com"));
@@ -142,7 +142,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "foo", "bar" }, null, null, null),
- new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foo.com"));
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.bar.com"));
@@ -154,8 +154,7 @@ public class ContentRewriterFeatureTestC
throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "foo", "bar" }, null, null, null),
- new ContentRewriterFeature.DefaultConfig(
- ".*", "test", "0", TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig("*", "test", "0", TAGS, false, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.foo.com"));
assertTrue(defaultRewriterFeature.shouldRewriteURL("http://www.bar.com"));
@@ -166,8 +165,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideIncludeUrls() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("norewrite", null, null, null),
- new ContentRewriterFeature.DefaultConfig(
- "^http://www.include.com", "def", "3600", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("^http://www.include.com", "def", "3600", TAGS, true, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature
.shouldRewriteURL("http://www.include.com/abc"));
@@ -181,8 +179,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeOverrideExcludeUrls() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite(null, "abc", null, null),
- new ContentRewriterFeature.DefaultConfig(
- "^http://www.include.com", "def", "3600", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("^http://www.include.com", "def", "3600", TAGS, true, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertFalse(defaultRewriterFeature
.shouldRewriteURL("http://www.include.com/abc"));
@@ -196,8 +193,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideIncludeUrlOS9() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(new String[] { "abc" }, null, null, null),
- new ContentRewriterFeature.DefaultConfig(
- "^http://www.include.com", "", "3600", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("^http://www.include.com", "", "3600", TAGS, true, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature
.shouldRewriteURL("http://www.include.com/abc"));
@@ -209,8 +205,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideExcludeUrlOS9() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewriteOS9(null, new String[] { "def" }, null, null),
- new ContentRewriterFeature.DefaultConfig(
- "^http://www.include.com", "", "3600", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("^http://www.include.com", "", "3600", TAGS, true, false));
assertTrue(defaultRewriterFeature.isRewriteEnabled());
assertTrue(defaultRewriterFeature
.shouldRewriteURL("http://www.include.com/abc"));
@@ -224,7 +219,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideDefaultExpires() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "3000", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "", TAGS, true, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 3000);
}
@@ -233,7 +228,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideExpiresGreater() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "8000", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "3000", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "3000", TAGS, true, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 3000);
}
@@ -242,7 +237,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideExpiresLesser() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "2000", tags),
- new ContentRewriterFeature.DefaultConfig("", "", "3000", TAGS, "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "3000", TAGS, true, false));
assertNotNull(defaultRewriterFeature.getExpires());
assertNotNull(defaultRewriterFeature.getExpires() == 2000);
}
@@ -251,7 +246,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideTagsSubset() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite("test\\.com", "testx", "0", Sets.newHashSet("img")),
- new ContentRewriterFeature.DefaultConfig("", "", "0", "img,script", "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", "img,script", true, false));
assertFalse(defaultRewriterFeature.shouldRewriteTag("IFRAME"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("img"));
assertFalse(defaultRewriterFeature.shouldRewriteTag("ScripT"));
@@ -261,7 +256,7 @@ public class ContentRewriterFeatureTestC
public void testSpecExcludeDisallowOverrideTagsSuperset() throws Exception {
defaultRewriterFeature = new ContentRewriterFeature.Config(
createSpecWithRewrite( "test\\.com", "testx", "0", Sets.newHashSet("img", "script", "link")),
- new ContentRewriterFeature.DefaultConfig("", "", "0", "img,script", "true", "false"));
+ new ContentRewriterFeature.DefaultConfig("", "", "0", "img,script", true, false));
assertFalse(defaultRewriterFeature.shouldRewriteTag("IFRAME"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("img"));
assertTrue(defaultRewriterFeature.shouldRewriteTag("ScripT"));
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.java Wed Jun 23 06:23:54 2010
@@ -78,7 +78,8 @@ public class MutableContentTest {
@Test
public void modifyContentReflectedInTreeUtf8() throws Exception {
- String theContent = "NèW C¯NTéNT";
+ String theContent = "N\uFFFDW C\uFFFDNT\uFFFDNT";
+
assertEquals(0, mhc.getNumChanges());
mhc.setContent(theContent);
assertEquals(1, mhc.getNumChanges());
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterTestBase.java Wed Jun 23 06:23:54 2010
@@ -71,8 +71,7 @@ public abstract class RewriterTestBase {
@Before
public void setUp() throws Exception {
rewriterFeatureFactory = new ContentRewriterFeature.Factory(null,
- new ContentRewriterFeature.DefaultConfig(".*", "", "86400",
- TAGS, "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "86400", TAGS, false, false));
defaultRewriterFeature = rewriterFeatureFactory.getDefault();
tags = defaultRewriterFeature.getIncludedTags();
injector = Guice.createInjector(getParseModule(), new PropertiesModule(), new TestModule());
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/BaseRewriterTestCase.java Wed Jun 23 06:23:54 2010
@@ -84,8 +84,7 @@ public abstract class BaseRewriterTestCa
@Before
public void setUp() throws Exception {
rewriterFeatureFactory = new ContentRewriterFeature.Factory(null,
- new ContentRewriterFeature.DefaultConfig(".*", "", "86400",
- "embed,img,script,link,style", "false", "false"));
+ new ContentRewriterFeature.DefaultConfig(".*", "", "86400", "embed,img,script,link,style", false, false));
defaultRewriterFeature = rewriterFeatureFactory.getDefault();
tags = defaultRewriterFeature.getIncludedTags();
defaultContainerRewriterUris = new ContentRewriterUris(
@@ -266,7 +265,7 @@ public abstract class BaseRewriterTestCa
private final ContentRewriterFeature.Config feature;
public FakeRewriterFeatureFactory(ContentRewriterFeature.Config feature) {
- super(null, new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "", "false", "false"));
+ super(null, new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "", false, false));
this.feature = feature;
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/HTMLContentRewriterTest.java Wed Jun 23 06:23:54 2010
@@ -409,4 +409,15 @@ public class HTMLContentRewriterTest ext
rewriter.rewrite(req, fakeResponse);
control.verify();
}
+
+ @Test
+ public void testStyleWithDifferentMedia() throws Exception {
+ String content = IOUtils.toString(this.getClass().getClassLoader().
+ getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritestylemedia.html"));
+ String expected = IOUtils.toString(this.getClass().getClassLoader().
+ getResourceAsStream("org/apache/shindig/gadgets/rewrite/rewritestylemedia-expected.html"));
+ MutableContent mc = rewriteContent(rewriter, content, "default");
+ assertEquals(StringUtils.deleteWhitespace(mc.getContent()),
+ StringUtils.deleteWhitespace(expected));
+ }
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriterTest.java Wed Jun 23 06:23:54 2010
@@ -78,7 +78,7 @@ public class ProxyingLinkRewriterTest ex
@Test
public void testWithRefresh() throws Exception {
ContentRewriterFeature.Config contentRewriterFeature = new ContentRewriterFeature.DefaultConfig(
- ".*", "", "3600", "embed,img,script,link,style", "false", "false");
+ ".*", "", "3600", "embed,img,script,link,style", false, false);
ProxyingLinkRewriter rewriter = new DefaultProxyingLinkRewriterFactory(
defaultContainerRewriterUris).create(SPEC_URL, contentRewriterFeature,
"default", false, false);
@@ -90,7 +90,7 @@ public class ProxyingLinkRewriterTest ex
@Test
public void testWithBadRefresh() throws Exception {
ContentRewriterFeature.Config contentRewriterFeature = new ContentRewriterFeature.DefaultConfig(
- ".*", "", "HTTP", "embed,img,script,link,style", "false", "false");
+ ".*", "", "HTTP", "embed,img,script,link,style", false, false);
ProxyingLinkRewriter rewriter = new DefaultProxyingLinkRewriterFactory(
defaultContainerRewriterUris).create(SPEC_URL, contentRewriterFeature,
"default", false, false);
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java Wed Jun 23 06:23:54 2010
@@ -37,6 +37,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.Map;
+import java.util.concurrent.Executor;
public class ConcatProxyServletTest extends ServletTestFixture {
private static final String REQUEST_DOMAIN = "example.org";
@@ -57,6 +58,20 @@ public class ConcatProxyServletTest exte
private final ConcatProxyServlet servlet = new ConcatProxyServlet();
private TestConcatUriManager uriManager;
+ private final Executor sequentialExecutor = new Executor() {
+ public void execute(Runnable r) {
+ // Sequential version of 'execute'.
+ r.run();
+ }
+ };
+
+ private final Executor threadedExecutor = new Executor() {
+ public void execute(Runnable r) {
+ // Threaded version of 'execute'.
+ new Thread(r).start();
+ }
+ };
+
@Before
public void setUp() throws Exception {
servlet.setRequestPipeline(pipeline);
@@ -104,17 +119,19 @@ public class ConcatProxyServletTest exte
return '\"' + url + "\":\"" + data +"\",\r\n";
}
-
+
/**
- * Run a concat test
+ * Run a concat test by fetching resources as configured by given Executor
* @param result - expected concat results
* @param uris - list of uris to concat
* @throws Exception
*/
- private void runConcat(String result, String tok, Uri... uris) throws Exception {
+ private void runConcat(Executor exec, String result, String tok, Uri... uris)
+ throws Exception {
expectRequestWithUris(Lists.newArrayList(uris), tok);
// Run the servlet
+ servlet.setExecutor(exec);
servlet.doGet(request, recorder);
verify();
assertEquals(result, recorder.getResponseAsString());
@@ -124,17 +141,30 @@ public class ConcatProxyServletTest exte
@Test
public void testSimpleConcat() throws Exception {
String results = addComment(SCRT1, URL1.toString()) + addComment(SCRT2,URL2.toString());
- runConcat(results, null, URL1, URL2);
+ runConcat(sequentialExecutor, results, null, URL1, URL2);
}
@Test
+ public void testSimpleConcatThreaded() throws Exception {
+ 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())
+ addComment(SCRT3, URL3.toString());
- runConcat(results, null, URL1, URL2, URL3);
+ runConcat(sequentialExecutor, results, null, URL1, URL2, URL3);
}
@Test
+ public void testThreeConcatThreaded() throws Exception {
+ String results = addComment(SCRT1, URL1.toString()) + addComment(SCRT2,URL2.toString())
+ + 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");
@@ -178,7 +208,7 @@ public class ConcatProxyServletTest exte
+ addVar(URL1.toString(), SCRT1_ESCAPED)
+ addVar(URL2.toString(), SCRT2_ESCAPED)
+ "};\r\n";
- runConcat(results, "_js", URL1, URL2);
+ runConcat(sequentialExecutor, results, "_js", URL1, URL2);
}
@Test
@@ -188,7 +218,7 @@ public class ConcatProxyServletTest exte
+ addVar(URL2.toString(), SCRT2_ESCAPED)
+ addVar(URL3.toString(), SCRT3_ESCAPED)
+ "};\r\n";
- runConcat(results, "_js", URL1, URL2, URL3);
+ runConcat(sequentialExecutor, results, "_js", URL1, URL2, URL3);
}
@Test
@@ -213,7 +243,7 @@ public class ConcatProxyServletTest exte
+ addVar(URL1.toString(), SCRT1_ESCAPED)
+ "/* ---- Error 404 (http://example.org/4.js) ---- */\r\n"
+ "};\r\n";
- runConcat(results, "_js", URL1, URL4);
+ runConcat(sequentialExecutor, results, "_js", URL1, URL4);
}
@Test
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServletTest.java Wed Jun 23 06:23:54 2010
@@ -24,12 +24,13 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNull;
import org.apache.shindig.common.servlet.HttpServletResponseRecorder;
+import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.GadgetContext;
-import org.apache.shindig.gadgets.UrlGenerator;
-import org.apache.shindig.gadgets.UrlValidationStatus;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.render.Renderer;
import org.apache.shindig.gadgets.render.RenderingResults;
+import org.apache.shindig.gadgets.uri.IframeUriManager;
+import org.apache.shindig.gadgets.uri.UriStatus;
import org.easymock.IMocksControl;
import org.easymock.EasyMock;
@@ -44,19 +45,19 @@ public class GadgetRenderingServletTest
= "Games, HQ, Mang\u00E1, Anime e tudo que um bom nerd ama";
private final IMocksControl control = EasyMock.createNiceControl();
- private final HttpServletRequest request = control.createMock(HttpServletRequest.class);
+ private final HttpServletRequest request = makeRequestMock(this);
private final HttpServletResponse response = control.createMock(HttpServletResponse.class);
private final Renderer renderer = control.createMock(Renderer.class);
public final HttpServletResponseRecorder recorder = new HttpServletResponseRecorder(response);
private final GadgetRenderingServlet servlet = new GadgetRenderingServlet();
- private final UrlGenerator urlGenerator = control.createMock(UrlGenerator.class);
+ private final IframeUriManager iframeUriManager = control.createMock(IframeUriManager.class);
@Before
public void setUpUrlGenerator() {
- expect(urlGenerator.validateIframeUrl(isA(String.class))).andReturn(UrlValidationStatus.VALID_UNVERSIONED);
+ expect(iframeUriManager.validateRenderingUri(isA(Uri.class))).andReturn(UriStatus.VALID_UNVERSIONED);
expect(request.getRequestURL()).andReturn(new StringBuffer("http://foo.com"));
expect(request.getQueryString()).andReturn("?q=a");
- servlet.setUrlGenerator(urlGenerator);
+ servlet.setIframeUriManager(iframeUriManager);
}
@Test
@@ -172,4 +173,13 @@ public class GadgetRenderingServletTest
servlet.doGet(request, recorder);
assertEquals("private,max-age=300", recorder.getHeader("Cache-Control"));
}
+
+ private static HttpServletRequest makeRequestMock(GadgetRenderingServletTest testcase) {
+ HttpServletRequest req = testcase.control.createMock(HttpServletRequest.class);
+ expect(req.getScheme()).andReturn("http").anyTimes();
+ expect(req.getServerPort()).andReturn(80).anyTimes();
+ expect(req.getServerName()).andReturn("example.com").anyTimes();
+ expect(req.getRequestURI()).andReturn("/path").anyTimes();
+ return req;
+ }
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java Wed Jun 23 06:23:54 2010
@@ -18,54 +18,84 @@
*/
package org.apache.shindig.gadgets.servlet;
-import static org.easymock.EasyMock.capture;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
-
-import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.GadgetContext;
-import org.apache.shindig.gadgets.UrlGenerator;
-import org.apache.shindig.gadgets.UrlValidationStatus;
+import org.apache.shindig.config.AbstractContainerConfig;
+import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
-import org.apache.shindig.gadgets.render.Renderer;
-import org.apache.shindig.gadgets.render.RenderingResults;
-import org.easymock.Capture;
+import org.apache.shindig.gadgets.rewrite.CaptureRewriter;
+import org.apache.shindig.gadgets.rewrite.DefaultResponseRewriterRegistry;
+import org.apache.shindig.gadgets.rewrite.ResponseRewriter;
+import org.apache.shindig.gadgets.uri.AccelUriManager;
+import org.apache.shindig.gadgets.uri.DefaultAccelUriManager;
+import org.apache.shindig.gadgets.uri.DefaultProxyUriManager;
+import static org.easymock.EasyMock.expect;
import org.junit.Before;
import org.junit.Test;
-import java.util.Collection;
+import java.util.Arrays;
import java.util.Map;
public class HtmlAccelServletTest extends ServletTestFixture {
+ private static class FakeContainerConfig extends AbstractContainerConfig {
+ protected final Map<String, Object> data = ImmutableMap.<String, Object>builder()
+ .put(AccelUriManager.PROXY_HOST_PARAM, "apache.org")
+ .put(AccelUriManager.PROXY_PATH_PARAM, "/gadgets/accel")
+ .build();
+
+ @Override
+ public Object getProperty(String container, String name) {
+ return data.get(name);
+ }
+ }
+
+ private class FakeCaptureRewriter extends CaptureRewriter {
+ String contentToRewrite;
+
+ public void setContentToRewrite(String s) {
+ contentToRewrite = s;
+ }
+ @Override
+ public void rewrite(HttpRequest request, HttpResponseBuilder original) {
+ super.rewrite(request, original);
+ if (!StringUtils.isEmpty(contentToRewrite)) {
+ original.setResponse(contentToRewrite.getBytes());
+ }
+ }
+ }
+
private static final String REWRITE_CONTENT = "working rewrite";
private static final String SERVLET = "/gadgets/accel";
private HtmlAccelServlet servlet;
- private Renderer renderer;
@Before
public void setUp() throws Exception {
servlet = new HtmlAccelServlet();
- servlet.setRequestPipeline(pipeline);
- servlet.setUrlGenerator(new FakeUrlGenerator());
- renderer = mock(Renderer.class);
- servlet.setRenderer(renderer);
+ ContainerConfig config = new FakeContainerConfig();
+ AccelUriManager accelUriManager = new DefaultAccelUriManager(
+ config, new DefaultProxyUriManager(config, null));
+
+ rewriter = new FakeCaptureRewriter();
+ rewriterRegistry = new DefaultResponseRewriterRegistry(
+ Arrays.<ResponseRewriter>asList(rewriter), null);
+ servlet.setHandler(new AccelHandler(pipeline, rewriterRegistry,
+ accelUriManager));
}
@Test
public void testHtmlAccelNoData() throws Exception {
String url = "http://example.org/data.html";
-
+
HttpRequest req = new HttpRequest(Uri.parse(url));
expect(pipeline.execute(req)).andReturn(null).once();
expectRequest("", url);
replay();
-
+
servlet.doGet(request, recorder);
verify();
assertEquals("Error fetching data", recorder.getResponseAsString());
@@ -76,7 +106,7 @@ public class HtmlAccelServletTest extend
public void testHtmlAccelNoHtml() throws Exception {
String url = "http://example.org/data.xml";
String data = "<html><body>Hello World</body></html>";
-
+
HttpRequest req = new HttpRequest(Uri.parse(url));
HttpResponse resp = new HttpResponseBuilder()
.setResponse(data.getBytes())
@@ -86,7 +116,7 @@ public class HtmlAccelServletTest extend
expect(pipeline.execute(req)).andReturn(resp).once();
expectRequest("", url);
replay();
-
+
servlet.doGet(request, recorder);
verify();
assertEquals(data, recorder.getResponseAsString());
@@ -96,7 +126,8 @@ public class HtmlAccelServletTest extend
public void testHtmlAccelRewriteSimple() throws Exception {
String url = "http://example.org/data.html";
String data = "<html><body>Hello World</body></html>";
-
+
+ ((FakeCaptureRewriter) rewriter).setContentToRewrite(REWRITE_CONTENT);
HttpRequest req = new HttpRequest(Uri.parse(url));
HttpResponse resp = new HttpResponseBuilder()
.setResponse(data.getBytes())
@@ -105,78 +136,21 @@ public class HtmlAccelServletTest extend
.create();
expect(pipeline.execute(req)).andReturn(resp).once();
expectRequest("", url);
- expect(renderer.render(isA(GadgetContext.class)))
- .andReturn(RenderingResults.ok(REWRITE_CONTENT));
- replay();
-
- servlet.doGet(request, recorder);
- verify();
- assertEquals(REWRITE_CONTENT, recorder.getResponseAsString());
- assertEquals(200, recorder.getHttpStatusCode());
- }
-
- @Test
- public void testHtmlAccelRewriteChain() throws Exception {
- String url = "http://example.org/data.html?id=1";
- String data = "<html><body>Hello World</body></html>";
-
- Capture<HttpRequest> reqCapture = new Capture<HttpRequest>();
- HttpResponse resp = new HttpResponseBuilder()
- .setResponse(data.getBytes())
- .setHeader("Content-Type", "text/html")
- .setCacheTtl(567)
- .setHttpStatusCode(200)
- .create();
- expect(pipeline.execute(capture(reqCapture))).andReturn(resp).once();
- expectRequest("//" + url, null);
- expect(renderer.render(isA(GadgetContext.class)))
- .andReturn(RenderingResults.ok(REWRITE_CONTENT));
replay();
-
- servlet.doGet(request, recorder);
- verify();
- HttpRequest req = reqCapture.getValue();
- assertEquals(url, req.getUri().toString());
- assertEquals("accel", req.getContainer());
- assertEquals(REWRITE_CONTENT, recorder.getResponseAsString());
- assertEquals(200, recorder.getHttpStatusCode());
- assertTrue(recorder.getHeader("Cache-Control").equals("private,max-age=566")
- || recorder.getHeader("Cache-Control").equals("private,max-age=567"));
- // Note: due to rounding (MS to S conversion), ttl is down by 1
- }
- @Test
- public void testHtmlAccelRewriteChainParams() throws Exception {
- String url = "http://example.org/data.html?id=1";
- String data = "<html><body>Hello World</body></html>";
-
- HttpResponse resp = new HttpResponseBuilder()
- .setResponse(data.getBytes())
- .setHeader("Content-Type", "text/html")
- .setHttpStatusCode(200)
- .create();
- Capture<HttpRequest> reqCapture = new Capture<HttpRequest>();
- expect(pipeline.execute(capture(reqCapture))).andReturn(resp).once();
- expectRequest("/container=open&refresh=3600/" + url, null);
- expect(renderer.render(isA(GadgetContext.class)))
- .andReturn(RenderingResults.ok(REWRITE_CONTENT));
- replay();
-
servlet.doGet(request, recorder);
verify();
- HttpRequest req = reqCapture.getValue();
- assertEquals(url, req.getUri().toString());
- assertEquals("open", req.getContainer());
assertEquals(REWRITE_CONTENT, recorder.getResponseAsString());
assertEquals(200, recorder.getHttpStatusCode());
- assertEquals("private,max-age=3600", recorder.getHeader("Cache-Control"));
+ assertTrue(rewriter.responseWasRewritten());
}
@Test
public void testHtmlAccelRewriteErrorCode() throws Exception {
String url = "http://example.org/data.html";
String data = "<html><body>This is error page</body></html>";
-
+
+ ((FakeCaptureRewriter) rewriter).setContentToRewrite(REWRITE_CONTENT);
HttpRequest req = new HttpRequest(Uri.parse(url));
HttpResponse resp = new HttpResponseBuilder()
.setResponse(data.getBytes())
@@ -185,21 +159,21 @@ public class HtmlAccelServletTest extend
.create();
expect(pipeline.execute(req)).andReturn(resp).once();
expectRequest("", url);
- expect(renderer.render(isA(GadgetContext.class)))
- .andReturn(RenderingResults.ok(REWRITE_CONTENT));
replay();
-
+
servlet.doGet(request, recorder);
verify();
- assertEquals(REWRITE_CONTENT, recorder.getResponseAsString());
+ assertEquals(AccelHandler.ERROR_FETCHING_DATA, recorder.getResponseAsString());
assertEquals(404, recorder.getHttpStatusCode());
+ assertFalse(rewriter.responseWasRewritten());
}
@Test
public void testHtmlAccelRewriteInternalError() throws Exception {
String url = "http://example.org/data.html";
String data = "<html><body>This is error page</body></html>";
-
+
+ ((FakeCaptureRewriter) rewriter).setContentToRewrite(data);
HttpRequest req = new HttpRequest(Uri.parse(url));
HttpResponse resp = new HttpResponseBuilder()
.setResponse(data.getBytes())
@@ -208,82 +182,26 @@ public class HtmlAccelServletTest extend
.create();
expect(pipeline.execute(req)).andReturn(resp).once();
expectRequest("", url);
- expect(renderer.render(isA(GadgetContext.class)))
- .andReturn(RenderingResults.ok(REWRITE_CONTENT));
replay();
-
- servlet.doGet(request, recorder);
- verify();
- assertEquals(REWRITE_CONTENT, recorder.getResponseAsString());
- assertEquals(502, recorder.getHttpStatusCode());
- }
-
- @Test
- public void testHtmlAccelParams() throws Exception {
- Renderer newRenderer = new Renderer(null, null, null, lockedDomainService) {
- @Override
- public RenderingResults render(GadgetContext context) {
- assertTrue(HtmlAccelServlet.isAccel(context));
- assertEquals("accel", context.getParameter("container"));
- return RenderingResults.ok(REWRITE_CONTENT);
- }
- };
- servlet.setRenderer(newRenderer);
- Map<String,String> paramMap = Maps.newHashMap();
- paramMap.put("container","accel");
- servlet.setAddedServletParams(paramMap);
-
- String url = "http://example.org/data.html";
-
- HttpRequest req = new HttpRequest(Uri.parse(url));
- HttpResponse resp = new HttpResponseBuilder()
- .setHeader("Content-Type", "text/html")
- .setHttpStatusCode(200)
- .create();
- expect(pipeline.execute(req)).andReturn(resp).once();
- expectRequest("", url);
- replay();
-
servlet.doGet(request, recorder);
verify();
+ assertEquals(AccelHandler.ERROR_FETCHING_DATA, recorder.getResponseAsString());
+ assertEquals(502, recorder.getHttpStatusCode());
+ assertFalse(rewriter.responseWasRewritten());
}
private void expectRequest(String extraPath, String url) {
expect(request.getServletPath()).andReturn(SERVLET).anyTimes();
- expect(request.getScheme()).andReturn("http").once();
- expect(request.getServerName()).andReturn("apache.org").once();
- expect(request.getServerPort()).andReturn(-1).once();
- expect(request.getRequestURI()).andReturn(SERVLET + extraPath).anyTimes();
+ expect(request.getScheme()).andReturn("http").anyTimes();
+ expect(request.getServerName()).andReturn("apache.org").anyTimes();
+ expect(request.getServerPort()).andReturn(-1).anyTimes();
+ expect(request.getRequestURI()).andReturn(SERVLET + extraPath).anyTimes();
expect(request.getRequestURL())
.andReturn(new StringBuffer("apache.org" + SERVLET + extraPath))
.anyTimes();
- String queryParams = (url == null ? "" : "url=" + url);
+ String queryParams = (url == null ? "" : "url=" + url + "&container=accel"
+ + "&gadget=test");
expect(request.getQueryString()).andReturn(queryParams).anyTimes();
}
-
- private static class FakeUrlGenerator implements UrlGenerator {
-
- public UrlValidationStatus validateJsUrl(String url) {
- throw new UnsupportedOperationException();
- }
-
- public String getIframeUrl(Gadget gadget) {
- throw new UnsupportedOperationException();
- }
-
- public UrlValidationStatus validateIframeUrl(String url) {
- return UrlValidationStatus.VALID_UNVERSIONED;
- }
-
- public String getBundledJsUrl(Collection<String> features, GadgetContext context) {
- throw new UnsupportedOperationException();
- }
-
- public String getGadgetDomainOAuthCallback(String container, String gadgetHost) {
- throw new UnsupportedOperationException();
- }
- }
-
-
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java Wed Jun 23 06:23:54 2010
@@ -27,12 +27,12 @@ import org.apache.shindig.common.uri.Uri
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.UrlGenerator;
-import org.apache.shindig.gadgets.UrlValidationStatus;
import org.apache.shindig.gadgets.process.ProcessingException;
import org.apache.shindig.gadgets.process.Processor;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.View;
+import org.apache.shindig.gadgets.uri.IframeUriManager;
+import org.apache.shindig.gadgets.uri.UriStatus;
import com.google.common.collect.Maps;
@@ -42,7 +42,6 @@ import org.json.JSONObject;
import org.junit.Before;
import org.junit.Test;
-import java.util.Collection;
import java.util.Collections;
import java.util.Map;
@@ -80,7 +79,7 @@ public class JsonRpcHandlerTest {
"</Module>";
private final FakeProcessor processor = new FakeProcessor();
- private final FakeUrlGenerator urlGenerator = new FakeUrlGenerator();
+ private final FakeIframeUriManager urlGenerator = new FakeIframeUriManager();
private final JsonRpcHandler jsonRpcHandler
= new JsonRpcHandler(new TestExecutorService(), processor, urlGenerator);
@@ -111,7 +110,7 @@ public class JsonRpcHandlerTest {
.put("context", createContext("en", "US"))
.put("gadgets", gadgets);
- urlGenerator.iframeUrl = SPEC_URL.toString();
+ urlGenerator.iframeUrl = SPEC_URL;
JSONObject response = jsonRpcHandler.process(input);
@@ -261,37 +260,20 @@ public class JsonRpcHandlerTest {
}
}
- protected static class FakeUrlGenerator implements UrlGenerator {
+ protected static class FakeIframeUriManager implements IframeUriManager {
protected boolean throwRandomFault = false;
- protected String iframeUrl = "http://example.org/gadgets/foo-does-not-matter";
+ protected Uri iframeUrl = Uri.parse("http://example.org/gadgets/foo-does-not-matter");
- protected FakeUrlGenerator() {
- }
-
- public String getBundledJsParam(Collection<String> features, GadgetContext context) {
- throw new UnsupportedOperationException();
- }
+ protected FakeIframeUriManager() { }
- public String getBundledJsUrl(Collection<String> features, GadgetContext context) {
- throw new UnsupportedOperationException();
- }
-
- public UrlValidationStatus validateJsUrl(String jsUrl) {
- throw new UnsupportedOperationException();
- }
-
- public String getIframeUrl(Gadget gadget) {
+ public Uri makeRenderingUri(Gadget gadget) {
if (throwRandomFault) {
throw new RuntimeException("BROKEN");
}
return iframeUrl;
}
-
- public UrlValidationStatus validateIframeUrl(String url) {
- throw new UnsupportedOperationException();
- }
- public String getGadgetDomainOAuthCallback(String container, String gadgetHost) {
+ public UriStatus validateRenderingUri(Uri uri) {
throw new UnsupportedOperationException();
}
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java Wed Jun 23 06:23:54 2010
@@ -40,8 +40,8 @@ import javax.servlet.http.HttpServletRes
*/
public abstract class ServletTestFixture extends EasyMockTestCase {
public final RequestPipeline pipeline = mock(RequestPipeline.class);
- public final CaptureRewriter rewriter = new CaptureRewriter();
- public final ResponseRewriterRegistry rewriterRegistry
+ public CaptureRewriter rewriter = new CaptureRewriter();
+ public ResponseRewriterRegistry rewriterRegistry
= new DefaultResponseRewriterRegistry(Arrays.<ResponseRewriter>asList(rewriter), null);
public final HttpServletRequest request = mock(HttpServletRequest.class);
public final HttpServletResponse response = mock(HttpServletResponse.class);
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java Wed Jun 23 06:23:54 2010
@@ -21,6 +21,7 @@ package org.apache.shindig.gadgets.spec;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -220,10 +221,12 @@ public class ModulePrefsTest {
assertEquals(0, prefs.getIntAttribute("arbitrary"));
}
- @Test(expected = SpecParserException.class)
- public void missingTitleThrows() throws Exception {
+ @Test
+ public void missingTitleOkay() throws Exception {
String xml = "<ModulePrefs/>";
- new ModulePrefs(XmlUtil.parse(xml), SPEC_URL);
+ ModulePrefs prefs = new ModulePrefs(XmlUtil.parse(xml), SPEC_URL);
+ assertNotNull("Empty ModulePrefs Parses", prefs);
+ assertEquals("Title is empty string", "", prefs.getTitle());
}
@Test
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java Wed Jun 23 06:23:54 2010
@@ -31,8 +31,8 @@ import org.apache.shindig.expressions.Ro
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.parse.DefaultHtmlSerializer;
-import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.ParseModule;
+import org.apache.shindig.gadgets.parse.SocialDataTags;
import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
import org.apache.shindig.gadgets.render.SanitizingGadgetRewriter;
import org.apache.shindig.gadgets.templates.tags.AbstractTagHandler;
@@ -281,7 +281,7 @@ public class DefaultTemplateProcessorTes
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 (Element) document.getElementsByTagName(GadgetHtmlParser.OSML_TEMPLATE_TAG).item(0);
+ return SocialDataTags.getTags(document, SocialDataTags.OSML_TEMPLATE_TAG).get(0);
}
private String serialize(Node node) throws IOException {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java Wed Jun 23 06:23:54 2010
@@ -24,8 +24,8 @@ import org.apache.shindig.gadgets.Gadget
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.parse.DefaultHtmlSerializer;
-import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.ParseModule;
+import org.apache.shindig.gadgets.parse.SocialDataTags;
import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
import org.apache.shindig.gadgets.templates.DefaultTemplateProcessor;
import org.apache.shindig.gadgets.templates.TagRegistry;
@@ -117,7 +117,7 @@ public class RenderTagHandlerTest {
String content = "<script type=\"text/os-template\" xmlns:foo=\"" + TEST_NS +
"\" xmlns:os=\"" + TagHandler.OPENSOCIAL_NAMESPACE + "\">" + markup + "</script>";
Document document = parser.parseDom(content);
- return (Element) document.getElementsByTagName(GadgetHtmlParser.OSML_TEMPLATE_TAG).item(0);
+ return SocialDataTags.getTags(document, SocialDataTags.OSML_TEMPLATE_TAG).get(0);
}
private String serialize(Node node) throws IOException {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java Wed Jun 23 06:23:54 2010
@@ -25,6 +25,7 @@ import org.apache.shindig.gadgets.Gadget
import org.apache.shindig.gadgets.oauth.OAuthModule;
import org.apache.shindig.gadgets.parse.DefaultHtmlSerializer;
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
+import org.apache.shindig.gadgets.parse.SocialDataTags;
import org.apache.shindig.gadgets.templates.TagRegistry;
import org.apache.shindig.gadgets.templates.TemplateContext;
import org.apache.shindig.gadgets.templates.TemplateProcessor;
@@ -166,7 +167,7 @@ public class TemplateBasedTagHandlerTest
String content = "<script type=\"text/os-template\" xmlns:foo=\"" + TEST_NS +
"\" xmlns:os=\"" + TagHandler.OPENSOCIAL_NAMESPACE + "\">" + markup + "</script>";
Document document = parser.parseDom(content);
- return (Element) document.getElementsByTagName(GadgetHtmlParser.OSML_TEMPLATE_TAG).item(0);
+ return SocialDataTags.getTags(document, SocialDataTags.OSML_TEMPLATE_TAG).get(0);
}
private String serialize(Node node) throws IOException {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java Wed Jun 23 06:23:54 2010
@@ -204,7 +204,7 @@ public class DefaultConcatUriManagerTest
@Test
public void validateNoContainerStrict() {
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
- manager.setUseStrictParsing("true");
+ manager.setUseStrictParsing(true);
ConcatUriManager.ConcatUri validated =
manager.process(Uri.parse("http://host.com/path?q=f"));
assertEquals(UriStatus.BAD_URI, validated.getStatus());
@@ -221,7 +221,7 @@ public class DefaultConcatUriManagerTest
@Test
public void validateHostMismatchStrict() {
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
- manager.setUseStrictParsing("true");
+ manager.setUseStrictParsing(true);
ConcatUriManager.ConcatUri validated =
manager.process(Uri.parse("http://another.com/path?" +
Param.CONTAINER.getKey() + '=' + CONTAINER + "&type=css"));
@@ -231,7 +231,7 @@ public class DefaultConcatUriManagerTest
@Test
public void validatePathMismatchStrict() {
DefaultConcatUriManager manager = makeManager("host.com", "/path", null, null);
- manager.setUseStrictParsing("true");
+ manager.setUseStrictParsing(true);
ConcatUriManager.ConcatUri validated =
manager.process(Uri.parse("http://host.com/another?" +
Param.CONTAINER.getKey() + '=' + CONTAINER + "&type=css"));
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java Wed Jun 23 06:23:54 2010
@@ -312,7 +312,7 @@ public class DefaultProxyUriManagerTest
String host = "host.com";
String path = "/proxy/path";
DefaultProxyUriManager manager = makeManager("foo" + host, path, null);
- manager.setUseStrictParsing("true");
+ manager.setUseStrictParsing(true);
Uri testUri = new UriBuilder().setAuthority(host).setPath(path)
.addQueryParameter(Param.URL.getKey(), "http://foo.com").toUri();
manager.process(testUri);
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriManagerTestBase.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriManagerTestBase.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriManagerTestBase.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriManagerTestBase.java Wed Jun 23 06:23:54 2010
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
package org.apache.shindig.gadgets.uri;
import static org.easymock.EasyMock.expect;
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java Wed Jun 23 06:23:54 2010
@@ -21,8 +21,8 @@ import org.apache.shindig.common.uri.Uri
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.render.FakeMessageBundleFactory;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import org.apache.shindig.gadgets.spec.SpecParserException;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
public class BidiSubstituterTest extends Assert {
@@ -37,18 +37,11 @@ public class BidiSubstituterTest extends
assertLeftToRight(BidiSubstituter.LTR);
}
- @Test
- @Ignore("Is this valid behaviour?")
+ @Test(expected=SpecParserException.class)
public void testBidiWithEmpty() throws Exception {
assertLeftToRight("");
}
- @Test
- @Ignore("Is this valid behaviour?")
- public void testBidiWithNull() throws Exception {
- assertLeftToRight(null);
- }
-
private void assertRightToLeft(String direction) throws Exception {
assertSubstitutions(direction, BidiSubstituter.RIGHT,
BidiSubstituter.LEFT, BidiSubstituter.RTL, BidiSubstituter.LTR);
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java Wed Jun 23 06:23:54 2010
@@ -29,8 +29,8 @@ import org.apache.shindig.gadgets.spec.G
import org.apache.shindig.gadgets.spec.LocaleSpec;
import org.apache.shindig.gadgets.spec.MessageBundle;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
import org.junit.Test;
@@ -38,7 +38,7 @@ import java.util.Locale;
public class VariableSubstituterTest {
private final FakeMessageBundleFactory messageBundleFactory = new FakeMessageBundleFactory();
- private final VariableSubstituter substituter = new VariableSubstituter(Lists.newArrayList(
+ private final VariableSubstituter substituter = new VariableSubstituter(ImmutableList.<Substituter>of(
new MessageSubstituter(messageBundleFactory),
new UserPrefSubstituter(),
new ModuleSubstituter(),
Modified: shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java (original)
+++ shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java Wed Jun 23 06:23:54 2010
@@ -17,15 +17,17 @@
*/
package org.apache.shindig.social.opensocial.jpa;
+import static javax.persistence.CascadeType.MERGE;
+import static javax.persistence.CascadeType.PERSIST;
+import static javax.persistence.CascadeType.REFRESH;
import static javax.persistence.GenerationType.IDENTITY;
import org.apache.shindig.social.opensocial.jpa.api.DbObject;
import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.opensocial.model.MediaItem;
import org.apache.shindig.social.opensocial.model.Address;
+import org.apache.shindig.social.opensocial.model.MediaItem;
import javax.persistence.Basic;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -190,7 +192,7 @@ public class MediaItemDb implements Medi
* model field.
* @see org.apache.shindig.social.opensocial.model.MediaItem
*/
- @ManyToOne(targetEntity = AddressDb.class, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH })
+ @ManyToOne(targetEntity = AddressDb.class, cascade = { PERSIST, MERGE, REFRESH })
@JoinColumn(name = "address_id", referencedColumnName = "oid")
private Address location;
Modified: shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java (original)
+++ shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java Wed Jun 23 06:23:54 2010
@@ -243,7 +243,7 @@ public class ActivityServiceDb implement
q.setFirstResult(0);
q.setMaxResults(1);
List<?> activities = q.getResultList();
- if ( activities != null && activities.size() > 0 ) {
+ if ( activities != null && !activities.isEmpty()) {
return (Activity) activities.get(0);
}
return null;
Modified: shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java (original)
+++ shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java Wed Jun 23 06:23:54 2010
@@ -165,7 +165,7 @@ public class PersonServiceDb implements
q.setMaxResults(1);
List<?> plist = q.getResultList();
Person person = null;
- if (plist != null && plist.size() > 0) {
+ if (plist != null && !plist.isEmpty()) {
person = (Person) plist.get(0);
}
return ImmediateFuture.newInstance(person);
Modified: shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java (original)
+++ shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java Wed Jun 23 06:23:54 2010
@@ -60,7 +60,6 @@ import net.oauth.OAuthProblemException;
* Provides component injection for tests
* Injects Social API and JPA persistence guice modules
*
- * @author bens
*/
public class JpaTestGuiceModule extends AbstractModule {
Modified: shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java (original)
+++ shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java Wed Jun 23 06:23:54 2010
@@ -68,7 +68,7 @@ public class PersonPopulate {
// TODO Auto-generated constructor stub
}
- private static final Logger log = Logger.getLogger("shindig-db-test");
+ private static final Logger LOG = Logger.getLogger("shindig-db-test");
public Person createPerson(int i, long key, Random random) {
@@ -174,7 +174,7 @@ public class PersonPopulate {
// TODO: person.setActivities(activities);
// TODO: person.setAddresses(addresses);
- log.info("Created user ++++++ " + personId);
+ LOG.info("Created user ++++++ " + personId);
return person;
}
Modified: shindig/branches/2.0.x/java/server/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/server/pom.xml?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/server/pom.xml (original)
+++ shindig/branches/2.0.x/java/server/pom.xml Wed Jun 23 06:23:54 2010
@@ -78,12 +78,6 @@
</plugins>
<resources>
<resource>
- <directory>${basedir}/../../content/</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
- <resource>
<targetPath>containers/default</targetPath>
<directory>${basedir}/../../config</directory>
<includes>
Modified: shindig/branches/2.0.x/java/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/server/src/main/webapp/WEB-INF/web.xml?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/server/src/main/webapp/WEB-INF/web.xml (original)
+++ shindig/branches/2.0.x/java/server/src/main/webapp/WEB-INF/web.xml Wed Jun 23 06:23:54 2010
@@ -246,6 +246,11 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>accel</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>metadata</servlet-name>
<url-pattern>/gadgets/metadata</url-pattern>
</servlet-mapping>
Modified: shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java (original)
+++ shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java Wed Jun 23 06:23:54 2010
@@ -144,19 +144,15 @@ public class EndToEndServer {
rpcServletHolder.setInitParameter("handlers", "org.apache.shindig.handlers");
context.addServlet(rpcServletHolder, SOCIAL_RPC_BASE);
context.addFilter(AuthenticationServletFilter.class, SOCIAL_RPC_BASE, 0);
+ context.addServlet(rpcServletHolder, GADGET_RPC_BASE);
+ context.addFilter(AuthenticationServletFilter.class, GADGET_RPC_BASE, 0);
+ context.addServlet(rpcServletHolder, RPC_BASE);
+ context.addFilter(AuthenticationServletFilter.class, RPC_BASE, 0);
// Attach the ConcatProxyServlet - needed for rewritten JS
ServletHolder concatHolder = new ServletHolder(new ConcatProxyServlet());
context.addServlet(concatHolder, CONCAT_BASE);
- // Attach the Gadget
- ServletHolder gadgetsJsonRpcServletHolder = new ServletHolder(new JsonRpcServlet());
- gadgetsJsonRpcServletHolder.setInitParameter("handlers", "org.apache.shindig.handlers");
- context.addServlet(gadgetsJsonRpcServletHolder, GADGET_RPC_BASE);
- context.addFilter(AuthenticationServletFilter.class, GADGET_RPC_BASE, 0);
- context.addServlet(gadgetsJsonRpcServletHolder, RPC_BASE);
- context.addFilter(AuthenticationServletFilter.class, RPC_BASE, 0);
-
// Attach the JsServlet - needed for rewritten JS
ServletHolder jsHolder = new ServletHolder(new JsServlet());
context.addServlet(jsHolder, JS_BASE);
Modified: shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java (original)
+++ shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java Wed Jun 23 06:23:54 2010
@@ -257,13 +257,13 @@ public class EndToEndTest {
@Test
- @Ignore("Problem with taming") // FIXME
+ //@Ignore("Problem with taming") // FIXME
public void testCajaOsapiAppdata() throws Exception {
executeAllPageTests("osapi/appdataTest", true /* caja */);
}
@Test
- @Ignore("Problem with taming") // FIXME
+ //@Ignore("Problem with taming") // FIXME
public void testCajaOsapiBatch() throws Exception {
executeAllPageTests("osapi/batchTest", true /* caja */);
}
@@ -341,6 +341,7 @@ public class EndToEndTest {
webClient.setAjaxController(new NicelyResynchronizingAjaxController());
webClient.waitForBackgroundJavaScript(2000);
webClient.setHTMLParserListener(HTMLParserListener.LOG_REPORTER);
+ webClient.setTimeout(3000);
alertHandler = new CollectingAlertHandler();
webClient.setAlertHandler(alertHandler);
Modified: shindig/branches/2.0.x/java/server/src/test/resources/endtoend/errorTest.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/server/src/test/resources/endtoend/errorTest.xml?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/server/src/test/resources/endtoend/errorTest.xml (original)
+++ shindig/branches/2.0.x/java/server/src/test/resources/endtoend/errorTest.xml Wed Jun 23 06:23:54 2010
@@ -56,7 +56,7 @@
req.add(req.newFetchPersonRequest("canonical"), "canonical");
function receivedData(response) {
- assertTrue("Expecting error", response.hadError());
+ assertTrue("Expecting error, got " + gadgets.json.stringify(response), response.hadError());
var dataItem = response.get("canonical");
assertFalse("Expecting data item", dataItem == undefined);
assertTrue("Expecting item error", dataItem.hadError());
Modified: shindig/branches/2.0.x/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/pom.xml?rev=957119&r1=957118&r2=957119&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/pom.xml (original)
+++ shindig/branches/2.0.x/java/social-api/pom.xml Wed Jun 23 06:23:54 2010
@@ -53,6 +53,24 @@
</resources>
</build>
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <comparisonVersion>1.0.1</comparisonVersion>
+ </configuration>
+ <version>2.2.2</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+
<dependencies>
<!-- project dependencies -->
<dependency>