Merge branch fix/testSaveInUserTemporaryArea of npcode/yobi

from pull request 571
naver · Feb 4, 2014 · 331ceb2 · 331ceb2
2 parents 7831387 + f5fd54b
commit 331ceb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/Attachment.java b/app/models/Attachment.java
@@ -236,7 +236,7 @@ public boolean store(File file, String name, Resource container) throws IOExcept
                     new BufferedInputStream(new FileInputStream(file)), meta);
             this.mimeType = mediaType.toString();
             if (mediaType.getType().toLowerCase().equals("text")) {
-                this.mimeType += " ;charset=" + FileUtil.detectCharset(new FileInputStream(file));
+                this.mimeType += "; charset=" + FileUtil.detectCharset(new FileInputStream(file));
             }
         }
 

diff --git a/test/models/AttachmentTest.java b/test/models/AttachmentTest.java
@@ -36,7 +36,7 @@ public void testSaveInUserTemporaryArea() throws IOException, NoSuchAlgorithmExc
 
         // Then
         assertThat(attach.name).isEqualTo("bar.txt");
-        assertThat(attach.mimeType).isEqualTo("text/plain");
+        assertThat(attach.mimeType).isEqualTo("text/plain; charset=UTF-8");
         assertThat(new String(b, 0, length)).isEqualTo(new String("Hello"));
     }