Replace hashes in bytecode listing tests with 'HASH'
This commit is contained in:
@@ -17,7 +17,3 @@ fun noInline(lambda: ()->Unit) : Runnable {
|
|||||||
fun noInline2(lambda: ()->Unit) : Runnable {
|
fun noInline2(lambda: ()->Unit) : Runnable {
|
||||||
return Runnable(lambda)
|
return Runnable(lambda)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1 final class test/_1Kt\$sam\$Runnable\$89f9321c
|
|
||||||
// 1 public final class test/_1Kt\$sam\$Runnable\$i\$89f9321c
|
|
||||||
// 2 class test/_1Kt\$sam\$
|
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
@kotlin.Metadata
|
@kotlin.Metadata
|
||||||
final class test/SamAdapterAndInlinedOneKt$sam$Runnable$82391ccd {
|
final class test/SamAdapterAndInlinedOneKt$sam$Runnable$HASH {
|
||||||
private synthetic final field function: kotlin.jvm.functions.Function0
|
private synthetic final field function: kotlin.jvm.functions.Function0
|
||||||
method <init>(p0: kotlin.jvm.functions.Function0): void
|
method <init>(p0: kotlin.jvm.functions.Function0): void
|
||||||
public synthetic final method run(): void
|
public synthetic final method run(): void
|
||||||
}
|
}
|
||||||
|
|
||||||
@kotlin.Metadata
|
@kotlin.Metadata
|
||||||
public final class test/SamAdapterAndInlinedOneKt$sam$Runnable$i$82391ccd {
|
public final class test/SamAdapterAndInlinedOneKt$sam$Runnable$i$HASH {
|
||||||
private synthetic final field function: kotlin.jvm.functions.Function0
|
private synthetic final field function: kotlin.jvm.functions.Function0
|
||||||
public method <init>(p0: kotlin.jvm.functions.Function0): void
|
public method <init>(p0: kotlin.jvm.functions.Function0): void
|
||||||
public synthetic final method run(): void
|
public synthetic final method run(): void
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() {
|
|||||||
val cr = ClassReader(it.asByteArray())
|
val cr = ClassReader(it.asByteArray())
|
||||||
val visitor = TextCollectingVisitor()
|
val visitor = TextCollectingVisitor()
|
||||||
cr.accept(visitor, ClassReader.SKIP_CODE)
|
cr.accept(visitor, ClassReader.SKIP_CODE)
|
||||||
visitor.text
|
KotlinTestUtils.replaceHash(visitor.text, "HASH")
|
||||||
}.joinToString("\n\n")
|
}.joinToString("\n\n")
|
||||||
|
|
||||||
KotlinTestUtils.assertEqualsToFile(txtFile, generatedFiles)
|
KotlinTestUtils.assertEqualsToFile(txtFile, generatedFiles)
|
||||||
|
|||||||
@@ -950,10 +950,14 @@ public class KotlinTestUtils {
|
|||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public static String replaceHashWithStar(@NotNull String string) {
|
public static String replaceHashWithStar(@NotNull String string) {
|
||||||
|
return replaceHash(string, "*");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String replaceHash(@NotNull String string, @NotNull String replacement) {
|
||||||
//TODO: hashes are still used in SamWrapperCodegen
|
//TODO: hashes are still used in SamWrapperCodegen
|
||||||
Matcher matcher = STRIP_PACKAGE_PART_HASH_PATTERN.matcher(string);
|
Matcher matcher = STRIP_PACKAGE_PART_HASH_PATTERN.matcher(string);
|
||||||
if (matcher.find()) {
|
if (matcher.find()) {
|
||||||
return matcher.replaceAll("\\$*");
|
return matcher.replaceAll("\\$" + replacement);
|
||||||
}
|
}
|
||||||
return string;
|
return string;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user