[FEATURE] Proxy redesign, first step

2013-11-25 22:35:58 +01:00
parent 76ad7acd21
commit 7c8f361826
6 changed files with 221 additions and 36 deletions
--- a/src/test/java/net/sourceforge/plantuml/servlet/TestOldProxy.java
+++ b/src/test/java/net/sourceforge/plantuml/servlet/TestOldProxy.java
@@ -0,0 +1,67 @@
+package net.sourceforge.plantuml.servlet;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+public class TestOldProxy extends WebappTestCase {
+    /**
+     * Verifies the proxified reception of the default Bob and Alice diagram
+     */
+    public void testDefaultProxy() throws Exception {
+        WebConversation conversation = new WebConversation();
+        WebRequest request = new GetMethodWebRequest(getServerUrl() + "proxy/" + getServerUrl() + "welcome");
+        WebResponse response = conversation.getResource(request);
+        // Analyze response
+        // Verifies the Content-Type header
+        // assertEquals( "Response content type is not PNG", "image/png", response.getContentType());
+        // Get the image and verify its size (~2000 bytes)
+        InputStream responseStream = response.getInputStream();
+        ByteArrayOutputStream imageStream = new ByteArrayOutputStream();
+        byte[] buf = new byte[1024];
+        int n = 0;
+        while ((n = responseStream.read(buf)) != -1) {
+            imageStream.write(buf, 0, n);
+        }
+        imageStream.close();
+        responseStream.close();
+        byte[] inMemoryImage = imageStream.toByteArray();
+        int diagramLen = inMemoryImage.length;
+        assertTrue(diagramLen > 1500);
+        assertTrue(diagramLen < 2500);
+    }
+
+    public void testProxyWithFormat() throws Exception {
+        WebConversation conversation = new WebConversation();
+        WebRequest request = new GetMethodWebRequest(getServerUrl() + "proxy/svg/" + getServerUrl() + "welcome");
+        WebResponse response = conversation.getResource(request);
+        // Analyze response
+        // Verifies the Content-Type header
+        // TODO assertEquals( "Response content type is not SVG", "image/svg+xml", response.getContentType());
+        // Get the content and verify its size
+        String diagram = response.getText();
+        int diagramLen = diagram.length();
+        assertTrue(diagramLen > 1000);
+        assertTrue(diagramLen < 3000);
+    }
+
+    /**
+     * Verifies that the HTTP header of a diagram incites the browser to cache it.
+     */
+    public void testInvalidUrl() throws Exception {
+        WebConversation conversation = new WebConversation();
+        // Try to proxify an invalid address
+        WebRequest request = new GetMethodWebRequest(getServerUrl() + "proxy/invalidURL");
+        WebResponse response = conversation.getResource(request);
+        // Analyze response, it must be the empty form
+        // Verifies the Content-Type header
+        assertEquals("Response content type is not HTML", "text/html", response.getContentType());
+        WebForm forms[] = response.getForms();
+        assertEquals(2, forms.length);
+    }
+}