Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes an error when displaying the current layout test index.

Browse Source 
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
This commit is contained in:
Kristian Monsen
2010-05-26 18:21:39 +01:00
parent ffa5de2e07
commit fb4b88fddb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
View File

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

4
tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
View File

@@ -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);