test: add tests for upgraded JavaCC (manticore branch)

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>

Author: manticore-projects

src/test/java/net/sf/jsqlparser/parser/CCJSqlParserTest.java

@@ -10,10 +10,14 @@
 package net.sf.jsqlparser.parser;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import net.sf.jsqlparser.JSQLParserException;
 import org.junit.jupiter.api.Test;
 
 import net.sf.jsqlparser.parser.feature.Feature;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 public class CCJSqlParserTest {
     @Test
@@ -24,4 +28,21 @@ public void parserWithTimeout() throws Exception {
 
         assertThat(timeOut).isEqualTo(123L);
     }
+
+    @ParameterizedTest
+    @CsvSource(delimiter = '|', value = {
+            "SELECT /* c */1                | SELECT /* c */ 1",
+            "SELECT 1 /* c */+2             | SELECT 1 /* c */ +2",
+            "SELECT 1/*x*/+2                | SELECT 1 /*x*/ +2",
+            "SELECT /* a /* b */ c */1      | SELECT /* a /* b */ c */ 1",
+            "SELECT * FROM t WHERE/*c*/x=1  | SELECT * FROM t WHERE /*c*/ x=1",
+            "SELECT/*+ FULL(t) */*FROM t    | SELECT /*+ FULL(t) */ * FROM t"
+    })
+    void testBlockCommentFollowedByNonWhitespace(String tight, String spaced)
+            throws JSQLParserException {
+        // Issue #2509: the first character after */ was swallowed into the comment token,
+        // so the tight form either failed to parse or silently lost that character.
+        assertEquals(CCJSqlParserUtil.parse(spaced).toString(),
+                     CCJSqlParserUtil.parse(tight).toString());
+    }
 }

src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java

@@ -200,7 +200,7 @@ public Object visit(Node node, Object data) {
             }
         }, null);
 
-        assertThat(comments).extracting(token -> token.image).containsExactly("/* testcomment */ ",
+        assertThat(comments).extracting(token -> token.image).containsExactly("/* testcomment */",
                 "-- testcomment2 ");
     }
 
@@ -211,7 +211,7 @@ public void testSelectASTExtractWithCommentsIssue1580_2() throws JSQLParserExcep
         Node root = (Node) CCJSqlParserUtil.parseAST(sql);
 
         assertThat(root.jjtGetFirstToken().specialToken.image)
-                .isEqualTo("/* I want this comment */\n");
+                .isEqualTo("/* I want this comment */");
     }
 
     @Test