Skip to content

Commit 1fd56ac

Browse files
manticore-projectsmanticore-projects
committed
Keyword test adopt JUnit5
Update keywords
1 parent 4bef952 commit 1fd56ac

5 files changed

Lines changed: 68 additions & 40 deletions

File tree

‎build.gradle‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ repositories {
2222
maven {
2323
url = uri('https://repo.maven.apache.org/maven2/')
2424
}
25+
26+
maven {
27+
url "https://plugins.gradle.org/m2/"
28+
}
2529
}
2630

2731
dependencies {
@@ -31,11 +35,20 @@ dependencies {
3135
testImplementation 'org.assertj:assertj-core:3.16.1'
3236
testImplementation 'org.apache.commons:commons-lang3:3.10'
3337
testImplementation 'com.h2database:h2:1.4.200'
38+
39+
3440

3541
// for JaCoCo Reports
3642
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
43+
testImplementation 'org.junit.jupiter:junit-jupiter-params'
3744
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
38-
45+
46+
47+
// https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
48+
testImplementation 'org.mockito:mockito-junit-jupiter:4.1.0'
49+
50+
// enforce latest version of JavaCC
51+
javacc 'net.java.dev.javacc:javacc:7.0.10'
3952
}
4053

4154
compileJavacc {
@@ -56,6 +69,8 @@ jacoco {
5669
}
5770

5871
test {
72+
useJUnitPlatform()
73+
5974
finalizedBy jacocoTestReport // report is always generated after tests run
6075
finalizedBy jacocoTestCoverageVerification
6176
}

‎src/main/java/net/sf/jsqlparser/parser/ParserKeywordsUtils.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2021 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
110
package net.sf.jsqlparser.parser;
211

312
import java.util.*;

‎src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,8 +1335,8 @@ Update Update( List<WithItem> with ):
13351335
}
13361336
{
13371337
<K_UPDATE> { update.setOracleHint(getOracleHint()); }
1338-
[<K_LOW_PRIORITY> { modifierPriority = UpdateModifierPriority.LOW_PRIORITY; }]
1339-
[<K_IGNORE> { modifierIgnore = true; }]
1338+
[ LOOKAHEAD(2) <K_LOW_PRIORITY> { modifierPriority = UpdateModifierPriority.LOW_PRIORITY; }]
1339+
[ LOOKAHEAD(2) <K_IGNORE> { modifierIgnore = true; }]
13401340
table=TableWithAlias() startJoins=JoinsList()
13411341
<K_SET>
13421342
(
@@ -1698,9 +1698,9 @@ Delete Delete( List<WithItem> with ):
16981698
}
16991699
{
17001700
<K_DELETE> { delete.setOracleHint(getOracleHint()); }
1701-
[<K_LOW_PRIORITY> { modifierPriority = DeleteModifierPriority.LOW_PRIORITY; }]
1702-
[<K_QUICK> { modifierQuick = true; }]
1703-
[<K_IGNORE> { modifierIgnore = true; }]
1701+
[ LOOKAHEAD(2) <K_LOW_PRIORITY> { modifierPriority = DeleteModifierPriority.LOW_PRIORITY; }]
1702+
[ LOOKAHEAD(2) <K_QUICK> { modifierQuick = true; }]
1703+
[ LOOKAHEAD(2) <K_IGNORE> { modifierIgnore = true; }]
17041704
[LOOKAHEAD(4) (table=TableWithAlias() { tables.add(table); }
17051705
("," table=TableWithAlias() { tables.add(table); } )*
17061706
<K_FROM> | <K_FROM>) { hasFrom = true; }]
@@ -1835,12 +1835,12 @@ The following tokens are allowed as Names for Schema, Table, Column and Aliases
18351835
// Generated Code! Please do not edit manually.
18361836
// Instead:
18371837
// 1) define the ALL_RESERVED_KEYWORDS in the PARSER DECLARATION above (line 157 ff)
1838-
// 2) then insert the Code fragment built by Graddle Task :JSQLParser:updateKeywords
1838+
// 2) then insert the Code fragment built by Gradle Task :JSQLParser:updateKeywords
18391839
String RelObjectNameWithoutValue() :
18401840
{ Token tk = null; }
18411841
{
18421842
( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME>
1843-
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="COSTS" | tk="CYCLE" | tk="DATABASE" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTO" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOG" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="PARALLEL" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="ZONE" )
1843+
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="BEGIN" | tk="BINARY" | tk="BIT" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="COSTS" | tk="CYCLE" | tk="DATABASE" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFAULT" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GLOBAL" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTO" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LINK" | tk="LOCAL" | tk="LOG" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAXVALUE" | tk="MERGE" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="PARALLEL" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PRECEDING" | tk="PRECISION" | tk="PRIMARY" | tk="PRIOR" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="READ" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REGISTER" | tk="RENAME" | tk="REPLACE" | tk="RESET" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RLIKE" | tk="ROLLBACK" | tk="ROW" | tk="ROWS" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="THEN" | tk="TIMEOUT" | tk="TO" | tk="TRUE" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="USER" | tk="VALIDATE" | tk="VERBOSE" | tk="VIEW" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLTEXT" | tk="YAML" | tk="ZONE" )
18441844
{ return tk.image; }
18451845
}
18461846

‎src/test/java/net/sf/jsqlparser/statement/ConditionalKeywordsTest.java‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2021 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
110
package net.sf.jsqlparser.statement;
211

312
import net.sf.jsqlparser.JSQLParserException;
413
import net.sf.jsqlparser.parser.ParserKeywordsUtils;
5-
import org.junit.Test;
6-
import org.junit.runner.RunWith;
7-
import org.junit.runners.Parameterized;
8-
import org.junit.runners.Parameterized.Parameters;
14+
import org.junit.jupiter.params.ParameterizedTest;
15+
import org.junit.jupiter.params.provider.MethodSource;
16+
917

1018
import java.util.ArrayList;
1119
import java.util.List;
1220
import java.util.logging.Level;
1321
import java.util.logging.Logger;
22+
import java.util.stream.Stream;
1423

1524
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
1625

@@ -19,12 +28,11 @@
1928
* @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
2029
*/
2130

22-
@RunWith(Parameterized.class)
31+
2332
public class ConditionalKeywordsTest {
2433
public final static Logger LOGGER = Logger.getLogger(ConditionalKeywordsTest.class.getName());
2534

26-
@Parameters(name = "Keyword {0}")
27-
public final static Iterable<String> KEY_WORDS() {
35+
public final static Stream<String> KEY_WORDS() {
2836
List<String> keywords = new ArrayList<>();
2937
try {
3038
try {
@@ -42,17 +50,12 @@ public final static Iterable<String> KEY_WORDS() {
4250
} catch (Exception ex) {
4351
LOGGER.log(Level.SEVERE, "Failed to generate the Keyword List", ex);
4452
}
45-
return keywords;
46-
}
47-
48-
protected String keyword;
49-
50-
public ConditionalKeywordsTest(String keyword) {
51-
this.keyword = keyword;
53+
return keywords.stream();
5254
}
5355

54-
@Test
55-
public void testRelObjectNameExt() throws JSQLParserException {
56+
@ParameterizedTest(name = "Keyword {0}")
57+
@MethodSource("KEY_WORDS")
58+
public void testRelObjectNameExt(String keyword) throws JSQLParserException {
5659
String sqlStr = String.format("SELECT %1$s.%1$s.%1$s AS \"%1$s\" from %1$s ORDER BY %1$s ", keyword);
5760
LOGGER.fine(sqlStr);
5861
assertSqlCanBeParsedAndDeparsed(sqlStr, true);

‎src/test/java/net/sf/jsqlparser/statement/KeywordsTest.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
1+
/*-
2+
* #%L
3+
* JSQLParser library
4+
* %%
5+
* Copyright (C) 2004 - 2021 JSQLParser
6+
* %%
7+
* Dual licensed under GNU LGPL 2.1 or Apache License 2.0
8+
* #L%
9+
*/
110
package net.sf.jsqlparser.statement;
211

312
import net.sf.jsqlparser.JSQLParserException;
413
import net.sf.jsqlparser.parser.ParserKeywordsUtils;
5-
import org.junit.Test;
6-
import org.junit.runner.RunWith;
7-
import org.junit.runners.Parameterized;
8-
import org.junit.runners.Parameterized.Parameters;
14+
import org.junit.jupiter.params.ParameterizedTest;
15+
import org.junit.jupiter.params.provider.MethodSource;
916

1017
import java.util.ArrayList;
1118
import java.util.List;
1219
import java.util.logging.Level;
1320
import java.util.logging.Logger;
21+
import java.util.stream.Stream;
1422

1523
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
1624

@@ -19,12 +27,10 @@
1927
* @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
2028
*/
2129

22-
@RunWith(Parameterized.class)
2330
public class KeywordsTest {
2431
public final static Logger LOGGER = Logger.getLogger(KeywordsTest.class.getName());
2532

26-
@Parameters(name = "Keyword {0}")
27-
public final static Iterable<String> KEY_WORDS() {
33+
public final static Stream<String> KEY_WORDS() {
2834
List<String> keywords = new ArrayList<>();
2935
try {
3036
keywords.addAll(ParserKeywordsUtils.getDefinedKeywords());
@@ -34,17 +40,12 @@ public final static Iterable<String> KEY_WORDS() {
3440
} catch (Exception ex) {
3541
LOGGER.log(Level.SEVERE, "Failed to generate the Keyword List", ex);
3642
}
37-
return keywords;
38-
}
39-
40-
protected String keyword;
41-
42-
public KeywordsTest(String keyword) {
43-
this.keyword = keyword;
43+
return keywords.stream();
4444
}
4545

46-
@Test
47-
public void testRelObjectNameWithoutValue() throws JSQLParserException {
46+
@ParameterizedTest(name = "Keyword {0}")
47+
@MethodSource("KEY_WORDS")
48+
public void testRelObjectNameWithoutValue(String keyword) throws JSQLParserException {
4849
String sqlStr = String.format("SELECT %1$s.%1$s AS %1$s from %1$s.%1$s AS %1$s", keyword);
4950
LOGGER.fine(sqlStr);
5051
assertSqlCanBeParsedAndDeparsed(sqlStr, true);

0 commit comments

Comments
 (0)