Skip to content

Add branch coverage #2486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
egiptipavel wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

Add branch coverage #2486

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
72fb549
Add working version of branch coverage
egiptipavel Aug 3, 2023
0c5cfd6
Refactor
egiptipavel Aug 3, 2023
032f8de
Add working version of branch trace instrumentation
egiptipavel Aug 4, 2023
f46d08e
Refactor
egiptipavel Aug 5, 2023
7acd40d
Refactor
egiptipavel Aug 5, 2023
e734db2
Refactor
egiptipavel Aug 7, 2023
d1d7434
Merge branch 'main' into egiptipavel/branch-coverage
egiptipavel Aug 7, 2023
218f61c
Delete extra dependency
egiptipavel Aug 7, 2023
fb003cb
Add a base class CoverageInstrumentation
egiptipavel Aug 8, 2023
fb876c8
Merge branch 'main' into egiptipavel/branch-coverage
egiptipavel Aug 9, 2023
e186e17
Fix bug
egiptipavel Aug 9, 2023
0babb3a
Add flag to select trace instrumentation
egiptipavel Aug 10, 2023
0065fc3
Add inserting probes before method instruction
egiptipavel Aug 11, 2023
fc6e5ad
Add tests for branch coverage instrumentation and branch trace instru…
egiptipavel Aug 11, 2023
3d41e0e
Merge branch 'main' into egiptipavel/branch-coverage
egiptipavel Aug 16, 2023
47758fe
Fix bug
egiptipavel Aug 17, 2023
3ebc51c
Merge branch 'main' into egiptipavel/branch-coverage
egiptipavel Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor
  • Loading branch information
@egiptipavel
egiptipavel committed Aug 5, 2023
commit 7acd40d7616cf5f679e4578ba225e2c875fdbc16
50 changes: 0 additions & 50 deletions ...-instrumentation/src/main/kotlin/org/jacoco/core/internal/flow/TraceClassProbesAdapter.kt
View file
Open in desktop

This file was deleted.

247 changes: 0 additions & 247 deletions ...instrumentation/src/main/kotlin/org/jacoco/core/internal/flow/TraceMethodProbesAdapter.kt
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions utbot-instrumentation/src/main/kotlin/org/jacoco/core/internal/instr/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.jacoco.core.internal.instr

import org.jacoco.core.internal.flow.ClassProbesAdapter
import org.jacoco.core.internal.flow.MethodProbesCollector
import org.jacoco.core.internal.flow.TraceClassProbesAdapter
import org.objectweb.asm.ClassWriter
import org.objectweb.asm.util.TraceClassVisitor
import org.utbot.instrumentation.Settings
Expand Down Expand Up @@ -32,14 +31,13 @@ fun createClassVisitorForTracingBranchInstructions(
className: String,
storage: ProcessingStorage,
writer: ClassWriter
): TraceClassProbesAdapter {
): ClassProbesAdapter {
val strategy = TraceStrategy()
val tcv = TraceClassVisitor(writer, PrintWriter(sw)) // TODO: remove
return TraceClassProbesAdapter(
TraceClassInstrumenter(strategy, tcv) { id ->
return ClassProbesAdapter(
TraceClassInstrumenter(className, storage, strategy, tcv) { id ->
storage.computeId(className, id)
},
className,
storage
false
)
}
10 changes: 7 additions & 3 deletions ...-instrumentation/src/main/kotlin/org/jacoco/core/internal/instr/TraceClassInstrumenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ package org.jacoco.core.internal.instr

import org.jacoco.core.internal.flow.MethodProbesVisitor
import org.objectweb.asm.ClassVisitor
import org.utbot.instrumentation.instrumentation.et.ProcessingStorage

class TraceClassInstrumenter(
private val className: String,
private val storage: ProcessingStorage,
private val probeArrayStrategy: IProbeArrayStrategy,
cv: ClassVisitor,
private val nextIdGenerator: (id: Int) -> Long
Expand All @@ -19,9 +22,10 @@ class TraceClassInstrumenter(
val mv = cv.visitMethod(access, name, desc, signature, exceptions)

val frameEliminator = DuplicateFrameEliminator(mv)
val probeVariableInserter = TraceProbeInserter(access,
name, desc, frameEliminator, probeArrayStrategy, nextIdGenerator)
return MethodInstrumenter(probeVariableInserter, probeVariableInserter)
val probeVariableInserter = TraceProbeInserter(
access, name, desc, frameEliminator, probeArrayStrategy, nextIdGenerator
)
return TraceMethodInstrumenter(className, storage, name, desc, probeVariableInserter, probeVariableInserter)
}

}
Loading