From 36fd6d243ee5414618e8bc2cbdc6c0a6f311157f Mon Sep 17 00:00:00 2001
From: Sridhar Gurivireddy <>
Date: Tue, 31 Mar 2009 14:47:19 -0700
Subject: [PATCH] AI 143779: am: CL 143727 Make the test runner and results
 assets of DumpRendertree. This is done so that we could have   1) Lab
 machines can run layout tests without having build environment setup   2) We
 could have different set of pass/fail results per branch   Also added a
 simple python script which runs run_layout_tests.py   Original author:
 sridharg   Merged from: //branches/cupcake/...

Automated import of CL 143779
---
 .../results/layout_tests_crashed.txt          |  0
 .../results/layout_tests_failed.txt           |  0
 .../results/layout_tests_nontext.txt          |  0
 .../results/layout_tests_passed.txt           |  0
 .../{ => assets}/run_layout_tests.py          |  0
 .../dumprendertree/LayoutTestsAutoTest.java   | 38 +++++++++++++++++++
 6 files changed, 38 insertions(+)
 rename tests/DumpRenderTree/{ => assets}/results/layout_tests_crashed.txt (100%)
 rename tests/DumpRenderTree/{ => assets}/results/layout_tests_failed.txt (100%)
 rename tests/DumpRenderTree/{ => assets}/results/layout_tests_nontext.txt (100%)
 rename tests/DumpRenderTree/{ => assets}/results/layout_tests_passed.txt (100%)
 rename tests/DumpRenderTree/{ => assets}/run_layout_tests.py (100%)

diff --git a/tests/DumpRenderTree/results/layout_tests_crashed.txt b/tests/DumpRenderTree/assets/results/layout_tests_crashed.txt
similarity index 100%
rename from tests/DumpRenderTree/results/layout_tests_crashed.txt
rename to tests/DumpRenderTree/assets/results/layout_tests_crashed.txt
diff --git a/tests/DumpRenderTree/results/layout_tests_failed.txt b/tests/DumpRenderTree/assets/results/layout_tests_failed.txt
similarity index 100%
rename from tests/DumpRenderTree/results/layout_tests_failed.txt
rename to tests/DumpRenderTree/assets/results/layout_tests_failed.txt
diff --git a/tests/DumpRenderTree/results/layout_tests_nontext.txt b/tests/DumpRenderTree/assets/results/layout_tests_nontext.txt
similarity index 100%
rename from tests/DumpRenderTree/results/layout_tests_nontext.txt
rename to tests/DumpRenderTree/assets/results/layout_tests_nontext.txt
diff --git a/tests/DumpRenderTree/results/layout_tests_passed.txt b/tests/DumpRenderTree/assets/results/layout_tests_passed.txt
similarity index 100%
rename from tests/DumpRenderTree/results/layout_tests_passed.txt
rename to tests/DumpRenderTree/assets/results/layout_tests_passed.txt
diff --git a/tests/DumpRenderTree/run_layout_tests.py b/tests/DumpRenderTree/assets/run_layout_tests.py
similarity index 100%
rename from tests/DumpRenderTree/run_layout_tests.py
rename to tests/DumpRenderTree/assets/run_layout_tests.py
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
index a857e681aa5c2..39eae02940d21 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
@@ -42,6 +42,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Vector;
 
 //TestRecorder creates two files, one for passing tests
@@ -122,6 +124,18 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
     static final String ANDROID_EXPECTED_RESULT_DIR = "/sdcard/android/expected_results/";
     static final String LAYOUT_TESTS_LIST_FILE = "/sdcard/android/layout_tests_list.txt";
     static final String TEST_STATUS_FILE = "/sdcard/android/running_test.txt";
+    static final String LAYOUT_TESTS_RESULTS_REFERENCE_FILES[] = {
+          "results/layout_tests_passed.txt",
+          "results/layout_tests_failed.txt",
+          "results/layout_tests_nontext.txt",
+          "results/layout_tests_crashed.txt",
+          "run_layout_tests.py"
+    };
+
+    static final String LAYOUT_RESULTS_FAILED_RESULT_FILE = "results/layout_tests_failed.txt";
+    static final String LAYOUT_RESULTS_NONTEXT_RESULT_FILE = "results/layout_tests_nontext.txt";
+    static final String LAYOUT_RESULTS_CRASHED_RESULT_FILE = "results/layout_tests_crashed.txt";
+    static final String LAYOUT_TESTS_RUNNER = "run_layout_tests.py";
 
     private MyTestRecorder mResultRecorder;
     private Vector<String> mTestList;
@@ -452,4 +466,28 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
     public void resumeLayoutTests() {
         executeLayoutTests(true);
     }
+
+    public void copyResultsAndRunnerAssetsToCache() {
+        try {
+            String out_dir = getActivity().getApplicationContext().getCacheDir().getPath() + "/";
+
+            for( int i=0; i< LAYOUT_TESTS_RESULTS_REFERENCE_FILES.length; i++) {
+                InputStream in = getActivity().getAssets().open(LAYOUT_TESTS_RESULTS_REFERENCE_FILES[i]);
+                OutputStream out = new FileOutputStream(out_dir + LAYOUT_TESTS_RESULTS_REFERENCE_FILES[i]);
+
+                byte[] buf = new byte[2048];
+                int len;
+
+                while ((len = in.read(buf)) > 0 ) {
+                    out.write(buf, 0, len);
+                }
+                out.close();
+                in.close();
+            }
+        }catch (IOException e) {
+          e.printStackTrace();
+        }
+
+    }
+
 }