From adda3ef69d11af03610f6e22507b0a688dea1c57 Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Thu, 28 Apr 2016 09:53:35 +0300
Subject: [PATCH] Ability to run tests via adb

---
 .../android/tests/CodegenTestsOnAndroidRunner.java    |  9 +++++++++
 .../kotlin/android/tests/gradle/GradleRunner.java     | 11 +++++++++++
 2 files changed, 20 insertions(+)

diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java
index 0d02a41407b..a03b673216f 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java
@@ -98,6 +98,7 @@ public class CodegenTestsOnAndroidRunner {
 
             try {
                 emulator.waitEmulatorStart();
+                //runTestsViaAdb(emulator, gradleRunner);
                 return gradleRunner.connectedDebugAndroidTest();
             }
             catch (RuntimeException e) {
@@ -123,6 +124,14 @@ public class CodegenTestsOnAndroidRunner {
         }
     }
 
+    private String runTestsViaAdb(Emulator emulator, GradleRunner gradleRunner) {
+        gradleRunner.installDebugAndroidTest();
+        String result = emulator.runTestsViaAdb();
+        System.out.println(result);
+        gradleRunner.uninstallDebugAndroidTest();
+        return result;
+    }
+
     private static List<TestCase> parseSingleReportInFolder(String reportFolder) throws
                                                                                  IOException,
                                                                                  SAXException,
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java
index 9b172d3ebb0..84d0d714daf 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java
@@ -50,6 +50,17 @@ public class GradleRunner {
         OutputUtils.checkResult(result);
     }
 
+    public void installDebugAndroidTest() {
+        System.out.println("Install tests...");
+        OutputUtils.checkResult(RunUtils.execute(generateCommandLine("installDebug")));
+        OutputUtils.checkResult(RunUtils.execute(generateCommandLine("installDebugAndroidTest")));
+    }
+
+    public void uninstallDebugAndroidTest() {
+        System.out.println("Uninstall tests...");
+        RunUtils.execute(generateCommandLine("uninstallDebugAndroidTest"));
+        RunUtils.execute(generateCommandLine("uninstallDebug"));
+    }
 
     public String connectedDebugAndroidTest() {
         System.out.println("Starting tests...");