Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ data class MethodCoverage(
val testId: String?,
val testSessionId: String?,
@Serializable(with = BitSetSerializer::class)
var probes: Probes,
var stringProbes: Probes,
){
// Generated by IDEA, all fields included
override fun equals(other: Any?): Boolean {
Expand All @@ -57,7 +57,7 @@ data class MethodCoverage(
other as MethodCoverage

if (signature != other.signature) return false
if (probes != other.probes) return false
if (stringProbes != other.stringProbes) return false
if (testId != other.testId) return false
if (testSessionId != other.testSessionId) return false

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package com.epam.drill.agent.test2code.common.api

import kotlinx.serialization.KSerializer
import kotlinx.serialization.builtins.BooleanArraySerializer
import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.descriptors.buildClassSerialDescriptor
import kotlinx.serialization.encoding.Decoder
Expand All @@ -31,12 +30,12 @@ expect class Probes(size: Int) {
object BitSetSerializer : KSerializer<Probes> {

override fun serialize(encoder: Encoder, value: Probes) {
encoder.encodeSerializableValue(BooleanArraySerializer(), value.toBooleanArray())
encoder.encodeString(value.toBitString())
}

override fun deserialize(decoder: Decoder): Probes {
val decodeSerializableValue = decoder.decodeSerializableValue(BooleanArraySerializer())
return decodeSerializableValue.toBitSet()
val bitString = decoder.decodeString()
return bitString.toBitSet()
}

override val descriptor: SerialDescriptor
Expand Down Expand Up @@ -78,8 +77,12 @@ fun Probes.toBooleanArray(): BooleanArray {
}
}

fun Probes.toList(): List<Boolean> {
return toBooleanArray().toList()
fun Probes.toBitString(): String {
val result = StringBuilder()
for (i in 0 until length() - 1) { // -1 drops end-of-original-array-indicator bit
result.append(if (get(i)) '1' else '0')
}
return result.toString()
}

fun BooleanArray.toBitSet(): Probes {
Expand All @@ -92,16 +95,12 @@ fun BooleanArray.toBitSet(): Probes {
}
}

fun List<Boolean>.toBitSet(): Probes {
val finalSize = size + 1
fun String.toBitSet(): Probes {
val finalSize = length + 1
return Probes(finalSize).apply {
forEachIndexed { index, b ->
set(index, b)
set(index, b != '0')
}
set(size, true) // set end-of-original-array-indicator bit (see explanation above)
set(length, true) // set end-of-original-array-indicator bit (see explanation above)
}
}

fun probesOf(vararg elements: Boolean): Probes {
return elements.toBitSet()
}
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class IntervalCoverageSender(
bodyChecksum = metadata.bodyChecksum,
testId = it.testId,
testSessionId = it.sessionId,
probes = methodProbes
stringProbes = methodProbes
)
}
?.asSequence()
Expand Down
Loading