Skip to content

Commit 1e5f067

Browse files
LipenLipen
committed
Fix tests
1 parent a25abd9 commit 1e5f067

File tree

4 files changed

+53
-38
lines changed

4 files changed

+53
-38
lines changed

‎jacodb-panda-dynamic/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dependencies {
1414

1515
antlr(Libs.antlr)
1616

17-
testImplementation(kotlin("test"))
1817
testImplementation(project(":jacodb-analysis"))
1918
testImplementation(testFixtures(project(":jacodb-core")))
2019
testImplementation(Libs.mockk)

‎jacodb-panda-dynamic/src/test/kotlin/analysis/IfdsPandaTest.kt

Lines changed: 50 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,32 @@ import org.jacodb.analysis.ifds.UnitResolver
2222
import org.jacodb.analysis.taint.ForwardTaintFlowFunctions
2323
import org.jacodb.analysis.taint.TaintManager
2424
import org.jacodb.analysis.util.PandaTraits
25-
import org.jacodb.panda.dynamic.api.*
25+
import org.jacodb.panda.dynamic.api.PandaAnyType
26+
import org.jacodb.panda.dynamic.api.PandaApplicationGraphImpl
27+
import org.jacodb.panda.dynamic.api.PandaBasicBlock
28+
import org.jacodb.panda.dynamic.api.PandaClass
29+
import org.jacodb.panda.dynamic.api.PandaInst
30+
import org.jacodb.panda.dynamic.api.PandaInstLocation
31+
import org.jacodb.panda.dynamic.api.PandaInstRef
32+
import org.jacodb.panda.dynamic.api.PandaMethod
33+
import org.jacodb.panda.dynamic.api.PandaNullConstant
34+
import org.jacodb.panda.dynamic.api.PandaProject
35+
import org.jacodb.panda.dynamic.api.PandaReturnInst
2636
import org.jacodb.panda.dynamic.parser.IRParser
27-
import org.jacodb.taint.configuration.*
28-
import kotlin.test.Test
29-
import kotlin.test.assertTrue
37+
import org.jacodb.taint.configuration.Argument
38+
import org.jacodb.taint.configuration.AssignMark
39+
import org.jacodb.taint.configuration.ConstantTrue
40+
import org.jacodb.taint.configuration.ContainsMark
41+
import org.jacodb.taint.configuration.CopyAllMarks
42+
import org.jacodb.taint.configuration.RemoveMark
43+
import org.jacodb.taint.configuration.Result
44+
import org.jacodb.taint.configuration.TaintConfigurationItem
45+
import org.jacodb.taint.configuration.TaintMark
46+
import org.jacodb.taint.configuration.TaintMethodSink
47+
import org.jacodb.taint.configuration.TaintMethodSource
48+
import org.jacodb.taint.configuration.TaintPassThrough
49+
import org.junit.jupiter.api.Assertions.assertTrue
50+
import org.junit.jupiter.api.Test
3051

3152
private val logger = mu.KotlinLogging.logger {}
3253

@@ -61,8 +82,7 @@ class IfdsPandaTest {
6182
)
6283
if (method.name == "log") add(
6384
TaintMethodSink(
64-
method = mockk(),
65-
ruleNote = "CUSTOM SINK", // FIXME
85+
method = mockk(), ruleNote = "CUSTOM SINK", // FIXME
6686
cwe = listOf(), // FIXME
6787
condition = ContainsMark(position = Argument(0), mark = TaintMark("TAINT"))
6888
)
@@ -105,8 +125,7 @@ class IfdsPandaTest {
105125
)
106126
if (method.name == "sink") add(
107127
TaintMethodSink(
108-
method = mockk(),
109-
ruleNote = "SINK", // FIXME
128+
method = mockk(), ruleNote = "SINK", // FIXME
110129
cwe = listOf(), // FIXME
111130
condition = ContainsMark(position = Argument(0), mark = TaintMark("TAINT"))
112131
)
@@ -158,34 +177,31 @@ class IfdsPandaTest {
158177
PandaClass(
159178
name = "Sample",
160179
superClassName = "std.core.Object",
161-
methods = listOf(
162-
PandaMethod(name = "source").also {
163-
it.blocks = listOf(
164-
PandaBasicBlock(
165-
id = 0,
166-
successors = setOf(1),
167-
predecessors = emptySet(),
168-
start = PandaInstRef(0),
169-
end = PandaInstRef(1)
170-
),
171-
PandaBasicBlock(
172-
id = 1,
173-
successors = setOf(),
174-
predecessors = setOf(0),
175-
start = PandaInstRef(0),
176-
end = PandaInstRef(1)
177-
)
180+
methods = listOf(PandaMethod(name = "source").also {
181+
it.blocks = listOf(
182+
PandaBasicBlock(
183+
id = 0,
184+
successors = setOf(1),
185+
predecessors = emptySet(),
186+
start = PandaInstRef(0),
187+
end = PandaInstRef(1)
188+
), PandaBasicBlock(
189+
id = 1,
190+
successors = setOf(),
191+
predecessors = setOf(0),
192+
start = PandaInstRef(0),
193+
end = PandaInstRef(1)
178194
)
179-
it.instructions = listOf(
180-
PandaReturnInst(
181-
location = PandaInstLocation(method = it, index = 0, lineNumber = 3),
182-
returnValue = PandaNullConstant
183-
)
195+
)
196+
it.instructions = listOf(
197+
PandaReturnInst(
198+
location = PandaInstLocation(method = it, index = 0, lineNumber = 3),
199+
returnValue = PandaNullConstant
184200
)
185-
it.className = "Sample"
186-
it.type = PandaAnyType
187-
}
188-
)
201+
)
202+
it.className = "Sample"
203+
it.type = PandaAnyType
204+
})
189205
)
190206
)
191207
)

‎jacodb-panda-dynamic/src/test/kotlin/parser/IRParserBinarySamplesTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import org.jacodb.panda.dynamic.api.PandaReturnInst
2626
import org.jacodb.panda.dynamic.api.PandaSubExpr
2727
import org.jacodb.panda.dynamic.parser.IRParser
2828
import org.junit.jupiter.api.Assertions
29+
import org.junit.jupiter.api.Assertions.assertEquals
2930
import org.junit.jupiter.api.Test
30-
import kotlin.test.assertEquals
3131

3232
class IRParserBinarySamplesTest {
3333

‎jacodb-panda-dynamic/src/test/kotlin/parser/IRParserSamplesTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package parser
1818

1919
import org.jacodb.panda.dynamic.parser.IRParser
20+
import org.junit.jupiter.api.Assertions.assertEquals
2021
import org.junit.jupiter.api.Assertions.assertNotNull
2122
import org.junit.jupiter.api.Test
22-
import kotlin.test.assertEquals
2323

2424
private val logger = mu.KotlinLogging.logger {}
2525

@@ -112,7 +112,7 @@ class IRParserSamplesTest {
112112
}
113113

114114
"main" -> {
115-
assertEquals(3, pandaMethod.instructions.size)
115+
assertEquals(4, pandaMethod.instructions.size)
116116
assertEquals(2, pandaMethod.blocks.size)
117117
}
118118
}

0 commit comments

Comments
 (0)