From 4396b4259ecf8ca8eede53d3778165b87a62f24d Mon Sep 17 00:00:00 2001
From: Ilmir Usmanov <ilmir.usmanov@jetbrains.com>
Date: Tue, 24 Apr 2018 22:02:18 +0300
Subject: [PATCH] Minor: Fix compilation of android tests

---
 .../org/jetbrains/kotlin/codegen/CodegenTestCase.java      | 7 +++++++
 .../tests/org/jetbrains/kotlin/test/KotlinTestUtils.java   | 5 +++++
 .../org/jetbrains/kotlin/test/KotlinTestUtils.java.181     | 5 +++++
 .../org/jetbrains/kotlin/test/KotlinTestUtils.java.as31    | 5 +++++
 .../org/jetbrains/kotlin/test/KotlinTestUtils.java.as32    | 5 +++++
 5 files changed, 27 insertions(+)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
index 31774af83bb..27c9531145c 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
@@ -152,6 +152,13 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
         return configuration;
     }
 
+    protected static void updateConfigurationByDirectivesInTestFiles(
+            @NotNull List<TestFile> testFilesWithConfigurationDirectives,
+            @NotNull CompilerConfiguration configuration
+    ) {
+        updateConfigurationByDirectivesInTestFiles(testFilesWithConfigurationDirectives, configuration, "");
+    }
+
     protected static void updateConfigurationByDirectivesInTestFiles(
             @NotNull List<TestFile> testFilesWithConfigurationDirectives,
             @NotNull CompilerConfiguration configuration,
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
index 066d0d7ee37..2e95577877a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
@@ -711,6 +711,11 @@ public class KotlinTestUtils {
         }
     }
 
+    @NotNull
+    public static <M, F> List<F> createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory<M, F> factory) {
+        return createTestFiles(testFileName, expectedText, factory, false, "");
+    }
+
     @NotNull
     public static <M, F> List<F> createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory<M, F> factory, String coroutinesPackage) {
         return createTestFiles(testFileName, expectedText, factory, false, coroutinesPackage);
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.181 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.181
index b96e13169bd..a8ca78061f5 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.181
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.181
@@ -711,6 +711,11 @@ public class KotlinTestUtils {
         }
     }
 
+    @NotNull
+    public static <M, F> List<F> createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory<M, F> factory) {
+        return createTestFiles(testFileName, expectedText, factory, false, "");
+    }
+
     @NotNull
     public static <M, F> List<F> createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory<M, F> factory, String coroutinesPackage) {
         return createTestFiles(testFileName, expectedText, factory, false, coroutinesPackage);
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
index 62e1a456718..fb68d356d53 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
@@ -711,6 +711,11 @@ public class KotlinTestUtils {
         }
     }
 
+    @NotNull
+    public static <M, F> List<F> createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory<M, F> factory) {
+        return createTestFiles(testFileName, expectedText, factory, false, "");
+    }
+
     @NotNull
     public static <M, F> List<F> createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory<M, F> factory, String coroutinesPackage) {
         return createTestFiles(testFileName, expectedText, factory, false, coroutinesPackage);
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
index 2929ca1e43b..0ee6a12ff24 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32
@@ -711,6 +711,11 @@ public class KotlinTestUtils {
         }
     }
 
+    @NotNull
+    public static <M, F> List<F> createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory<M, F> factory) {
+        return createTestFiles(testFileName, expectedText, factory, false, "");
+    }
+
     @NotNull
     public static <M, F> List<F> createTestFiles(@Nullable String testFileName, String expectedText, TestFileFactory<M, F> factory, String coroutinesPackage) {
         return createTestFiles(testFileName, expectedText, factory, false, coroutinesPackage);