From 72510beb695eb8f2b616f86027795b4e47d81b64 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Fri, 16 Jan 2015 12:29:22 +0300
Subject: [PATCH] Android tests: generate tests only for directories 'box' and
 'boxWithStdlib'

---
 .../tests/CodegenTestsOnAndroidGenerator.java    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
index 857def42ff9..8071b92f117 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
@@ -101,8 +101,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
         p.println("public class ", testClassName, " extends ", baseTestClassName, " {");
         p.pushIndent();
 
-        File testDataSources = new File("compiler/testData/codegen/");
-        generateTestMethodsForDirectory(p, testDataSources);
+        generateTestMethodsForDirectories(p, new File("compiler/testData/codegen/box"), new File("compiler/testData/codegen/boxWithStdlib"));
 
         p.popIndent();
         p.println("}");
@@ -112,12 +111,15 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
         FileUtil.writeToFile(new File(testSourceFilePath), out.toString());
     }
 
-    private void generateTestMethodsForDirectory(Printer p, File dir) throws IOException {
-        File[] files = dir.listFiles();
-        Assert.assertNotNull("Folder with testData is empty: " + dir.getAbsolutePath(), files);
-        FilesWriter holderFull = new FilesWriter(true);
+    private void generateTestMethodsForDirectories(Printer p, File... dirs) throws IOException {
         FilesWriter holderMock = new FilesWriter(false);
-        processFiles(p, files, holderFull, holderMock);
+        FilesWriter holderFull = new FilesWriter(true);
+
+        for (File dir : dirs) {
+            File[] files = dir.listFiles();
+            Assert.assertNotNull("Folder with testData is empty: " + dir.getAbsolutePath(), files);
+            processFiles(p, files, holderFull, holderMock);
+        }
 
         holderFull.writeFilesOnDisk();
         holderMock.writeFilesOnDisk();