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

Commit fb4b88fd authored by Kristian Monsen's avatar Kristian Monsen
Browse files

Fixes an error when displaying the current layout test index. 

This fixes a bug in commit https://android-git.corp.google.com/g/#change,52518.
Updated index to be zero based when passed around and off by one error on
resume. Note that previous commit changes how DumpRenderTree dumps titles.
This might affect the results of layout tests.

Change-Id: I3d6989d71c336f90168e38c994dd36743bda365c
parent ffa5de2e

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

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

    private String mTestPathPrefix;

    private boolean mFinished;

    private boolean mFinished;

    private int mTestCount;

    private int mTestCount;

    private int mResumeIndex = 0;

    private int mResumeIndex;





    public LayoutTestsAutoTest() {

    public LayoutTestsAutoTest() {

      super(TestShellActivity.class);

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

                if (mTestList.elementAt(i).equals(line)) {

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

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

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

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

                    mResumeIndex = i;

                    mResumeIndex = i + 1;

                    break;

                    break;

                }

                }

            }

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

            boolean ignoreResult = mTestListIgnoreResult.elementAt(i);

            FsUtils.updateTestStatus(TEST_STATUS_FILE, s);

            FsUtils.updateTestStatus(TEST_STATUS_FILE, s);

            // Run tests

            // 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");

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

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

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

        mSaveImagePath = intent.getStringExtra(SAVE_IMAGE);

        mTestCount = intent.getIntExtra(TEST_COUNT, 0);

        mTestCount = intent.getIntExtra(TEST_COUNT, 0);

        mTestIndex = intent.getIntExtra(TEST_INDEX, 0);

        mTestIndex = intent.getIntExtra(TEST_INDEX, 0);

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

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





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

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

        mWebView.loadUrl(mTestUrl);

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




        @Override

        @Override

        public void onReceivedTitle(WebView view, String title) {

        public void onReceivedTitle(WebView view, String title) {

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

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

            if (mDumpTitleChanges) {

            if (mDumpTitleChanges) {

                mTitleChanges.append("TITLE CHANGED: ");

                mTitleChanges.append("TITLE CHANGED: ");

                mTitleChanges.append(title);

                mTitleChanges.append(title);