summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-09-27 16:54:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-09-27 16:54:35 -0700
commitd155f6d79251ecc1f27e079e9ac05d7855dda505 (patch)
tree2b9d66ffdc35c838c54574b756ee2a4e81b20cc0 /tests
parentdd205d14468b532395a2d9896dd550150f09cc23 (diff)
parentd021ea27cea0ea14ad0e0295eaa51c94e92946fc (diff)
downloadframeworks_base-d155f6d79251ecc1f27e079e9ac05d7855dda505.zip
frameworks_base-d155f6d79251ecc1f27e079e9ac05d7855dda505.tar.gz
frameworks_base-d155f6d79251ecc1f27e079e9ac05d7855dda505.tar.bz2
am d021ea27: Merge change 27306 into eclair
Merge commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc' into eclair-plus-aosp * commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc': Modified the test case name for the browser page load test.
Diffstat (limited to 'tests')
-rw-r--r--tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java b/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
index 861e37b..32763b3 100644
--- a/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
+++ b/tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
@@ -21,7 +21,7 @@ public class PowerMeasurement extends ActivityInstrumentationTestCase2<PowerTest
super(PKG_NAME, PowerTestActivity.class);
}
- public void testPageLoad() throws Throwable {
+ public void testPageLoadStaticNYTimes() throws Throwable {
Instrumentation mInst = getInstrumentation();
PowerTestActivity act = getActivity();