Merge lp:~vrruiz/cordova-ubuntu-tests/ap-better-reporting into lp:cordova-ubuntu-tests
- ap-better-reporting
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Robert Bruce Park | ||||
Approved revision: | 29 | ||||
Merged at revision: | 25 | ||||
Proposed branch: | lp:~vrruiz/cordova-ubuntu-tests/ap-better-reporting | ||||
Merge into: | lp:cordova-ubuntu-tests | ||||
Diff against target: |
806 lines (+159/-91) 26 files modified
tests/autopilot/cordova_ubuntu/tests/__init__.py (+30/-12) tests/autopilot/cordova_ubuntu/tests/test_mobilespec.py (+37/-26) tests/autopilot/tools/qml/main-local.qml (+1/-1) www/autotest/html/JUnitXmlReporter.js (+5/-5) www/autotest/pages/accelerometer.html (+2/-2) www/autotest/pages/all.html (+3/-3) www/autotest/pages/battery.html (+2/-2) www/autotest/pages/bridge.html (+2/-2) www/autotest/pages/camera.html (+2/-2) www/autotest/pages/capture.html (+2/-2) www/autotest/pages/compass.html (+2/-2) www/autotest/pages/contacts.html (+2/-2) www/autotest/pages/datauri.html (+2/-2) www/autotest/pages/device.html (+2/-2) www/autotest/pages/file.html (+4/-4) www/autotest/pages/filetransfer.html (+4/-4) www/autotest/pages/geolocation.html (+2/-2) www/autotest/pages/globalization.html (+2/-2) www/autotest/pages/media.html (+2/-2) www/autotest/pages/network.html (+2/-2) www/autotest/pages/notification.html (+2/-2) www/autotest/pages/platform.html (+2/-2) www/autotest/pages/splashscreen.html (+2/-2) www/autotest/pages/storage.html (+2/-2) www/autotest/pages/whitelist.html (+2/-2) www/autotest/test-runner.js (+39/-0) |
||||
To merge this branch: | bzr merge lp:~vrruiz/cordova-ubuntu-tests/ap-better-reporting | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Robert Bruce Park (community) | Approve | ||
Review via email: mp+191177@code.launchpad.net |
Commit message
Skip unsupported API tests.
Description of the change
Skip unsupported API tests.
PS Jenkins bot (ps-jenkins) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:25
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:26
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:27
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:28
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Robert Bruce Park (robru) wrote : | # |
What is the purpose of get_www_dir_path? Unlike get_{cordova_
Víctor R. Ruiz (vrruiz) wrote : | # |
Robert: To be able to run the tests on the development branch, wherever the developer is working.
Víctor R. Ruiz (vrruiz) wrote : | # |
Robert: Ok, checked carefully and that method is not used anymore. Removed.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
Unapproved changes made after approval.
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Robert Bruce Park (robru) wrote : | # |
Thanks Victor! Looks good now ;-)
PS Jenkins bot (ps-jenkins) : | # |
Preview Diff
1 | === modified file 'tests/autopilot/cordova_ubuntu/tests/__init__.py' | |||
2 | --- tests/autopilot/cordova_ubuntu/tests/__init__.py 2013-10-08 22:08:37 +0000 | |||
3 | +++ tests/autopilot/cordova_ubuntu/tests/__init__.py 2013-10-16 17:03:33 +0000 | |||
4 | @@ -11,6 +11,7 @@ | |||
5 | 11 | import os.path | 11 | import os.path |
6 | 12 | import subprocess | 12 | import subprocess |
7 | 13 | 13 | ||
8 | 14 | from xml.dom import minidom | ||
9 | 14 | from testtools.matchers import Contains, Equals | 15 | from testtools.matchers import Contains, Equals |
10 | 15 | 16 | ||
11 | 16 | from autopilot.input import Mouse, Touch, Pointer | 17 | from autopilot.input import Mouse, Touch, Pointer |
12 | @@ -27,22 +28,19 @@ | |||
13 | 27 | "-qDEB_HOST_MULTIARCH"]).strip() | 28 | "-qDEB_HOST_MULTIARCH"]).strip() |
14 | 28 | QML_LAUNCHER = "/usr/lib/" + arch + "/qt5/bin/qmlscene" | 29 | QML_LAUNCHER = "/usr/lib/" + arch + "/qt5/bin/qmlscene" |
15 | 29 | 30 | ||
26 | 30 | # TODO: fix version | 31 | PERSISTENT_PATH= os.path.join(os.environ['HOME'], '.local/share/cordova-ubuntu/persistent/L3Vzci9zaGFyZS9jb3Jkb3ZhLXVidW50dS10ZXN0cy9jb3Jkb3ZhbW9iaWxlc3BlYy93d3c=/') |
27 | 31 | # mobile_spec_path = '/usr/share/cordova-ubuntu-tests/www/' | 32 | LOCAL_PERSISTENT_PATH= os.path.join(os.environ['HOME'], '.local/share/cordova-ubuntu/persistent/L2hvbWUvdnJydWl6L3dlYmFwcHMvbHAvY29yZG92YS11YnVudHUtdGVzdHMvd3d3') |
18 | 32 | LOCAL_WWW_DIR_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__)), | ||
19 | 33 | '../../../www/')) | ||
20 | 34 | WWW_DIR_PATH = '/usr/share/cordova-ubuntu-tests/cordovamobilespec/www/' | ||
21 | 35 | |||
22 | 36 | def get_www_dir_path(self): | ||
23 | 37 | if os.path.exists(self.WWW_DIR_PATH): | ||
24 | 38 | return self.WWW_DIR_PATH | ||
25 | 39 | return self.WWW_DIR_PATH | ||
28 | 40 | 33 | ||
29 | 41 | def get_cordova_container_path(self): | 34 | def get_cordova_container_path(self): |
31 | 42 | if os.path.exists(self.LOCAL_CORDOVA_CONTAINER_PATH): | 35 | if (os.path.exists(self.LOCAL_CORDOVA_CONTAINER_PATH)): |
32 | 43 | return self.LOCAL_CORDOVA_CONTAINER_PATH | 36 | return self.LOCAL_CORDOVA_CONTAINER_PATH |
33 | 44 | return self.INSTALLED_CORDOVA_CONTAINER_PATH | 37 | return self.INSTALLED_CORDOVA_CONTAINER_PATH |
34 | 45 | 38 | ||
35 | 39 | def get_persistent_path(self): | ||
36 | 40 | if (os.path.exists(self.LOCAL_CORDOVA_CONTAINER_PATH)): | ||
37 | 41 | return self.LOCAL_PERSISTENT_PATH | ||
38 | 42 | return self.PERSISTENT_PATH | ||
39 | 43 | |||
40 | 46 | def setUp(self): | 44 | def setUp(self): |
41 | 47 | params = [self.QML_LAUNCHER, self.get_cordova_container_path()] | 45 | params = [self.QML_LAUNCHER, self.get_cordova_container_path()] |
42 | 48 | if (model() <> 'Desktop'): | 46 | if (model() <> 'Desktop'): |
43 | @@ -50,13 +48,14 @@ | |||
44 | 50 | self.app = self.launch_test_application( | 48 | self.app = self.launch_test_application( |
45 | 51 | *params, | 49 | *params, |
46 | 52 | app_type='qt') | 50 | app_type='qt') |
47 | 51 | print params | ||
48 | 53 | super(CordovaUbuntuTestCase, self).setUp() | 52 | super(CordovaUbuntuTestCase, self).setUp() |
49 | 54 | 53 | ||
50 | 55 | def tearDown(self): | 54 | def tearDown(self): |
51 | 56 | super(CordovaUbuntuTestCase, self).tearDown() | 55 | super(CordovaUbuntuTestCase, self).tearDown() |
52 | 57 | 56 | ||
53 | 58 | def pick_app_launcher(self, app_path): | 57 | def pick_app_launcher(self, app_path): |
55 | 59 | # force Qt app introspection | 58 | """ Force Qt app introspection """ |
56 | 60 | from autopilot.introspection.qt import QtApplicationLauncher | 59 | from autopilot.introspection.qt import QtApplicationLauncher |
57 | 61 | return QtApplicationLauncher() | 60 | return QtApplicationLauncher() |
58 | 62 | 61 | ||
59 | @@ -66,3 +65,22 @@ | |||
60 | 66 | def get_webview(self): | 65 | def get_webview(self): |
61 | 67 | return self.app.select_single(objectName="webView") | 66 | return self.app.select_single(objectName="webView") |
62 | 68 | 67 | ||
63 | 68 | def get_junitxml_path(self, junitxml_filename): | ||
64 | 69 | """ Return the absolute path of a JUnit XML file """ | ||
65 | 70 | return os.path.join(self.get_persistent_path(), junitxml_filename) | ||
66 | 71 | |||
67 | 72 | def junitxml_remove(self, junitxml_filename): | ||
68 | 73 | """ Remove, if exists the JUnit XML file """ | ||
69 | 74 | file_path = self.get_junitxml_path(junitxml_filename) | ||
70 | 75 | if (os.path.exists(file_path)): | ||
71 | 76 | os.unlink(file_path) | ||
72 | 77 | |||
73 | 78 | def assert_junitxml_failures(self, junitxml_filename): | ||
74 | 79 | """ Open a JUnit XML file and search errors """ | ||
75 | 80 | file_path = self.get_junitxml_path(junitxml_filename) | ||
76 | 81 | self.assertThat(os.path.exists(file_path), Equals(True)) | ||
77 | 82 | xml = minidom.parse(file_path) | ||
78 | 83 | testsuites = xml.getElementsByTagName('testsuite') | ||
79 | 84 | for testsuite in testsuites: | ||
80 | 85 | failures = testsuite.attributes['failures'] | ||
81 | 86 | self.assertThat(failures.value, Equals('0')) | ||
82 | 69 | 87 | ||
83 | === modified file 'tests/autopilot/cordova_ubuntu/tests/test_mobilespec.py' | |||
84 | --- tests/autopilot/cordova_ubuntu/tests/test_mobilespec.py 2013-10-15 17:07:38 +0000 | |||
85 | +++ tests/autopilot/cordova_ubuntu/tests/test_mobilespec.py 2013-10-16 17:03:33 +0000 | |||
86 | @@ -12,6 +12,7 @@ | |||
87 | 12 | 12 | ||
88 | 13 | from testtools.matchers import Equals | 13 | from testtools.matchers import Equals |
89 | 14 | from autopilot.matchers import Eventually | 14 | from autopilot.matchers import Eventually |
90 | 15 | from unittest import skip | ||
91 | 15 | 16 | ||
92 | 16 | from cordova_ubuntu.tests import CordovaUbuntuTestCase | 17 | from cordova_ubuntu.tests import CordovaUbuntuTestCase |
93 | 17 | from unittest import skipIf | 18 | from unittest import skipIf |
94 | @@ -27,20 +28,23 @@ | |||
95 | 27 | ARCH = subprocess.check_output('uname -p', shell=True).lower() | 28 | ARCH = subprocess.check_output('uname -p', shell=True).lower() |
96 | 28 | TIMEOUT = 120 | 29 | TIMEOUT = 120 |
97 | 29 | 30 | ||
98 | 30 | |||
99 | 31 | class TestMobileSpec(CordovaUbuntuTestCase): | 31 | class TestMobileSpec(CordovaUbuntuTestCase): |
100 | 32 | 32 | ||
102 | 33 | def run_mobilespec(self, test_page='all'): | 33 | def run_mobilespec(self, test_page='all', junitxml_file=''): |
103 | 34 | """ Executes Cordova to run a Mobile Spec Suite's automated test """ | ||
104 | 35 | sleep(1) | ||
105 | 36 | if (junitxml_file): | ||
106 | 37 | self.junitxml_remove(junitxml_file) | ||
107 | 34 | web_view = self.get_webview() | 38 | web_view = self.get_webview() |
108 | 35 | self.assertThat(web_view.loadProgress, Eventually(Equals(100))) | 39 | self.assertThat(web_view.loadProgress, Eventually(Equals(100))) |
109 | 36 | # Click on "Automated tests" (index.html) | 40 | # Click on "Automated tests" (index.html) |
111 | 37 | web_view.slots.evalInPageUnsafe('document.getElementById("__automated").click();'); | 41 | web_view.slots.evalInPageUnsafe('document.getElementById("__automated").click();') |
112 | 38 | self.assertThat(web_view.loadProgress, Eventually(Equals(100))) | 42 | self.assertThat(web_view.loadProgress, Eventually(Equals(100))) |
113 | 39 | # Click on test (autotest/index.html) | 43 | # Click on test (autotest/index.html) |
115 | 40 | web_view.slots.evalInPageUnsafe('document.evaluate(\'//a[contains(@href, "%s.html")]\', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.click();' % test_page); | 44 | web_view.slots.evalInPageUnsafe('document.evaluate(\'//a[contains(@href, "%s.html")]\', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.click();' % test_page) |
116 | 41 | self.assertThat(web_view.loadProgress, Eventually(Equals(100))) | 45 | self.assertThat(web_view.loadProgress, Eventually(Equals(100))) |
117 | 42 | # Wait until finished (autotest/pages/all.html) | 46 | # Wait until finished (autotest/pages/all.html) |
119 | 43 | web_view.slots.evalInPageUnsafe("document.addEventListener('junitxml-finished', function (e) { setTimeout(navigator.app.closeApp, 1000); }, false);"); | 47 | web_view.slots.evalInPageUnsafe("document.addEventListener('junitxml-finished', function (e) { setTimeout(navigator.app.closeApp, 1000); }, false);") |
120 | 44 | # Detect window closed | 48 | # Detect window closed |
121 | 45 | signal.signal(signal.SIGALRM, alarm_handler) | 49 | signal.signal(signal.SIGALRM, alarm_handler) |
122 | 46 | signal.alarm(TIMEOUT) # Setup timeout | 50 | signal.alarm(TIMEOUT) # Setup timeout |
123 | @@ -48,9 +52,10 @@ | |||
124 | 48 | try: | 52 | try: |
125 | 49 | while (self.app.process.poll() is None): | 53 | while (self.app.process.poll() is None): |
126 | 50 | # Process still running, sleep a bit | 54 | # Process still running, sleep a bit |
127 | 51 | sleep(1) | ||
128 | 52 | signal.alarm(0) | 55 | signal.alarm(0) |
129 | 53 | finished = True | 56 | finished = True |
130 | 57 | if (junitxml_file): | ||
131 | 58 | self.assert_junitxml_failures(junitxml_file) | ||
132 | 54 | except Alarm: | 59 | except Alarm: |
133 | 55 | # Timeout reached | 60 | # Timeout reached |
134 | 56 | pass | 61 | pass |
135 | @@ -58,67 +63,73 @@ | |||
136 | 58 | 63 | ||
137 | 59 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | 64 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') |
138 | 60 | def test_accelerometer(self): | 65 | def test_accelerometer(self): |
140 | 61 | self.run_mobilespec('accelerometer'); | 66 | self.run_mobilespec('accelerometer', 'TEST-Accelerometernavigatoraccelerometer.xml') |
141 | 62 | 67 | ||
142 | 68 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | ||
143 | 63 | def test_battery(self): | 69 | def test_battery(self): |
145 | 64 | self.run_mobilespec('battery'); | 70 | self.run_mobilespec('battery', 'TEST-Batterynavigatorbattery.xml') |
146 | 65 | 71 | ||
147 | 66 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | 72 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') |
148 | 67 | def test_camera(self): | 73 | def test_camera(self): |
150 | 68 | self.run_mobilespec('camera'); | 74 | self.run_mobilespec('camera', 'TEST-CameraConstantswindowCameranavigatorcamera.xml') |
151 | 69 | 75 | ||
152 | 70 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | 76 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') |
153 | 71 | def test_capture(self): | 77 | def test_capture(self): |
155 | 72 | self.run_mobilespec('capture'); | 78 | self.run_mobilespec('capture', 'TEST-Capturenavigatordevicecapture.xml') |
156 | 73 | 79 | ||
157 | 74 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | 80 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') |
158 | 75 | def test_compass(self): | 81 | def test_compass(self): |
160 | 76 | self.run_mobilespec('compass'); | 82 | self.run_mobilespec('compass', 'TEST-Compassnavigatorcompass.xml') |
161 | 77 | 83 | ||
162 | 78 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | 84 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') |
163 | 79 | def test_contacts(self): | 85 | def test_contacts(self): |
165 | 80 | self.run_mobilespec('contacts'); | 86 | self.run_mobilespec('contacts', 'TEST-Contactsnavigatorcontacts.xml') |
166 | 81 | 87 | ||
167 | 82 | def test_datauri(self): | 88 | def test_datauri(self): |
169 | 83 | self.run_mobilespec('datauri'); | 89 | self.run_mobilespec('datauri', 'TEST-datauris.xml') |
170 | 84 | 90 | ||
171 | 85 | def test_device(self): | 91 | def test_device(self): |
173 | 86 | self.run_mobilespec('device'); | 92 | self.run_mobilespec('device', 'TEST-DeviceInformationwindowdevice.xml') |
174 | 87 | 93 | ||
175 | 88 | def test_file(self): | 94 | def test_file(self): |
177 | 89 | self.run_mobilespec('file'); | 95 | self.run_mobilespec('file', 'TEST-FileAPI.xml') |
178 | 90 | 96 | ||
179 | 97 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | ||
180 | 91 | def test_filetransfer(self): | 98 | def test_filetransfer(self): |
182 | 92 | self.run_mobilespec('filetransfer'); | 99 | self.run_mobilespec('filetransfer', 'TEST-FileTransfer.xml') |
183 | 93 | 100 | ||
184 | 94 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | 101 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') |
185 | 95 | def test_geolocation(self): | 102 | def test_geolocation(self): |
187 | 96 | self.run_mobilespec('geolocation'); | 103 | self.run_mobilespec('geolocation', 'TEST-Geolocationnavigatorgeolocation.xml') |
188 | 97 | 104 | ||
189 | 105 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | ||
190 | 98 | def test_globalization(self): | 106 | def test_globalization(self): |
192 | 99 | self.run_mobilespec('globalization'); | 107 | self.run_mobilespec('globalization', 'TEST-Globalizationnavigatorglobalization.xml') |
193 | 100 | 108 | ||
194 | 101 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | 109 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') |
195 | 102 | def test_media(self): | 110 | def test_media(self): |
197 | 103 | self.run_mobilespec('media'); | 111 | self.run_mobilespec('media', 'TEST-Media.xml') |
198 | 104 | 112 | ||
199 | 105 | def test_network(self): | 113 | def test_network(self): |
201 | 106 | self.run_mobilespec('network'); | 114 | self.run_mobilespec('network', 'TEST-Networknavigatorconnection.xml') |
202 | 107 | 115 | ||
203 | 108 | def test_notification(self): | 116 | def test_notification(self): |
205 | 109 | self.run_mobilespec('notification'); | 117 | self.run_mobilespec('notification', 'TEST-Notificationnavigatornotification.xml') |
206 | 110 | 118 | ||
207 | 111 | def test_platform(self): | 119 | def test_platform(self): |
209 | 112 | self.run_mobilespec('platform'); | 120 | self.run_mobilespec('platform', 'TEST-Platformcordova.xml') |
210 | 113 | 121 | ||
211 | 114 | def test_storage(self): | 122 | def test_storage(self): |
213 | 115 | self.run_mobilespec('storage'); | 123 | self.run_mobilespec('storage', 'TEST-SessionStorage.xml') |
214 | 116 | 124 | ||
215 | 125 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | ||
216 | 117 | def test_bridge(self): | 126 | def test_bridge(self): |
218 | 118 | self.run_mobilespec('bridge'); | 127 | self.run_mobilespec('bridge', 'TEST-bridge.xml') |
219 | 119 | 128 | ||
220 | 120 | def test_splashscreen(self): | 129 | def test_splashscreen(self): |
222 | 121 | self.run_mobilespec('splashscreen'); | 130 | self.run_mobilespec('splashscreen', 'TEST-Splashscreencordova.xml') |
223 | 122 | 131 | ||
224 | 132 | @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.') | ||
225 | 123 | def test_whitelist(self): | 133 | def test_whitelist(self): |
227 | 124 | self.run_mobilespec('whitelist'); | 134 | self.run_mobilespec('whitelist', 'TEST-whitelist.xml') |
228 | 135 | |||
229 | 125 | 136 | ||
230 | === modified file 'tests/autopilot/tools/qml/main-local.qml' | |||
231 | --- tests/autopilot/tools/qml/main-local.qml 2013-08-28 15:28:22 +0000 | |||
232 | +++ tests/autopilot/tools/qml/main-local.qml 2013-10-16 17:03:33 +0000 | |||
233 | @@ -8,6 +8,6 @@ | |||
234 | 8 | width: 640 | 8 | width: 640 |
235 | 9 | height: 640 | 9 | height: 640 |
236 | 10 | 10 | ||
238 | 11 | wwwDir: '../www/' | 11 | wwwDir: '../../www/' |
239 | 12 | 12 | ||
240 | 13 | } | 13 | } |
241 | 14 | 14 | ||
242 | === modified file 'www/autotest/html/JUnitXmlReporter.js' | |||
243 | --- www/autotest/html/JUnitXmlReporter.js 2013-08-23 18:00:28 +0000 | |||
244 | +++ www/autotest/html/JUnitXmlReporter.js 2013-10-16 17:03:33 +0000 | |||
245 | @@ -165,11 +165,11 @@ | |||
246 | 165 | } | 165 | } |
247 | 166 | // When all done, make it known on JUnitXmlReporter | 166 | // When all done, make it known on JUnitXmlReporter |
248 | 167 | JUnitXmlReporter.finished_at = (new Date()).getTime(); | 167 | JUnitXmlReporter.finished_at = (new Date()).getTime(); |
254 | 168 | // FIXME 1: closeApp should be elsewhere? | 168 | // FIXME: Avoid using setTimeout. Waits until all files have been written |
255 | 169 | // FIXME 2: Avoid using setTimeout. Waits until all files have been written | 169 | setTimeout(function() { |
256 | 170 | var event = new Event('junitxml-finished'); | 170 | var event = new Event('junitxml-finished'); |
257 | 171 | document.dispatchEvent(event); | 171 | document.dispatchEvent(event); |
258 | 172 | // setTimeout(navigator.app.closeApp, 1000); // Close app | 172 | }, 1000); |
259 | 173 | }, | 173 | }, |
260 | 174 | 174 | ||
261 | 175 | getNestedOutput: function(suite) { | 175 | getNestedOutput: function(suite) { |
262 | 176 | 176 | ||
263 | === modified file 'www/autotest/pages/accelerometer.html' | |||
264 | --- www/autotest/pages/accelerometer.html 2013-10-10 20:38:16 +0000 | |||
265 | +++ www/autotest/pages/accelerometer.html 2013-10-16 17:03:33 +0000 | |||
266 | @@ -47,7 +47,7 @@ | |||
267 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
268 | 48 | <script type="text/javascript" src="../tests/accelerometer.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/accelerometer.tests.js"></script> |
269 | 49 | 49 | ||
271 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
272 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
273 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
274 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
275 | @@ -65,7 +65,7 @@ | |||
276 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
277 | 66 | }, false); | 66 | }, false); |
278 | 67 | </script> | 67 | </script> |
280 | 68 | </head> | 68 | </head --> |
281 | 69 | 69 | ||
282 | 70 | <body> | 70 | <body> |
283 | 71 | <a href="javascript:" class="backBtn" onclick="backHome();">Back</a> | 71 | <a href="javascript:" class="backBtn" onclick="backHome();">Back</a> |
284 | 72 | 72 | ||
285 | === modified file 'www/autotest/pages/all.html' | |||
286 | --- www/autotest/pages/all.html 2013-08-23 17:50:24 +0000 | |||
287 | +++ www/autotest/pages/all.html 2013-10-16 17:03:33 +0000 | |||
288 | @@ -56,7 +56,7 @@ | |||
289 | 56 | <script type="text/javascript" src="../tests/file.tests.js"></script> | 56 | <script type="text/javascript" src="../tests/file.tests.js"></script> |
290 | 57 | <script type="text/javascript" src="../tests/filetransfer.tests.js"></script> | 57 | <script type="text/javascript" src="../tests/filetransfer.tests.js"></script> |
291 | 58 | <script type="text/javascript" src="../tests/geolocation.tests.js"></script> | 58 | <script type="text/javascript" src="../tests/geolocation.tests.js"></script> |
293 | 59 | <!-- script type="text/javascript" src="../tests/globalization.tests.js"></script --> | 59 | <script type="text/javascript" src="../tests/globalization.tests.js"></script> |
294 | 60 | <script type="text/javascript" src="../tests/media.tests.js"></script> | 60 | <script type="text/javascript" src="../tests/media.tests.js"></script> |
295 | 61 | <script type="text/javascript" src="../tests/network.tests.js"></script> | 61 | <script type="text/javascript" src="../tests/network.tests.js"></script> |
296 | 62 | <script type="text/javascript" src="../tests/notification.tests.js"></script> | 62 | <script type="text/javascript" src="../tests/notification.tests.js"></script> |
297 | @@ -64,7 +64,7 @@ | |||
298 | 64 | <script type="text/javascript" src="../tests/storage.tests.js"></script> | 64 | <script type="text/javascript" src="../tests/storage.tests.js"></script> |
299 | 65 | <script type="text/javascript" src="../tests/splashscreen.tests.js"></script> | 65 | <script type="text/javascript" src="../tests/splashscreen.tests.js"></script> |
300 | 66 | 66 | ||
302 | 67 | <script type="text/javascript"> | 67 | <!-- script type="text/javascript"> |
303 | 68 | var root, temp_root, persistent_root; | 68 | var root, temp_root, persistent_root; |
304 | 69 | 69 | ||
305 | 70 | document.addEventListener('deviceready', function () { | 70 | document.addEventListener('deviceready', function () { |
306 | @@ -102,7 +102,7 @@ | |||
307 | 102 | temp_root = fileSystem.root; // set in file.tests.js | 102 | temp_root = fileSystem.root; // set in file.tests.js |
308 | 103 | }, onError); | 103 | }, onError); |
309 | 104 | }, false); | 104 | }, false); |
311 | 105 | </script> | 105 | </script --> |
312 | 106 | </head> | 106 | </head> |
313 | 107 | 107 | ||
314 | 108 | <body> | 108 | <body> |
315 | 109 | 109 | ||
316 | === modified file 'www/autotest/pages/battery.html' | |||
317 | --- www/autotest/pages/battery.html 2013-10-10 20:38:16 +0000 | |||
318 | +++ www/autotest/pages/battery.html 2013-10-16 17:03:33 +0000 | |||
319 | @@ -43,7 +43,7 @@ | |||
320 | 43 | 43 | ||
321 | 44 | <!-- Tests --> | 44 | <!-- Tests --> |
322 | 45 | <script type="text/javascript" src="../tests/battery.tests.js"></script> | 45 | <script type="text/javascript" src="../tests/battery.tests.js"></script> |
324 | 46 | <script type="text/javascript"> | 46 | <!-- script type="text/javascript"> |
325 | 47 | document.addEventListener('deviceready', function () { | 47 | document.addEventListener('deviceready', function () { |
326 | 48 | var jasmineEnv = jasmine.getEnv(); | 48 | var jasmineEnv = jasmine.getEnv(); |
327 | 49 | jasmineEnv.updateInterval = 1000; | 49 | jasmineEnv.updateInterval = 1000; |
328 | @@ -60,7 +60,7 @@ | |||
329 | 60 | 60 | ||
330 | 61 | jasmineEnv.execute(); | 61 | jasmineEnv.execute(); |
331 | 62 | }, false); | 62 | }, false); |
333 | 63 | </script> | 63 | </script --> |
334 | 64 | </head> | 64 | </head> |
335 | 65 | 65 | ||
336 | 66 | <body> | 66 | <body> |
337 | 67 | 67 | ||
338 | === modified file 'www/autotest/pages/bridge.html' | |||
339 | --- www/autotest/pages/bridge.html 2013-10-10 20:38:16 +0000 | |||
340 | +++ www/autotest/pages/bridge.html 2013-10-16 17:03:33 +0000 | |||
341 | @@ -47,7 +47,7 @@ | |||
342 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
343 | 48 | <script type="text/javascript" src="../tests/bridge.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/bridge.tests.js"></script> |
344 | 49 | 49 | ||
346 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
347 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
348 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
349 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
350 | @@ -64,7 +64,7 @@ | |||
351 | 64 | 64 | ||
352 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
353 | 66 | }, false); | 66 | }, false); |
355 | 67 | </script> | 67 | </script --> |
356 | 68 | </head> | 68 | </head> |
357 | 69 | 69 | ||
358 | 70 | <body> | 70 | <body> |
359 | 71 | 71 | ||
360 | === modified file 'www/autotest/pages/camera.html' | |||
361 | --- www/autotest/pages/camera.html 2013-10-10 20:38:16 +0000 | |||
362 | +++ www/autotest/pages/camera.html 2013-10-16 17:03:33 +0000 | |||
363 | @@ -48,7 +48,7 @@ | |||
364 | 48 | <!-- Tests --> | 48 | <!-- Tests --> |
365 | 49 | <script type="text/javascript" src="../tests/camera.tests.js"></script> | 49 | <script type="text/javascript" src="../tests/camera.tests.js"></script> |
366 | 50 | 50 | ||
368 | 51 | <script type="text/javascript"> | 51 | <!-- script type="text/javascript"> |
369 | 52 | document.addEventListener('deviceready', function () { | 52 | document.addEventListener('deviceready', function () { |
370 | 53 | var jasmineEnv = jasmine.getEnv(); | 53 | var jasmineEnv = jasmine.getEnv(); |
371 | 54 | jasmineEnv.updateInterval = 1000; | 54 | jasmineEnv.updateInterval = 1000; |
372 | @@ -65,7 +65,7 @@ | |||
373 | 65 | 65 | ||
374 | 66 | jasmineEnv.execute(); | 66 | jasmineEnv.execute(); |
375 | 67 | }, false); | 67 | }, false); |
377 | 68 | </script> | 68 | </script --> |
378 | 69 | </head> | 69 | </head> |
379 | 70 | 70 | ||
380 | 71 | <body> | 71 | <body> |
381 | 72 | 72 | ||
382 | === modified file 'www/autotest/pages/capture.html' | |||
383 | --- www/autotest/pages/capture.html 2013-10-10 20:38:16 +0000 | |||
384 | +++ www/autotest/pages/capture.html 2013-10-16 17:03:33 +0000 | |||
385 | @@ -47,7 +47,7 @@ | |||
386 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
387 | 48 | <script type="text/javascript" src="../tests/capture.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/capture.tests.js"></script> |
388 | 49 | 49 | ||
390 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
391 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
392 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
393 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
394 | @@ -64,7 +64,7 @@ | |||
395 | 64 | 64 | ||
396 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
397 | 66 | }, false); | 66 | }, false); |
399 | 67 | </script> | 67 | </script --> |
400 | 68 | </head> | 68 | </head> |
401 | 69 | 69 | ||
402 | 70 | <body> | 70 | <body> |
403 | 71 | 71 | ||
404 | === modified file 'www/autotest/pages/compass.html' | |||
405 | --- www/autotest/pages/compass.html 2013-10-10 20:38:16 +0000 | |||
406 | +++ www/autotest/pages/compass.html 2013-10-16 17:03:33 +0000 | |||
407 | @@ -47,7 +47,7 @@ | |||
408 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
409 | 48 | <script type="text/javascript" src="../tests/compass.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/compass.tests.js"></script> |
410 | 49 | 49 | ||
412 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
413 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
414 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
415 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
416 | @@ -64,7 +64,7 @@ | |||
417 | 64 | 64 | ||
418 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
419 | 66 | }, false); | 66 | }, false); |
421 | 67 | </script> | 67 | </script --> |
422 | 68 | </head> | 68 | </head> |
423 | 69 | 69 | ||
424 | 70 | <body> | 70 | <body> |
425 | 71 | 71 | ||
426 | === modified file 'www/autotest/pages/contacts.html' | |||
427 | --- www/autotest/pages/contacts.html 2013-10-10 20:38:16 +0000 | |||
428 | +++ www/autotest/pages/contacts.html 2013-10-16 17:03:33 +0000 | |||
429 | @@ -47,7 +47,7 @@ | |||
430 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
431 | 48 | <script type="text/javascript" src="../tests/contacts.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/contacts.tests.js"></script> |
432 | 49 | 49 | ||
434 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
435 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
436 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
437 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
438 | @@ -64,7 +64,7 @@ | |||
439 | 64 | 64 | ||
440 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
441 | 66 | }, false); | 66 | }, false); |
443 | 67 | </script> | 67 | </script --> |
444 | 68 | </head> | 68 | </head> |
445 | 69 | 69 | ||
446 | 70 | <body> | 70 | <body> |
447 | 71 | 71 | ||
448 | === modified file 'www/autotest/pages/datauri.html' | |||
449 | --- www/autotest/pages/datauri.html 2013-10-10 20:38:16 +0000 | |||
450 | +++ www/autotest/pages/datauri.html 2013-10-16 17:03:33 +0000 | |||
451 | @@ -45,7 +45,7 @@ | |||
452 | 45 | <!-- Tests --> | 45 | <!-- Tests --> |
453 | 46 | <script type="text/javascript" src="../tests/datauri.tests.js"></script> | 46 | <script type="text/javascript" src="../tests/datauri.tests.js"></script> |
454 | 47 | 47 | ||
456 | 48 | <script type="text/javascript"> | 48 | <!-- script type="text/javascript"> |
457 | 49 | document.addEventListener('deviceready', function () { | 49 | document.addEventListener('deviceready', function () { |
458 | 50 | var jasmineEnv = jasmine.getEnv(); | 50 | var jasmineEnv = jasmine.getEnv(); |
459 | 51 | jasmineEnv.updateInterval = 1000; | 51 | jasmineEnv.updateInterval = 1000; |
460 | @@ -62,7 +62,7 @@ | |||
461 | 62 | 62 | ||
462 | 63 | jasmineEnv.execute(); | 63 | jasmineEnv.execute(); |
463 | 64 | }, false); | 64 | }, false); |
465 | 65 | </script> | 65 | </script --> |
466 | 66 | </head> | 66 | </head> |
467 | 67 | 67 | ||
468 | 68 | <body> | 68 | <body> |
469 | 69 | 69 | ||
470 | === modified file 'www/autotest/pages/device.html' | |||
471 | --- www/autotest/pages/device.html 2013-10-10 20:38:16 +0000 | |||
472 | +++ www/autotest/pages/device.html 2013-10-16 17:03:33 +0000 | |||
473 | @@ -47,7 +47,7 @@ | |||
474 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
475 | 48 | <script type="text/javascript" src="../tests/device.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/device.tests.js"></script> |
476 | 49 | 49 | ||
478 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
479 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
480 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
481 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
482 | @@ -64,7 +64,7 @@ | |||
483 | 64 | 64 | ||
484 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
485 | 66 | }, false); | 66 | }, false); |
487 | 67 | </script> | 67 | </script --> |
488 | 68 | </head> | 68 | </head> |
489 | 69 | 69 | ||
490 | 70 | <body> | 70 | <body> |
491 | 71 | 71 | ||
492 | === modified file 'www/autotest/pages/file.html' | |||
493 | --- www/autotest/pages/file.html 2013-10-10 20:38:16 +0000 | |||
494 | +++ www/autotest/pages/file.html 2013-10-16 17:03:33 +0000 | |||
495 | @@ -46,7 +46,7 @@ | |||
496 | 46 | <!-- Tests --> | 46 | <!-- Tests --> |
497 | 47 | <script type="text/javascript" src="../tests/file.tests.js"></script> | 47 | <script type="text/javascript" src="../tests/file.tests.js"></script> |
498 | 48 | 48 | ||
500 | 49 | <script type="text/javascript"> | 49 | <!-- script type="text/javascript"> |
501 | 50 | var root, temp_root, persistent_root; | 50 | var root, temp_root, persistent_root; |
502 | 51 | 51 | ||
503 | 52 | document.addEventListener('deviceready', function () { | 52 | document.addEventListener('deviceready', function () { |
504 | @@ -67,10 +67,10 @@ | |||
505 | 67 | jasmineEnv.updateInterval = 1000; | 67 | jasmineEnv.updateInterval = 1000; |
506 | 68 | 68 | ||
507 | 69 | var htmlReporter = new jasmine.HtmlReporter(); | 69 | var htmlReporter = new jasmine.HtmlReporter(); |
509 | 70 | var jUnitXmlReporter = new jasmine.JUnitXmlReporter(); | 70 | var jUnitXmlReporter = new jasmine.JUnitXmlReporter(); |
510 | 71 | 71 | ||
511 | 72 | jasmineEnv.addReporter(htmlReporter); | 72 | jasmineEnv.addReporter(htmlReporter); |
513 | 73 | jasmineEnv.addReporter(jUnitXmlReporter); | 73 | jasmineEnv.addReporter(jUnitXmlReporter); |
514 | 74 | 74 | ||
515 | 75 | jasmineEnv.specFilter = function(spec) { | 75 | jasmineEnv.specFilter = function(spec) { |
516 | 76 | return htmlReporter.specFilter(spec); | 76 | return htmlReporter.specFilter(spec); |
517 | @@ -84,7 +84,7 @@ | |||
518 | 84 | temp_root = fileSystem.root; // set in file.tests.js | 84 | temp_root = fileSystem.root; // set in file.tests.js |
519 | 85 | }, onError); | 85 | }, onError); |
520 | 86 | }, false); | 86 | }, false); |
522 | 87 | </script> | 87 | </script --> |
523 | 88 | </head> | 88 | </head> |
524 | 89 | 89 | ||
525 | 90 | <body> | 90 | <body> |
526 | 91 | 91 | ||
527 | === modified file 'www/autotest/pages/filetransfer.html' | |||
528 | --- www/autotest/pages/filetransfer.html 2013-10-10 20:38:16 +0000 | |||
529 | +++ www/autotest/pages/filetransfer.html 2013-10-16 17:03:33 +0000 | |||
530 | @@ -46,7 +46,7 @@ | |||
531 | 46 | <!-- Tests --> | 46 | <!-- Tests --> |
532 | 47 | <script type="text/javascript" src="../tests/filetransfer.tests.js"></script> | 47 | <script type="text/javascript" src="../tests/filetransfer.tests.js"></script> |
533 | 48 | 48 | ||
535 | 49 | <script type="text/javascript"> | 49 | <!-- script type="text/javascript"> |
536 | 50 | var root, temp_root, persistent_root; | 50 | var root, temp_root, persistent_root; |
537 | 51 | 51 | ||
538 | 52 | document.addEventListener('deviceready', function () { | 52 | document.addEventListener('deviceready', function () { |
539 | @@ -67,10 +67,10 @@ | |||
540 | 67 | jasmineEnv.updateInterval = 1000; | 67 | jasmineEnv.updateInterval = 1000; |
541 | 68 | 68 | ||
542 | 69 | var htmlReporter = new jasmine.HtmlReporter(); | 69 | var htmlReporter = new jasmine.HtmlReporter(); |
544 | 70 | var jUnitXmlReporter = new jasmine.JUnitXmlReporter(); | 70 | var jUnitXmlReporter = new jasmine.JUnitXmlReporter(); |
545 | 71 | 71 | ||
546 | 72 | jasmineEnv.addReporter(htmlReporter); | 72 | jasmineEnv.addReporter(htmlReporter); |
548 | 73 | jasmineEnv.addReporter(jUnitXmlReporter); | 73 | jasmineEnv.addReporter(jUnitXmlReporter); |
549 | 74 | 74 | ||
550 | 75 | jasmineEnv.specFilter = function(spec) { | 75 | jasmineEnv.specFilter = function(spec) { |
551 | 76 | return htmlReporter.specFilter(spec); | 76 | return htmlReporter.specFilter(spec); |
552 | @@ -84,7 +84,7 @@ | |||
553 | 84 | temp_root = fileSystem.root; // set in file.tests.js | 84 | temp_root = fileSystem.root; // set in file.tests.js |
554 | 85 | }, onError); | 85 | }, onError); |
555 | 86 | }, false); | 86 | }, false); |
557 | 87 | </script> | 87 | </script --> |
558 | 88 | </head> | 88 | </head> |
559 | 89 | 89 | ||
560 | 90 | <body> | 90 | <body> |
561 | 91 | 91 | ||
562 | === modified file 'www/autotest/pages/geolocation.html' | |||
563 | --- www/autotest/pages/geolocation.html 2013-10-10 20:38:16 +0000 | |||
564 | +++ www/autotest/pages/geolocation.html 2013-10-16 17:03:33 +0000 | |||
565 | @@ -47,7 +47,7 @@ | |||
566 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
567 | 48 | <script type="text/javascript" src="../tests/geolocation.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/geolocation.tests.js"></script> |
568 | 49 | 49 | ||
570 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
571 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
572 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
573 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
574 | @@ -64,7 +64,7 @@ | |||
575 | 64 | 64 | ||
576 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
577 | 66 | }, false); | 66 | }, false); |
579 | 67 | </script> | 67 | </script --> |
580 | 68 | </head> | 68 | </head> |
581 | 69 | 69 | ||
582 | 70 | <body> | 70 | <body> |
583 | 71 | 71 | ||
584 | === modified file 'www/autotest/pages/globalization.html' | |||
585 | --- www/autotest/pages/globalization.html 2013-10-10 20:38:16 +0000 | |||
586 | +++ www/autotest/pages/globalization.html 2013-10-16 17:03:33 +0000 | |||
587 | @@ -47,7 +47,7 @@ | |||
588 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
589 | 48 | <script type="text/javascript" src="../tests/globalization.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/globalization.tests.js"></script> |
590 | 49 | 49 | ||
592 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
593 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
594 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
595 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
596 | @@ -64,7 +64,7 @@ | |||
597 | 64 | 64 | ||
598 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
599 | 66 | }, false); | 66 | }, false); |
601 | 67 | </script> | 67 | </script --> |
602 | 68 | </head> | 68 | </head> |
603 | 69 | 69 | ||
604 | 70 | <body> | 70 | <body> |
605 | 71 | 71 | ||
606 | === modified file 'www/autotest/pages/media.html' | |||
607 | --- www/autotest/pages/media.html 2013-10-10 20:38:16 +0000 | |||
608 | +++ www/autotest/pages/media.html 2013-10-16 17:03:33 +0000 | |||
609 | @@ -47,7 +47,7 @@ | |||
610 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
611 | 48 | <script type="text/javascript" src="../tests/media.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/media.tests.js"></script> |
612 | 49 | 49 | ||
614 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
615 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
616 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
617 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
618 | @@ -64,7 +64,7 @@ | |||
619 | 64 | 64 | ||
620 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
621 | 66 | }, false); | 66 | }, false); |
623 | 67 | </script> | 67 | </script --> |
624 | 68 | </head> | 68 | </head> |
625 | 69 | 69 | ||
626 | 70 | <body> | 70 | <body> |
627 | 71 | 71 | ||
628 | === modified file 'www/autotest/pages/network.html' | |||
629 | --- www/autotest/pages/network.html 2013-10-10 20:38:16 +0000 | |||
630 | +++ www/autotest/pages/network.html 2013-10-16 17:03:33 +0000 | |||
631 | @@ -47,7 +47,7 @@ | |||
632 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
633 | 48 | <script type="text/javascript" src="../tests/network.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/network.tests.js"></script> |
634 | 49 | 49 | ||
636 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
637 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
638 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
639 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
640 | @@ -64,7 +64,7 @@ | |||
641 | 64 | 64 | ||
642 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
643 | 66 | }, false); | 66 | }, false); |
645 | 67 | </script> | 67 | </script --> |
646 | 68 | </head> | 68 | </head> |
647 | 69 | 69 | ||
648 | 70 | <body> | 70 | <body> |
649 | 71 | 71 | ||
650 | === modified file 'www/autotest/pages/notification.html' | |||
651 | --- www/autotest/pages/notification.html 2013-10-10 20:38:16 +0000 | |||
652 | +++ www/autotest/pages/notification.html 2013-10-16 17:03:33 +0000 | |||
653 | @@ -47,7 +47,7 @@ | |||
654 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
655 | 48 | <script type="text/javascript" src="../tests/notification.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/notification.tests.js"></script> |
656 | 49 | 49 | ||
658 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
659 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
660 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
661 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
662 | @@ -64,7 +64,7 @@ | |||
663 | 64 | 64 | ||
664 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
665 | 66 | }, false); | 66 | }, false); |
667 | 67 | </script> | 67 | </script --> |
668 | 68 | </head> | 68 | </head> |
669 | 69 | 69 | ||
670 | 70 | <body> | 70 | <body> |
671 | 71 | 71 | ||
672 | === modified file 'www/autotest/pages/platform.html' | |||
673 | --- www/autotest/pages/platform.html 2013-10-10 20:38:16 +0000 | |||
674 | +++ www/autotest/pages/platform.html 2013-10-16 17:03:33 +0000 | |||
675 | @@ -47,7 +47,7 @@ | |||
676 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
677 | 48 | <script type="text/javascript" src="../tests/platform.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/platform.tests.js"></script> |
678 | 49 | 49 | ||
680 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
681 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
682 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
683 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
684 | @@ -64,7 +64,7 @@ | |||
685 | 64 | 64 | ||
686 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
687 | 66 | }, false); | 66 | }, false); |
689 | 67 | </script> | 67 | </script --> |
690 | 68 | </head> | 68 | </head> |
691 | 69 | 69 | ||
692 | 70 | <body> | 70 | <body> |
693 | 71 | 71 | ||
694 | === modified file 'www/autotest/pages/splashscreen.html' | |||
695 | --- www/autotest/pages/splashscreen.html 2013-10-10 20:38:16 +0000 | |||
696 | +++ www/autotest/pages/splashscreen.html 2013-10-16 17:03:33 +0000 | |||
697 | @@ -47,7 +47,7 @@ | |||
698 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
699 | 48 | <script type="text/javascript" src="../tests/splashscreen.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/splashscreen.tests.js"></script> |
700 | 49 | 49 | ||
702 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
703 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
704 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
705 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
706 | @@ -64,7 +64,7 @@ | |||
707 | 64 | 64 | ||
708 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
709 | 66 | }, false); | 66 | }, false); |
711 | 67 | </script> | 67 | </script --> |
712 | 68 | </head> | 68 | </head> |
713 | 69 | 69 | ||
714 | 70 | <body> | 70 | <body> |
715 | 71 | 71 | ||
716 | === modified file 'www/autotest/pages/storage.html' | |||
717 | --- www/autotest/pages/storage.html 2013-10-10 20:38:16 +0000 | |||
718 | +++ www/autotest/pages/storage.html 2013-10-16 17:03:33 +0000 | |||
719 | @@ -47,7 +47,7 @@ | |||
720 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
721 | 48 | <script type="text/javascript" src="../tests/storage.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/storage.tests.js"></script> |
722 | 49 | 49 | ||
724 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
725 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
726 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
727 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
728 | @@ -64,7 +64,7 @@ | |||
729 | 64 | 64 | ||
730 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
731 | 66 | }, false); | 66 | }, false); |
733 | 67 | </script> | 67 | </script --> |
734 | 68 | </head> | 68 | </head> |
735 | 69 | 69 | ||
736 | 70 | <body> | 70 | <body> |
737 | 71 | 71 | ||
738 | === modified file 'www/autotest/pages/whitelist.html' | |||
739 | --- www/autotest/pages/whitelist.html 2013-10-10 20:38:16 +0000 | |||
740 | +++ www/autotest/pages/whitelist.html 2013-10-16 17:03:33 +0000 | |||
741 | @@ -47,7 +47,7 @@ | |||
742 | 47 | <!-- Tests --> | 47 | <!-- Tests --> |
743 | 48 | <script type="text/javascript" src="../tests/whitelist.tests.js"></script> | 48 | <script type="text/javascript" src="../tests/whitelist.tests.js"></script> |
744 | 49 | 49 | ||
746 | 50 | <script type="text/javascript"> | 50 | <!-- script type="text/javascript"> |
747 | 51 | document.addEventListener('deviceready', function () { | 51 | document.addEventListener('deviceready', function () { |
748 | 52 | var jasmineEnv = jasmine.getEnv(); | 52 | var jasmineEnv = jasmine.getEnv(); |
749 | 53 | jasmineEnv.updateInterval = 1000; | 53 | jasmineEnv.updateInterval = 1000; |
750 | @@ -64,7 +64,7 @@ | |||
751 | 64 | 64 | ||
752 | 65 | jasmineEnv.execute(); | 65 | jasmineEnv.execute(); |
753 | 66 | }, false); | 66 | }, false); |
755 | 67 | </script> | 67 | </script --> |
756 | 68 | </head> | 68 | </head> |
757 | 69 | 69 | ||
758 | 70 | <body> | 70 | <body> |
759 | 71 | 71 | ||
760 | === modified file 'www/autotest/test-runner.js' | |||
761 | --- www/autotest/test-runner.js 2013-07-25 13:09:34 +0000 | |||
762 | +++ www/autotest/test-runner.js 2013-10-16 17:03:33 +0000 | |||
763 | @@ -60,3 +60,42 @@ | |||
764 | 60 | return false; | 60 | return false; |
765 | 61 | }, "Expecting callbacks to be called.", timeout); | 61 | }, "Expecting callbacks to be called.", timeout); |
766 | 62 | } | 62 | } |
767 | 63 | |||
768 | 64 | // Expects session storage to be available and executes the tests | ||
769 | 65 | var root, temp_root, persistent_root; | ||
770 | 66 | |||
771 | 67 | document.addEventListener('deviceready', function () { | ||
772 | 68 | // one-time retrieval of the root file system entry | ||
773 | 69 | var onError = function(e) { | ||
774 | 70 | console.log('[ERROR] Problem setting up root filesystem for test running! Error to follow.'); | ||
775 | 71 | console.log(JSON.stringify(e)); | ||
776 | 72 | }; | ||
777 | 73 | |||
778 | 74 | window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, | ||
779 | 75 | function(fileSystem) { | ||
780 | 76 | console.log('File API test Init: Setting PERSISTENT FS.'); | ||
781 | 77 | root = fileSystem.root; // set in file.tests.js | ||
782 | 78 | persistent_root = root; | ||
783 | 79 | |||
784 | 80 | // Once root is set up, fire off tests | ||
785 | 81 | var jasmineEnv = jasmine.getEnv(); | ||
786 | 82 | jasmineEnv.updateInterval = 1000; | ||
787 | 83 | |||
788 | 84 | var htmlReporter = new jasmine.HtmlReporter(); | ||
789 | 85 | var jUnitXmlReporter = new jasmine.JUnitXmlReporter(); | ||
790 | 86 | |||
791 | 87 | jasmineEnv.addReporter(htmlReporter); | ||
792 | 88 | jasmineEnv.addReporter(jUnitXmlReporter); | ||
793 | 89 | |||
794 | 90 | jasmineEnv.specFilter = function(spec) { | ||
795 | 91 | return htmlReporter.specFilter(spec); | ||
796 | 92 | }; | ||
797 | 93 | |||
798 | 94 | jasmineEnv.execute(); | ||
799 | 95 | }, onError); | ||
800 | 96 | window.requestFileSystem(LocalFileSystem.TEMPORARY, 0, | ||
801 | 97 | function(fileSystem) { | ||
802 | 98 | console.log('File API test Init: Setting TEMPORARY FS.'); | ||
803 | 99 | temp_root = fileSystem.root; // set in file.tests.js | ||
804 | 100 | }, onError); | ||
805 | 101 | }, false); | ||
806 | 63 | \ No newline at end of file | 102 | \ No newline at end of file |
PASSED: Continuous integration, rev:24 jenkins. qa.ubuntu. com/job/ cordova- ubuntu- tests-ci/ 16/ jenkins. qa.ubuntu. com/job/ cordova- ubuntu- tests-saucy- amd64-ci/ 16 jenkins. qa.ubuntu. com/job/ cordova- ubuntu- tests-saucy- armhf-ci/ 16
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/cordova- ubuntu- tests-ci/ 16/rebuild
http://