Initial support and tests for MHTML

nzakas · Nov 27, 2009 · d25b6a2 · d25b6a2
1 parent 48ff78e
commit d25b6a2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/net/nczonline/web/cssembed/CSSURLEmbedder.java b/src/net/nczonline/web/cssembed/CSSURLEmbedder.java
@@ -44,7 +44,7 @@ public class CSSURLEmbedder {
     public static final int DATAURI_OPTION = 1;
     public static final int MHTML_OPTION = 2;
 
-    private static String MHTML_SEPARATOR = "CSSEmbed_Image";
+    protected static String MHTML_SEPARATOR = "CSSEmbed_Image";
 
     private static HashSet<String> imageTypes;    
     static {
@@ -100,7 +100,7 @@ public void setVerbose(boolean newVerbose){
     // Determine if an option is set - Options support not yet complete
     //--------------------------------------------------------------------------    
 
-    public boolean hasOption(int option){
+    private boolean hasOption(int option){
         return (options & option) > 0;
     }
 

diff --git a/tests/net/nczonline/web/cssembed/CSSURLEmbedderTest.java b/tests/net/nczonline/web/cssembed/CSSURLEmbedderTest.java
@@ -55,6 +55,24 @@ public void testAbsoluteLocalFile() throws IOException {
         assertEquals("background: url(" + folderDataURI + ");", result);
     }
 
+    @Test
+    public void testAbsoluteLocalFileWithMhtml() throws IOException {
+        String filename = CSSURLEmbedderTest.class.getResource("folder.png").getPath().replace("%20", " ");
+        String code = "background: url(folder.png);";
+        String mhtmlUrl = "http://www.example.com/dir/styles_ie.css";
+
+        StringWriter writer = new StringWriter();
+        embedder = new CSSURLEmbedder(new StringReader(code), CSSURLEmbedder.MHTML_OPTION, true);
+        embedder.setMhtmlUrl(mhtmlUrl);
+        embedder.embedImages(writer, filename.substring(0, filename.lastIndexOf("/")+1));
+
+        String result = writer.toString();
+        assertEquals("/*\nContent-Type: multipart/related; boundary=\"" + CSSURLEmbedder.MHTML_SEPARATOR + 
+                "\"\n\n--" + CSSURLEmbedder.MHTML_SEPARATOR + "\nContent-Location:folder.png\n" +
+                "Content-Transfer-Encoding:base64\n\n" + folderDataURI.substring(folderDataURI.indexOf(",")+1) +
+                "\n*/\nbackground: url(mhtml:" + mhtmlUrl + "!folder.png);", result);
+    }
+
     @Test
     public void testAbsoluteLocalFileMultipleOneLine() throws IOException {
         String filename = CSSURLEmbedderTest.class.getResource("folder.png").getPath().replace("%20", " ");