Update to latest ph-javacc-maven-plugin.

- Update FastCharStream method names to follow changes in
  generated CharStream class.
- Update expected test output due to improvements in generated
  code.
- Improve ability to debug tests by more clearly printing out
  the diff between expected and actual output.

2 files changed, 9 insertions, 9 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/javacc/FastCharStream.java b/vespajlib/src/main/java/com/yahoo/javacc/FastCharStream.java
index 57376734030..96dc03865e3 100644
--- a/vespajlib/src/main/java/com/yahoo/javacc/FastCharStream.java
+++ b/vespajlib/src/main/java/com/yahoo/javacc/FastCharStream.java
@@ -49,21 +49,21 @@ public class FastCharStream {
         readPos -= amount;
     }
 
-    public char BeginToken() throws IOException {
+    public char beginToken() throws IOException {
         tokenPos = readPos;
         return readChar();
     }
 
-    public String GetImage() {
+    public String getImage() {
         return inputStr.substring(tokenPos, readPos);
     }
 
     @SuppressWarnings("UnusedParameters")
-    public char[] GetSuffix(int len) {
+    public char[] getSuffix(int len) {
         throw new UnsupportedOperationException();
     }
 
-    public void Done() {
+    public void done() {
 
     }
 
@@ -73,7 +73,7 @@ public class FastCharStream {
 
     public void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 
-    public boolean getTrackLineColumn() { return trackLineColumn; }
+    public boolean isTrackLineColumn() { return trackLineColumn; }
 
     public String formatException(String parseException) {
         int errPos = findErrPos(parseException);
diff --git a/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java b/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java
index d8f7b6e9e7e..5d768ee3b93 100644
--- a/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java
@@ -79,7 +79,7 @@ public class FastCharStreamTestCase {
     @Test
     public void requireThatSuffixIsNotSupported() {
         try {
-            new FastCharStream("foo").GetSuffix(0);
+            new FastCharStream("foo").getSuffix(0);
             fail();
         } catch (UnsupportedOperationException e) {
 
@@ -89,7 +89,7 @@ public class FastCharStreamTestCase {
     @Test
     public void requireThatDoneDoesNotThrowException() {
         FastCharStream input = new FastCharStream("foo");
-        input.Done();
+        input.done();
     }
 
     @Test
@@ -99,7 +99,7 @@ public class FastCharStreamTestCase {
         input.readChar();
         input.readChar();
         input.readChar();
-        assertEquals('b', input.BeginToken());
+        assertEquals('b', input.beginToken());
         assertEquals(5, input.getBeginColumn());
         assertEquals(-1, input.getBeginLine());
         assertEquals(6, input.getEndColumn());
@@ -108,7 +108,7 @@ public class FastCharStreamTestCase {
         assertEquals('r', input.readChar());
         assertEquals(8, input.getEndColumn());
         assertEquals(-1, input.getEndLine());
-        assertEquals("bar", input.GetImage());
+        assertEquals("bar", input.getImage());
     }
 
     @Test