svn commit: r990153 - in /shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets: rewrite/RewriterUtilsTest.java uri/DefaultProxyUriManagerTest.java

[li...@apache.org]

Author: lindner
Date: Fri Aug 27 13:55:02 2010
New Revision: 990153

URL: http://svn.apache.org/viewvc?rev=990153&view=rev
Log:
test fixes

Added:
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java
Modified:
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java

Added: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java?rev=990153&view=auto
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java (added)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java Fri Aug 27 13:55:02 2010
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shindig.gadgets.rewrite;
+
+import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.gadgets.http.HttpRequest;
+import org.apache.shindig.gadgets.http.HttpResponseBuilder;
+import org.apache.shindig.gadgets.uri.UriCommon;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests for RewriterUtils.
+ */
+public class RewriterUtilsTest {
+  @Test
+  public void testIsHtmlWithoutHtmlTagContext() throws Exception {
+    HttpRequest req = new HttpRequest(Uri.parse("http://www.example.org/"));
+    HttpResponseBuilder builder = new HttpResponseBuilder()
+        .addHeader("Content-Type", "text/html");
+    assertTrue(RewriterUtils.isHtml(req, builder));
+  }
+
+  @Test
+  public void testIsHtmlReturnsFalseIfNonHtmlTagContext() throws Exception {
+    HttpRequest req = new HttpRequest(Uri.parse("http://www.example.org/"));
+    req.setParam(UriCommon.Param.HTML_TAG_CONTEXT.getKey(), "script");
+    HttpResponseBuilder builder = new HttpResponseBuilder()
+        .addHeader("Content-Type", "text/html");
+    assertFalse(RewriterUtils.isHtml(req, builder));
+  }
+
+  @Test
+  public void testIsHtmlReturnsTrueIfHtmlAcceptingTagContext() throws Exception {
+    HttpRequest req = new HttpRequest(Uri.parse("http://www.example.org/"));
+    req.setParam(UriCommon.Param.HTML_TAG_CONTEXT.getKey(), "link");
+    HttpResponseBuilder builder = new HttpResponseBuilder()
+        .addHeader("Content-Type", "text/html");
+    assertTrue(RewriterUtils.isHtml(req, builder));
+
+    req.setParam(UriCommon.Param.HTML_TAG_CONTEXT.getKey(), "iframe");
+    assertTrue(RewriterUtils.isHtml(req, builder));
+  }
+}

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java?rev=990153&r1=990152&r2=990153&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java Fri Aug 27 13:55:02 2010
@@ -18,29 +18,24 @@
  */
 package org.apache.shindig.gadgets.uri;
 
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.common.uri.UriBuilder;
 import org.apache.shindig.config.ContainerConfig;
 import org.apache.shindig.gadgets.Gadget;
 import org.apache.shindig.gadgets.GadgetException;
+import org.apache.shindig.gadgets.http.HttpRequest;
 import org.apache.shindig.gadgets.uri.ProxyUriManager.ProxyUri;
 import org.apache.shindig.gadgets.uri.UriCommon.Param;
 import org.junit.Test;
 
 import java.util.List;
 
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class DefaultProxyUriManagerTest extends UriManagerTestBase {
   private static final Uri RESOURCE_1 = Uri.parse("http://example.com/one.dat?param=value");
   private static final Uri RESOURCE_2 = Uri.parse("http://gadgets.com/two.dat");