summaryrefslogtreecommitdiffstats
path: root/server/tests
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2015-03-06 09:09:27 +0000
committerVaadin Code Review <review@vaadin.com>2015-03-06 09:17:53 +0000
commit4db0b55aefd83d149e62a7fad2b14fb232d976c8 (patch)
treef2b90e7bf6c7df843a34f244d94d56c8ed74ab28 /server/tests
parent69db9eac8f76a66210b8eb7308c9e5fc84eff977 (diff)
downloadvaadin-framework-4db0b55aefd83d149e62a7fad2b14fb232d976c8.tar.gz
vaadin-framework-4db0b55aefd83d149e62a7fad2b14fb232d976c8.zip
Revert "Encode filenames to UTF-8 in Content-Disposition header. (#16556)"
Breaks AppResource404, BrowserFrameIsVisible and FlashIsVisible This reverts commit af6dd56e89db8ea8c88f607c4214abcde50dfc94. Change-Id: I82fc9ef4c9d08dc8aa48e0fa137fae5782701389
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/src/com/vaadin/server/FileDownloaderTests.java41
1 files changed, 0 insertions, 41 deletions
diff --git a/server/tests/src/com/vaadin/server/FileDownloaderTests.java b/server/tests/src/com/vaadin/server/FileDownloaderTests.java
deleted file mode 100644
index 4e9478c570..0000000000
--- a/server/tests/src/com/vaadin/server/FileDownloaderTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.vaadin.server;
-
-import static org.mockito.Matchers.contains;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLEncoder;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class FileDownloaderTests {
- private String filename = "日本語.png";
- private DownloadStream stream;
-
- @Before
- public void setup() {
- stream = new DownloadStream(mock(InputStream.class), "", filename);
- }
-
- @Test
- public void contentDispositionFilenameIsUtf8Encoded() throws IOException {
- VaadinResponse response = mock(VaadinResponse.class);
-
- stream.writeResponse(mock(VaadinRequest.class), response);
-
- verify(response).setHeader(eq("Content-Disposition"),
- contains("attachment;"));
- String encodedFileName = URLEncoder.encode(filename, "utf-8");
- verify(response).setHeader(eq("Content-Disposition"),
- contains(String.format("filename=\"%s\";", encodedFileName)));
- verify(response)
- .setHeader(
- eq("Content-Disposition"),
- contains(String.format("filename*=utf-8''%s",
- encodedFileName)));
- }
-}