diff --git a/test/README.md b/test/README.md index cf74cb65..81697244 100755 --- a/test/README.md +++ b/test/README.md @@ -30,7 +30,6 @@ project.properties has a library reference to ../framework. To run manually from command line: -0. Install the Cordova Device Plugin using plugman 0. Build by entering `ant debug install` 0. Run tests by clicking on "CordovaTest" icon on device diff --git a/test/assets/www/backbuttonmultipage/index.html b/test/assets/www/backbuttonmultipage/index.html index 8f94b8bd..8739aa0e 100755 --- a/test/assets/www/backbuttonmultipage/index.html +++ b/test/assets/www/backbuttonmultipage/index.html @@ -28,9 +28,7 @@

Cordova Android Tests

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:  , Color Depth:

+

Deviceready:  

Page 1

diff --git a/test/assets/www/backbuttonmultipage/sample2.html b/test/assets/www/backbuttonmultipage/sample2.html index 712437cf..0b5be64c 100755 --- a/test/assets/www/backbuttonmultipage/sample2.html +++ b/test/assets/www/backbuttonmultipage/sample2.html @@ -28,9 +28,7 @@

Cordova Android Tests

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:  , Color Depth:

+

Deviceready:  

Page 2

diff --git a/test/assets/www/backbuttonmultipage/sample3.html b/test/assets/www/backbuttonmultipage/sample3.html index a35946ba..7aa1e3b4 100755 --- a/test/assets/www/backbuttonmultipage/sample3.html +++ b/test/assets/www/backbuttonmultipage/sample3.html @@ -28,9 +28,7 @@

Cordova Android Tests

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:  , Color Depth:

+

Deviceready:  

Page 3

diff --git a/test/assets/www/background/index.html b/test/assets/www/background/index.html index 6aaed6a6..751806bc 100755 --- a/test/assets/www/background/index.html +++ b/test/assets/www/background/index.html @@ -1,21 +1,21 @@ @@ -40,13 +40,8 @@ $ function onDeviceReady() { // Register the event listener - document.getElementById("platform").innerHTML = device.platform; - document.getElementById("version").innerHTML = device.version; - document.getElementById("uuid").innerHTML = device.uuid; - document.getElementById("name").innerHTML = device.name; - document.getElementById("width").innerHTML = screen.width; - document.getElementById("height").innerHTML = screen.height; - document.getElementById("colorDepth").innerHTML = screen.colorDepth; + document.getElementById("deviceready").innerHTML = "fired"; + document.getElementById("cordova").innerHTML = cordova.version; document.addEventListener("pause", onPause, false); document.addEventListener("resume", onResume, false); @@ -84,10 +79,8 @@ $

Events

-

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:  , Color Depth:

+

Cordova:  

+

Deviceready:  

Press "Home" button, then return to this app to see pause/resume.
diff --git a/test/assets/www/background/index2.html b/test/assets/www/background/index2.html index 62710876..fa5a367f 100755 --- a/test/assets/www/background/index2.html +++ b/test/assets/www/background/index2.html @@ -1,21 +1,21 @@ @@ -40,13 +40,8 @@ $ function onDeviceReady() { // Register the event listener - document.getElementById("platform").innerHTML = device.platform; - document.getElementById("version").innerHTML = device.version; - document.getElementById("uuid").innerHTML = device.uuid; - document.getElementById("name").innerHTML = device.name; - document.getElementById("width").innerHTML = screen.width; - document.getElementById("height").innerHTML = screen.height; - document.getElementById("colorDepth").innerHTML = screen.colorDepth; + document.getElementById("deviceready").innerHTML = "fired"; + document.getElementById("cordova").innerHTML = cordova.version; document.addEventListener("pause", onPause, false); document.addEventListener("resume", onResume, false); @@ -85,9 +80,7 @@ $

Events

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:  , Color Depth:

+

Deviceready:  

Press "Back" button to return to Page 1.

diff --git a/test/assets/www/backgroundcolor/index.html b/test/assets/www/backgroundcolor/index.html index 795ac8bc..3b09d648 100755 --- a/test/assets/www/backgroundcolor/index.html +++ b/test/assets/www/backgroundcolor/index.html @@ -19,7 +19,7 @@ - + Cordova Tests @@ -30,10 +30,7 @@

Background Color Test

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Deviceready:  

Before this page was show, you should have seen the background flash green.
diff --git a/test/assets/www/basicauth/index.html b/test/assets/www/basicauth/index.html index bcde753e..5d2bc512 100755 --- a/test/assets/www/basicauth/index.html +++ b/test/assets/www/basicauth/index.html @@ -19,7 +19,7 @@ - + Cordova Tests @@ -30,10 +30,7 @@

Basic Auth

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Deviceready:  

Loading link below should be successful and show page indicating username=test & password=test.
diff --git a/test/assets/www/fullscreen/index.html b/test/assets/www/fullscreen/index.html index a960053f..ab43cc43 100755 --- a/test/assets/www/fullscreen/index.html +++ b/test/assets/www/fullscreen/index.html @@ -19,7 +19,7 @@ - + Cordova Tests @@ -30,10 +30,7 @@

Full Screen Test

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Deviceready:  

The app should take over the entire screen.
diff --git a/test/assets/www/iframe/index.html b/test/assets/www/iframe/index.html index d8b5f069..7953fc25 100755 --- a/test/assets/www/iframe/index.html +++ b/test/assets/www/iframe/index.html @@ -19,7 +19,7 @@ --> - + Cordova Tests @@ -34,10 +34,7 @@

IFrame

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Deviceready:  

Press the two buttons:
diff --git a/test/assets/www/iframe/index2.html b/test/assets/www/iframe/index2.html index 868b20f0..b1ca1b0b 100755 --- a/test/assets/www/iframe/index2.html +++ b/test/assets/www/iframe/index2.html @@ -19,7 +19,7 @@ --> - + Cordova Tests @@ -30,10 +30,7 @@

IFrame window

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Deviceready:  

This should display a Cordova page inside an iframe. The info above should be filled out. diff --git a/test/assets/www/index.html b/test/assets/www/index.html index c05294ca..2876d78c 100755 --- a/test/assets/www/index.html +++ b/test/assets/www/index.html @@ -38,11 +38,8 @@

Cordova Android Tests

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

-

Cordova Version:  

+

Cordova:  

+

Deviceready:  

Run each of the test activities below:

diff --git a/test/assets/www/lifecycle/index.html b/test/assets/www/lifecycle/index.html index 874c7a97..25fc2308 100755 --- a/test/assets/www/lifecycle/index.html +++ b/test/assets/www/lifecycle/index.html @@ -40,14 +40,8 @@ function onDeviceReady() { // Register the event listener - document.getElementById("platform").innerHTML = device.platform; - document.getElementById("version").innerHTML = device.version; - document.getElementById("uuid").innerHTML = device.uuid; - document.getElementById("name").innerHTML = device.name; - document.getElementById("width").innerHTML = screen.width; - document.getElementById("height").innerHTML = screen.height; - document.getElementById("colorDepth").innerHTML = screen.colorDepth; - document.getElementById("cordova").innerHTML = device.cordova; + document.getElementById("deviceready").innerHTML = "fired"; + document.getElementById("cordova").innerHTML = cordova.version; document.addEventListener("pause", onPause, false); document.addEventListener("resume", onResume, false); @@ -85,10 +79,8 @@

Events

-

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:  , Color Depth:

+

Cordova:  

+

Deviceready:  

Test 1

diff --git a/test/assets/www/lifecycle/index2.html b/test/assets/www/lifecycle/index2.html index 02ac7493..9b22a0d6 100755 --- a/test/assets/www/lifecycle/index2.html +++ b/test/assets/www/lifecycle/index2.html @@ -40,14 +40,8 @@ function onDeviceReady() { // Register the event listener - document.getElementById("platform").innerHTML = device.platform; - document.getElementById("version").innerHTML = device.version; - document.getElementById("uuid").innerHTML = device.uuid; - document.getElementById("name").innerHTML = device.name; - document.getElementById("cordova").innerHTML = device.cordova; - document.getElementById("width").innerHTML = screen.width; - document.getElementById("height").innerHTML = screen.height; - document.getElementById("colorDepth").innerHTML = screen.colorDepth; + document.getElementById("deviceready").innerHTML = "fired"; + document.getElementById("cordova").innerHTML = cordova.version; document.addEventListener("pause", onPause, false); document.addEventListener("resume", onResume, false); diff --git a/test/assets/www/main.js b/test/assets/www/main.js index aa1b226c..f525a5c1 100755 --- a/test/assets/www/main.js +++ b/test/assets/www/main.js @@ -18,17 +18,8 @@ */ var deviceInfo = function() { - document.getElementById("platform").innerHTML = device.platform; - document.getElementById("version").innerHTML = device.version; - document.getElementById("uuid").innerHTML = device.uuid; - document.getElementById("name").innerHTML = device.name; - document.getElementById("width").innerHTML = screen.width; - document.getElementById("height").innerHTML = screen.height; - document.getElementById("colorDepth").innerHTML = screen.colorDepth; - var el = document.getElementById("cordova"); - if (el) { - el.innerHTML = device.cordova; - } + document.getElementById("deviceready").innerHTML = "fired"; + document.getElementById("cordova").innerHTML = cordova.version; }; var getLocation = function() { diff --git a/test/assets/www/menus/index.html b/test/assets/www/menus/index.html index b51a0ef4..58d64c34 100755 --- a/test/assets/www/menus/index.html +++ b/test/assets/www/menus/index.html @@ -19,7 +19,7 @@ --> - + Cordova Tests @@ -30,10 +30,7 @@

Menu Test

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Deviceready:  

The menu items should be:

diff --git a/test/assets/www/splashscreen/index.html b/test/assets/www/splashscreen/index.html index 8d2cd9fb..5f5d9e8d 100755 --- a/test/assets/www/splashscreen/index.html +++ b/test/assets/www/splashscreen/index.html @@ -1,25 +1,25 @@ - + Cordova Tests @@ -29,10 +29,8 @@ $

Splash Screen Test

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Cordova:  

+

Deviceready:  

You should have seen the splash screen for 2 seconds.
diff --git a/test/assets/www/userwebview/index.html b/test/assets/www/userwebview/index.html index 51eec6ad..b1a653a2 100755 --- a/test/assets/www/userwebview/index.html +++ b/test/assets/www/userwebview/index.html @@ -1,25 +1,25 @@ - + Cordova Tests @@ -29,10 +29,8 @@ $

User WebView/Client/Chrome Test

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Cordova:  

+

Deviceready:  

The following should be seen in LogCat:

diff --git a/test/assets/www/whitelist/index.html b/test/assets/www/whitelist/index.html index 3dfa60b3..b9596c93 100755 --- a/test/assets/www/whitelist/index.html +++ b/test/assets/www/whitelist/index.html @@ -1,25 +1,25 @@ - + Cordova Tests @@ -30,10 +30,7 @@ $

Whitelist Page 1

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Deviceready:  

Loading Page 2 should be successful.
diff --git a/test/assets/www/whitelist/index2.html b/test/assets/www/whitelist/index2.html index 47f23114..5d990ad7 100755 --- a/test/assets/www/whitelist/index2.html +++ b/test/assets/www/whitelist/index2.html @@ -1,25 +1,25 @@ - + Cordova Tests @@ -30,10 +30,7 @@ $

Whitelist Page 2

Cordova:  

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Deviceready:  

Press "backbutton" diff --git a/test/assets/www/xhr/index.html b/test/assets/www/xhr/index.html index 9eddb1d5..d1b997a9 100755 --- a/test/assets/www/xhr/index.html +++ b/test/assets/www/xhr/index.html @@ -1,25 +1,25 @@ - + Cordova Tests @@ -49,10 +49,8 @@ $

XHR

-

Platform:  , Version:  

-

UUID:  , Name:  

-

Width:  , Height:   - , Color Depth:

+

Cordova:  

+

Deviceready:  

Press buttons below to test. You should see an alert with results displayed.