Author: doll
Date: Thu Jun 12 10:08:03 2008
New Revision: 667163
URL: http://svn.apache.org/viewvc?rev=667163&view=rev
Log:
Moved the FakeGadgetToken into common so the the social tests can use it too.
(Note: I think it has to be in the main dir as opposed to the tests dir so that
the maven dependencies can work. For this reason I moved it into a "testing"
package. Feel free to correct me if this does not have to be true)
Added:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java
- copied, changed from r667146,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java
Removed:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
Copied:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java
(from r667146,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java&r1=667146&r2=667163&rev=667163&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java
Thu Jun 12 10:08:03 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets;
+package org.apache.shindig.common.testing;
import org.apache.shindig.common.SecurityToken;
@@ -24,23 +24,23 @@
* A fake SecurityToken implementation to help testing.
*/
public class FakeGadgetToken implements SecurityToken {
-
+
private String updatedToken;
private String trustedJson;
public FakeGadgetToken() {
this(null, null);
}
-
+
public FakeGadgetToken(String updatedToken) {
this(updatedToken, null);
}
-
+
public FakeGadgetToken(String updatedToken, String trustedJson) {
this.updatedToken = updatedToken;
this.trustedJson = trustedJson;
}
-
+
public String getOwnerId() {
return "owner";
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=667163&r1=667162&r2=667163&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
Thu Jun 12 10:08:03 2008
@@ -22,7 +22,7 @@
import static org.easymock.EasyMock.isA;
import org.apache.shindig.gadgets.ContainerConfig;
-import org.apache.shindig.gadgets.FakeGadgetToken;
+import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -200,7 +200,7 @@
}
return null;
}
-
+
public void testAuthTokenInjection_allparams() throws Exception {
expect(request.getParameter("st")).andReturn("fake-token");
expect(securityTokenDecoder.createToken("fake-token")).andReturn(
@@ -210,7 +210,7 @@
assertEquals("updated-token", auth.getString("authToken"));
assertEquals("{ 'foo' : 'bar' }", auth.getString("trustedJson"));
}
-
+
public void testAuthTokenInjection_none() throws Exception {
expect(request.getParameter("st")).andReturn("fake-token");
expect(securityTokenDecoder.createToken("fake-token")).andReturn(
@@ -219,7 +219,7 @@
JSONObject auth = parseShindigAuthConfig(content);
assertEquals(0, auth.length());
}
-
+
public void testAuthTokenInjection_trustedJson() throws Exception {
expect(request.getParameter("st")).andReturn("fake-token");
expect(securityTokenDecoder.createToken("fake-token")).andReturn(
@@ -229,7 +229,7 @@
assertEquals(1, auth.length());
assertEquals("trusted", auth.getString("trustedJson"));
}
-
+
public void testAuthTokenInjection_updatedToken() throws Exception {
expect(request.getParameter("st")).andReturn("fake-token");
expect(securityTokenDecoder.createToken("fake-token")).andReturn(
@@ -237,7 +237,7 @@
String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
JSONObject auth = parseShindigAuthConfig(content);
assertEquals(1, auth.length());
- assertEquals("updated-token", auth.getString("authToken"));
+ assertEquals("updated-token", auth.getString("authToken"));
}
// TODO: Lots of ugly tests on html content.
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java?rev=667163&r1=667162&r2=667163&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
Thu Jun 12 10:08:03 2008
@@ -28,7 +28,7 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.SecurityTokenException;
-import org.apache.shindig.gadgets.FakeGadgetToken;
+import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.http.HttpRequest;
