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 2009/12/16 23:07:46 UTC
svn commit: r891450 [3/4] - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/expressions/
common/src/test/java/org/apache/shindig/auth/
common/src/test/java/org/apache/shindig/common/
common/src/test/java/org/apache/shindig/com...
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java Wed Dec 16 22:07:43 2009
@@ -28,6 +28,7 @@
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import com.google.common.collect.Maps;
+import org.junit.Test;
import java.util.Arrays;
import java.util.List;
@@ -48,6 +49,7 @@
}
};
+ @Test
public void testValidateUrlNoPath() throws Exception {
Uri url = proxy.validateUrl("http://www.example.com");
assertEquals("http", url.getScheme());
@@ -57,6 +59,7 @@
assertNull(url.getFragment());
}
+ @Test
public void testValidateUrlHttps() throws Exception {
Uri url = proxy.validateUrl("https://www.example.com");
assertEquals("https", url.getScheme());
@@ -66,6 +69,7 @@
assertNull(url.getFragment());
}
+ @Test
public void testValidateUrlWithPath() throws Exception {
Uri url = proxy.validateUrl("http://www.example.com/foo");
assertEquals("http", url.getScheme());
@@ -75,6 +79,7 @@
assertNull(url.getFragment());
}
+ @Test
public void testValidateUrlWithPort() throws Exception {
Uri url = proxy.validateUrl("http://www.example.com:8080/foo");
assertEquals("http", url.getScheme());
@@ -84,6 +89,7 @@
assertNull(url.getFragment());
}
+ @Test
public void testValidateUrlWithEncodedPath() throws Exception {
Uri url = proxy.validateUrl("http://www.example.com/foo%20bar");
assertEquals("http", url.getScheme());
@@ -93,6 +99,7 @@
assertNull(url.getFragment());
}
+ @Test
public void testValidateUrlWithEncodedQuery() throws Exception {
Uri url = proxy.validateUrl("http://www.example.com/foo?q=with%20space");
assertEquals("http", url.getScheme());
@@ -103,6 +110,7 @@
assertNull(url.getFragment());
}
+ @Test
public void testValidateUrlWithNoPathAndEncodedQuery() throws Exception {
Uri url = proxy.validateUrl("http://www.example.com?q=with%20space");
assertEquals("http", url.getScheme());
@@ -112,31 +120,22 @@
assertNull(url.getFragment());
}
- public void testValidateUrlNullInput() {
- try {
- proxy.validateUrl(null);
- fail("Should have thrown");
- } catch (GadgetException e) {
- // good
- }
+ @Test(expected = GadgetException.class)
+ public void testValidateUrlNullInput() throws Exception {
+ proxy.validateUrl(null);
}
- public void testValidateUrlBadInput() {
- try {
+ @Test(expected=GadgetException.class)
+ public void testValidateUrlBadInput() throws Exception {
proxy.validateUrl("%$#%#$%#$%");
- } catch (GadgetException e) {
- // good
- }
}
- public void testValidateUrlBadProtocol() {
- try {
+ @Test(expected=GadgetException.class)
+ public void testValidateUrlBadProtocol() throws Exception {
proxy.validateUrl("gopher://foo");
- } catch (GadgetException e) {
- // good
- }
}
+ @Test
public void testSetResponseHeaders() throws Exception {
HttpResponse results = new HttpResponseBuilder().create();
replay();
@@ -149,6 +148,7 @@
assertEquals("attachment;filename=p.txt", recorder.getHeader("Content-Disposition"));
}
+ @Test
public void testSetResponseHeadersForFlash() throws Exception {
HttpResponse results = new HttpResponseBuilder()
.setHeader("Content-Type", "application/x-shockwave-flash")
@@ -164,15 +164,17 @@
assertNull(recorder.getHeader("Content-Disposition"));
}
+ @Test
public void testSetContentTypeHeader() throws Exception {
HttpResponse results = new HttpResponseBuilder()
.create();
replay();
proxy.setResponseHeaders(request, recorder, results);
- assertEquals(recorder.getHeader("Content-Type"), "application/octet-stream");
+ assertEquals("application/octet-stream", recorder.getHeader("Content-Type"));
}
+ @Test
public void testSetResponseHeadersNoCache() throws Exception {
Map<String, List<String>> headers = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
headers.put("Pragma", Arrays.asList("no-cache"));
@@ -190,6 +192,7 @@
assertEquals("attachment;filename=p.txt", recorder.getHeader("Content-Disposition"));
}
+ @Test
public void testSetResponseHeadersForceParam() throws Exception {
HttpResponse results = new HttpResponseBuilder().create();
expect(request.getParameter(ProxyBase.REFRESH_PARAM)).andReturn("30").anyTimes();
@@ -201,6 +204,7 @@
assertEquals("attachment;filename=p.txt", recorder.getHeader("Content-Disposition"));
}
+ @Test
public void testSetResponseHeadersForceParamInvalid() throws Exception {
HttpResponse results = new HttpResponseBuilder().create();
expect(request.getParameter(ProxyBase.REFRESH_PARAM)).andReturn("foo").anyTimes();
@@ -214,6 +218,7 @@
}
+ @Test
public void testGetParameter() {
expect(request.getParameter("foo")).andReturn("bar");
replay();
@@ -221,6 +226,7 @@
assertEquals("bar", proxy.getParameter(request, "foo", "not foo"));
}
+ @Test
public void testGetParameterWithNullValue() {
expect(request.getParameter("foo")).andReturn(null);
replay();
@@ -228,6 +234,7 @@
assertEquals("not foo", proxy.getParameter(request, "foo", "not foo"));
}
+ @Test
public void testGetContainerWithContainer() {
expect(request.getParameter(ProxyBase.CONTAINER_PARAM)).andReturn("bar");
replay();
@@ -235,6 +242,7 @@
assertEquals("bar", proxy.getContainer(request));
}
+ @Test
public void testGetContainerWithSynd() {
expect(request.getParameter(ProxyBase.CONTAINER_PARAM)).andReturn(null);
expect(request.getParameter(ProxyBase.SYND_PARAM)).andReturn("syndtainer");
@@ -243,6 +251,7 @@
assertEquals("syndtainer", proxy.getContainer(request));
}
+ @Test
public void testGetContainerNoParam() {
expect(request.getParameter(ProxyBase.CONTAINER_PARAM)).andReturn(null);
expect(request.getParameter(ProxyBase.SYND_PARAM)).andReturn(null);
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java Wed Dec 16 22:07:43 2009
@@ -30,6 +30,7 @@
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import org.easymock.Capture;
+import org.junit.Test;
import java.util.Arrays;
import java.util.List;
@@ -66,6 +67,7 @@
expect(request.getHeader("Host")).andReturn(host);
}
+ @Test
public void testIfModifiedSinceAlwaysReturnsEarly() throws Exception {
expect(request.getHeader("If-Modified-Since"))
.andReturn("Yes, this is an invalid header.");
@@ -78,6 +80,7 @@
assertFalse(rewriter.responseWasRewritten());
}
+ @Test
public void testLockedDomainEmbed() throws Exception {
setupProxyRequestMock("www.example.com", URL_ONE);
expect(lockedDomainService.isSafeForOpenProxy("www.example.com")).andReturn(true);
@@ -91,6 +94,7 @@
assertTrue(rewriter.responseWasRewritten());
}
+ @Test
public void testNoUrl() throws Exception {
setupProxyRequestMock("www.example.com", null);
expect(lockedDomainService.isSafeForOpenProxy("www.example.com")).andReturn(true);
@@ -104,8 +108,7 @@
}
}
-
-
+ @Test
public void testHttpRequestFillsParentAndContainer() throws Exception {
setupProxyRequestMock("www.example.com", URL_ONE);
expect(lockedDomainService.isSafeForOpenProxy("www.example.com")).andReturn(true);
@@ -127,6 +130,7 @@
assertTrue(rewriter.responseWasRewritten());
}
+ @Test
public void testLockedDomainFailedEmbed() throws Exception {
setupFailedProxyRequestMock("www.example.com", URL_ONE);
expect(lockedDomainService.isSafeForOpenProxy("www.example.com")).andReturn(false);
@@ -139,6 +143,7 @@
}
}
+ @Test
public void testHeadersPreserved() throws Exception {
// Some headers may be blacklisted. These are OK.
String url = "http://example.org/file.evil";
@@ -162,6 +167,7 @@
assertTrue(rewriter.responseWasRewritten());
}
+ @Test
public void testGetFallback() throws Exception {
String url = "http://example.org/file.evil";
String domain = "example.org";
@@ -185,6 +191,7 @@
verify();
}
+ @Test
public void testNoCache() throws Exception {
String url = "http://example.org/file.evil";
String domain = "example.org";
@@ -204,6 +211,7 @@
verify();
}
+ @Test
public void testXForwardedFor() throws Exception {
String url = "http://example.org/";
String domain = "example.org";
@@ -253,18 +261,22 @@
reset();
}
+ @Test
public void testMimeMatchPass() throws Exception {
expectMime("text/css", "text/css", "text/css");
}
+ @Test
public void testMimeMatchPassWithAdditionalAttributes() throws Exception {
expectMime("text/css", "text/css; charset=UTF-8", "text/css");
}
+ @Test
public void testMimeMatchOverrideNonMatch() throws Exception {
expectMime("text/css", "image/png; charset=UTF-8", "text/css");
}
+ @Test
public void testMimeMatchVarySupport() throws Exception {
expectMime("image/*", "image/gif", "image/gif");
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java Wed Dec 16 22:07:43 2009
@@ -21,6 +21,7 @@
import static org.easymock.EasyMock.expect;
import org.apache.shindig.common.EasyMockTestCase;
+import org.junit.Test;
import javax.servlet.http.HttpServletRequest;
@@ -43,6 +44,7 @@
return new ProxyServletRequest(request);
}
+ @Test
public void testOldRequestSyntax() throws Exception {
ProxyServletRequest req = setupMockRequest(
"http://localhost/gadgets/proxy?url=" + URL
@@ -52,6 +54,7 @@
verify();
}
+ @Test
public void testChainedSyntaxWithNoParameters() throws Exception {
ProxyServletRequest req = setupMockRequest(
"http://localhost/gadgets/proxy//http://remote/proxy?query=foo"
@@ -62,6 +65,7 @@
verify();
}
+ @Test
public void testChainedSyntaxWithOneParameter() throws Exception {
ProxyServletRequest req = setupMockRequest(
"http://localhost/gadgets/proxy/nocache=1/http://remote/proxy?nocache=0"
@@ -72,6 +76,7 @@
verify();
}
+ @Test
public void testChainedSyntaxWithParametersDontDecode() throws Exception {
ProxyServletRequest req = setupMockRequest(
"http://u:p@127.0.0.1:80/g/proxy/a=b%20+c&url=u/http://r/p%3Fa+e"
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java Wed Dec 16 22:07:43 2009
@@ -25,6 +25,8 @@
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
+import org.junit.Before;
+import org.junit.Test;
import javax.servlet.http.HttpServletResponse;
@@ -49,9 +51,8 @@
private final HttpRequest internalRequest = new HttpRequest(REQUEST_URL);
private final HttpResponse internalResponse = new HttpResponse(RESPONSE_BODY);
- @Override
+ @Before
public void setUp() throws Exception {
- super.setUp();
servlet.setProxyHandler(proxyHandler);
expect(request.getParameter(ProxyBase.URL_PARAM))
.andReturn(REQUEST_URL.toString()).anyTimes();
@@ -73,6 +74,7 @@
assertEquals(expectedBody, recorder.getResponseAsString());
}
+ @Test
public void testDoGetNormal() throws Exception {
setupBasic();
expect(pipeline.execute(internalRequest)).andReturn(internalResponse);
@@ -83,6 +85,7 @@
assertResponseOk(HttpResponse.SC_OK, RESPONSE_BODY);
}
+ @Test
public void testDoGetHttpError() throws Exception {
setupBasic();
expect(pipeline.execute(internalRequest)).andReturn(HttpResponse.notFound());
@@ -93,6 +96,7 @@
assertResponseOk(HttpResponse.SC_NOT_FOUND, "");
}
+ @Test
public void testDoGetException() throws Exception {
setupBasic();
expect(pipeline.execute(internalRequest)).andThrow(
@@ -105,6 +109,7 @@
assertContains(ERROR_MESSAGE, recorder.getResponseAsString());
}
+ @Test
public void testDoGetAlternateSyntax() throws Exception {
setupAltSyntax();
expect(request.getRequestURI()).andReturn(ALT_SYNTAX_URL);
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/RpcServletTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/RpcServletTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/RpcServletTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/RpcServletTest.java Wed Dec 16 22:07:43 2009
@@ -30,26 +30,27 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import junit.framework.TestCase;
-
import org.json.JSONException;
import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests for RpcServlet.
*/
-public class RpcServletTest extends TestCase {
+public class RpcServletTest extends Assert {
private RpcServlet servlet;
private JsonRpcHandler handler;
- @Override
+ @Before
public void setUp() throws Exception {
- super.setUp();
servlet = new RpcServlet();
handler = createMock(JsonRpcHandler.class);
servlet.setJsonRpcHandler(handler);
}
+ @Test
public void testDoGetNormal() throws Exception {
HttpServletRequest request = createGetRequest("{\"gadgets\":[]}",
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz._");
@@ -64,6 +65,7 @@
verify(response);
}
+ @Test
public void testDoGetWithHandlerRpcException() throws Exception {
HttpServletRequest request = createGetRequest("{\"gadgets\":[]}", "function");
HttpServletResponse response = createHttpResponse("rpcExceptionMessage",
@@ -75,6 +77,7 @@
verify(response);
}
+ @Test
public void testDoGetWithHandlerJsonException() throws Exception {
HttpServletRequest request = createGetRequest("{\"gadgets\":[]}", "function");
HttpServletResponse response = createHttpResponse("Malformed JSON request.",
@@ -85,6 +88,7 @@
verify(response);
}
+ @Test
public void testDoGetWithMissingReqParam() throws Exception {
HttpServletRequest request = createGetRequest(null, "function");
HttpServletResponse response = createHttpResponse(null, HttpServletResponse.SC_BAD_REQUEST);
@@ -92,6 +96,7 @@
verify(response);
}
+ @Test
public void testDoGetWithMissingCallbackParam() throws Exception {
HttpServletRequest request = createGetRequest("{\"gadgets\":[]}", null);
HttpServletResponse response = createHttpResponse(null, HttpServletResponse.SC_BAD_REQUEST);
@@ -99,6 +104,7 @@
verify(response);
}
+ @Test
public void testDoGetWithBadCallbackParamValue() throws Exception {
HttpServletRequest request = createGetRequest("{\"gadgets\":[]}", "/'!=");
HttpServletResponse response = createHttpResponse(null, HttpServletResponse.SC_BAD_REQUEST);
@@ -141,5 +147,4 @@
replay(result, writer);
return result;
}
-
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/FeatureTest.java Wed Dec 16 22:07:43 2009
@@ -21,12 +21,14 @@
import org.apache.shindig.common.xml.XmlUtil;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimap;
-public class FeatureTest extends TestCase {
+public class FeatureTest extends Assert {
+ @Test
public void testRequire() throws Exception {
String xml = "<Require feature=\"foo\"/>";
Feature feature = new Feature(XmlUtil.parse(xml));
@@ -34,6 +36,7 @@
assertTrue(feature.getRequired());
}
+ @Test
public void testOptional() throws Exception {
String xml = "<Optional feature=\"foo\"/>";
Feature feature = new Feature(XmlUtil.parse(xml));
@@ -41,6 +44,7 @@
assertFalse(feature.getRequired());
}
+ @Test
public void testParams() throws Exception {
String key = "bar";
String value = "Hello, World!";
@@ -53,6 +57,7 @@
assertEquals(ImmutableList.of(value), params.get(key));
}
+ @Test
public void testMultiParams() throws Exception {
String key = "bar";
String key2 = "bar2";
@@ -72,11 +77,11 @@
assertEquals(value, feature.getParam(key));
assertEquals(ImmutableList.of(value2, value), params.get(key2));
assertEquals(value2, feature.getParam(key2));
-
- assertEquals(ImmutableList.of(), params.get("foobar"));
+ assertTrue(params.get("foobar").isEmpty());
assertNull(feature.getParam("foobar"));
}
+ @Test
public void testDoesNotLikeUnnamedFeatures() throws Exception {
String xml = "<Require/>";
try {
@@ -87,6 +92,7 @@
}
}
+ @Test
public void testEnforceParamNames() throws Exception {
String xml = "<Require feature=\"foo\"><Param>Test</Param></Require>";
try {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.java Wed Dec 16 22:07:43 2009
@@ -24,12 +24,13 @@
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.variables.Substitutions;
import org.apache.shindig.gadgets.variables.Substitutions.Type;
+import org.junit.Assert;
+import org.junit.Test;
-import junit.framework.TestCase;
-
-public class GadgetSpecTest extends TestCase {
+public class GadgetSpecTest extends Assert {
private static final Uri SPEC_URL = Uri.parse("http://example.org/g.xml");
+ @Test
public void testBasic() throws Exception {
String xml = "<Module>" +
"<ModulePrefs title=\"title\"/>" +
@@ -43,6 +44,8 @@
assertEquals("Hello!", spec.getView(GadgetSpec.DEFAULT_VIEW).getContent());
}
+
+ @Test
public void testAlternativeConstructor() throws Exception {
String xml = "<Module>" +
"<ModulePrefs title=\"title\"/>" +
@@ -58,6 +61,7 @@
assertEquals(HashUtil.checksum(xml.getBytes()), spec.getChecksum());
}
+ @Test
public void testMultipleContentSections() throws Exception {
String xml = "<Module>" +
"<ModulePrefs title=\"title\"/>" +
@@ -71,6 +75,7 @@
assertEquals("test", spec.getView("test").getContent());
}
+ @Test
public void testMissingModulePrefs() throws Exception {
String xml = "<Module>" +
"<Content type=\"html\"/>" +
@@ -83,6 +88,7 @@
}
}
+ @Test
public void testEnforceOneModulePrefs() throws Exception {
String xml = "<Module>" +
"<ModulePrefs title=\"hello\"/>" +
@@ -97,6 +103,7 @@
}
}
+ @Test
public void testSubstitutions() throws Exception {
Substitutions substituter = new Substitutions();
String title = "Hello, World!";
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/IconTest.java Wed Dec 16 22:07:43 2009
@@ -22,9 +22,11 @@
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.variables.Substitutions;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
-public class IconTest extends TestCase {
+public class IconTest extends Assert {
+ @Test
public void testBasicIcon() throws Exception {
String xml = "<Icon type=\"foo\" mode=\"base64\">helloWorld</Icon>";
Icon icon = new Icon(XmlUtil.parse(xml));
@@ -33,6 +35,7 @@
assertEquals("helloWorld", icon.getContent());
}
+ @Test
public void testInvalidMode() throws Exception {
String xml = "<Icon type=\"foo\" mode=\"broken\"/>";
try {
@@ -43,6 +46,7 @@
}
}
+ @Test
public void testSubstitutions() throws Exception {
String xml = "<Icon>http://__MSG_domain__/icon.png</Icon>";
Substitutions substituter = new Substitutions();
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java Wed Dec 16 22:07:43 2009
@@ -126,7 +126,7 @@
Multimap<String, Node> extra = prefs.getExtraElements();
assertTrue(extra.containsKey("NavigationItem"));
- assertEquals(extra.get("NavigationItem").iterator().next().getChildNodes().getLength(), 1);
+ assertEquals(1, extra.get("NavigationItem").iterator().next().getChildNodes().getLength());
}
@Test
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/UserPrefTest.java Wed Dec 16 22:07:43 2009
@@ -22,9 +22,11 @@
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.variables.Substitutions;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
-public class UserPrefTest extends TestCase {
+public class UserPrefTest extends Assert {
+ @Test
public void testBasic() throws Exception {
String xml = "<UserPref" +
" name=\"name\"" +
@@ -40,6 +42,7 @@
assertEquals(UserPref.DataType.HIDDEN, userPref.getDataType());
}
+ @Test
public void testEnum() throws Exception {
String xml = "<UserPref name=\"foo\" datatype=\"enum\">" +
" <EnumValue value=\"0\" display_value=\"Zero\"/>" +
@@ -51,6 +54,7 @@
assertEquals("1", userPref.getEnumValues().get("1"));
}
+ @Test
public void testSubstitutions() throws Exception {
String xml = "<UserPref name=\"name\" datatype=\"enum\"" +
" display_name=\"__MSG_display_name__\"" +
@@ -73,6 +77,7 @@
assertEquals(displayValue, userPref.getEnumValues().get("0"));
}
+ @Test
public void testMissingName() throws Exception {
String xml = "<UserPref datatype=\"string\"/>";
try {
@@ -83,12 +88,14 @@
}
}
+ @Test
public void testMissingDataType() throws Exception {
String xml = "<UserPref name=\"name\"/>";
UserPref pref = new UserPref(XmlUtil.parse(xml));
assertEquals(UserPref.DataType.STRING, pref.getDataType());
}
+ @Test
public void testMissingEnumValue() throws Exception {
String xml = "<UserPref name=\"foo\" datatype=\"enum\">" +
" <EnumValue/>" +
@@ -101,6 +108,7 @@
}
}
+ @Test
public void testToString() throws Exception {
String xml = "<UserPref name=\"name\" display_name=\"__MSG_display_name__\" "
+ "default_value=\"__MSG_default_value__\" required=\"false\" "
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java Wed Dec 16 22:07:43 2009
@@ -111,6 +111,7 @@
EasyMock.expect(gadgetContext.getParameter(EasyMock.eq("st"))).andReturn("12345");
}
+ @Test
public void testBasicRender() throws Exception {
Document document = parser.parseDom(
"<script type='text/os-template'>"
@@ -126,9 +127,9 @@
replay();
handler.process(result.getDocumentElement().getFirstChild().getNextSibling(), tag, processor);
XPathWrapper wrapper = new XPathWrapper(result);
- assertEquals(wrapper.getValue("/html/head/script[1]"), "swfobject()");
- assertEquals(wrapper.getValue("/html/body/div/@id"), "os_xFlash_alt_1");
- assertEquals(wrapper.getValue("/html/body/div"), "Click Me");
+ assertEquals("swfobject()", wrapper.getValue("/html/head/script[1]"));
+ assertEquals("os_xFlash_alt_1", wrapper.getValue("/html/body/div/@id"));
+ assertEquals("Click Me", wrapper.getValue("/html/body/div"));
assertNull(wrapper.getNode("/html/body/div/@onclick"));
assertEquals(wrapper.getValue("/html/body/script[1]"),
"swfobject.embedSWF(\"http://www.example.org/test.swf\",\"os_xFlash_alt_1\",\"100px\","
@@ -136,6 +137,7 @@
verify();
}
+ @Test
public void testSanitizedRender() throws Exception {
Document document = parser.parseDom(
"<script type='text/os-template'>"
@@ -151,9 +153,9 @@
replay();
handler.process(result.getDocumentElement().getFirstChild().getNextSibling(), tag, processor);
XPathWrapper wrapper = new XPathWrapper(result);
- assertEquals(wrapper.getValue("/html/head/script[1]"), "swfobject()");
- assertEquals(wrapper.getValue("/html/body/div/@id"), "os_xFlash_alt_1");
- assertEquals(wrapper.getValue("/html/body/div"), "Click Me");
+ assertEquals("swfobject()", wrapper.getValue("/html/head/script[1]"));
+ assertEquals("os_xFlash_alt_1", wrapper.getValue("/html/body/div/@id"));
+ assertEquals("Click Me", wrapper.getValue("/html/body/div"));
assertNull(wrapper.getNode("/html/body/div/@onclick"));
assertEquals(wrapper.getValue("/html/body/script[1]"),
"swfobject.embedSWF(\"http://www.example.org/test.swf\",\"os_xFlash_alt_1\",\"100px\","
@@ -162,6 +164,7 @@
verify();
}
+ @Test
public void testSanitizedRenderClickToPlay() throws Exception {
Document document = parser.parseDom(
"<script type='text/os-template'>"
@@ -177,10 +180,10 @@
replay();
handler.process(result.getDocumentElement().getFirstChild().getNextSibling(), tag, processor);
XPathWrapper wrapper = new XPathWrapper(result);
- assertEquals(wrapper.getValue("/html/head/script[1]"), "swfobject()");
- assertEquals(wrapper.getValue("/html/body/div/@id"), "os_xFlash_alt_1");
- assertEquals(wrapper.getValue("/html/body/div"), "Click Me");
- assertEquals(wrapper.getValue("/html/body/div/@onclick"), "os_xFlash_alt_1()");
+ assertEquals("swfobject()", wrapper.getValue("/html/head/script[1]"));
+ assertEquals("os_xFlash_alt_1", wrapper.getValue("/html/body/div/@id"));
+ assertEquals("Click Me", wrapper.getValue("/html/body/div"));
+ assertEquals("os_xFlash_alt_1()", wrapper.getValue("/html/body/div/@onclick"));
assertEquals(wrapper.getValue("/html/body/script[1]"),
"function os_xFlash_alt_1(){ swfobject.embedSWF(\"http://www.example.org/test.swf\","
+ "\"os_xFlash_alt_1\",\"100px\",\"100px\",\"9.0.115\",null,null,"
@@ -214,26 +217,26 @@
tag.setAttribute("allownetworking", "none");
tag.setAttribute("flashvars", "a=b&c=d");
FlashTagHandler.SwfObjectConfig config = handler.getSwfConfig(tag, processor);
- assertEquals(config.id, "myflash");
- assertEquals(config.clazz, "stylish");
+ assertEquals("myflash", config.id);
+ assertEquals("stylish", config.clazz);
assertEquals(config.swf, Uri.parse("http://www.example.org/x.swf"));
- assertEquals(config.width, "100px");
- assertEquals(config.height, "200px");
- assertEquals(config.name, "myflashname");
- assertEquals(config.play, FlashTagHandler.SwfObjectConfig.Play.onclick);
- assertEquals(config.menu, Boolean.TRUE);
- assertEquals(config.scale, FlashTagHandler.SwfObjectConfig.Scale.exactfit);
- assertEquals(config.wmode, FlashTagHandler.SwfObjectConfig.WMode.transparent);
- assertEquals(config.devicefont, Boolean.TRUE);
- assertEquals(config.swliveconnect, Boolean.TRUE);
- assertEquals(config.allowscriptaccess, FlashTagHandler.SwfObjectConfig.ScriptAccess.samedomain);
+ assertEquals("100px", config.width);
+ assertEquals("200px", config.height);
+ assertEquals("myflashname", config.name);
+ assertEquals(FlashTagHandler.SwfObjectConfig.Play.onclick, config.play);
+ assertEquals(Boolean.TRUE, config.menu);
+ assertEquals(FlashTagHandler.SwfObjectConfig.Scale.exactfit, config.scale);
+ assertEquals(FlashTagHandler.SwfObjectConfig.WMode.transparent, config.wmode);
+ assertEquals(Boolean.TRUE, config.devicefont);
+ assertEquals(Boolean.TRUE, config.swliveconnect);
+ assertEquals(FlashTagHandler.SwfObjectConfig.ScriptAccess.samedomain, config.allowscriptaccess);
assertNull(config.loop);
- assertEquals(config.quality, FlashTagHandler.SwfObjectConfig.Quality.autohigh);
- assertEquals(config.salign, FlashTagHandler.SwfObjectConfig.SAlign.tl);
- assertEquals(config.bgcolor, "#77ff77");
- assertEquals(config.allowfullscreen, Boolean.TRUE);
- assertEquals(config.allownetworking, FlashTagHandler.SwfObjectConfig.NetworkAccess.none);
- assertEquals(config.flashvars, "a=b&c=d");
+ assertEquals(FlashTagHandler.SwfObjectConfig.Quality.autohigh, config.quality);
+ assertEquals(FlashTagHandler.SwfObjectConfig.SAlign.tl, config.salign);
+ assertEquals("#77ff77", config.bgcolor);
+ assertEquals(Boolean.TRUE, config.allowfullscreen);
+ assertEquals(FlashTagHandler.SwfObjectConfig.NetworkAccess.none, config.allownetworking);
+ assertEquals("a=b&c=d", config.flashvars);
}
@Test
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/BidiSubstituterTest.java Wed Dec 16 22:07:43 2009
@@ -20,22 +20,27 @@
import org.apache.shindig.gadgets.variables.BidiSubstituter;
import org.apache.shindig.gadgets.variables.Substitutions;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
-public class BidiSubstituterTest extends TestCase {
+public class BidiSubstituterTest extends Assert {
+ @Test
public void testBidiWithRtl() {
assertRightToLeft(BidiSubstituter.RTL);
}
+ @Test
public void testBidiWithLtr() {
assertLeftToRight(BidiSubstituter.LTR);
}
+ @Test
public void testBidiWithEmpty() {
assertLeftToRight("");
}
+ @Test
public void testBidiWithNull() {
assertLeftToRight(null);
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/SubstitutionsTest.java Wed Dec 16 22:07:43 2009
@@ -22,35 +22,41 @@
import org.apache.commons.lang.StringUtils;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
-public class SubstitutionsTest extends TestCase {
+public class SubstitutionsTest extends Assert {
private Substitutions subst;
- @Override
+ @Before
public void setUp() throws Exception {
- super.setUp();
subst = new Substitutions();
}
+ @Test
public void testMessages() throws Exception {
String msg = "Hello, __MSG_world__!";
subst.addSubstitution(Type.MESSAGE, "world", "planet");
assertEquals("Hello, planet!", subst.substituteString(msg));
}
+ @Test
public void testBidi() throws Exception {
String msg = "Hello, __BIDI_DIR__-world!";
subst.addSubstitution(Type.BIDI, "DIR", "rtl");
assertEquals("Hello, rtl-world!", subst.substituteString(msg));
}
+ @Test
public void testUserPref() throws Exception {
String msg = "__UP_hello__, world!";
subst.addSubstitution(Type.USER_PREF, "hello", "Greetings");
assertEquals("Greetings, world!", subst.substituteString(msg));
}
+ @Test
public void testCorrectOrder() throws Exception {
String msg = "__UP_hello__, __MSG_world__!";
subst.addSubstitution(Type.MESSAGE, "world",
@@ -61,6 +67,7 @@
assertEquals("Greetings, planet rtl-Earth!", subst.substituteString(msg));
}
+ @Test
public void testIncorrectOrder() throws Exception {
String msg = "__UP_hello__, __MSG_world__";
subst.addSubstitution(Type.MESSAGE, "world",
@@ -75,6 +82,7 @@
subst.substituteString(msg));
}
+ @Test
public void testDanglingUnderScoresAreIgnored() throws Exception {
String msg = "__MSG_hello__, var_msg + '__' + 'world __MSG_world__";
subst.addSubstitution(Type.MESSAGE, "hello", "Hello");
@@ -83,6 +91,7 @@
assertEquals("Hello, var_msg + '__' + 'world World", subst.substituteString(msg));
}
+ @Test
public void testComplexUnderscores() throws Exception {
String msg = "__MSG_hello____________ten____________MSG_world______";
subst.addSubstitution(Type.MESSAGE, "hello", "Hello");
@@ -91,24 +100,29 @@
assertEquals("Hello__________ten__________World____", subst.substituteString(msg));
}
+ @Test
public void testMessageId() throws Exception {
String msg = "Hello, __MODULE_ID__!";
subst.addSubstitution(Type.MODULE, "ID", "123");
assertEquals("Hello, 123!", subst.substituteString(msg));
}
+ @Test
public void testOddNumberOfPrecedingUnderscores() throws Exception {
String msg = "<div id='div___MODULE_ID__'/>";
subst.addSubstitution(Type.MODULE, "ID", "123");
assertEquals("<div id='div_123'/>", subst.substituteString(msg));
}
+ @Test
public void testOddUnderscoresWithInvalidSubstFollowedByValidSubst() throws Exception {
String msg = "<div id='div___HI_THERE__MODULE_ID___'/>";
subst.addSubstitution(Type.MODULE, "ID", "123");
assertEquals("<div id='div___HI_THERE123_'/>", subst.substituteString(msg));
}
+ @Test
+ @Ignore("off by default, TODO add test logic")
public void loadTest() throws Exception {
String msg
= "Random text and __UP_hello__, amongst other words __MSG_world__ stuff __weeeeee";
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java Wed Dec 16 22:07:43 2009
@@ -26,11 +26,13 @@
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.variables.Substitutions.Type;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import java.util.Map;
-public class UserPrefSubstituterTest extends TestCase {
+public class UserPrefSubstituterTest extends Assert {
private final Substitutions substituter = new Substitutions();
private final static String DEFAULT_NAME = "default";
private final static String DEFAULT_VALUE = "default value";
@@ -53,12 +55,12 @@
"</Module>";
private GadgetSpec spec;
- @Override
+ @Before
public void setUp() throws Exception {
- super.setUp();
spec = new GadgetSpec(Uri.parse("#"), DEFAULT_XML);
}
+ @Test
public void testSubstitutions() throws Exception {
Map<String, String> map = ImmutableMap.of(USER_NAME, USER_VALUE, OVERRIDE_NAME, OVERRIDE_VALUE);
UserPrefs prefs = new UserPrefs(map);
@@ -72,6 +74,7 @@
substituter.getSubstitution(Type.USER_PREF, OVERRIDE_NAME));
}
+ @Test
public void testEscaping() throws Exception {
Map<String, String> map = ImmutableMap.of(USER_NAME, UNESCAPED_USER_VALUE);
UserPrefs prefs = new UserPrefs(map);
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java Wed Dec 16 22:07:43 2009
@@ -18,6 +18,7 @@
package org.apache.shindig.social.opensocial.jpa.spi;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.apache.shindig.auth.SecurityToken;
@@ -222,7 +223,7 @@
*/
public static void assertPersonEquals(Person actual, String expectedId, String expectedName) {
assertEquals(actual.getId(), expectedId);
- assertTrue(actual.getName() != null);
+ assertNotNull(actual.getName());
assertEquals(actual.getName().getFormatted(), expectedName);
}
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java Wed Dec 16 22:07:43 2009
@@ -22,6 +22,8 @@
import org.apache.shindig.social.opensocial.jpa.spi.SpiDatabaseBootstrap;
import com.google.inject.Injector;
+import org.junit.After;
+import org.junit.Before;
/**
* JPA restful Json activity test, which wraps around shindig's <code>RestfulJsonActivityTest</code>
@@ -39,10 +41,9 @@
*
* @throws Exception the exception
*/
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
+
// Init config
Injector injector = JpaRestfulTestConfigHelper.init();
this.setServlet(JpaRestfulTestConfigHelper.getDataServiceServlet(injector));
@@ -52,12 +53,8 @@
this.bootstrap.init();
}
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
this.bootstrap.tearDown();
}
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonDataTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonDataTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonDataTest.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonDataTest.java Wed Dec 16 22:07:43 2009
@@ -22,6 +22,8 @@
import org.apache.shindig.social.opensocial.jpa.spi.SpiDatabaseBootstrap;
import com.google.inject.Injector;
+import org.junit.After;
+import org.junit.Before;
/**
* JPA restful Json data test, which wraps around shindig's <code>RestfulJsonDataTest</code>
@@ -39,10 +41,8 @@
*
* @throws Exception the exception
*/
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
// Init config
Injector injector = JpaRestfulTestConfigHelper.init();
this.setServlet(JpaRestfulTestConfigHelper.getDataServiceServlet(injector));
@@ -52,12 +52,8 @@
this.bootstrap.init();
}
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
this.bootstrap.tearDown();
}
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java Wed Dec 16 22:07:43 2009
@@ -22,6 +22,8 @@
import org.apache.shindig.social.opensocial.jpa.spi.SpiDatabaseBootstrap;
import com.google.inject.Injector;
+import org.junit.After;
+import org.junit.Before;
/**
* JPA restful Json people test, which wraps around shindig's <code>RestfulJsonPeopleTest</code>
@@ -39,10 +41,8 @@
*
* @throws Exception the exception
*/
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
// Init config
Injector injector = JpaRestfulTestConfigHelper.init();
this.setServlet(JpaRestfulTestConfigHelper.getDataServiceServlet(injector));
@@ -52,12 +52,8 @@
this.bootstrap.init();
}
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
this.bootstrap.tearDown();
}
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlActivityTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlActivityTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlActivityTest.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlActivityTest.java Wed Dec 16 22:07:43 2009
@@ -22,6 +22,8 @@
import org.apache.shindig.social.opensocial.jpa.spi.SpiDatabaseBootstrap;
import com.google.inject.Injector;
+import org.junit.After;
+import org.junit.Before;
/**
* JPA restful Json activity test, which wraps around shindig's <code>RestfulXmlActivityTest</code>
@@ -39,10 +41,8 @@
*
* @throws Exception the exception
*/
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
// Init config
Injector injector = JpaRestfulTestConfigHelper.init();
this.setServlet(JpaRestfulTestConfigHelper.getDataServiceServlet(injector));
@@ -52,12 +52,8 @@
this.bootstrap.init();
}
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
this.bootstrap.tearDown();
}
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlDataTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlDataTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlDataTest.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlDataTest.java Wed Dec 16 22:07:43 2009
@@ -22,6 +22,8 @@
import org.apache.shindig.social.opensocial.jpa.spi.SpiDatabaseBootstrap;
import com.google.inject.Injector;
+import org.junit.After;
+import org.junit.Before;
/**
* JPA restful Json data test, which wraps around shindig's <code>RestfulXmlDataTest</code>
@@ -39,10 +41,8 @@
*
* @throws Exception the exception
*/
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
// Init config
Injector injector = JpaRestfulTestConfigHelper.init();
this.setServlet(JpaRestfulTestConfigHelper.getDataServiceServlet(injector));
@@ -52,12 +52,8 @@
this.bootstrap.init();
}
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
this.bootstrap.tearDown();
}
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlPeopleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlPeopleTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlPeopleTest.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulXmlPeopleTest.java Wed Dec 16 22:07:43 2009
@@ -22,6 +22,8 @@
import org.apache.shindig.social.opensocial.jpa.spi.SpiDatabaseBootstrap;
import com.google.inject.Injector;
+import org.junit.After;
+import org.junit.Before;
/**
* JPA restful Json people test, which wraps around shindig's <code>RestfulXmlPeopleTest</code>
@@ -39,10 +41,9 @@
*
* @throws Exception the exception
*/
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
+
// Init config
Injector injector = JpaRestfulTestConfigHelper.init();
this.setServlet(JpaRestfulTestConfigHelper.getDataServiceServlet(injector));
@@ -52,12 +53,8 @@
this.bootstrap.init();
}
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
this.bootstrap.tearDown();
}
Modified: incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java (original)
+++ incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java Wed Dec 16 22:07:43 2009
@@ -299,7 +299,7 @@
private <T> T findOne(String query, String[] names, Object[] params) {
List<T> l = find(query, names, params);
if (!l.isEmpty()) {
- return (T) l.get(0);
+ return l.get(0);
}
return null;
}
Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java (original)
+++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java Wed Dec 16 22:07:43 2009
@@ -155,13 +155,13 @@
NodeList bodyList = page.getElementsByTagName("body");
// Result should contain just one body
- assertEquals(bodyList.getLength(), 1);
+ assertEquals(1, bodyList.getLength());
DomNode body = (DomNode) bodyList.item(0);
// Failed output contains only an error block plus a onload script block
- assertEquals(body.getChildNodes().getLength(), 2);
- assertEquals(body.getFirstChild().getNodeName(), "pre");
- assertEquals(body.getLastChild().getNodeName(), "script");
+ assertEquals(2, body.getChildNodes().getLength());
+ assertEquals("pre", body.getFirstChild().getNodeName());
+ assertEquals("script", body.getLastChild().getNodeName());
}
@Test
@@ -319,7 +319,7 @@
String testMethod = null;
for (String alert : alertHandler.getCollectedAlerts()) {
if (testMethod == null) {
- assertFalse("Test method omitted", "FINISHED".equals(alert));
+ assertFalse("Test method omitted - '" + alert + '"', "FINISHED".equals(alert));
testMethod = alert;
} else {
assertEquals("test method " + testMethod + " did not finish", "FINISHED", alert);
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java Wed Dec 16 22:07:43 2009
@@ -23,21 +23,22 @@
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
-import junit.framework.TestCase;
-
import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
import java.util.List;
-public class SocialApiGuiceModuleTest extends TestCase {
+public class SocialApiGuiceModuleTest extends Assert {
private Injector injector;
- @Override public void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
injector = Guice.createInjector(new SocialApiGuiceModule(), new PropertiesModule(),
new AbstractModule() {
@Override
@@ -50,6 +51,7 @@
/**
* Test default auth handler injection
*/
+ @Test
public void testAuthHandler() {
injector.getInstance(AuthenticationHandlerProvider.class).get();
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java Wed Dec 16 22:07:43 2009
@@ -23,21 +23,22 @@
import com.google.inject.Key;
import com.google.inject.TypeLiteral;
-import junit.framework.TestCase;
-
import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.social.core.config.SocialApiGuiceModule;
+import org.junit.Assert;
+import org.junit.Test;
import java.util.Collections;
import java.util.List;
-public class AuthenticationProviderHandlerTest extends TestCase {
+public class AuthenticationProviderHandlerTest extends Assert {
/**
* Test that existing custom handlers won't be broken with the switch
* to injecting List<ProviderHandler>.
*/
+ @Test
public void testCustomHandler() {
Injector injector = Guice.createInjector(new SocialApiGuiceModule(),
new CustomAuthHandlerProviderModule(), new PropertiesModule());
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHanderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHanderTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHanderTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHanderTest.java Wed Dec 16 22:07:43 2009
@@ -34,6 +34,7 @@
import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
import org.apache.shindig.social.opensocial.oauth.OAuthEntry;
import org.easymock.classextension.EasyMock;
+import org.junit.Before;
import org.junit.Test;
import java.util.Arrays;
@@ -59,8 +60,8 @@
private static final String DOMAIN = "example.org";
private static final String CONTAINER = "sandbox";
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
reqHandler = new OAuthAuthenticationHandler(mockStore, true);
formEncodedPost = new FakeOAuthRequest("POST", TEST_URL, "a=b&c=d",
OAuth.FORM_ENCODED);
@@ -101,7 +102,7 @@
FakeOAuthRequest.CONSUMER_SECRET, new OAuthServiceProvider(null, null, null)))
.anyTimes();
} catch (OAuthProblemException e) {
-
+ // ignore
}
}
@@ -111,7 +112,7 @@
EasyMock.eq(FakeOAuthRequest.CONSUMER_KEY), EasyMock.eq(FakeOAuthRequest.REQUESTOR))).
andReturn(new AnonymousSecurityToken());
} catch (OAuthProblemException e) {
-
+ // ignore
}
}
@@ -123,10 +124,10 @@
HttpServletRequest request = formEncodedPost.sign(TOKEN,
FakeOAuthRequest.OAuthParamLocation.URI_QUERY, FakeOAuthRequest.BodySigning.NONE);
SecurityToken token = reqHandler.getSecurityTokenFromRequest(request);
- assertEquals(token.getViewerId(), FakeOAuthRequest.REQUESTOR);
- assertEquals(token.getAppId(), APP_ID);
- assertEquals(token.getDomain(), DOMAIN);
- assertEquals(token.getContainer(), CONTAINER);
+ assertEquals(FakeOAuthRequest.REQUESTOR, token.getViewerId());
+ assertEquals(APP_ID, token.getAppId());
+ assertEquals(DOMAIN, token.getDomain());
+ assertEquals(CONTAINER, token.getContainer());
assertNotNull(token);
assertTrue(token instanceof OAuthSecurityToken);
verify();
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java Wed Dec 16 22:07:43 2009
@@ -43,6 +43,7 @@
import org.custommonkey.xmlunit.XpathEngine;
import org.easymock.EasyMock;
import org.json.JSONObject;
+import org.junit.Before;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -85,9 +86,8 @@
this.servlet = servlet;
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void abstractLargeRestfulBefore() throws Exception {
Injector injector = Guice.createInjector(new SocialApiTestsGuiceModule());
servlet = new DataServiceServlet();
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java Wed Dec 16 22:07:43 2009
@@ -24,14 +24,14 @@
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.junit.Before;
import org.junit.Test;
public class RestfulJsonActivityTest extends AbstractLargeRestfulTests {
Activity johnsActivity;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void restfulJsonActivityTestBefore() throws Exception {
johnsActivity = new ActivityImpl("1", "john.doe");
johnsActivity.setTitle("yellow");
johnsActivity.setBody("what a color!");
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java Wed Dec 16 22:07:43 2009
@@ -20,6 +20,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.protocol.ContentTypes;
import org.apache.shindig.protocol.model.Enum;
import org.apache.shindig.protocol.model.EnumImpl;
@@ -44,6 +45,7 @@
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.junit.Before;
import org.junit.Test;
import java.util.Date;
@@ -53,10 +55,8 @@
public class RestfulJsonPeopleTest extends AbstractLargeRestfulTests {
private Person canonical;
- @SuppressWarnings({ "unchecked", "boxing" })
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void restfulJsonPeopleTestBefore() throws Exception {
NameImpl name = new NameImpl("Sir Shin H. Digg Social Butterfly");
name.setAdditionalName("H");
name.setFamilyName("Digg");
@@ -213,11 +213,7 @@
// TODO(doll): Test all of the date fields
Map<String, String> extraParams = Maps.newHashMap();
- String allFieldsParam = "";
- for (String allField : Person.Field.ALL_FIELDS) {
- allFieldsParam += allField + ',';
- }
- extraParams.put("fields", allFieldsParam);
+ extraParams.put("fields", StringUtils.join(Person.Field.ALL_FIELDS, ','));
// Currently, for Shindig {pid}/@all/{uid} == {uid}/@self
String resp = getResponse("/people/canonical/@self", "GET", extraParams, null,
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java Wed Dec 16 22:07:43 2009
@@ -21,6 +21,7 @@
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.util.XSDValidator;
+import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -32,9 +33,8 @@
public class RestfulXmlActivityTest extends AbstractLargeRestfulTests {
private Activity johnsActivity;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void restfulXmlActivityTestBefore() throws Exception {
johnsActivity = new ActivityImpl("1", "john.doe");
johnsActivity.setTitle("yellow");
johnsActivity.setBody("what a color!");
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java Wed Dec 16 22:07:43 2009
@@ -30,11 +30,6 @@
public class RestfulXmlDataTest extends AbstractLargeRestfulTests {
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Expected response for app data in json:
*
@@ -44,7 +39,7 @@
* "george.doe" : {"count" : "2"},
* "maija.m" : {}, // TODO: Should this entry really be included if she
* doesn't have any data? } }
- *
+ * s
* @throws Exception
* if test encounters an error
*/
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java Wed Dec 16 22:07:43 2009
@@ -41,6 +41,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -53,10 +54,8 @@
public class RestfulXmlPeopleTest extends AbstractLargeRestfulTests {
private Person canonical;
- @SuppressWarnings({ "boxing", "unchecked" })
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void restfulxXmlPeopleTestBefore() throws Exception {
NameImpl name = new NameImpl("Sir Shin H. Digg Social Butterfly");
name.setAdditionalName("H");
@@ -429,10 +428,8 @@
}
@SuppressWarnings("boxing")
- private void assertFloatField(Map<String, List<String>> result,
- Float expected, Object field) {
- assertEquals(expected.floatValue(), Float.valueOf(result.get(
- field.toString()).get(0)));
+ private void assertFloatField(Map<String, List<String>> result, Float expected, Object field) {
+ assertEquals(expected.floatValue(), Float.valueOf(result.get(field.toString()).get(0)), 0);
}
private void assertStringField(Map<String, List<String>> result,
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/model/PersonTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/model/PersonTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/model/PersonTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/model/PersonTest.java Wed Dec 16 22:07:43 2009
@@ -19,14 +19,16 @@
import org.apache.shindig.social.core.model.PersonImpl;
-import junit.framework.TestCase;
-
-public class PersonTest extends TestCase {
+import org.junit.Assert;
+import org.junit.Test;
+public class PersonTest extends Assert {
+ @Test
public void testInvalidFromUrlString() throws Exception {
assertNull(Person.Field.fromUrlString("badness"));
}
+ @Test
public void testFromUrlString() throws Exception {
assertUrlStringMaps(Person.Field.NAME);
assertUrlStringMaps(Person.Field.THUMBNAIL_URL);
@@ -36,6 +38,7 @@
assertEquals(field, Person.Field.fromUrlString(field.toString()));
}
+ @Test
public void testGetProfileUrl() throws Exception {
Person person = new PersonImpl();
assertNull(person.getProfileUrl());
@@ -56,6 +59,7 @@
assertEquals(address, person.getUrls().get(0).getValue());
}
+ @Test
public void testGetThumbnailUrl() throws Exception {
Person person = new PersonImpl();
assertNull(person.getThumbnailUrl());
@@ -74,5 +78,4 @@
assertEquals(1, person.getPhotos().size());
assertEquals(url, person.getPhotos().get(0).getValue());
}
-
}
\ No newline at end of file
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java Wed Dec 16 22:07:43 2009
@@ -45,6 +45,8 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isNull;
import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
import java.io.StringReader;
import java.util.List;
@@ -67,16 +69,15 @@
protected HandlerRegistry registry;
protected ContainerConfig containerConfig;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
token = new FakeGadgetToken();
token.setAppId("appId");
converter = mock(BeanJsonConverter.class);
activityService = mock(ActivityService.class);
- JSONObject config = new JSONObject("{" + ContainerConfig.DEFAULT_CONTAINER + ":" +
+ JSONObject config = new JSONObject('{' + ContainerConfig.DEFAULT_CONTAINER + ':' +
"{'gadgets.features':{opensocial:" +
"{supportedFields: {activity: ['id', 'title']}}" +
"}}}");
@@ -106,18 +107,22 @@
reset();
}
+ @Test
public void testHandleGetAll() throws Exception {
assertHandleGetForGroup(GroupId.Type.all);
}
+ @Test
public void testHandleGetFriends() throws Exception {
assertHandleGetForGroup(GroupId.Type.friends);
}
+ @Test
public void testHandleGetSelf() throws Exception {
assertHandleGetForGroup(GroupId.Type.self);
}
+ @Test
public void testHandleGetPlural() throws Exception {
String path = "/activities/john.doe,jane.doe/@self/@app";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -138,6 +143,7 @@
reset();
}
+ @Test
public void testHandleGetActivityById() throws Exception {
String path = "/activities/john.doe/@friends/@app/1";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -174,6 +180,7 @@
new StringReader(jsonActivity), token, converter);
}
+ @Test
public void testHandlePost() throws Exception {
Future<?> future = setupBodyRequest("POST");
assertNull(future.get());
@@ -181,6 +188,7 @@
reset();
}
+ @Test
public void testHandlePut() throws Exception {
Future<?> future = setupBodyRequest("PUT");
assertNull(future.get());
@@ -188,6 +196,7 @@
reset();
}
+ @Test
public void testHandleDelete() throws Exception {
String path = "/activities/john.doe/@self/@app/1";
RestHandler operation = registry.getRestHandler(path, "DELETE");
@@ -204,6 +213,7 @@
reset();
}
+ @Test
public void testHandleGetSuportedFields() throws Exception {
String path = "/activities/@supportedFields";
RestHandler operation = registry.getRestHandler(path, "GET");
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java Wed Dec 16 22:07:43 2009
@@ -47,6 +47,8 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.common.collect.Maps;
+import org.junit.Before;
+import org.junit.Test;
public class AppDataHandlerTest extends EasyMockTestCase {
@@ -63,9 +65,8 @@
ImmutableSet.of(new UserId(UserId.Type.userId, "john.doe")));
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
token = new FakeGadgetToken();
converter = mock(BeanJsonConverter.class);
appDataService = mock(AppDataService.class);
@@ -91,18 +92,22 @@
verify();
}
+ @Test
public void testHandleGetAll() throws Exception {
assertHandleGetForGroup(GroupId.Type.all);
}
+ @Test
public void testHandleGetFriends() throws Exception {
assertHandleGetForGroup(GroupId.Type.friends);
}
+ @Test
public void testHandleGetSelf() throws Exception {
assertHandleGetForGroup(GroupId.Type.self);
}
+ @Test
public void testHandleGetPlural() throws Exception {
String path = "/appdata/john.doe,jane.doe/@self/appId";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -121,6 +126,7 @@
verify();
}
+ @Test
public void testHandleGetWithoutFields() throws Exception {
String path = "/appdata/john.doe/@friends/appId";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -160,11 +166,13 @@
return operation.execute(params, new StringReader(jsonAppData), token, converter);
}
+ @Test
public void testHandlePost() throws Exception {
assertNull(setupPostData("POST").get());
verify();
}
+ @Test
public void testHandlePut() throws Exception {
assertNull(setupPostData("PUT").get());
verify();
@@ -174,6 +182,7 @@
* Test that the handler correctly recognizes null keys in the data.
* @throws Exception if the test fails
*/
+ @Test
public void testHandleNullPostDataKeys() throws Exception {
String path = "/appdata/john.doe/@self/appId";
RestHandler operation = registry.getRestHandler(path, "POST");
@@ -194,8 +203,8 @@
operation.execute(params, new StringReader(jsonAppData), token, converter).get();
fail();
} catch (ExecutionException ee) {
- assertEquals(((ProtocolException)ee.getCause()).getCode(),
- HttpServletResponse.SC_BAD_REQUEST);
+ assertEquals(HttpServletResponse.SC_BAD_REQUEST,
+ ((ProtocolException) ee.getCause()).getCode());
// was expecting an Exception
}
verify();
@@ -204,6 +213,7 @@
* Test that the handler correctly recognizes invalid keys in the data.
* @throws Exception if the test fails
*/
+ @Test
public void testHandleInvalidPostDataKeys() throws Exception {
String path = "/appdata/john.doe/@self/appId";
RestHandler operation = registry.getRestHandler(path, "POST");
@@ -224,13 +234,14 @@
operation.execute(params, new StringReader(jsonAppData), token, converter).get();
fail();
} catch (ExecutionException ee) {
- assertEquals(((ProtocolException)ee.getCause()).getCode(),
- HttpServletResponse.SC_BAD_REQUEST);
+ assertEquals(HttpServletResponse.SC_BAD_REQUEST,
+ ((ProtocolException) ee.getCause()).getCode());
}
verify();
}
+ @Test
public void testHandleDelete() throws Exception {
Map<String, String[]> params = Maps.newHashMap();
params.put("fields", new String[]{"pandas"});
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java Wed Dec 16 22:07:43 2009
@@ -36,13 +36,14 @@
import java.util.Map;
import java.util.concurrent.ExecutionException;
-import junit.framework.TestCase;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
-public class MessageHandlerTest extends TestCase {
+public class MessageHandlerTest extends Assert {
private MessageService messageService;
private MessageHandler handler;
@@ -53,8 +54,8 @@
protected HandlerRegistry registry;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
token = new FakeGadgetToken();
messageService = EasyMock.createMock(MessageService.class);
messageService = EasyMock.createMock(MessageService.class);
@@ -68,8 +69,8 @@
registry.addHandlers(ImmutableSet.<Object>of(handler));
}
- public void testPostMessage()
- throws ProtocolException, InterruptedException, ExecutionException {
+ @Test
+ public void testPostMessage() throws Exception {
MessageImpl message = new MessageImpl("A message body", "A title", Message.Type.PRIVATE_MESSAGE);
message.setRecipients(recipients);
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java Wed Dec 16 22:07:43 2009
@@ -48,6 +48,8 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
import java.util.List;
import java.util.Map;
@@ -80,12 +82,12 @@
DEFAULT_OPTIONS.setMax(20);
}
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
token = new FakeGadgetToken();
converter = mock(BeanJsonConverter.class);
personService = mock(PersonService.class);
- JSONObject config = new JSONObject("{" + ContainerConfig.DEFAULT_CONTAINER + ":" +
+ JSONObject config = new JSONObject('{' + ContainerConfig.DEFAULT_CONTAINER + ':' +
"{'gadgets.features':{opensocial:" +
"{supportedFields: {person: ['id', {name: 'familyName'}]}}" +
"}}}");
@@ -97,6 +99,7 @@
registry.addHandlers(ImmutableSet.<Object>of(handler));
}
+ @Test
public void testHandleGetAllNoParams() throws Exception {
String path = "/people/john.doe/@all";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -118,6 +121,7 @@
verify();
}
+ @Test
public void testHandleGetFriendsNoParams() throws Exception {
String path = "/people/john.doe/@friends";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -138,6 +142,7 @@
verify();
}
+ @Test
public void testHandleGetFriendsWithParams() throws Exception {
String path = "/people/john.doe/@friends";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -175,6 +180,7 @@
verify();
}
+ @Test
public void testHandleGetFriendById() throws Exception {
String path = "/people/john.doe/@friends/jane.doe";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -195,6 +201,7 @@
verify();
}
+ @Test
public void testHandleGetSelf() throws Exception {
String path = "/people/john.doe/@self";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -209,6 +216,7 @@
verify();
}
+ @Test
public void testHandleGetPlural() throws Exception {
String path = "/people/john.doe,jane.doe/@self";
RestHandler operation = registry.getRestHandler(path, "GET");
@@ -229,6 +237,7 @@
verify();
}
+ @Test
public void testHandleGetSupportedFields() throws Exception {
String path = "/people/@supportedFields";
RestHandler operation = registry.getRestHandler(path, "GET");
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ResponseItemTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ResponseItemTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ResponseItemTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ResponseItemTest.java Wed Dec 16 22:07:43 2009
@@ -17,22 +17,19 @@
*/
package org.apache.shindig.social.opensocial.service;
-import static junit.framework.Assert.assertFalse;
-import static junitx.framework.Assert.assertNotEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-
import org.apache.shindig.protocol.ResponseItem;
+import org.junit.Assert;
import org.junit.Test;
import javax.servlet.http.HttpServletResponse;
+import static junitx.framework.Assert.assertNotEquals;
+
/**
* Tests Response Item equality methods.
*/
-public class ResponseItemTest {
+public class ResponseItemTest extends Assert {
@Test
public void testEquals() {
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/SocialRequestItemTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/SocialRequestItemTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/SocialRequestItemTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/SocialRequestItemTest.java Wed Dec 16 22:07:43 2009
@@ -24,20 +24,23 @@
import com.google.common.collect.Maps;
import com.google.inject.Guice;
-import junit.framework.TestCase;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test social specific request parameters
*/
-public class SocialRequestItemTest extends TestCase {
+public class SocialRequestItemTest extends Assert {
private static final FakeGadgetToken FAKE_TOKEN = new FakeGadgetToken();
protected SocialRequestItem request;
protected BeanJsonConverter converter;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
FAKE_TOKEN.setAppId("12345");
FAKE_TOKEN.setOwnerId("someowner");
FAKE_TOKEN.setViewerId("someowner");
@@ -47,11 +50,13 @@
FAKE_TOKEN, converter, converter);
}
+ @Test
public void testGetUser() throws Exception {
request.setParameter("userId", "@owner");
assertEquals(UserId.Type.owner, request.getUsers().iterator().next().getType());
}
+ @Test
public void testGetGroup() throws Exception {
request.setParameter("groupId", "@self");
assertEquals(GroupId.Type.self, request.getGroup().getType());
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java?rev=891450&r1=891449&r2=891450&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/GroupIdTest.java Wed Dec 16 22:07:43 2009
@@ -19,10 +19,12 @@
import org.apache.shindig.social.opensocial.spi.GroupId;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
-public class GroupIdTest extends TestCase {
+public class GroupIdTest extends Assert {
+ @Test
public void testFromJson() throws Exception {
GroupId all = GroupId.fromJson("@all");
assertEquals(GroupId.Type.all, all.getType());
@@ -37,5 +39,4 @@
assertEquals(GroupId.Type.groupId, group.getType());
assertEquals("superbia", group.getGroupId());
}
-
}
\ No newline at end of file