Update tests to use KotlinMetadataVerifier

New Pass that replaces the old KotlinMetadataAsserter
Guardsquare · Jan 9, 2023 · fbda5d5 · fbda5d5
1 parent 81561a0
commit fbda5d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 177 deletions.
diff --git a/base/src/test/kotlin/proguard/MarkerTest.kt b/base/src/test/kotlin/proguard/MarkerTest.kt
@@ -19,7 +19,7 @@ import proguard.testutils.KotlinSource
 import proguard.util.ProcessingFlags.DONT_OBFUSCATE
 import proguard.util.ProcessingFlags.DONT_OPTIMIZE
 import proguard.util.ProcessingFlags.DONT_SHRINK
-import proguard.util.kotlin.asserter.KotlinMetadataAsserter
+import proguard.util.kotlin.asserter.KotlinMetadataVerifier
 import testutils.asConfiguration
 import testutils.shouldHaveFlag
 import testutils.shouldNotHaveFlag
@@ -107,7 +107,7 @@ class MarkerTest : FreeSpec({
         )
 
         // Run the asserter to ensure any metadata that isn't initialized correctly is thrown away
-        KotlinMetadataAsserter(Configuration()).execute(AppView(programClassPool, libraryClassPool))
+        KotlinMetadataVerifier(Configuration()).execute(AppView(programClassPool, libraryClassPool))
 
         "Then when marking" - {
             val config = """
@@ -149,7 +149,7 @@ class MarkerTest : FreeSpec({
         )
 
         // Run the asserter to ensure any metadata that isn't initialized correctly is thrown away
-        KotlinMetadataAsserter(Configuration()).execute(AppView(programClassPool, libraryClassPool))
+        KotlinMetadataVerifier(Configuration()).execute(AppView(programClassPool, libraryClassPool))
 
         "Then when marking" - {
             val config = """

diff --git a/base/src/test/kotlin/proguard/shrink/ClassUsageMarkerTest.kt b/base/src/test/kotlin/proguard/shrink/ClassUsageMarkerTest.kt
@@ -21,7 +21,7 @@ import proguard.testutils.KotlinSource
 import proguard.util.Processable
 import proguard.util.ProcessingFlagSetter
 import proguard.util.ProcessingFlags.DONT_SHRINK
-import proguard.util.kotlin.asserter.KotlinMetadataAsserter
+import proguard.util.kotlin.asserter.KotlinMetadataVerifier
 
 private fun beMarkedWith(simpleUsageMarker: SimpleUsageMarker) = object : Matcher<Processable> {
     override fun test(value: Processable) =
@@ -205,7 +205,7 @@ class ClassUsageMarkerTest : StringSpec({
         )
 
         // Run the asserter to ensure any metadata that isn't initialized correctly is thrown away
-        KotlinMetadataAsserter(Configuration()).execute(AppView(programClassPool, libraryClassPool))
+        KotlinMetadataVerifier(Configuration()).execute(AppView(programClassPool, libraryClassPool))
 
         programClassPool.classAccept("Test", AllMethodVisitor(ProcessingFlagSetter(DONT_SHRINK)))
         val classUsageMarker = ClassUsageMarker(SimpleUsageMarker())

diff --git a/base/src/test/kotlin/proguard/util/kotlin/asserter/KotlinMetadataAsserterTest.kt b/base/src/test/kotlin/proguard/util/kotlin/asserter/KotlinMetadataAsserterTest.kt