Skip to content

Commit 4867c80

Browse files
build: bring back JaCoCo
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent fbe97a8 commit 4867c80

File tree

1 file changed

+63
-75
lines changed

1 file changed

+63
-75
lines changed

build.gradle

Lines changed: 63 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id 'signing'
77

88
id "org.javacc.javacc" version "latest.release"
9-
//id 'jacoco'
9+
id 'jacoco'
1010
id 'com.github.kt3k.coveralls' version "latest.release"
1111
id "com.github.spotbugs" version "latest.release"
1212
id "com.diffplug.spotless" version "latest.release"
@@ -195,87 +195,75 @@ test {
195195
coveralls {
196196
jacocoReportPath 'build/reports/jacoco/test/jacocoTestReport.xml'
197197
}
198-
//
199-
//jacocoTestReport {
200-
// afterEvaluate {
201-
// classDirectories.setFrom(files(classDirectories.files.collect {
202-
// fileTree(dir: it, exclude: ' net/sf/jsqlparser/parser/CCJSqlParserTokenManager')
203-
// }))
204-
// }
205-
// dependsOn test // tests are required to run before generating the report
206-
// reports {
207-
// xml.required = false
208-
// csv.required = false
209-
// html.outputLocation = layout.buildDirectory.dir('reports/jacoco')
210-
// }
211-
//}
212-
//jacocoTestCoverageVerification {
213-
// violationRules {
214-
// rule {
215-
// //element = 'CLASS'
216-
// limit {
217-
// //@todo: temporarily reduced it 80%, we need to bring that back to 84% accepting the Keywords PR
218-
// minimum = 0.80
219-
// }
220-
// excludes = [
221-
// 'net.sf.jsqlparser.util.validation.*',
222-
// 'net.sf.jsqlparser.**.*Adapter',
223-
// 'net.sf.jsqlparser.parser.JJTCCJSqlParserState',
224-
// 'net.sf.jsqlparser.parser.TokenMgrError',
225-
// 'net.sf.jsqlparser.parser.StreamProvider',
226-
// 'net.sf.jsqlparser.parser.CCJSqlParserTokenManager',
227-
// 'net.sf.jsqlparser.parser.ParseException',
228-
// 'net.sf.jsqlparser.parser.SimpleNode',
229-
// 'net.sf.jsqlparser.parser.SimpleCharStream',
230-
// 'net.sf.jsqlparser.parser.StringProvider',
231-
// 'net.sf.jsqlparser.parser.CCJSqlParserTokenManager'
232-
// ]
233-
// }
198+
199+
jacocoTestReport {
200+
// Jacoco can't handle the TokenManager class
201+
afterEvaluate {
202+
classDirectories.setFrom(files(classDirectories.files.collect {
203+
fileTree(dir: it, exclude: [
204+
"**CCJSqlParserTokenManager**"
205+
])
206+
}))
207+
}
208+
dependsOn test // tests are required to run before generating the report
209+
reports {
210+
xml.required = false
211+
csv.required = false
212+
html.outputLocation = layout.buildDirectory.dir('reports/jacoco')
213+
}
214+
}
215+
jacocoTestCoverageVerification {
216+
// Jacoco can't handle the TokenManager class
217+
afterEvaluate {
218+
classDirectories.setFrom(files(classDirectories.files.collect {
219+
fileTree(dir: it, exclude: [
220+
"**CCJSqlParserTokenManager**"
221+
])
222+
}))
223+
}
224+
violationRules {
225+
rule {
226+
//element = 'CLASS'
227+
limit {
228+
//@todo: temporarily reduced it 80%, we need to bring that back to 84% accepting the Keywords PR
229+
minimum = 0.80
230+
}
231+
excludes = [
232+
'net.sf.jsqlparser.util.validation.*',
233+
'net.sf.jsqlparser.**.*Adapter',
234+
'net.sf.jsqlparser.parser.**'
235+
]
236+
}
237+
rule {
238+
//element = 'CLASS'
239+
limit {
240+
counter = 'LINE'
241+
value = 'MISSEDCOUNT'
242+
243+
//@todo: temporarily increased to 7000, we need to bring that down to 5500 after accepting the Keywords PR
244+
maximum = 7000
245+
}
246+
excludes = [
247+
'net.sf.jsqlparser.util.validation.*',
248+
'net.sf.jsqlparser.**.*Adapter',
249+
'net.sf.jsqlparser.parser.**'
250+
]
251+
}
234252
// rule {
235-
// //element = 'CLASS'
253+
// element = 'CLASS'
236254
// limit {
237255
// counter = 'LINE'
238-
// value = 'MISSEDCOUNT'
239-
//
240-
// //@todo: temporarily increased to 7000, we need to bring that down to 5500 after accepting the Keywords PR
241-
// maximum = 7000
242-
// }
243-
// excludes = [
256+
// value = 'MISSEDRATIO'
257+
// maximum = 0.3
258+
// }
259+
// excludes = [
244260
// 'net.sf.jsqlparser.util.validation.*',
245261
// 'net.sf.jsqlparser.**.*Adapter',
246-
// 'net.sf.jsqlparser.parser.JJTCCJSqlParserState',
247-
// 'net.sf.jsqlparser.parser.TokenMgrError',
248-
// 'net.sf.jsqlparser.parser.StreamProvider',
249-
// 'net.sf.jsqlparser.parser.CCJSqlParserTokenManager',
250-
// 'net.sf.jsqlparser.parser.ParseException',
251-
// 'net.sf.jsqlparser.parser.SimpleNode',
252-
// 'net.sf.jsqlparser.parser.SimpleCharStream',
253-
// 'net.sf.jsqlparser.parser.StringProvider',
254-
// 'net.sf.jsqlparser.parser.CCJSqlParserTokenManager'
262+
// 'net.sf.jsqlparser.parser.**'
255263
// ]
256264
// }
257-
//// rule {
258-
//// element = 'CLASS'
259-
//// limit {
260-
//// counter = 'LINE'
261-
//// value = 'MISSEDRATIO'
262-
//// maximum = 0.3
263-
//// }
264-
//// excludes = [
265-
//// 'net.sf.jsqlparser.util.validation.*',
266-
//// 'net.sf.jsqlparser.**.*Adapter',
267-
//// 'net.sf.jsqlparser.parser.JJTCCJSqlParserState',
268-
//// 'net.sf.jsqlparser.parser.TokenMgrError',
269-
//// 'net.sf.jsqlparser.parser.StreamProvider',
270-
//// 'net.sf.jsqlparser.parser.CCJSqlParserTokenManager',
271-
//// 'net.sf.jsqlparser.parser.ParseException',
272-
//// 'net.sf.jsqlparser.parser.SimpleNode',
273-
//// 'net.sf.jsqlparser.parser.SimpleCharStream',
274-
//// 'net.sf.jsqlparser.parser.StringProvider',
275-
//// ]
276-
//// }
277-
// }
278-
//}
265+
}
266+
}
279267

280268
spotbugsMain {
281269
reports {

0 commit comments

Comments
 (0)