Skip to content

Unit tests support multi-os and higher versions of jdk #1886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Unit tests support multi-os and higher versions of jdk #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4eb7558
fix: tokenBlockPattern support \r\n or \r
kslex Nov 7, 2023
9e6b0fa
test: remove nashorn ignore annotation to support jdk11+
kslex Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public static void main(String[] args) throws Exception {

public static TreeSet<String> getAllKeywordsUsingRegex(File file) throws IOException {
Pattern tokenBlockPattern = Pattern.compile(
"TOKEN\\s*:\\s*(?:/\\*.*\\*/*)\\n\\{(?:[^\\}\\{]+|\\{(?:[^\\}\\{]+|\\{[^\\}\\{]*\\})*\\})*\\}",
"TOKEN\\s*:\\s*(?:/\\*.*\\*/*)(?:\\r?\\n|\\r)\\{(?:[^\\}\\{]+|\\{(?:[^\\}\\{]+|\\{[^\\}\\{]*\\})*\\})*\\}",
Pattern.MULTILINE);
Pattern tokenStringValuePattern = Pattern.compile("\\\"(\\w{2,})\\\"", Pattern.MULTILINE);

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
package net.sf.jsqlparser.util;

import jdk.nashorn.internal.ir.annotations.Ignore;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.OracleHint;
import net.sf.jsqlparser.parser.CCJSqlParserManager;
Expand All @@ -23,6 +22,7 @@
import net.sf.jsqlparser.statement.simpleparsing.CCJSqlParserManagerTest;
import net.sf.jsqlparser.test.TestException;
import net.sf.jsqlparser.test.TestUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.io.BufferedReader;
Expand All @@ -41,17 +41,17 @@ public class TablesNamesFinderTest {

private static final CCJSqlParserManager PARSER_MANAGER = new CCJSqlParserManager();

@Ignore
@Disabled
public void testRUBiSTableList() throws Exception {
runTestOnResource("/RUBiS-select-requests.txt");
}

@Ignore
@Disabled
public void testMoreComplexExamples() throws Exception {
runTestOnResource("complex-select-requests.txt");
}

@Ignore
@Disabled
public void testComplexMergeExamples() throws Exception {
runTestOnResource("complex-merge-requests.txt");
}
Expand Down