Skip to content

Commit af7bc1c

Browse files
Adjust Gradle to JUnit 5 (#1428)
* Adjust Gradle to JUnit 5 Parallel Test execution Gradle Caching Explicitly request for latest JavaCC 7.0.10 * Do not mark SpeedTest for concurrent execution * Remove unused imports
1 parent bc891e7 commit af7bc1c

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed

build.gradle

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8
1919
repositories {
2020
gradlePluginPortal()
2121
mavenLocal()
22+
mavenCentral()
2223
maven {
2324
url = uri('https://repo.maven.apache.org/maven2/')
2425
}
26+
maven {
27+
url "https://plugins.gradle.org/m2/"
28+
}
2529
}
2630

2731
dependencies {
@@ -36,6 +40,12 @@ dependencies {
3640
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
3741
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
3842

43+
// https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
44+
testImplementation 'org.mockito:mockito-junit-jupiter:4.1.0'
45+
46+
// enforce latest version of JavaCC
47+
javacc 'net.java.dev.javacc:javacc:7.0.10'
48+
3949
}
4050

4151
compileJavacc {
@@ -56,6 +66,18 @@ jacoco {
5666
}
5767

5868
test {
69+
useJUnitPlatform()
70+
71+
// set heap size for the test JVM(s)
72+
minHeapSize = "128m"
73+
maxHeapSize = "1G"
74+
75+
jvmArgs << [
76+
'-Djunit.jupiter.execution.parallel.enabled=true',
77+
'-Djunit.jupiter.execution.parallel.config.strategy=dynamic',
78+
'-Djunit.jupiter.execution.parallel.mode.default=concurrent'
79+
]
80+
5981
finalizedBy jacocoTestReport // report is always generated after tests run
6082
finalizedBy jacocoTestCoverageVerification
6183
}
@@ -93,7 +115,7 @@ jacocoTestCoverageVerification {
93115
limit {
94116
counter = 'LINE'
95117
value = 'MISSEDCOUNT'
96-
maximum = 5458
118+
maximum = 5500
97119
}
98120
excludes = [
99121
'net.sf.jsqlparser.util.validation.*',

gradle.properties

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Specifies the JVM arguments used for the daemon process.
2+
# The setting is particularly useful for tweaking memory settings.
3+
org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
4+
5+
org.gradle.caching=true
6+
7+
# Modularise your project and enable parallel build
8+
org.gradle.parallel=true
9+
10+
# Enable configure on demand.
11+
org.gradle.configureondemand=true
12+

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545
import static org.junit.jupiter.api.Assertions.fail;
4646
import org.junit.jupiter.api.Disabled;
4747
import org.junit.jupiter.api.Test;
48+
import org.junit.jupiter.api.parallel.Execution;
49+
import org.junit.jupiter.api.parallel.ExecutionMode;
4850

51+
@Execution(ExecutionMode.CONCURRENT)
4952
public class SelectTest {
5053

5154
private final CCJSqlParserManager parserManager = new CCJSqlParserManager();

0 commit comments

Comments
 (0)