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

Commit d1e2d823 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android (Google) Code Review
Browse files

Merge "Fixes an error when displaying the current layout test index."

parents 6f48790c fb4b88fd

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

+3 −3
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
    private String mTestPathPrefix;

    private boolean mFinished;

    private int mTestCount;

    private int mResumeIndex = 0;

    private int mResumeIndex;



    public LayoutTestsAutoTest() {

      super(TestShellActivity.class);
@@ -189,7 +189,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
                if (mTestList.elementAt(i).equals(line)) {

                    mTestList = new Vector<String>(mTestList.subList(i+1, mTestList.size()));

                    mTestListIgnoreResult = new Vector<Boolean>(mTestListIgnoreResult.subList(i+1, mTestListIgnoreResult.size()));

                    mResumeIndex = i;

                    mResumeIndex = i + 1;

                    break;

                }

            }
@@ -402,7 +402,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
            boolean ignoreResult = mTestListIgnoreResult.elementAt(i);

            FsUtils.updateTestStatus(TEST_STATUS_FILE, s);

            // Run tests

            runTestAndWaitUntilDone(activity, s, runner.mTimeoutInMillis, ignoreResult, i + 1 + mResumeIndex);

            runTestAndWaitUntilDone(activity, s, runner.mTimeoutInMillis, ignoreResult, i + mResumeIndex);

        }



        FsUtils.updateTestStatus(TEST_STATUS_FILE, "#DONE");

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

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public class TestShellActivity extends Activity implements LayoutTestController 
        mSaveImagePath = intent.getStringExtra(SAVE_IMAGE);

        mTestCount = intent.getIntExtra(TEST_COUNT, 0);

        mTestIndex = intent.getIntExtra(TEST_INDEX, 0);

        setTitle("Test " + mTestIndex + " of " + mTestCount);

        setTitle("Test " + (mTestIndex + 1) + " of " + mTestCount);



        Log.v(LOGTAG, "  Loading " + mTestUrl);

        mWebView.loadUrl(mTestUrl);
@@ -574,7 +574,7 @@ public class TestShellActivity extends Activity implements LayoutTestController 


        @Override

        public void onReceivedTitle(WebView view, String title) {

            setTitle("Test " + mTestIndex + " of " + mTestCount + ": "+ title);

            setTitle("Test " + (mTestIndex + 1) + " of " + mTestCount + ": "+ title);

            if (mDumpTitleChanges) {

                mTitleChanges.append("TITLE CHANGED: ");

                mTitleChanges.append(title);