diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
| commit | 4656e69bf36d42a35c9290ab79eeb33b4cca1d5c (patch) | |
| tree | 84c6fe3c5e58781c54ce34961d9152d370919dae /docs/html/tools/testing | |
| parent | 8268ad6779c38fb67ea3783fd57bf71bb0cccc51 (diff) | |
| parent | 2008cff73bbc816f867dac0cd057899bed714356 (diff) | |
| download | frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.zip frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.tar.gz frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.tar.bz2 | |
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
Diffstat (limited to 'docs/html/tools/testing')
| -rw-r--r-- | docs/html/tools/testing/testing_eclipse.jd | 2 | ||||
| -rw-r--r-- | docs/html/tools/testing/testing_otheride.jd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/tools/testing/testing_eclipse.jd b/docs/html/tools/testing/testing_eclipse.jd index 7d3be47..6c9d55b 100644 --- a/docs/html/tools/testing/testing_eclipse.jd +++ b/docs/html/tools/testing/testing_eclipse.jd @@ -218,7 +218,7 @@ from Eclipse</a>. <p> Another useful convention is to add the method <code>testPreconditions()</code> to your test class. Use this method to test that the application under test is initialized correctly. If this - test fails, you know that that the initial conditions were in error. When this happens, further + test fails, you know that the initial conditions were in error. When this happens, further test results are suspect, regardless of whether or not the tests succeeded. </p> <p> diff --git a/docs/html/tools/testing/testing_otheride.jd b/docs/html/tools/testing/testing_otheride.jd index 9484158..a774087 100644 --- a/docs/html/tools/testing/testing_otheride.jd +++ b/docs/html/tools/testing/testing_otheride.jd @@ -281,7 +281,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd <p> Another useful convention is to add the method <code>testPreConditions()</code> to your test class. Use this method to test that the application under test is initialized correctly. If this - test fails, you know that that the initial conditions were in error. When this happens, further + test fails, you know that the initial conditions were in error. When this happens, further test results are suspect, regardless of whether or not the tests succeeded. </p> <p> |