From e7e0032cc8bfab1d3b103b22a059c3d93727cb93 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <Yan.Zhulanow@jetbrains.com>
Date: Tue, 20 Jun 2017 16:52:49 +0300
Subject: [PATCH] Kapt3, minor, tests: Weaken regular expression for Metadata
 shrinking

---
 .../jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt    | 2 +-
 plugins/kapt3/testData/converter/defaultImpls.txt             | 4 ++--
 plugins/kapt3/testData/converter/methodParameterNames.txt     | 2 +-
 plugins/kapt3/testData/converter/nestedClasses.txt            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt b/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
index 5acf027e491..7ea07f5dbdb 100644
--- a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
+++ b/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
@@ -87,7 +87,7 @@ abstract class AbstractKotlinKapt3Test : CodegenTestCase() {
 
 abstract class AbstractClassFileToSourceStubConverterTest : AbstractKotlinKapt3Test() {
     internal companion object {
-        private val KOTLIN_METADATA_GROUP = "[a-z0-9]+ = \\{.+?\\}"
+        private val KOTLIN_METADATA_GROUP = "[a-z0-9]+ = (\\{.+?\\}|[0-9]+)"
         private val KOTLIN_METADATA_REGEX = "@kotlin\\.Metadata\\(($KOTLIN_METADATA_GROUP)(, $KOTLIN_METADATA_GROUP)*\\)".toRegex()
 
         fun removeMetadataAnnotationContents(s: String): String = s.replace(KOTLIN_METADATA_REGEX, "@kotlin.Metadata()")
diff --git a/plugins/kapt3/testData/converter/defaultImpls.txt b/plugins/kapt3/testData/converter/defaultImpls.txt
index 9bcd1ad40f0..94bb15ac85e 100644
--- a/plugins/kapt3/testData/converter/defaultImpls.txt
+++ b/plugins/kapt3/testData/converter/defaultImpls.txt
@@ -5,7 +5,7 @@ public abstract interface Intf {
 
     public abstract int getColor();
 
-    @kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3)
+    @kotlin.Metadata()
     public static final class DefaultImpls {
 
         public DefaultImpls() {
@@ -40,7 +40,7 @@ public abstract interface IntfWithDefaultImpls {
 
     public abstract void a();
 
-    @kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3)
+    @kotlin.Metadata()
     public static final class DefaultImpls {
 
         public DefaultImpls() {
diff --git a/plugins/kapt3/testData/converter/methodParameterNames.txt b/plugins/kapt3/testData/converter/methodParameterNames.txt
index fd42c28d93a..b6e36a2a0db 100644
--- a/plugins/kapt3/testData/converter/methodParameterNames.txt
+++ b/plugins/kapt3/testData/converter/methodParameterNames.txt
@@ -26,7 +26,7 @@ public abstract interface Intf {
     @org.jetbrains.annotations.NotNull()
     public abstract java.lang.String bar(int bcd);
 
-    @kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3)
+    @kotlin.Metadata()
     public static final class DefaultImpls {
 
         public DefaultImpls() {
diff --git a/plugins/kapt3/testData/converter/nestedClasses.txt b/plugins/kapt3/testData/converter/nestedClasses.txt
index 11c5b6ccb25..36c1398acd3 100644
--- a/plugins/kapt3/testData/converter/nestedClasses.txt
+++ b/plugins/kapt3/testData/converter/nestedClasses.txt
@@ -25,7 +25,7 @@ public final class A {
         @org.jetbrains.annotations.Nullable()
         public abstract A.B getY();
 
-        @kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3)
+        @kotlin.Metadata()
         public static final class DefaultImpls {
 
             public DefaultImpls() {