257 Commits

Author SHA1 Message Date
Guang Zhu
79d45660f2 dodging the @JavascriptInterface bullet
The reason for not to fix the test instead with new annotation
is that it's preferable to have a single version that works for
all platforms.

This can be revisted once we have enough platforms released to
not to care about the older ones.

Change-Id: I42557f920702e5a65e39a3fea80533bd07b54367
2012-09-13 12:03:10 -07:00
Guang Zhu
738d39c5a0 Revert "fix sdcard path for webkit perf and layout test scripts"
This reverts commit 8aaa32b13e565893c57059ca14eb49fbe4bdf0ba

Change-Id: I831eb07943c85bb23b43bdf2d9026bf88ed23c5a
2012-08-20 21:09:28 -07:00
Guang Zhu
8aaa32b13e fix sdcard path for webkit perf and layout test scripts
paths are moved from /sdcard/ to /sdcard/0/

Change-Id: I27dee294eff033da47c5de17c3b7843790386be3
2012-08-19 15:27:40 -07:00
Steve Block
b56ed30666 Fix style for Geolocation mock mechanism
See I6d88d5dce5c2148812b191a5b452718bf0854aeb

Change-Id: I1179319f066664393aa5f7324df89f8057a9e922
2012-05-29 16:20:03 +01:00
Steve Block
f3f60d9328 Switch Geolocation DRT methods to control client-based mock
Note that we plumb DRT Geolocation mock calls via WebView. This is required
because the WebCore client-based mock is not a static but is tied to the Page.

See WebKit change Ib74a3c05991593e75c3138415d4ac0bf0c9aefa9.

Bug: 6511338
Change-Id: I6d88d5dce5c2148812b191a5b452718bf0854aeb
2012-05-22 12:07:55 +01:00
Jonathan Dixon
d3101b1d30 Seperate interface and implementation of 4 WebView classes
GeolocationPermissionsClassic
CookieManagerClassic
WebIconDatabaseClassic
WebStorageClassic

Also creats a WebViewFactory top level class - this remains hidden
for now, as it's currently only used implicitly by the other
public WebView classes to create the provider instances.

Bug: 5626244

Change-Id: Id0ca1c16d8058f31a86414bbc0e8a55db4b907ba
2012-04-23 12:43:02 +01:00
Guang Zhu
b0668e4d19 follow up file original policy change
enable the access for webview test

Change-Id: Iebde5f3175eabf6e084dc1a2fe8b9dce280ebe7c
2012-04-19 22:02:04 -07:00
Steve Block
5ba2efeb9f Minor clean-up in DeviceOrientation and DeviceMotion
No functional change.

See corresponding external/webkit change
https://android-git.corp.google.com/g/#change,125700

Change-Id: I2693328cb058820587ac43dd3121818959efd2d0
2012-04-12 11:08:13 +01:00
Guang Zhu
3ae8c42152 Update to DumpRenderTree test harness
* removed some unused parameters
* removed obsolete live website test harness
* updated test class so that mean suite time for page cycler
  is emmitted via instrumentation status

Change-Id: Iccb40f70a62a4ac9b8d5bceab9a6a715c611c573
2012-03-05 15:33:17 -08:00
Jonathan Dixon
3c90952036 Refactor WebView to be a thin proxy class
Splits interface and implementation; all client calls are forwarded
to an abstract WebViewProvider interface, and the existing implementation
moved into the WebViewClassic implementor of this interface.

Originally taken from a snapshot from the development branch, by:
git diff HEAD 9a4c328a54cc05e5 | git apply
- but then rebased to keep up to date with master

Interdepends on webkit and Browser changes:
https://android-git.corp.google.com/g/158979
https://android-git.corp.google.com/g/167911

Change-Id: I91403f32654ff308934e95c832d17b292a7d9b2e
2012-03-02 11:17:47 +00:00
Guang Zhu
20a14ca937 disable cpu_upload path workaround
Bug: 6008123

Change-Id: I9bee623827ad82185c77875ba317c2fd95f3fce8
2012-02-14 10:01:46 -08:00
Guang Zhu
6ae14555f9 Merge "fix build" 2012-02-13 18:38:54 -08:00
Guang Zhu
2995f95f0d fix build
remove extra import

Change-Id: Ia3f764e87bc412ec65da82f7ffd5c21f508229c4
2012-02-13 18:36:12 -08:00
Guang Zhu
af99ce7964 use hard coded WebViewProperties.gfxUseMinimalMemory
WebViewProperties is package private to browser

Change-Id: I33e4b5f42c748bb6b8a1f730be140d6fd73059b5
2012-02-13 18:14:02 -08:00
Guang Zhu
c978c560c8 Increase transfer queue size for DRT
To maintain the baseline, DRT app should use the same
transfer queue size as before.

Bug: 6008123

Change-Id: I143ebf86b7798c1a6608af2e37d618ffa09d1062
2012-02-13 17:37:49 -08:00
Guang Zhu
7a640a0936 Merge "Revert "Use port 18000 instead of 8000 for layout tests"" 2012-01-20 17:06:42 -08:00
Guang Zhu
d467347d73 Revert "Use port 18000 instead of 8000 for layout tests"
port 8000 is no longer being occupied, plus this approach never worked 100% because some pages have access to port 8000 hard coded in HTML


This reverts commit e2b9d7f2f027907c7dcdbfb9e99297ff799ce482
2012-01-20 17:06:11 -08:00
Guang Zhu
2452ad3028 Merge "Revert "log stack trace when finish() or onDestroy() is called"" 2011-09-29 10:14:27 -07:00
Guang Zhu
c5daa17928 Revert "log stack trace when finish() or onDestroy() is called"
We are already clear on why it's happening (phantom touches) so reverting this log.

This reverts commit 0882eb05af02616cac5cfd82d9039c9e18d029d8
2011-09-28 20:06:56 -07:00
Guang Zhu
ef4d25c885 Use CPU upload path in DRT
This makes it the same as default browser settings (for now). Otherwise
the test may crash due to GPU OOM.

This is to be a workaround only, and should be reverted after the bug is
fixed.

Bug: 5382134

Change-Id: I82a8dd83b69c8fceb657af9e32a2c5fa66ead2ce
2011-09-27 18:23:10 -07:00
Guang Zhu
0882eb05af log stack trace when finish() or onDestroy() is called
Some supurious calls to these functions when tests are still
running are observed. Add more logging to see what's the
caller.

Change-Id: I9254c3639bcb8619be39bfbc6981fae5bf5e7efa
2011-09-15 01:28:17 -07:00
Guang Zhu
e2b9d7f2f0 Use port 18000 instead of 8000 for layout tests
Apparently some system process is occupying this port now

Change-Id: Iaed4c64d7a8ab41830588d91f5deab1caadfdcdd
2011-08-19 10:52:12 -07:00
Ben Murdoch
333d63ad62 Revert "Disable Crankshaft in DRT for performance testing."
This reverts commit 3f9d171e80eea1162c051dd7200dd828fa258e09.

Bug: 5052287
Change-Id: I8cd4a753e3a5a177934757a67880627c5c14e1af
2011-07-28 21:00:31 +01:00
Ben Murdoch
3f9d171e80 Disable Crankshaft in DRT for performance testing.
Bug: 5052287
Change-Id: I9197f116d36c4cddd533f4aa07974f8c2d4678fe
2011-07-27 14:06:05 +01:00
Ben Murdoch
adafec5e43 Update Android DRT skip list.
The latest merges have brought in several tests for which we are missing
layout test controller functions. Add them to the skip list until we
address DRT to add the functionality.

Change-Id: I465dd71245f68cc8c67122a52dcbb93a5276c31e
2011-06-21 17:54:11 +01:00
Ben Murdoch
34db30db56 LayoutTests with dumpAsText in the pathname should always dump as text.
See http://trac.webkit.org/changeset/79403

Change-Id: Ifd607b0c05804dd40a11072cf6862c36aaf448fe
2011-06-21 13:46:38 +01:00
Guang Zhu
c1635bf14e call clearCache from UI thread
according to the warning message, WebView#clearCache now should be
invoked from UI thread only

Change-Id: I089d9dcdcccc353b802a628c539e62f001d361f8
2011-05-18 10:14:44 -07:00
Guang Zhu
97499df874 change how test sets timeout for webkit dump
there are cases where webkit dump timed out, but a RuntimeException
was not thrown (as it should have) after the timeout limit was
reached. It's probably because the Looper message to invoke time
out is obtained after the message to dump webview. This change
adjusts the order of obtaining the message so hopefully it can make
the timeout work for real.

Change-Id: I4197699f5aad765c88dc81123d052e4c49d7c53d
2011-05-16 11:06:53 -07:00
Guang Zhu
e8e335a500 even more logging
to track down test hang issue

Change-Id: Ida686506275eb7c8c624c135f988feb9c43f86f5
2011-05-13 10:30:17 -07:00
Guang Zhu
49171bc479 add more logging into DRT
Need the extra log to track down a test hang issue

Change-Id: I1556f27b64296fcd39bc49ecbdd14347213bb9a2
2011-05-10 19:08:08 -07:00
Guang Zhu
f6d1b3f125 Make DRT pull data over network
command format:

adb shell am instrument -w -e class \
    com.android.dumprendertree.LoadTestsAutoTest#runPageCyclerTest \
    -e suite moz \
    -e iteration 1 \
    -e forward android-browser-test:80/page_cycler/ \
    com.android.dumprendertree/.LayoutTestsAutoRunner

Change-Id: Ib4e9db28953f6be155517bb4b139e4477305c2c2
2011-04-26 17:55:27 -07:00
Steve Block
6dfef1b86d Merge "Adds CookieManager methods to configure policy for cookies for file scheme URLs" 2011-02-10 13:59:09 -08:00
Steve Block
fb40a64d80 Merge "Increase DRT timeout while waiting for WebView to dump as text" 2011-02-10 12:13:27 -08:00
Steve Block
8e8cf732d1 Increase DRT timeout while waiting for WebView to dump as text
This avoids problems with LayoutTests fast/frames/lots-of-iframes.html and fast/frames/lots-of-objects.html

Bug: 3440578
Change-Id: Ic045141f986baf779ffc9eec804ba994ce0d0fbe
2011-02-10 11:11:22 -08:00
Steve Block
c1f81466f7 Remove LayoutTest http/tests/xmlhttprequest/simple-cross-origin-progress-events.html from skipped list
This test no longer crashes, so we should no longer skip it.

Bug: 2929261
Change-Id: I808926c3dce2e9a01d6c190a18187d9ca965b662
2011-02-09 16:30:12 -08:00
Guang Zhu
5794f23022 change the way test app waits for gc
gcSoftReferences methods are being obsoleted, so we need a different
approach to wait for gc: create a CountDownLatch and release it in
a dummy object's finalizer, call gc and await on the CDL.

Change-Id: I54d9e6bc05540b16ee1f3959ace9008041ac4903
2011-01-25 17:25:59 -08:00
Huahui Wu
f93246923f A few small cleanning-ups.
1. Remove mDeferMultiTouch in WebView, it was for testing only but
we don't need it now since we always pass MultiTouch to WebKit.

2. Remove the use of mDeferMultiTouch in DRT tests.

3. Correct the index of getX(Y) for the second touch point in the
debug string of MotionEvent.

Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18
2011-01-24 12:07:37 -08:00
Huahui Wu
17d25c564d Merge "b/3369602 Using Math.round() to convert float coordinates to integers." into honeycomb 2011-01-21 13:03:49 -08:00
Huahui Wu
a586b7baaf b/3369602 Using Math.round() to convert float coordinates to integers.
Change-Id: If4da01046c909667ce57a849569ae6b1acefb939
2011-01-21 10:37:09 -08:00
Ben Murdoch
7e73ce90d6 DRT needs to clear cookies between tests.
Fixes failure seen in fast/cookies/local-file-can-set-cookies.html

Change-Id: I08b8a0fcf87003fa4621dce08604bf42e70e4635
2011-01-20 11:22:10 +00:00
Ben Murdoch
0b5bd35f60 Add case-sensitive tests to DRT ignore list.
/mnt/sdcard forces lowercase, but these tests verify
the capitialization of the filename. We will never pass them
with DRT1 while storing tests on external storage. DRT2 will
fix this as it does not store any files locally (hence DRT2's
ignore list is unchanged).

Change-Id: Ia062ad77ad312a34db61d606a1d1382ac1d7b70e
2011-01-20 10:52:24 +00:00
Guang Zhu
3974be6163 further remove calls to runFinalization
apparently these calls may deadlock as well...

Change-Id: I83132aa50f4e49a170be2b960f6c3236f14745c9
2011-01-18 18:04:34 -08:00
Guang Zhu
44060f4d76 Merge "when test case times out, stop loading first" into honeycomb 2011-01-14 16:26:30 -08:00
Guang Zhu
4ce6e7c433 when test case times out, stop loading first
current timeout mechanism does a text dump and then move to next case.
sometimes the text dump causes WebView to spin, and doing a
stopLoading seems to resolve some of the cases.

Change-Id: Iae08f9c93b2da3e805cacae43f80083fdf1bc5e1
2011-01-14 16:17:20 -08:00
Guang Zhu
e88255df39 remove runFinalizationSync calls
according to csharpiro, these calls are unnecessary and may
lead to problems.

bug: 3350034

Change-Id: I25a80e4e7610901e75622334bf97d6c1bed17cbd
2011-01-13 15:37:43 -08:00
Guang Zhu
7171622320 change webkit test data path
path changed from "/sdcard/android/" to "/sdcard/webkit/". the
old path clashes with "/sdcard/Android/" and has some odd issues
under FUSE

Change-Id: I57102dca99612bdd7b4d1f196e43436cd1276281
2011-01-12 22:57:41 -08:00
Guang Zhu
f2f7f56e8b bugfix: remove dump timeout message after dump is received
Change-Id: I4061ccf77d47045a23065d27d6c9fa7452d085cc
2010-12-23 16:25:47 -08:00
Guang Zhu
f37a574f1c Throw exception if webview dump times out
if a webview dump times out, normally it's already in a bad state,
throwing runtime execption will generate a crash on the test case
and make the test move forward.

Change-Id: Id7430700db6b6d90160d60d23debd250b1731789
2010-12-23 14:37:31 -08:00
Kristian Monsen
16d041cc9f Adds CookieManager methods to configure policy for cookies for file scheme URLs
Needs https://android-git.corp.google.com/g/83647 in external/webkit,
which disallows such cookies by default and provides configuration
methods native side.

Also updates TestShellActivity to allow such cookies, as they are
required for the page cycler.

Bug: 2944150
Change-Id: Idcc7e2812fab33e6a2a8766a2176bc3278e617da
2010-12-21 18:19:24 +00:00
Steve Block
6a6146958c Add LayoutTest http/tests/appcache/foreign-fallback.html to the DRT ignore list
Bug: 3285647
Change-Id: I3acafe4690a4d2c7fae74bbd01a5f487867f2fc6
2010-12-16 13:30:52 +00:00