diff options
| author | qsr <qsr@chromium.org> | 2014-10-16 08:59:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 15:59:50 +0000 |
| commit | ddd10127f54dfe20e1f82bfe6c76b01296867338 (patch) | |
| tree | 7303cb5f28660370b8656cf4bfcb797ed1a84803 /mojo/android/javatests/src | |
| parent | 0388a1c95c2c6ad38a041a8ad58c029201a7196d (diff) | |
| download | chromium_src-ddd10127f54dfe20e1f82bfe6c76b01296867338.zip chromium_src-ddd10127f54dfe20e1f82bfe6c76b01296867338.tar.gz chromium_src-ddd10127f54dfe20e1f82bfe6c76b01296867338.tar.bz2 | |
mojo: Fix java bindings for maps
Also fix parsing of validation files.
TBR=ppi@chromium.org
Review URL: https://codereview.chromium.org/640223003
Cr-Commit-Position: refs/heads/master@{#299899}
Diffstat (limited to 'mojo/android/javatests/src')
| -rw-r--r-- | mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java index e6a1923..8bf5e21 100644 --- a/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java +++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTest.java @@ -62,10 +62,11 @@ public class ValidationTest extends MojoTestCase { private static String getStringContent(File f) throws FileNotFoundException { Scanner scanner = new Scanner(f).useDelimiter("\\Z"); - if (scanner.hasNext()) { - return scanner.next(); + StringBuilder result = new StringBuilder(); + while (scanner.hasNext()) { + result.append(scanner.next()); } - return ""; + return result.toString().trim(); } private static List<TestData> getTestData(String prefix) |