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/02 11:05:02 UTC
svn commit: r950443 [5/7] - in /shindig/branches/2.0.x: ./ config/
content/samplecontainer/ content/samplecontainer/examples/
content/samplecontainer/examples/ActivityStreams/ content/sampledata/
extras/src/main/java/org/apache/shindig/extras/ extras/s...
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java Wed Jun 2 09:04:51 2010
@@ -31,7 +31,6 @@ import org.apache.shindig.gadgets.oauth.
import org.apache.shindig.gadgets.oauth.AccessorInfo.OAuthParamLocation;
import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret.KeyType;
import org.apache.shindig.gadgets.oauth.OAuthArguments.UseToken;
-import org.apache.shindig.gadgets.oauth.OAuthResponseParams.OAuthRequestException;
import org.apache.shindig.gadgets.oauth.OAuthStore.TokenInfo;
import org.apache.shindig.gadgets.oauth.testing.FakeOAuthServiceProvider;
import org.junit.Before;
@@ -132,7 +131,7 @@ public class GadgetTokenStoreTest {
store.getOAuthAccessor(socialToken, arguments, clientState, responseParams, fetcherConfig);
fail();
} catch (OAuthRequestException e) {
- assertEquals("BAD_OAUTH_CONFIGURATION", responseParams.getError());
+ assertEquals("BAD_OAUTH_CONFIGURATION", e.getError());
}
}
@@ -303,7 +302,7 @@ public class GadgetTokenStoreTest {
store.getOAuthAccessor(socialToken, arguments, clientState, responseParams, fetcherConfig);
fail();
} catch (OAuthRequestException e) {
- assertEquals("BAD_OAUTH_CONFIGURATION", responseParams.getError());
+ assertEquals("BAD_OAUTH_CONFIGURATION", e.getError());
}
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java Wed Jun 2 09:04:51 2010
@@ -399,7 +399,7 @@ public class OAuthRequestTest {
assertEquals("", response.getResponseAsString());
assertEquals(403, response.getHttpStatusCode());
assertEquals(-1, response.getCacheTtl());
- assertEquals(OAuthError.UNAUTHENTICATED.toString(), response.getMetadata().get("oauthError"));
+ assertEquals(OAuthError.UNAUTHENTICATED.name(), response.getMetadata().get("oauthError"));
}
@Test
@@ -418,7 +418,7 @@ public class OAuthRequestTest {
assertEquals("", response.getResponseAsString());
assertEquals(403, response.getHttpStatusCode());
assertEquals(-1, response.getCacheTtl());
- assertEquals(OAuthError.UNAUTHENTICATED.toString(), response.getMetadata().get("oauthError"));
+ assertEquals(OAuthError.UNAUTHENTICATED.name(), response.getMetadata().get("oauthError"));
}
}
@@ -468,7 +468,7 @@ public class OAuthRequestTest {
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("", response.getResponseAsString());
assertEquals(403, response.getHttpStatusCode());
- assertEquals(OAuthError.BAD_OAUTH_CONFIGURATION.toString(),
+ assertEquals(OAuthError.BAD_OAUTH_TOKEN_URL.name(),
response.getMetadata().get("oauthError"));
String errorText = response.getMetadata().get("oauthErrorText");
assertNotNull(errorText);
@@ -495,7 +495,7 @@ public class OAuthRequestTest {
assertEquals("", response.getResponseAsString());
assertEquals(403, response.getHttpStatusCode());
- assertEquals(OAuthError.BAD_OAUTH_CONFIGURATION.toString(),
+ assertEquals(OAuthError.BAD_OAUTH_TOKEN_URL.name(),
response.getMetadata().get("oauthError"));
String errorText = response.getMetadata().get("oauthErrorText");
assertNotNull(errorText);
@@ -518,7 +518,7 @@ public class OAuthRequestTest {
assertEquals("", response.getResponseAsString());
assertEquals(403, response.getHttpStatusCode());
- assertEquals(OAuthError.BAD_OAUTH_CONFIGURATION.toString(),
+ assertEquals(OAuthError.BAD_OAUTH_TOKEN_URL.name(),
response.getMetadata().get("oauthError"));
String errorText = response.getMetadata().get("oauthErrorText");
assertNotNull(errorText);
@@ -606,11 +606,11 @@ public class OAuthRequestTest {
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("", response.getResponseAsString());
assertEquals(403, response.getHttpStatusCode());
- assertEquals(OAuthError.BAD_OAUTH_CONFIGURATION.toString(),
+ assertEquals(OAuthError.INVALID_URL.name(),
response.getMetadata().get("oauthError"));
String errorText = response.getMetadata().get("oauthErrorText");
assertNotNull(errorText);
- checkStringContains("should report invalid url", errorText, "Invalid url: foo");
+ checkStringContains("should report invalid url", errorText, "Invalid URL: foo");
}
@Test
@@ -627,11 +627,11 @@ public class OAuthRequestTest {
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("", response.getResponseAsString());
assertEquals(403, response.getHttpStatusCode());
- assertEquals(OAuthError.BAD_OAUTH_CONFIGURATION.toString(),
+ assertEquals(OAuthError.INVALID_URL.name(),
response.getMetadata().get("oauthError"));
String errorText = response.getMetadata().get("oauthErrorText");
assertNotNull(errorText);
- checkStringContains("should report invalid url", errorText, "Invalid url: ");
+ checkStringContains("should report invalid url", errorText, "Invalid URL: ");
}
@Test
@@ -649,7 +649,7 @@ public class OAuthRequestTest {
response = friend.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("", response.getResponseAsString());
assertEquals(403, response.getHttpStatusCode());
- assertEquals(OAuthError.NOT_OWNER.toString(), response.getMetadata().get("oauthError"));
+ assertEquals(OAuthError.NOT_OWNER.name(), response.getMetadata().get("oauthError"));
}
@Test
@@ -755,7 +755,7 @@ public class OAuthRequestTest {
response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("", response.getResponseAsString());
assertEquals(HttpResponse.SC_FORBIDDEN, response.getHttpStatusCode());
- assertEquals("parameter_missing", response.getMetadata().get("oauthError"));
+ assertEquals("parameter_absent", response.getMetadata().get("oauthError"));
assertNull(response.getMetadata().get("oauthApprovalUrl"));
}
@@ -850,7 +850,7 @@ public class OAuthRequestTest {
assertEquals("", response.getResponseAsString());
Map<String, String> metadata = response.getMetadata();
assertNotNull(metadata);
- assertEquals("UNKNOWN_PROBLEM", metadata.get("oauthError"));
+ assertEquals("MISSING_OAUTH_PARAMETER", metadata.get("oauthError"));
String errorText = response.getMetadata().get("oauthErrorText");
checkStringContains("oauthErrorText mismatch", errorText,
"No oauth_token returned from service provider");
@@ -872,7 +872,7 @@ public class OAuthRequestTest {
assertEquals("", response.getResponseAsString());
Map<String, String> metadata = response.getMetadata();
assertNotNull(metadata);
- assertEquals("UNKNOWN_PROBLEM", metadata.get("oauthError"));
+ assertEquals("MISSING_OAUTH_PARAMETER", metadata.get("oauthError"));
String errorText = response.getMetadata().get("oauthErrorText");
checkStringContains("oauthErrorText mismatch", errorText,
"No oauth_token_secret returned from service provider");
@@ -907,7 +907,7 @@ public class OAuthRequestTest {
assertEquals("", response.getResponseAsString());
Map<String, String> metadata = response.getMetadata();
assertNotNull(metadata);
- assertEquals("UNKNOWN_PROBLEM", metadata.get("oauthError"));
+ assertEquals("MISSING_OAUTH_PARAMETER", metadata.get("oauthError"));
checkStringContains("oauthErrorText mismatch", metadata.get("oauthErrorText"),
"some vague error");
checkStringContains("oauthErrorText mismatch", metadata.get("oauthErrorText"),
@@ -1145,6 +1145,7 @@ public class OAuthRequestTest {
client.getBaseArgs().setRequestTokenSecret("garbage");
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+
assertEquals("", response.getResponseAsString());
assertEquals(1, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
@@ -1457,11 +1458,11 @@ public class OAuthRequestTest {
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
String tricky = "%6fpensocial_owner_id=gotcha";
HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + '?' + tricky);
- assertEquals(OAuthError.INVALID_REQUEST.toString(),
+ assertEquals(OAuthError.INVALID_PARAMETER.name(),
resp.getMetadata().get(OAuthResponseParams.ERROR_CODE));
checkStringContains("Wrong error text", resp.getMetadata().get("oauthErrorText"),
- "invalid parameter name opensocial_owner_id, applications may not override opensocial " +
- "or oauth parameters");
+ "Invalid parameter name opensocial_owner_id, applications may not override " +
+ "oauth, xoauth, or opensocial parameters");
}
@Test
@@ -1469,11 +1470,11 @@ public class OAuthRequestTest {
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
String tricky = "%6fpensocial_owner_id=gotcha";
HttpResponse resp = client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, tricky);
- assertEquals(OAuthError.INVALID_REQUEST.toString(),
+ assertEquals(OAuthError.INVALID_PARAMETER.name(),
resp.getMetadata().get(OAuthResponseParams.ERROR_CODE));
checkStringContains("Wrong error text", resp.getMetadata().get("oauthErrorText"),
- "invalid parameter name opensocial_owner_id, applications may not override opensocial " +
- "or oauth parameters");
+ "Invalid parameter name opensocial_owner_id, applications may not override " +
+ "oauth, xoauth, or opensocial parameters");
}
@Test
@@ -1557,10 +1558,10 @@ public class OAuthRequestTest {
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
HttpResponse resp =
client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL + "?opensocial_foo=bar", null);
- assertEquals(OAuthError.INVALID_REQUEST.toString(),
+ assertEquals(OAuthError.INVALID_PARAMETER.name(),
resp.getMetadata().get(OAuthResponseParams.ERROR_CODE));
checkStringContains("Wrong error text", resp.getMetadata().get("oauthErrorText"),
- "invalid parameter name opensocial_foo");
+ "Invalid parameter name opensocial_foo");
}
@Test
@@ -1568,10 +1569,10 @@ public class OAuthRequestTest {
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
HttpResponse resp =
client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL + "?oauth_foo=bar", "name=value");
- assertEquals(OAuthError.INVALID_REQUEST.toString(),
+ assertEquals(OAuthError.INVALID_PARAMETER.name(),
resp.getMetadata().get(OAuthResponseParams.ERROR_CODE));
checkStringContains("Wrong error text", resp.getMetadata().get("oauthErrorText"),
- "invalid parameter name oauth_foo");
+ "Invalid parameter name oauth_foo");
}
@Test
@@ -1579,20 +1580,20 @@ public class OAuthRequestTest {
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
HttpResponse resp =
client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, "opensocial_foo=bar");
- assertEquals(OAuthError.INVALID_REQUEST.toString(),
+ assertEquals(OAuthError.INVALID_PARAMETER.name(),
resp.getMetadata().get(OAuthResponseParams.ERROR_CODE));
checkStringContains("Wrong error text", resp.getMetadata().get("oauthErrorText"),
- "invalid parameter name opensocial_foo");
+ "Invalid parameter name opensocial_foo");
}
@Test
public void testStripOAuthParamsFromBody() throws Exception {
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
HttpResponse resp = client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, "oauth_foo=bar");
- assertEquals(OAuthError.INVALID_REQUEST.toString(),
+ assertEquals(OAuthError.INVALID_PARAMETER.name(),
resp.getMetadata().get(OAuthResponseParams.ERROR_CODE));
checkStringContains("Wrong error text", resp.getMetadata().get("oauthErrorText"),
- "invalid parameter name oauth_foo");
+ "Invalid parameter name oauth_foo");
}
// Test we can refresh an expired access token.
@@ -1867,7 +1868,7 @@ public class OAuthRequestTest {
serviceProvider.setReturnNull(true);
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.ACCESS_TOKEN_URL);
- assertEquals("UNKNOWN_PROBLEM", response.getMetadata().get("oauthError"));
+ assertEquals("MISSING_SERVER_RESPONSE", response.getMetadata().get("oauthError"));
assertEquals("", response.getResponseAsString());
String oauthErrorText = response.getMetadata().get("oauthErrorText");
checkStringContains("should say no response", oauthErrorText, "No response from server");
@@ -1876,7 +1877,7 @@ public class OAuthRequestTest {
checkStringContains("should log empty response", oauthErrorText, "Received response 1:\n\n");
checkLogContains("No response from server");
checkLogContains("GET /request?param=foo&opensocial_owner_id=owner");
- checkLogContains("OAuth error [UNKNOWN_PROBLEM, No response from server] for " +
+ checkLogContains("OAuth error [MISSING_SERVER_RESPONSE, No response from server] for " +
"application http://www.example.com/gadget.xml");
}
@@ -1886,7 +1887,7 @@ public class OAuthRequestTest {
new GadgetException(GadgetException.Code.FAILED_TO_RETRIEVE_CONTENT, "mildly wrong"));
MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
HttpResponse response = client.sendGet(FakeOAuthServiceProvider.ACCESS_TOKEN_URL);
- assertEquals("UNKNOWN_PROBLEM", response.getMetadata().get("oauthError"));
+ assertEquals("MISSING_SERVER_RESPONSE", response.getMetadata().get("oauthError"));
assertEquals("", response.getResponseAsString());
String oauthErrorText = response.getMetadata().get("oauthErrorText");
checkStringContains("should say no response", oauthErrorText, "No response from server");
@@ -1895,7 +1896,7 @@ public class OAuthRequestTest {
checkStringContains("should log empty response", oauthErrorText, "Received response 1:\n\n");
checkLogContains("No response from server");
checkLogContains("GET /request?param=foo&opensocial_owner_id=owner");
- checkLogContains("OAuth error [UNKNOWN_PROBLEM, No response from server] for " +
+ checkLogContains("OAuth error [MISSING_SERVER_RESPONSE, No response from server] for " +
"application http://www.example.com/gadget.xml");
checkLogContains("GadgetException");
checkLogContains("mildly wrong");
@@ -1913,7 +1914,7 @@ public class OAuthRequestTest {
}
checkLogContains("OAuth fetch unexpected fatal erro");
checkLogContains("GET /request?param=foo&opensocial_owner_id=owner");
- checkLogContains("OAuth error [null, null] for " +
+ checkLogContains("OAuth error [very, very wrong] for " +
"application http://www.example.com/gadget.xml");
checkLogContains("RuntimeException");
checkLogContains("very, very wrong");
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java Wed Jun 2 09:04:51 2010
@@ -26,7 +26,6 @@ import org.apache.shindig.common.uri.Uri
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.oauth.OAuthResponseParams.OAuthRequestException;
import org.easymock.EasyMock;
import static org.junit.Assert.assertEquals;
@@ -75,10 +74,10 @@ public class OAuthResponseParamsTest {
public void testAddParams() {
params.getNewClientState().setAccessToken("access");
params.setAznUrl("aznurl");
- params.oauthRequestException(OAuthError.BAD_OAUTH_CONFIGURATION, "whoa there cowboy");
+ OAuthRequestException e = new OAuthRequestException(OAuthError.BAD_OAUTH_CONFIGURATION, "whoa there cowboy");
HttpResponseBuilder responseBuilder = new HttpResponseBuilder();
- params.addToResponse(responseBuilder);
+ params.addToResponse(responseBuilder, e);
HttpResponse response = responseBuilder.create();
assertEquals("BAD_OAUTH_CONFIGURATION", response.getMetadata().get("oauthError"));
String errorText = response.getMetadata().get("oauthErrorText");
@@ -90,20 +89,19 @@ public class OAuthResponseParamsTest {
@Test
public void testSendTraceToClient() {
- params.oauthRequestException(OAuthError.BAD_OAUTH_CONFIGURATION, "whoa there cowboy");
+ OAuthRequestException e = new OAuthRequestException(OAuthError.BAD_OAUTH_CONFIGURATION, "whoa there cowboy");
params.addRequestTrace(null, null);
params.addRequestTrace(null, null);
- params.oauthRequestException(OAuthError.BAD_OAUTH_CONFIGURATION, "whoa there cowboy");
HttpResponseBuilder responseBuilder = new HttpResponseBuilder();
- params.addToResponse(responseBuilder);
+ params.addToResponse(responseBuilder, e);
HttpResponse response = responseBuilder.create();
String errorText = response.getMetadata().get("oauthErrorText");
assertEquals("whoa there cowboy", errorText);
params.setSendTraceToClient(true);
- params.addToResponse(responseBuilder);
+ params.addToResponse(responseBuilder, e);
response = responseBuilder.create();
errorText = response.getMetadata().get("oauthErrorText");
checkStringContains("includes error text", errorText, "whoa there cowboy");
@@ -114,7 +112,7 @@ public class OAuthResponseParamsTest {
@Test
public void testAddEmptyParams() {
HttpResponseBuilder responseBuilder = new HttpResponseBuilder();
- params.addToResponse(responseBuilder);
+ params.addToResponse(responseBuilder, null);
HttpResponse response = responseBuilder.create();
assertTrue(response.getMetadata().isEmpty());
}
@@ -152,19 +150,19 @@ public class OAuthResponseParamsTest {
HttpRequest req = new HttpRequest(Uri.parse("http://www"));
HttpResponse ok = new HttpResponseBuilder().setHttpStatusCode(200).create();
params.addRequestTrace(req, ok);
- OAuthRequestException e = params.oauthRequestException("error", "errorText");
+ OAuthRequestException e = new OAuthRequestException("error", "errorText");
checkStringContains(e.toString(), "[error,errorText]");
params.addRequestTrace(null, null);
Throwable cause = new RuntimeException();
- e = params.oauthRequestException(OAuthError.UNAUTHENTICATED, "errorText", cause);
- checkStringContains(e.toString(), "[UNAUTHENTICATED,errorText]");
+ e = new OAuthRequestException(OAuthError.UNAUTHENTICATED, "errorText", cause);
+ checkStringContains(e.toString(), "[UNAUTHENTICATED,Unauthenticated OAuth fetch]");
assertEquals(cause, e.getCause());
}
@Test
public void testNullSafe() {
params.addRequestTrace(null, null);
- params.oauthRequestException("error", "errorText");
+ new OAuthRequestException("error", "errorText");
params.logDetailedWarning("wow");
params.logDetailedWarning("new runtime", new RuntimeException());
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java Wed Jun 2 09:04:51 2010
@@ -43,11 +43,9 @@ public abstract class AbstractParsingTes
protected String loadFile(String path) throws IOException {
InputStream is = this.getClass().getClassLoader().getResourceAsStream(path);
// ENABLE THIS if you have troubles in your IDE loading resources.
- /*
- if (is == null) {
- is = new FileInputStream(new File("/shindig/base/java/gadgets/src/test/resources/" + path));
- }
- */
+ /*if (is == null) {
+ is = new FileInputStream(new File("/path/to/your/files/" + path));
+ }*/
return IOUtils.toString(is);
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java Wed Jun 2 09:04:51 2010
@@ -88,7 +88,7 @@ public class CajaCssSanitizerTest extend
assertStyleEquals(
".xyz { background: url('http://test.com/proxy/path?url=" +
"http%3A%2F%2Fwww.example.org%2Fimg.gif" +
- "&sanitize=1&rewriteMime=image%2F%2A');}", styleSheet);
+ "&sanitize=1&rewriteMime=image%2F%2a');}", styleSheet);
}
@Test
@@ -97,7 +97,7 @@ public class CajaCssSanitizerTest extend
CssTree.StyleSheet styleSheet = parser.parseDom(css);
sanitizer.sanitize(styleSheet, DUMMY, importRewriter, imageRewriter);
assertEquals(".xyz{background:url('http://test.com/proxy/path?url=http%3A%2F%2Fwww.example.org%2F" +
- "img.gif&sanitize=1&rewriteMime=image%2F%2A');}",
+ "img.gif&sanitize=1&rewriteMime=image%2F%2a');}",
parser.serialize(styleSheet).replaceAll("\\s", ""));
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaSocialMarkupHtmlParserTest.java Wed Jun 2 09:04:51 2010
@@ -45,5 +45,24 @@ public class CajaSocialMarkupHtmlParserT
@Override
@Ignore("Until xmlnamespace issues have been resolved")
public void testInvalid() throws Exception { super.testInvalid(); }
+
+ @Test
+ @Override
+ @Ignore("Until xml-in-HTML NPE issues have been resolved")
+ public void testSocialTemplateSerialization() { super.testSocialTemplateSerialization(); }
+
+ @Test
+ @Override
+ @Ignore("Until xml-in-HTML NPE issues have been resolved")
+ public void testJavascript() { super.testJavascript(); }
+ @Test
+ @Override
+ @Ignore("Until xml-in-HTML NPE issues have been resolved")
+ public void testPlainContent() { super.testPlainContent(); }
+
+ @Test
+ @Override
+ @Ignore("Until xml-in-HTML NPE issues have been resolved")
+ public void testCommentOrdering() { super.testCommentOrdering(); }
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizerTest.java Wed Jun 2 09:04:51 2010
@@ -101,7 +101,7 @@ public class CajaCssSanitizerTest extend
String css = ".xyz { background: url('http://www.example.org/img.gif');}";
CssTree.StyleSheet styleSheet = parser.parseDom(css);
sanitizer.sanitize(styleSheet, DUMMY, importRewriter, imageRewriter);
- assertEquals(".xyz{background:url('http://www.example.org/img.gif%26sanitize%3D1%26rewriteMime%3Dimage/%2A');}",
+ assertEquals(".xyz{background:url('http://www.example.org/img.gif%26sanitize%3d1%26rewriteMime%3dimage/%2a');}",
parser.serialize(styleSheet).replaceAll("\\s", ""));
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java Wed Jun 2 09:04:51 2010
@@ -63,8 +63,6 @@ public class HttpPreloaderTest extends P
}
return oauthFetcher.fetch(request);
}
-
- public void normalizeProtocol(HttpRequest request) {}
};
private void checkRequest(HttpRequest request) {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java Wed Jun 2 09:04:51 2010
@@ -39,8 +39,8 @@ import org.apache.shindig.gadgets.spec.R
import org.apache.shindig.gadgets.spec.SpecParserException;
import org.easymock.Capture;
import org.easymock.IArgumentMatcher;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Before;
@@ -105,7 +105,7 @@ public class PipelineExecutorTest {
Capture<PipelinedData.Batch> batchCapture =
new Capture<PipelinedData.Batch>();
- JSONObject expectedData = new JSONObject("{data: {foo: 'bar'}}");
+ JSONObject expectedData = new JSONObject("{result: {foo: 'bar'}}");
// Dummy return results (the "real" return would have two values)
Callable<PreloadedData> callable = createPreloadTask("key", expectedData.toString());
@@ -124,7 +124,7 @@ public class PipelineExecutorTest {
assertTrue(batchCapture.getValue().getPreloads().containsKey("me"));
assertTrue(batchCapture.getValue().getPreloads().containsKey("json"));
- JsonAssert.assertJsonEquals("[{id: 'key', data: {foo: 'bar'}}]",
+ JsonAssert.assertJsonEquals("[{id: 'key', result: {foo: 'bar'}}]",
JsonSerializer.serialize(results.results));
JsonAssert.assertJsonEquals("{foo: 'bar'}",
JsonSerializer.serialize(results.keyedResults.get("key")));
@@ -152,13 +152,13 @@ public class PipelineExecutorTest {
Capture<PipelinedData.Batch> firstBatch =
new Capture<PipelinedData.Batch>();
Callable<PreloadedData> firstTask = createPreloadTask("json",
- "{data: {user: 'canonical'}}");
+ "{result: {user: 'canonical'}}");
// Second batch, the user fetch
Capture<PipelinedData.Batch> secondBatch =
new Capture<PipelinedData.Batch>();
Callable<PreloadedData> secondTask = createPreloadTask("me",
- "{data: {'id':'canonical'}}");
+ "{result: {'id':'canonical'}}");
// First, a batch with an HTTP request
expect(
@@ -176,8 +176,8 @@ public class PipelineExecutorTest {
PipelineExecutor.Results results = executor.execute(context,
ImmutableList.of(pipeline));
- JsonAssert.assertJsonEquals("[{id: 'json', data: {user: 'canonical'}}," +
- "{id: 'me', data: {id: 'canonical'}}]",
+ JsonAssert.assertJsonEquals("[{id: 'json', result: {user: 'canonical'}}," +
+ "{id: 'me', result: {id: 'canonical'}}]",
JsonSerializer.serialize(results.results));
assertEquals(ImmutableSet.of("json", "me"), results.keyedResults.keySet());
assertTrue(results.remainingPipelines.isEmpty());
@@ -299,7 +299,7 @@ public class PipelineExecutorTest {
}
public void appendTo(StringBuffer buffer) {
- buffer.append("eqBuffer[social=" + socialCount + ",http=" + httpCount + ']');
+ buffer.append("eqBuffer[social=").append(socialCount).append(",http=").append(httpCount).append(']');
}
public boolean matches(Object obj) {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java Wed Jun 2 09:04:51 2010
@@ -29,7 +29,6 @@ import org.apache.shindig.config.Contain
import org.apache.shindig.expressions.Expressions;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetELResolver;
-import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
@@ -122,7 +121,7 @@ public class PipelinedDataPreloaderTest
public void testSocialPreload() throws Exception {
GadgetSpec spec = new GadgetSpec(GADGET_URL, XML);
- String socialResult = "[{id:'p', data:1}, {id:'a', data:2}]";
+ String socialResult = "[{id:'p', result:1}, {id:'a', result:2}]";
RecordingRequestPipeline pipeline = new RecordingRequestPipeline(socialResult);
PipelinedDataPreloader preloader = new PipelinedDataPreloader(pipeline, containerConfig);
@@ -144,8 +143,8 @@ public class PipelinedDataPreloaderTest
Collection<Object> result = tasks.iterator().next().call().toJson();
assertEquals(2, result.size());
- JSONObject resultWithKeyP = new JSONObject("{id: 'p', data: 1}");
- JSONObject resultWithKeyA = new JSONObject("{id: 'a', data: 2}");
+ JSONObject resultWithKeyP = new JSONObject("{id: 'p', result: 1}");
+ JSONObject resultWithKeyA = new JSONObject("{id: 'a', result: 2}");
Map<String, String> resultsById = getResultsById(result);
JsonAssert.assertJsonEquals(resultWithKeyA.toString(), resultsById.get("a"));
JsonAssert.assertJsonEquals(resultWithKeyP.toString(), resultsById.get("p"));
@@ -277,7 +276,7 @@ public class PipelinedDataPreloaderTest
HttpResponse response = new HttpResponseBuilder()
.setResponseString("{foo: 'bar'}")
.create();
- String expectedResult = "{data: {status: 200, content: {foo: 'bar'}}, id: 'p'}";
+ String expectedResult = "{result: {status: 200, content: {foo: 'bar'}}, id: 'p'}";
verifyHttpPreload(response, expectedResult);
}
@@ -291,7 +290,7 @@ public class PipelinedDataPreloaderTest
.addHeader("not-ok", "shouldn'tbehere")
.create();
- String expectedResult = "{data: {status: 200, headers:" +
+ String expectedResult = "{result: {status: 200, headers:" +
"{'content-type': ['application/json; charset=UTF-8'], 'set-cookie': ['cookiecookie']}," +
"content: [1, 2]}, id: 'p'}";
@@ -321,7 +320,7 @@ public class PipelinedDataPreloaderTest
.create();
JSONObject result = new JSONObject(executeHttpPreload(response, XML_WITH_HTTP_REQUEST));
- assertFalse(result.has("data"));
+ assertFalse(result.has("result"));
JSONObject error = result.getJSONObject("error");
assertEquals(HttpResponse.SC_NOT_ACCEPTABLE, error.getInt("code"));
@@ -335,7 +334,7 @@ public class PipelinedDataPreloaderTest
.create();
// Even though the response was actually JSON, @format=text, so the content
// will be a block of text
- String expectedResult = "{data: {status: 200, headers:" +
+ String expectedResult = "{result: {status: 200, headers:" +
"{'content-type': ['application/json; charset=UTF-8']}," +
"content: '{foo: \\'bar\\'}'}, id: 'p'}";
@@ -445,7 +444,7 @@ public class PipelinedDataPreloaderTest
public void testSocialPreloadViewResolution() throws Exception {
GadgetSpec spec = new GadgetSpec(GADGET_URL, XML_IN_DEFAULT_CONTAINER);
- String socialResult = "[{id:'p', data:1}, {id:'a', data:2}]";
+ String socialResult = "[{id:'p', result:1}, {id:'a', result:2}]";
RecordingRequestPipeline pipeline = new RecordingRequestPipeline(socialResult);
PipelinedDataPreloader preloader = new PipelinedDataPreloader(pipeline, containerConfig);
@@ -489,7 +488,7 @@ public class PipelinedDataPreloaderTest
Collection<Object> result = tasks.iterator().next().call().toJson();
assertEquals(1, result.size());
- JsonAssert.assertObjectEquals("{id: 'p', data: 2}", result.iterator().next());
+ JsonAssert.assertObjectEquals("{id: 'p', result: 2}", result.iterator().next());
}
private static class RecordingRequestPipeline implements RequestPipeline {
@@ -508,7 +507,5 @@ public class PipelinedDataPreloaderTest
requests.add(request);
return response;
}
-
- public void normalizeProtocol(HttpRequest request) throws GadgetException {}
}
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java Wed Jun 2 09:04:51 2010
@@ -28,7 +28,7 @@ import org.apache.shindig.gadgets.http.H
import org.apache.shindig.gadgets.http.HttpResponse;
import com.google.common.collect.*;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import org.json.JSONArray;
import org.json.JSONObject;
import org.json.JSONException;
@@ -117,11 +117,11 @@ public class DefaultServiceFetcherTest e
public void testReadConfigWithValidEndpoints() throws Exception {
List<String> endPoint1Services = ImmutableList.of("do.something", "delete.someting");
JSONObject service1 = new JSONObject();
- service1.put("data", endPoint1Services);
+ service1.put("result", endPoint1Services);
List<String> endPoint2Services = ImmutableList.of("weather.get");
JSONObject service2 = new JSONObject();
- service2.put("data", endPoint2Services);
+ service2.put("result", endPoint2Services);
EasyMock.expect(mockFetcher.fetch(EasyMock.isA(HttpRequest.class))).andReturn(
new HttpResponse(service1.toString()));
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java Wed Jun 2 09:04:51 2010
@@ -226,11 +226,10 @@ public class ProxyRendererTest {
@Test
public void appendUserAgent() throws Exception {
String expectedUA = USER_AGENT + " Shindig";
- HttpRequest request = new HttpRequest(EXPECTED_PROXIED_HTML_HREF);
HttpResponse response = new HttpResponse(PROXIED_HTML_CONTENT);
pipeline.plainResponses.put(EXPECTED_PROXIED_HTML_HREF, response);
- String content = proxyRenderer.render(makeHrefGadget("none"));
+ proxyRenderer.render(makeHrefGadget("none"));
String actualUA = pipeline.lastHttpRequest.getHeader("User-Agent");
assertEquals(expectedUA, actualUA);
}
@@ -316,8 +315,6 @@ public class ProxyRendererTest {
public HttpRequest getLastHttpRequest() {
return lastHttpRequest;
}
-
- public void normalizeProtocol(HttpRequest request) throws GadgetException { }
}
private static class FakePipelineExecutor extends PipelineExecutor {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java Wed Jun 2 09:04:51 2010
@@ -22,13 +22,13 @@ import static org.apache.shindig.gadgets
import static org.apache.shindig.gadgets.render.RenderingGadgetRewriter.FEATURES_KEY;
import static org.apache.shindig.gadgets.render.RenderingGadgetRewriter.INSERT_BASE_ELEMENT_KEY;
import static org.apache.shindig.gadgets.render.RenderingGadgetRewriter.IS_GADGET_BEACON;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.eq;
-import static org.easymock.classextension.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.getCurrentArguments;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.reset;
-import static org.easymock.classextension.EasyMock.same;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.getCurrentArguments;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.same;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -686,7 +686,7 @@ public class RenderingGadgetRewriterTest
String prefix = "gadgets.config.init(";
int configIdx = content.indexOf(prefix);
assertTrue("gadgets.config.init not found in rewritten content", configIdx != -1);
- int endIdx = content.indexOf(")", configIdx + prefix.length());
+ int endIdx = content.indexOf(')', configIdx + prefix.length());
assertTrue("unexpected error, gadgets.config.init not closed", endIdx != -1);
String configJson = content.substring(configIdx + prefix.length(), endIdx);
JSONObject config = new JSONObject(configJson);
Propchange: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java Wed Jun 2 09:04:51 2010
@@ -21,8 +21,10 @@ package org.apache.shindig.gadgets.rende
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
+import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.caja.CajaCssParser;
import org.apache.shindig.gadgets.parse.caja.CajaCssSanitizer;
+import org.apache.shindig.gadgets.parse.caja.CajaHtmlParser;
import org.apache.shindig.gadgets.rewrite.RewriterTestBase;
import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature;
import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
@@ -88,7 +90,12 @@ public class SanitizingGadgetRewriterTes
gadgetNoCacheAndDebug.setSpec(new GadgetSpec(Uri.parse("www.example.org/gadget.xml"),
"<Module><ModulePrefs title=''/><Content type='x-html-sanitized'/></Module>"));
gadgetNoCacheAndDebug.setCurrentView(gadgetNoCacheAndDebug.getSpec().getViews().values().iterator().next());
-}
+ }
+
+ @Override
+ protected Class<? extends GadgetHtmlParser> getParserClass() {
+ return CajaHtmlParser.class;
+ }
private String rewrite(Gadget gadget, String content, Set<String> tags, Set<String> attributes)
throws Exception {
@@ -151,7 +158,7 @@ public class SanitizingGadgetRewriterTes
String sanitized =
"<html><head><link href=\"http://host.com/proxy?url=http%3A%2F%2Fwww.test.com%2Fdir%2F" +
"proxy%3Furl%3Dhttp%253A%252F%252Fwww.evil.com%252Fx.css%26gadget%3Dwww.example.org%252F" +
- "gadget.xml%26fp%3D45508%26rewriteMime%3Dtext%2Fcss&sanitize=1&rewriteMime=text%2Fcss\" " +
+ "gadget.xml%26fp%3D45508%26rewriteMime%3Dtext%2Fcss&sanitize=1&rewriteMime=text%2Fcss\" " +
"rel=\"stylesheet\"></head><body></body></html>";
String rewritten = rewrite(gadget, markup, set("link"), set("rel", "href"));
assertEquals(sanitized, rewritten);
@@ -167,8 +174,8 @@ public class SanitizingGadgetRewriterTes
String sanitized =
"<html><head><link href=\"http://host.com/proxy?url=http%3A%2F%2Fwww.test.com%2F"
+ "dir%2Fproxy%3Furl%3Dhttp%253A%252F%252Fwww.evil.com%252Fx.css%26gadget%3D"
- + "www.example.org%252Fgadget.xml%26fp%3D45508%26rewriteMime%3Dtext%2Fcss&"
- + "sanitize=1&rewriteMime=text%2Fcss\" rel=\"stylesheet\">"
+ + "www.example.org%252Fgadget.xml%26fp%3D45508%26rewriteMime%3Dtext%2Fcss&"
+ + "sanitize=1&rewriteMime=text%2Fcss\" rel=\"stylesheet\">"
+ "</head><body></body></html>";
String rewritten = rewrite(gadgetNoCacheAndDebug, markup, set("link"), set("rel", "href"));
assertEquals(sanitized, rewritten);
@@ -242,7 +249,7 @@ public class SanitizingGadgetRewriterTes
public void enforceImageSrcProxied() throws Exception {
String markup = "<img src='http://www.evil.com/x.js'>Evil happens</img>";
String sanitized = "<img src=\"http://host.com/proxy?url=http%3A%2F%2F" +
- "www.evil.com%2Fx.js&sanitize=1&rewriteMime=image%2F*\">Evil happens";
+ "www.evil.com%2Fx.js&sanitize=1&rewriteMime=image%2F*\">Evil happens";
assertEquals(sanitized, rewrite(gadget, markup, set("img"), set("src")));
}
@@ -250,7 +257,7 @@ public class SanitizingGadgetRewriterTes
public void enforceImageSrcProxiedNoCacheAndDebug() throws Exception {
String markup = "<img src='http://www.evil.com/x.js'>Evil happens</img>";
String sanitized = "<img src=\"http://host.com/proxy?url=http%3A%2F%2Fwww.evil.com" +
- "%2Fx.js&sanitize=1&rewriteMime=image%2F*\">Evil happens";
+ "%2Fx.js&sanitize=1&rewriteMime=image%2F*\">Evil happens";
assertEquals(sanitized, rewrite(gadgetNoCacheAndDebug, markup, set("img"), set("src")));
}
@@ -347,44 +354,6 @@ public class SanitizingGadgetRewriterTes
matcher.matches();
assertEquals("<p foo=\"bar\"></p>", matcher.group(1));
}
-
- @Test
- public void restrictHrefAndSrcAttributes() throws Exception {
- String markup =
- "<element " +
- "href=\"http://example.org/valid-href\" " +
- "src=\"http://example.org/valid-src\"/> " +
- "<element " +
- "href=\"https://example.org/valid-href\" " +
- "src=\"https://example.org/valid-src\"/> " +
- "<element " +
- "href=\"http-evil://example.org/valid-href\" " +
- "src=\"http-evil://example.org/valid-src\"/> " +
- "<element " +
- "href=\"javascript:evil()\" " +
- "src=\"javascript:evil()\" /> " +
- "<element " +
- "href=\"//example.org/valid-href\" " +
- "src=\"//example.org/valid-src\"/>";
-
- // TODO: This test is only valid when using a parser that converts empty tags to
- // balanced tags. The default (Neko) parser does this, with special case logic for handling
- // empty tags like br or link.
- String sanitized =
- "<element " +
- "href=\"http://example.org/valid-href\" " +
- "src=\"http://example.org/valid-src\"></element> " +
- "<element " +
- "href=\"https://example.org/valid-href\" " +
- "src=\"https://example.org/valid-src\"></element> " +
- "<element></element> " +
- "<element></element> " +
- "<element " +
- "href=\"//example.org/valid-href\" " +
- "src=\"//example.org/valid-src\"></element>";
-
- assertEquals(sanitized, rewrite(gadget, markup, set("element"), set("href", "src")));
- }
@Test
public void allCommentsStripped() throws Exception {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java Wed Jun 2 09:04:51 2010
@@ -18,11 +18,11 @@
*/
package org.apache.shindig.gadgets.render;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.capture;
-import static org.easymock.classextension.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriterTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriterTest.java Wed Jun 2 09:04:51 2010
@@ -26,7 +26,9 @@ import com.google.common.collect.Sets;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
+import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.caja.CajaCssParser;
+import org.apache.shindig.gadgets.parse.caja.CajaHtmlParser;
import org.apache.shindig.gadgets.parse.caja.old.CajaCssSanitizer;
import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature;
import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
@@ -88,7 +90,12 @@ public class SanitizingGadgetRewriterTes
gadgetNoCacheAndDebug.setSpec(new GadgetSpec(Uri.parse("www.example.org/gadget.xml"),
"<Module><ModulePrefs title=''/><Content type='x-html-sanitized'/></Module>"));
gadgetNoCacheAndDebug.setCurrentView(gadgetNoCacheAndDebug.getSpec().getViews().values().iterator().next());
-}
+ }
+
+ @Override
+ protected Class<? extends GadgetHtmlParser> getParserClass() {
+ return CajaHtmlParser.class;
+ }
private String rewrite(Gadget gadget, String content, Set<String> tags, Set<String> attributes)
throws Exception {
@@ -149,8 +156,8 @@ public class SanitizingGadgetRewriterTes
+ "fp=45508rewriteMime=text/css\"/>";
String sanitized =
"<html><head><link href=\"http://www.test.com/dir/proxy?"
- + "url=http%3A%2F%2Fwww.evil.com%2Fx.css&gadget=www.example.org%2Fgadget.xml&"
- + "fp=45508&sanitize=1&rewriteMime=text/css\" rel=\"stylesheet\"></head><body></body></html>";
+ + "url=http%3A%2F%2Fwww.evil.com%2Fx.css&gadget=www.example.org%2Fgadget.xml&"
+ + "fp=45508&sanitize=1&rewriteMime=text/css\" rel=\"stylesheet\"></head><body></body></html>";
String rewritten = rewrite(gadget, markup, set("link"), set("rel", "href"));
assertEquals(sanitized, rewritten);
}
@@ -164,8 +171,9 @@ public class SanitizingGadgetRewriterTes
+ "fp=45508rewriteMime=text/css\"/>";
String sanitized =
"<html><head><link href=\"http://www.test.com/dir/proxy?"
- + "url=http%3A%2F%2Fwww.evil.com%2Fx.css&gadget=www.example.org%2Fgadget.xml&"
- + "fp=45508&debug=1&nocache=1&sanitize=1&rewriteMime=text/css\" rel=\"stylesheet\"></head><body></body></html>";
+ + "url=http%3A%2F%2Fwww.evil.com%2Fx.css&gadget=www.example.org%2Fgadget.xml&"
+ + "fp=45508&debug=1&nocache=1&sanitize=1&rewriteMime=text/css\" "
+ + "rel=\"stylesheet\"></head><body></body></html>";
String rewritten = rewrite(gadgetNoCacheAndDebug, markup, set("link"), set("rel", "href"));
assertEquals(sanitized, rewritten);
}
@@ -198,7 +206,7 @@ public class SanitizingGadgetRewriterTes
"<html><head><style>"
+ "@import url('http://www.test.com/dir/proxy?url=www.example.org%2F"
+ "www.evil.com%2Fx.js&gadget=www.example.org%2Fgadget.xml&"
- + "fp=45508&sanitize=1&rewriteMime=text%2Fcss');"
+ + "fp=45508&sanitize=1&rewriteMime=text%2fcss');"
+ "</style></head><body></body></html>";
String rewritten = rewrite(gadget, markup, set("style"), set());
assertEquals(sanitized, rewritten);
@@ -214,7 +222,7 @@ public class SanitizingGadgetRewriterTes
"<html><head><style>"
+ "@import url('http://www.test.com/dir/proxy?url=www.example.org%2F"
+ "www.evil.com%2Fx.js&gadget=www.example.org%2Fgadget.xml&"
- + "fp=45508&debug=1&nocache=1&sanitize=1&rewriteMime=text%2Fcss');"
+ + "fp=45508&debug=1&nocache=1&sanitize=1&rewriteMime=text%2fcss');"
+ "</style></head><body></body></html>";
String rewritten = rewrite(gadgetNoCacheAndDebug, markup, set("style"), set());
assertEquals(sanitized, rewritten);
@@ -240,14 +248,17 @@ public class SanitizingGadgetRewriterTes
@Test
public void enforceImageSrcProxied() throws Exception {
String markup = "<img src='http://www.evil.com/x.js'>Evil happens</img>";
- String sanitized = "<img src=\"http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.evil.com%2Fx.js&gadget=www.example.org%2Fgadget.xml&fp=45508&sanitize=1&rewriteMime=image/*\">Evil happens";
+ String sanitized = "<img src=\"http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.evil.com%2Fx.js&"
+ + "gadget=www.example.org%2Fgadget.xml&fp=45508&sanitize=1&rewriteMime=image/*\">Evil happens";
assertEquals(sanitized, rewrite(gadget, markup, set("img"), set("src")));
}
@Test
public void enforceImageSrcProxiedNoCacheAndDebug() throws Exception {
String markup = "<img src='http://www.evil.com/x.js'>Evil happens</img>";
- String sanitized = "<img src=\"http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.evil.com%2Fx.js&gadget=www.example.org%2Fgadget.xml&fp=45508&debug=1&nocache=1&sanitize=1&rewriteMime=image/*\">Evil happens";
+ String sanitized = "<img src=\"http://www.test.com/dir/proxy?url=http%3A%2F%2Fwww.evil.com%2Fx.js&"
+ + "gadget=www.example.org%2Fgadget.xml&fp=45508&debug=1&nocache=1&sanitize=1&"
+ + "rewriteMime=image/*\">Evil happens";
assertEquals(sanitized, rewrite(gadgetNoCacheAndDebug, markup, set("img"), set("src")));
}
@@ -347,44 +358,6 @@ public class SanitizingGadgetRewriterTes
matcher.matches();
assertEquals("<p foo=\"bar\"></p>", matcher.group(1));
}
-
- @Test
- public void restrictHrefAndSrcAttributes() throws Exception {
- String markup =
- "<element " +
- "href=\"http://example.org/valid-href\" " +
- "src=\"http://example.org/valid-src\"/> " +
- "<element " +
- "href=\"https://example.org/valid-href\" " +
- "src=\"https://example.org/valid-src\"/> " +
- "<element " +
- "href=\"http-evil://example.org/valid-href\" " +
- "src=\"http-evil://example.org/valid-src\"/> " +
- "<element " +
- "href=\"javascript:evil()\" " +
- "src=\"javascript:evil()\" /> " +
- "<element " +
- "href=\"//example.org/valid-href\" " +
- "src=\"//example.org/valid-src\"/>";
-
- // TODO: This test is only valid when using a parser that converts empty tags to
- // balanced tags. The default (Neko) parser does this, with special case logic for handling
- // empty tags like br or link.
- String sanitized =
- "<element " +
- "href=\"http://example.org/valid-href\" " +
- "src=\"http://example.org/valid-src\"></element> " +
- "<element " +
- "href=\"https://example.org/valid-href\" " +
- "src=\"https://example.org/valid-src\"></element> " +
- "<element></element> " +
- "<element></element> " +
- "<element " +
- "href=\"//example.org/valid-href\" " +
- "src=\"//example.org/valid-src\"></element>";
-
- assertEquals(sanitized, rewrite(gadget, markup, set("element"), set("href", "src")));
- }
@Test
public void allCommentsStripped() throws Exception {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriterTest.java Wed Jun 2 09:04:51 2010
@@ -31,8 +31,7 @@ import org.apache.shindig.gadgets.parse.
import org.apache.shindig.gadgets.render.old.DefaultSanitizingProxyingLinkRewriterFactory;
import org.apache.shindig.gadgets.render.old.SanitizingRequestRewriter;
import org.apache.shindig.gadgets.rewrite.ContentRewriterFeature;
-import org.apache.shindig.gadgets.rewrite.MutableContent;
-import org.apache.shindig.gadgets.rewrite.RequestRewriter;
+import org.apache.shindig.gadgets.rewrite.ResponseRewriter;
import org.apache.shindig.gadgets.rewrite.old.BaseRewriterTestCase;
import org.junit.Test;
@@ -44,17 +43,18 @@ public class SanitizingRequestRewriterTe
private String rewrite(HttpRequest request, HttpResponse response) throws Exception {
request.setSanitizationRequested(true);
- RequestRewriter rewriter = createRewriter(Collections.<String>emptySet(),
+ ResponseRewriter rewriter = createRewriter(Collections.<String>emptySet(),
Collections.<String>emptySet());
- MutableContent mc = new MutableContent(parser, response);
- if (!rewriter.rewrite(request, response, mc)) {
+ HttpResponseBuilder hrb = new HttpResponseBuilder(parser, response);
+ rewriter.rewrite(request, hrb);
+ if (hrb.getNumChanges() == 0) {
return null;
}
- return mc.getContent();
+ return hrb.getContent();
}
- private RequestRewriter createRewriter(Set<String> tags, Set<String> attributes) {
+ private ResponseRewriter createRewriter(Set<String> tags, Set<String> attributes) {
ContentRewriterFeature.Factory rewriterFeatureFactory =
new ContentRewriterFeature.Factory(null,
new ContentRewriterFeature.DefaultConfig(".*", "", "HTTP", "embed,img,script,link,style", "false", "false"));
@@ -82,7 +82,7 @@ public class SanitizingRequestRewriterTe
String sanitized =
"@import url('http://www.test.com/dir/proxy?"
+ "url=http%3A%2F%2Fwww.evil.com%2Fmore.css"
- + "&fp=45508&sanitize=1&rewriteMime=text%2Fcss');\n"
+ + "&fp=45508&sanitize=1&rewriteMime=text%2fcss');\n"
+ "A {\n"
+ " font: BOLD\n"
+ '}';
@@ -102,7 +102,7 @@ public class SanitizingRequestRewriterTe
String sanitized =
"@import url('http://www.test.com/dir/proxy?"
+ "url=http%3A%2F%2Fwww.evil.com%2Fmore.css"
- + "&fp=45508&nocache=1&sanitize=1&rewriteMime=text%2Fcss');\n"
+ + "&fp=45508&nocache=1&sanitize=1&rewriteMime=text%2fcss');\n"
+ "A {\n"
+ " font: BOLD\n"
+ '}';
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java Wed Jun 2 09:04:51 2010
@@ -38,16 +38,16 @@ import com.google.common.collect.Lists;
public class DefaultContentRewriterRegistryTest extends BaseRewriterTestCase {
private static final Uri SPEC_URL = Uri.parse("http://example.org/gadget.xml");
private List<CaptureRewriter> rewriters;
- private List<RequestRewriter> contentRewriters;
- private RequestRewriterRegistry registry;
+ private List<ResponseRewriter> contentRewriters;
+ private ResponseRewriterRegistry registry;
@Before
@Override
public void setUp() throws Exception {
super.setUp();
rewriters = Lists.newArrayList(new CaptureRewriter(), new CaptureRewriter());
- contentRewriters = Lists.<RequestRewriter>newArrayList(rewriters);
- registry = new DefaultRequestRewriterRegistry(contentRewriters, parser);
+ contentRewriters = Lists.<ResponseRewriter>newArrayList(rewriters);
+ registry = new DefaultResponseRewriterRegistry(contentRewriters, parser);
}
@Test
@@ -72,18 +72,18 @@ public class DefaultContentRewriterRegis
*/
@Test
public void testNoDecodeHttpResponseForUnRewriteableMimeTypes() throws Exception {
- List<RequestRewriter> rewriters = Lists.newArrayList();
+ List<ResponseRewriter> rewriters = Lists.newArrayList();
rewriters.add(injector.getInstance(HTMLContentRewriter.class));
rewriters.add(injector.getInstance(CssRequestRewriter.class));
- registry = new DefaultRequestRewriterRegistry(rewriters, parser);
+ registry = new DefaultResponseRewriterRegistry(rewriters, parser);
HttpRequest req = control.createMock(HttpRequest.class);
EasyMock.expect(req.getRewriteMimeType()).andStubReturn("unknown");
control.replay();
- HttpResponse rewritten = registry.rewriteHttpResponse(req, fakeResponse);
+ HttpResponse rewritten = registry.rewriteHttpResponse(req, fakeResponse.create());
// Assert that response is untouched
- assertSame(rewritten, fakeResponse);
+ assertSame(rewritten, fakeResponse.create());
control.verify();
}
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java Wed Jun 2 09:04:51 2010
@@ -18,11 +18,11 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.expectLastCall;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import com.google.common.collect.Lists;
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTestBase.java Wed Jun 2 09:04:51 2010
@@ -19,8 +19,8 @@
package org.apache.shindig.gadgets.rewrite;
import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.replay;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.replay;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java Wed Jun 2 09:04:51 2010
@@ -44,8 +44,8 @@ import static org.easymock.EasyMock.expe
import static org.easymock.EasyMock.reportMatcher;
import static org.easymock.EasyMock.same;
import org.easymock.IArgumentMatcher;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.json.JSONException;
import org.json.JSONObject;
import static org.junit.Assert.assertEquals;
@@ -120,7 +120,7 @@ public class PipelineDataGadgetRewriterT
// Dummy return results (the "real" return would have two values)
Callable<PreloadedData> callable = createPreloadTask(
- "key", "{data: {foo: 'bar'}}");
+ "key", "{result: {foo: 'bar'}}");
// One batch with 1 each HTTP and Social preload
expect(preloader.createPreloadTasks(same(gadget.getContext()),
Propchange: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriterTest.java
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java Wed Jun 2 09:04:51 2010
@@ -17,11 +17,11 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import static org.easymock.classextension.EasyMock.capture;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
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=950443&r1=950442&r2=950443&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 2 09:04:51 2010
@@ -29,15 +29,18 @@ import org.apache.shindig.gadgets.http.H
import org.apache.shindig.gadgets.http.RequestPipeline;
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.ParseModule;
+import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import com.google.inject.Module;
+import com.google.inject.util.Modules;
import org.apache.commons.lang.StringUtils;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
import org.junit.Before;
import java.util.Set;
@@ -62,7 +65,7 @@ public abstract class RewriterTestBase {
protected ContentRewriterFeature.Factory rewriterFeatureFactory;
protected GadgetHtmlParser parser;
protected Injector injector;
- protected HttpResponse fakeResponse;
+ protected HttpResponseBuilder fakeResponse;
protected IMocksControl control;
@Before
@@ -72,12 +75,25 @@ public abstract class RewriterTestBase {
TAGS, "false", "false"));
defaultRewriterFeature = rewriterFeatureFactory.getDefault();
tags = defaultRewriterFeature.getIncludedTags();
- injector = Guice.createInjector(new ParseModule(), new PropertiesModule(), new TestModule());
+ injector = Guice.createInjector(getParseModule(), new PropertiesModule(), new TestModule());
parser = injector.getInstance(GadgetHtmlParser.class);
fakeResponse = new HttpResponseBuilder().setHeader("Content-Type", "unknown")
- .setResponse(new byte[]{ (byte)0xFE, (byte)0xFF}).create();
+ .setResponse(new byte[]{ (byte)0xFE, (byte)0xFF});
control = EasyMock.createControl();
}
+
+ private Module getParseModule() {
+ return Modules.override(new ParseModule()).with(new AbstractModule() {
+ @Override
+ protected void configure() {
+ bind(GadgetHtmlParser.class).to(getParserClass());
+ }
+ });
+ }
+
+ protected Class<? extends GadgetHtmlParser> getParserClass() {
+ return NekoSimplifiedHtmlParser.class;
+ }
public static GadgetSpec createSpecWithRewrite(String include, String exclude, String expires,
Set<String> tags) throws GadgetException {
@@ -200,7 +216,6 @@ public abstract class RewriterTestBase {
protected void configure() {
bind(RequestPipeline.class).toInstance(new RequestPipeline() {
public HttpResponse execute(HttpRequest request) { return null; }
- public void normalizeProtocol(HttpRequest request) throws GadgetException {}
});
bind(GadgetSpecFactory.class).toInstance(new GadgetSpecFactory() {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java Wed Jun 2 09:04:51 2010
@@ -18,12 +18,12 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.eq;
-import static org.easymock.classextension.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.isA;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -34,7 +34,7 @@ import com.google.inject.internal.Immuta
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.rewrite.CssRequestRewriter.UriMaker;
+import org.apache.shindig.gadgets.rewrite.CssResponseRewriter.UriMaker;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor.VisitStatus;
import org.apache.shindig.gadgets.uri.PassthruManager;
import org.apache.shindig.gadgets.uri.ProxyUriManager;
@@ -99,7 +99,7 @@ public class StyleTagExtractorVisitorTes
@Test
public void revisitNothingExtracted() throws Exception {
Gadget gadget = gadget();
- CssRequestRewriter cssRewriter = createMock(CssRequestRewriter.class);
+ CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
replay(cssRewriter);
// Tag name isn't inspected since visit() filters this.
@@ -115,7 +115,7 @@ public class StyleTagExtractorVisitorTes
public void revisitExtractSpecRelative() throws Exception {
Uri base = GADGET_URI;
Gadget gadget = gadget();
- CssRequestRewriter cssRewriter = createMock(CssRequestRewriter.class);
+ CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
Element elem1 = elem("elem1");
Element elem2 = elem("elem2");
String urlStr1 = "http://foo.com/1.css";
@@ -153,7 +153,7 @@ public class StyleTagExtractorVisitorTes
public void revisitExtractViewHrefRelative() throws Exception {
Uri base = Uri.parse("http://view.com/viewbase.xml");
Gadget gadget = gadget(true, true, base);
- CssRequestRewriter cssRewriter = createMock(CssRequestRewriter.class);
+ CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
Element elem1 = elem("elem1");
Element elem2 = elem("elem2");
String urlStr1 = "http://foo.com/1.css";
@@ -191,7 +191,7 @@ public class StyleTagExtractorVisitorTes
public void revisitExtractSpecRelativeDisabled() throws Exception {
Uri base = GADGET_URI;
Gadget gadget = gadget();
- CssRequestRewriter cssRewriter = createMock(CssRequestRewriter.class);
+ CssResponseRewriter cssRewriter = createMock(CssResponseRewriter.class);
Element elem1 = elem("elem1");
Element elem2 = elem("elem2");
List<String> extractedUrls1 = ImmutableList.of();
@@ -222,7 +222,7 @@ public class StyleTagExtractorVisitorTes
}
private boolean getRevisitStatus(
- Gadget gadget, boolean shouldRewriteUrl, CssRequestRewriter cssRewriter, List<Node> nodes)
+ Gadget gadget, boolean shouldRewriteUrl, CssResponseRewriter cssRewriter, List<Node> nodes)
throws Exception {
return new StyleTagExtractorVisitor(
config(true, true, shouldRewriteUrl), cssRewriter, proxyUriManager)
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java Wed Jun 2 09:04:51 2010
@@ -20,6 +20,7 @@ package org.apache.shindig.gadgets.rewri
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.Sanselan;
import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import org.junit.Ignore;
import org.junit.Test;
@@ -70,7 +71,9 @@ public class BMPOptimizerTest extends Ba
protected HttpResponse rewrite(HttpResponse original)
throws IOException, ImageReadException {
- return new BMPOptimizer(new OptimizerConfig(), original).rewrite(
+ HttpResponseBuilder builder = new HttpResponseBuilder(original);
+ new BMPOptimizer(new OptimizerConfig(), builder).rewrite(
Sanselan.getBufferedImage(original.getResponse()));
+ return builder.create();
}
}
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizerTest.java?rev=950443&r1=950442&r2=950443&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizerTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/GIFOptimizerTest.java Wed Jun 2 09:04:51 2010
@@ -20,6 +20,7 @@ package org.apache.shindig.gadgets.rewri
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.Sanselan;
import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import org.junit.Test;
import java.io.IOException;
@@ -67,7 +68,9 @@ public class GIFOptimizerTest extends Ba
protected HttpResponse rewrite(HttpResponse original)
throws IOException, ImageReadException {
- return new GIFOptimizer(new OptimizerConfig(), original).rewrite(
+ HttpResponseBuilder builder = new HttpResponseBuilder(original);
+ new GIFOptimizer(new OptimizerConfig(), builder).rewrite(
Sanselan.getBufferedImage(original.getResponse()));
+ return builder.create();
}
}