Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add newline after JSON responses 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1346101 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2012-06-04 19:34:51 +00:00
parent 649dfb6e79
commit e4a6061e8a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
View File

@ -92,7 +92,7 @@ class JSONWriter extends TextResponseWriter {
if(wrapperFunction!=null) {
writer.write(')');
}
if (doIndent) writer.write('\n'); // ending with a newline looks much better from the command line
writer.write('\n'); // ending with a newline looks much better from the command line
}
protected void writeKey(String fname, boolean needsEscaping) throws IOException {

16
solr/core/src/test/org/apache/solr/request/JSONWriterTest.java
View File

@ -44,7 +44,13 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig.xml","schema.xml");
}
}
private void jsonEq(String expected, String received) {
expected = expected.trim();
received = received.trim();
assertEquals(expected, received);
}
@Test
public void testTypes() throws IOException {
@ -57,17 +63,17 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
rsp.add("data2", Double.NEGATIVE_INFINITY);
rsp.add("data3", Float.POSITIVE_INFINITY);
w.write(buf, req, rsp);
assertEquals(buf.toString(), "{'data1':float('NaN'),'data2':-float('Inf'),'data3':float('Inf')}");
jsonEq(buf.toString(), "{'data1':float('NaN'),'data2':-float('Inf'),'data3':float('Inf')}");
w = new RubyResponseWriter();
buf = new StringWriter();
w.write(buf, req, rsp);
assertEquals(buf.toString(), "{'data1'=>(0.0/0.0),'data2'=>-(1.0/0.0),'data3'=>(1.0/0.0)}");
jsonEq(buf.toString(), "{'data1'=>(0.0/0.0),'data2'=>-(1.0/0.0),'data3'=>(1.0/0.0)}");
w = new JSONResponseWriter();
buf = new StringWriter();
w.write(buf, req, rsp);
assertEquals(buf.toString(), "{\"data1\":\"NaN\",\"data2\":\"-Infinity\",\"data3\":\"Infinity\"}");
jsonEq(buf.toString(), "{\"data1\":\"NaN\",\"data2\":\"-Infinity\",\"data3\":\"Infinity\"}");
req.close();
}
@ -88,7 +94,7 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
rsp.add("bytes", "abc".getBytes("UTF-8"));
w.write(buf, req, rsp);
assertEquals("{\"nl\":[[\"data1\",\"he\\u2028llo\\u2029!\"],[null,42]],\"byte\":-3,\"short\":-4,\"bytes\":\"YWJj\"}", buf.toString());
jsonEq("{\"nl\":[[\"data1\",\"he\\u2028llo\\u2029!\"],[null,42]],\"byte\":-3,\"short\":-4,\"bytes\":\"YWJj\"}", buf.toString());
req.close();
}