Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aa1c034 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 8a76a908 to master 

Change-Id: I8983d5c93dfa12d87449ac9f9a17a5aafdadef0a
parents 51ad36e8 8a76a908

tests/DumpRenderTree/src/com/android/dumprendertree/FileList.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.View; 
import android.widget.ListView;

import android.widget.ListView;

import android.widget.SimpleAdapter;

import android.widget.SimpleAdapter;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Environment;









public abstract class FileList extends ListActivity

public abstract class FileList extends ListActivity
@@ -179,9 +180,8 @@ public abstract class FileList extends ListActivity 
        getListView().setSelection(mFocusIndex);

        getListView().setSelection(mFocusIndex);

    }

    }





    protected void setupPath()

    protected void setupPath() {

    {

        mPath = Environment.getExternalStorageDirectory() + "/android/layout_tests";

    	mPath = "/sdcard/android/layout_tests";

        mBaseLength = mPath.length();

        mBaseLength = mPath.length();

    }

    }

tests/DumpRenderTree/src/com/android/dumprendertree/FsUtils.java

+12 −5
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.dumprendertree; 




import com.android.dumprendertree.forwarder.ForwardService;

import com.android.dumprendertree.forwarder.ForwardService;





import android.os.Environment;

import android.util.Log;

import android.util.Log;





import java.io.BufferedOutputStream;

import java.io.BufferedOutputStream;
@@ -32,11 +33,17 @@ import java.util.regex.Pattern; 
public class FsUtils {

public class FsUtils {





    private static final String LOGTAG = "FsUtils";

    private static final String LOGTAG = "FsUtils";

    static final String HTTP_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/";

    static final String EXTERNAL_DIR = Environment.getExternalStorageDirectory().toString();

    static final String HTTPS_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/ssl/";

    static final String HTTP_TESTS_PREFIX =

    static final String HTTP_LOCAL_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/local/";

        EXTERNAL_DIR + "/android/layout_tests/http/tests/";

    static final String HTTP_MEDIA_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/media/";

    static final String HTTPS_TESTS_PREFIX =

    static final String HTTP_WML_TESTS_PREFIX = "/sdcard/android/layout_tests/http/tests/wml/";

        EXTERNAL_DIR + "/android/layout_tests/http/tests/ssl/";

    static final String HTTP_LOCAL_TESTS_PREFIX =

        EXTERNAL_DIR + "/android/layout_tests/http/tests/local/";

    static final String HTTP_MEDIA_TESTS_PREFIX =

        EXTERNAL_DIR + "/android/layout_tests/http/tests/media/";

    static final String HTTP_WML_TESTS_PREFIX =

        EXTERNAL_DIR + "/android/layout_tests/http/tests/wml/";





    private FsUtils() {

    private FsUtils() {

        //no creation of instances

        //no creation of instances

tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java

+12 −9
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.dumprendertree.forwarder.AdbUtils; 
import com.android.dumprendertree.forwarder.ForwardService;

import com.android.dumprendertree.forwarder.ForwardService;





import android.content.Intent;

import android.content.Intent;

import android.os.Environment;

import android.test.ActivityInstrumentationTestCase2;

import android.test.ActivityInstrumentationTestCase2;

import android.util.Log;

import android.util.Log;
@@ -89,10 +90,11 @@ class MyTestRecorder { 




    public MyTestRecorder(boolean resume) {

    public MyTestRecorder(boolean resume) {

        try {

        try {

            File resultsPassedFile = new File("/sdcard/layout_tests_passed.txt");

            File externalDir = Environment.getExternalStorageDirectory();

            File resultsFailedFile = new File("/sdcard/layout_tests_failed.txt");

            File resultsPassedFile = new File(externalDir, "layout_tests_passed.txt");

            File resultsIgnoreResultFile = new File("/sdcard/layout_tests_ignored.txt");

            File resultsFailedFile = new File(externalDir, "layout_tests_failed.txt");

            File noExpectedResultFile = new File("/sdcard/layout_tests_nontext.txt");

            File resultsIgnoreResultFile = new File(externalDir, "layout_tests_ignored.txt");

            File noExpectedResultFile = new File(externalDir, "layout_tests_nontext.txt");





            mBufferedOutputPassedStream =

            mBufferedOutputPassedStream =

                new BufferedOutputStream(new FileOutputStream(resultsPassedFile, resume));

                new BufferedOutputStream(new FileOutputStream(resultsPassedFile, resume));
@@ -125,11 +127,12 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
    private static final String LOGTAG = "LayoutTests";

    private static final String LOGTAG = "LayoutTests";

    static final int DEFAULT_TIMEOUT_IN_MILLIS = 5000;

    static final int DEFAULT_TIMEOUT_IN_MILLIS = 5000;





    static final String LAYOUT_TESTS_ROOT = "/sdcard/android/layout_tests/";

    static final String EXTERNAL_DIR = Environment.getExternalStorageDirectory().toString();

    static final String LAYOUT_TESTS_RESULT_DIR = "/sdcard/android/layout_tests_results/";

    static final String LAYOUT_TESTS_ROOT = EXTERNAL_DIR + "/android/layout_tests/";

    static final String ANDROID_EXPECTED_RESULT_DIR = "/sdcard/android/expected_results/";

    static final String LAYOUT_TESTS_RESULT_DIR = EXTERNAL_DIR + "/android/layout_tests_results/";

    static final String LAYOUT_TESTS_LIST_FILE = "/sdcard/android/layout_tests_list.txt";

    static final String ANDROID_EXPECTED_RESULT_DIR = EXTERNAL_DIR + "/android/expected_results/";

    static final String TEST_STATUS_FILE = "/sdcard/android/running_test.txt";

    static final String LAYOUT_TESTS_LIST_FILE = EXTERNAL_DIR + "/android/layout_tests_list.txt";

    static final String TEST_STATUS_FILE = EXTERNAL_DIR + "/android/running_test.txt";

    static final String LAYOUT_TESTS_RESULTS_REFERENCE_FILES[] = {

    static final String LAYOUT_TESTS_RESULTS_REFERENCE_FILES[] = {

          "results/layout_tests_passed.txt",

          "results/layout_tests_passed.txt",

          "results/layout_tests_failed.txt",

          "results/layout_tests_failed.txt",

tests/DumpRenderTree/src/com/android/dumprendertree/LoadTestsAutoTest.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.Instrumentation; 
import android.content.Intent;

import android.content.Intent;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Debug;

import android.os.Debug;

import android.os.Environment;

import android.os.Process;

import android.os.Process;

import android.test.ActivityInstrumentationTestCase2;

import android.test.ActivityInstrumentationTestCase2;

import android.util.Log;

import android.util.Log;
@@ -35,7 +36,8 @@ import java.io.PrintStream; 
public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShellActivity> {

public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShellActivity> {





    private final static String LOGTAG = "LoadTest";

    private final static String LOGTAG = "LoadTest";

    private final static String LOAD_TEST_RESULT = "/sdcard/load_test_result.txt";

    private final static String LOAD_TEST_RESULT =

        Environment.getExternalStorageDirectory() + "/load_test_result.txt";

    private boolean mFinished;

    private boolean mFinished;

    static final String LOAD_TEST_RUNNER_FILES[] = {

    static final String LOAD_TEST_RUNNER_FILES[] = {

        "run_page_cycler.py"

        "run_page_cycler.py"

tests/DumpRenderTree/src/com/android/dumprendertree/Menu.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.dumprendertree; 




import android.content.Intent;

import android.content.Intent;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Environment;

import android.util.Log;

import android.util.Log;





import java.io.BufferedOutputStream;

import java.io.BufferedOutputStream;
@@ -28,7 +29,8 @@ public class Menu extends FileList { 




    private static final int MENU_START = 0x01;

    private static final int MENU_START = 0x01;

    private static String LOGTAG = "MenuActivity";

    private static String LOGTAG = "MenuActivity";

    static final String LAYOUT_TESTS_LIST_FILE = "/sdcard/android/layout_tests_list.txt";

    static final String LAYOUT_TESTS_LIST_FILE =

        Environment.getExternalStorageDirectory() + "/android/layout_tests_list.txt";





    public void onCreate(Bundle icicle) {

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        super.onCreate(icicle);