(fix) Severe encoding bug in Action.stringContent(String content). See …

…#66

src/main/java/com/xebialabs/restito/semantics/Action.java

@@ -127,7 +127,7 @@ public static Action resourceContent(URL resourceUrl) {
     }
 
     /**
-     * Combines {@link #resourceContent(java.net.URL)} and {@link #charset(java.nio.charset.Charset)}
+     * Combines {@link #resourceContent(java.net.URL)} and {@link #charset(Charset)}
      */
     public static Action resourceContent(URL resourceUrl, Charset charset) {
         final Action charsetAction = charset != null ? charset(charset) : Action.noop();
@@ -151,12 +151,27 @@ public static Action bytesContent(final byte[] content) {
     }
 
     /**
-     * Writes string content to response
+     * Writes string content into response. Important: when using this method, the string gets encoded
+     * into a sequence of bytes using the platform's default charset. Please use {@link #stringContent(String, Charset)}
+     * if you need to be specific about the encoding.
      */
     public static Action stringContent(final String content) {
         return bytesContent(content.getBytes());
     }
 
+    /**
+     * Writes string content into response. The passed charset is used:
+     *  - To encoded the string into bytes;
+     *  - As character set of the response.
+     * The latter will result in a <pre>charset=XXX</pre> part of <pre>Content-Type</pre> header
+     * if and only if the header has been set in some way (e.g. by using {@link #contentType(String)} action.
+     *
+     * See `integration.CharsetAndEncodingTest` for more details.
+     */
+    public static Action stringContent(final String content, final Charset charset) {
+        return composite(charset(charset), bytesContent(content.getBytes(charset)));
+    }
+
     /**
      * Sets key-value header on response
      */

src/test/java/integration/CharsetAndEncodingTest.java

@@ -0,0 +1,80 @@
+package integration;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.response.Response;
+import com.xebialabs.restito.server.StubServer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.nio.charset.Charset;
+
+import static com.jayway.restassured.RestAssured.expect;
+import static com.xebialabs.restito.builder.stub.StubHttp.whenHttp;
+import static com.xebialabs.restito.semantics.Action.*;
+import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.nullValue;
+
+public class CharsetAndEncodingTest {
+
+    private StubServer server;
+
+    private static Charset CP_1251 = Charset.forName("Cp1251");
+
+    @Before
+    public void start() {
+        server = new StubServer().run();
+        RestAssured.port = server.getPort();
+    }
+
+    @After
+    public void stop() {
+        server.stop();
+    }
+
+
+    @Test
+    public void shouldEncodeStringsUsingDefaultPlatformCharset() {
+        whenHttp(server)
+                .match("/default-charset").
+                then(stringContent("Хеллоу"));
+
+        expect().header("Content-Type", is(nullValue()))
+                .content(equalTo("Хеллоу"))
+                .when().get("/default-charset");
+    }
+
+    @Test
+    public void shouldEncodeStringsUsingExplicitlyPassedCharset() {
+        whenHttp(server)
+                .match("/custom-charset-1").
+                then(contentType("application/text"), stringContent("Хеллоу", CP_1251));
+
+        whenHttp(server)
+                .match("/custom-charset-2").
+                then(stringContent("Хеллоу", CP_1251), contentType("application/text"));
+
+        expect().header("Content-Type", is("application/text;charset=windows-1251"))
+                .content(equalTo("Хеллоу"))
+                .when().get("/custom-charset-1");
+
+        expect().header("Content-Type", is("application/text;charset=windows-1251"))
+                .content(equalTo("Хеллоу"))
+                .when().get("/custom-charset-2");
+    }
+
+    @Test
+    public void shouldNotIncludeExplicitlyPassedInHeadersCharsetWhenContentTypeHeaderIsMissing() {
+        whenHttp(server)
+                .match("/custom-charset-3").
+                then(stringContent("Хеллоу", CP_1251));
+
+        Response response = expect().header("Content-Type", is(nullValue()))
+                .when().get("/custom-charset-1");
+
+        assertArrayEquals(response.body().asByteArray(), "Хеллоу".getBytes(CP_1251));
+    }
+
+
+}