| commit | 8d71f29e1e0d0ccf7547b757ab6aefc03c8ce5b1 | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <edwin.kempin@sap.com> | Wed Feb 13 13:04:03 2013 +0100 |
| committer | Edwin Kempin <edwin.kempin@sap.com> | Wed Feb 13 13:07:42 2013 +0100 |
| tree | 2551bafb5a17bee8a444f04393578b135383a353 | |
| parent | c991828e45644e865db79ac54b2d44835840b3a0 [diff] |
Use constant from RestApiServlet to skip JSON_MAGIC in acceptance tests Change-Id: I9ebde3265a58eeafe0546733c9c962de28a3cb26 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/RestSession.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/RestSession.java index 16f1c34..2c21e22 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/RestSession.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/RestSession.java
@@ -14,6 +14,8 @@ package com.google.gerrit.acceptance; +import static com.google.gerrit.httpd.restapi.RestApiServlet.JSON_MAGIC; + import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -37,7 +39,7 @@ HttpGet get = new HttpGet("http://localhost:8080/a" + endPoint); HttpResponse response = getClient().execute(get); Reader reader = new InputStreamReader(response.getEntity().getContent()); - reader.skip(4); + reader.skip(JSON_MAGIC.length); return reader; }
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java index 32437fb..0859117 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -132,7 +132,7 @@ * HTTP interface will need to always strip the first line of response data to * remove this magic header. */ - private static final byte[] JSON_MAGIC; + public static final byte[] JSON_MAGIC; static { JSON_MAGIC = ")]}'\n".getBytes(UTF_8);