Skip to content

Commit f3a6516

Browse files
Lipenvolivan239
andauthored
Use external distribution of Juliet test suite (#155)
Use external distribution of Juliet test suite --------- Co-authored-by: Ivan Volkov <[email protected]>
1 parent f6c3dfb commit f3a6516

File tree

6 files changed

+27
-5
lines changed

6 files changed

+27
-5
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ allprojects {
3636

3737
repositories {
3838
mavenCentral()
39+
maven("https://jitpack.io")
3940
maven("https://s01.oss.sonatype.org/content/repositories/orgunittestbotsoot-1004/")
4041
maven("https://plugins.gradle.org/m2")
4142
maven("https://www.jetbrains.com/intellij-repository/releases")

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ object Versions {
1515
const val jmh = "1.21"
1616
const val joda_time = "2.12.5"
1717
const val jooq = "3.14.16"
18+
const val juliet = "1.3.2"
1819
const val junit = "5.9.2"
1920
const val kotlin = "1.7.21"
2021
const val kotlin_logging = "1.8.3"
@@ -265,6 +266,20 @@ object Libs {
265266
name = "asm-util",
266267
version = Versions.asm
267268
)
269+
270+
// https://github.com/UnitTestBot/juliet-java-test-suite
271+
val juliet_support = dep(
272+
group = "com.github.UnitTestBot.juliet-java-test-suite",
273+
name = "support",
274+
version = Versions.juliet
275+
)
276+
277+
@Suppress("FunctionName")
278+
fun juliet_cwe(cweNum: Int) = dep(
279+
group = "com.github.UnitTestBot.juliet-java-test-suite",
280+
name = "cwe${cweNum}",
281+
version = Versions.juliet
282+
)
268283
}
269284

270285
object Plugins {

jacodb-analysis/build.gradle.kts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ dependencies {
1313
implementation(Libs.kotlinx_serialization_json)
1414

1515
testImplementation(testFixtures(project(":jacodb-core")))
16-
testImplementation(Libs.javax_servlet_api)
17-
testImplementation(Libs.joda_time)
18-
testImplementation(files("src/test/resources/juliet.jar"))
16+
testImplementation(project(":jacodb-api"))
1917
testImplementation(files("src/test/resources/pointerbench.jar"))
18+
testImplementation(Libs.joda_time)
19+
testImplementation(Libs.juliet_support)
20+
for (cweNum in listOf(89, 476, 563, 690)) {
21+
testImplementation(Libs.juliet_cwe(cweNum))
22+
}
2023
}

jacodb-analysis/src/test/kotlin/org/jacodb/analysis/impl/BaseAnalysisTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.jacodb.analysis.impl
1818

19-
import juliet.testcasesupport.AbstractTestCase
19+
import juliet.support.AbstractTestCase
2020
import kotlinx.coroutines.runBlocking
2121
import org.jacodb.analysis.engine.VulnerabilityInstance
2222
import org.jacodb.api.JcClassOrInterface

jacodb-analysis/src/test/kotlin/org/jacodb/analysis/impl/SqlInjectionAnalysisTest.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ import java.util.stream.Stream
3535
class SqlInjectionAnalysisTest : BaseAnalysisTest() {
3636
companion object : WithDB(Usages, InMemoryHierarchy) {
3737
@JvmStatic
38-
fun provideClassesForJuliet89(): Stream<Arguments> = provideClassesForJuliet(89, emptyList())
38+
fun provideClassesForJuliet89(): Stream<Arguments> = provideClassesForJuliet(89, listOf(
39+
// Not working yet (#156)
40+
"s03", "s04"
41+
))
3942

4043
private val vulnerabilityType = SqlInjectionAnalyzer.vulnerabilityDescription.ruleId
4144
}
-3.57 MB
Binary file not shown.

0 commit comments

Comments
 (0)