Skip to content

Commit

Permalink
Merge pull request #35 from activey/#34
Browse files Browse the repository at this point in the history
#34 - multiple entries with same data type fix
  • Loading branch information
gmaslowski committed Jan 21, 2016
2 parents 75186bc + d3fd99a commit 96da11d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.reactor.response.renderer.simple;

import static com.google.common.base.Strings.isNullOrEmpty;
import static com.google.common.collect.Maps.newHashMap;
import static com.google.common.collect.ArrayListMultimap.create;
import static java.lang.String.format;

import java.io.PrintWriter;
import java.io.Writer;
import java.util.Map;

import com.google.common.collect.Multimap;
import org.reactor.response.list.ListElementFormatter;
import org.reactor.response.renderer.AbstractAutoFlushableResponseRenderer;

Expand All @@ -19,7 +19,7 @@ public class SimpleReactorResponseRenderer extends AbstractAutoFlushableResponse
private static final String PROPERTY_LIST = "list";

private String header;
private Map<String, String> responseElements = newHashMap();
private Multimap<String, String> responseElements = create();

@Override
public void renderHeadLine(String headerTemplateToBeRendered, Object... templateParameters) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public class SimpleReactorResponseRendererTest extends AbstractUnitTest {
private static final String DOUBLE_LINE_2 = "doubleLine2";
private static final double DOUBLE_VALUE_1 = 1.1d;
private static final double DOUBLE_VALUE_2 = 2.2d;
private static final double DOUBLE_VALUE_3 = 3.3d;
private static final double DOUBLE_VALUE_4 = 4.4d;

@Test
public void shouldPrintHeaderIfNotNull() {
Expand Down Expand Up @@ -71,6 +73,9 @@ public void shouldHaveAllEntriesPrintedOut() {
responseRenderer.renderTextLine(TEXT_LINE_2, TEXT_VALUE_2);
responseRenderer.renderDoubleLine(DOUBLE_LINE_1, DOUBLE_VALUE_1);
responseRenderer.renderDoubleLine(DOUBLE_LINE_2, DOUBLE_VALUE_2);
responseRenderer.renderDoubleLine(DOUBLE_VALUE_3);
responseRenderer.renderDoubleLine(DOUBLE_VALUE_4);


// and after commit to writer
StringWriter writer = spy(new StringWriter());
Expand All @@ -83,6 +88,8 @@ public void shouldHaveAllEntriesPrintedOut() {
verify(writer).write(TEXT_VALUE_2, 0, TEXT_VALUE_2.length());
verify(writer).write(Double.toString(DOUBLE_VALUE_1), 0, Double.toString(DOUBLE_VALUE_1).length());
verify(writer).write(Double.toString(DOUBLE_VALUE_2), 0, Double.toString(DOUBLE_VALUE_2).length());
verify(writer).write(Double.toString(DOUBLE_VALUE_3), 0, Double.toString(DOUBLE_VALUE_3).length());
verify(writer).write(Double.toString(DOUBLE_VALUE_4), 0, Double.toString(DOUBLE_VALUE_4).length());
}

@Test
Expand Down

0 comments on commit 96da11d

Please sign in to comment.