Merge lp:~pedro/mago/nautilus into lp:~mago-contributors/mago/mago-1.0
- nautilus
- Merge into mago-1.0
Proposed by
Pedro Villavicencio
Status: | Merged |
---|---|
Merged at revision: | 159 |
Proposed branch: | lp:~pedro/mago/nautilus |
Merge into: | lp:~mago-contributors/mago/mago-1.0 |
Diff against target: |
552 lines (+444/-10) 5 files modified
mago/application/nautilus.py (+278/-4) mago/test_suite/nautilus.py (+7/-2) nautilus/README (+33/-0) nautilus/nautilus_basics.py (+59/-1) nautilus/nautilus_basics.xml (+67/-3) |
To merge this branch: | bzr merge lp:~pedro/mago/nautilus |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nagappan Alagappan | Approve | ||
Review via email: mp+44497@code.launchpad.net |
Commit message
Description of the change
Adding more tests for nautilus, available tests:
* Move to Trash.
* Empty Trash.
* Show/No Show Hidden files.
* Change Zoom levels.
* Change Views.
* Add Bookmark.
* Remove Bookmark.
* Arrange by.
* Enable/Disable Toolbars.
* Connect to FTP.
* Connect to SSH.
* Connect to WebDAV.
* Enable/Disable Preferences options.
* Test About dialog.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'mago/application/nautilus.py' |
2 | --- mago/application/nautilus.py 2010-11-23 22:02:09 +0000 |
3 | +++ mago/application/nautilus.py 2010-12-22 18:09:14 +0000 |
4 | @@ -30,25 +30,44 @@ |
5 | LAUNCHER = 'nautilus' |
6 | LAUNCHER_ARGS = ['/home'] |
7 | WINDOW = 'frmhome' |
8 | - |
9 | + DESKTOP = 'frmDesktop' |
10 | + |
11 | BTN_100_ = _('btn100*') |
12 | BTN_11 = _('btn11') |
13 | BTN_12 = _('btn12') |
14 | BTN_BACK = _('btnBack') |
15 | + BTN_CONNECT = ('btnConnect') |
16 | BTN_CLOSE = _('btnClose') |
17 | BTN_COMPUTER = _('btnComputer') |
18 | + BTN_EMPTYTRASH = _('btnEmptyTrash') |
19 | BTN_FORWARD = _('btnForward') |
20 | BTN_HOME = _('btnHome') |
21 | + BTN_OK = _('btnOK') |
22 | BTN_RELOAD = _('btnReload') |
23 | + BTN_REMOVE = _('btnRemove') |
24 | BTN_STOP = _('btnStop') |
25 | BTN_UP = _('btnUp') |
26 | BTN_ZOOMIN = _('btnZoomIn') |
27 | BTN_ZOOMOUT = _('btnZoomOut') |
28 | + CBO_SERVICETYPE = _('cboServicetype') |
29 | + DLG_EDITBOOKMARKS = _('dlgEditBookmarks') |
30 | + DLG_CONNECTSERVER = _('dlgConnecttoServer') |
31 | + DLG_SELECTITEMSMATCHING = _('dlgSelectItemsMatching') |
32 | + DLG_PREFERENCES = _('dlgFileManagementPreferences') |
33 | + DLG_0 = _('dlg0') |
34 | MNU__ = _('mnu*') |
35 | MNU_ABOUT = _('mnuAbout') |
36 | MNU_ADDBOOKMARK = _('mnuAddBookmark') |
37 | + MNU_ARRANGEITEMS = _('mnuArrangeItems') |
38 | MNU_BACK = _('mnuBack') |
39 | MNU_BACKGROUNDSANDEMBLEMS = _('mnuBackgroundsandEmblems') |
40 | + MNU_BYNAME = _('mnuByName') |
41 | + MNU_BYSIZE = _('mnuBySize') |
42 | + MNU_BYTYPE = _('mnuByType') |
43 | + MNU_BYEMBLEMS = _('mnuByEmblems') |
44 | + MNU_BYMODIFICATIONDATE = _('mnuByModificationDate') |
45 | + MNU_COMPACTLAYOUT = _('mnuCompactLayout') |
46 | + MNU_REVERSEORDER = _('mnuReversedOrder') |
47 | MNU_CLEARHISTORY = _('mnuClearHistory') |
48 | MNU_CLOSE = _('mnuClose') |
49 | MNU_CLOSEALLWINDOWS = _('mnuCloseAllWindows') |
50 | @@ -93,6 +112,11 @@ |
51 | MNU_INVERTSELECTION = _('mnuInvertSelection') |
52 | MNU_LISTVIEW = _('mnuListView') |
53 | MNU_LOCATION = _('mnuLocation') |
54 | + MNU_MAINTOOLBAR = _('mnuMainToolbar') |
55 | + MNU_SIDEPANE = _('mnuSidePane') |
56 | + MNU_LOCATIONBAR = _('mnuLocationBar') |
57 | + MNU_STATUSBAR = _('mnuStatusbar') |
58 | + MNU_EXTRAPANE = _('mnuExtraPane') |
59 | MNU_MAKELINKS = _('mnuMakeLinks') |
60 | MNU_MOUNT = _('mnuMount') |
61 | MNU_MOVETOTRASH = _('mnuMovetoTrash') |
62 | @@ -129,6 +153,7 @@ |
63 | MNU_SAVESEARCHAS = _('mnuSaveSearchAs') |
64 | MNU_SELECTALL = _('mnuSelectAll') |
65 | MNU_SELECTITEMSMATCHING = _('mnuSelectItemsMatching') |
66 | + MNU_SHOWHIDDENFILES = _('mnuShowHiddenFiles') |
67 | MNU_START = _('mnuStart') |
68 | MNU_STOP = _('mnuStop') |
69 | MNU_STOP1 = _('mnuStop1') |
70 | @@ -136,17 +161,266 @@ |
71 | MNU_TRANSLATETHISAPPLICATION = _('mnuTranslateThisApplication') |
72 | MNU_TRASH = _('mnuTrash') |
73 | MNU_UNMOUNT = _('mnuUnmount') |
74 | - MNU_VBOXADDITIONS321066523 = _('mnuVBOXADDITIONS321066523') |
75 | MNU_VIDEOS = _('mnuVideos') |
76 | MNU_ZOOMIN = _('mnuZoomIn') |
77 | MNU_ZOOMOUT = _('mnuZoomOut') |
78 | MNU_HOME = _('mnuhome') |
79 | MNU_UBUNTU = _('mnuubuntu') |
80 | + MNU_UNMOUNT = _('mnuUnmount') |
81 | + PTAB_VIEWS = _('ptabViews') |
82 | + PTAB_MEDIA = _('ptabMedia') |
83 | + PTAB_DISPLAY = _('ptabDisplay') |
84 | + PTAB_LISTCOLUMNS = _('ptabListColumns') |
85 | + PTAB_BEHAVIOR = _('ptabBehavior') |
86 | + PTAB_PREVIEW = _('ptabPreview') |
87 | + PTL_0 = _('ptl0') |
88 | + RBTN_FORGETPASSWORD = _('rbtnForgetpasswordimmediately') |
89 | + TRASH = _('frmTrash') |
90 | TXT_0 = _('txt0') |
91 | TXT_2 = _('txt2') |
92 | + TXT_FOLDER = _('txtFolder') |
93 | TXT_LOCATION = _('txtLocation') |
94 | - |
95 | - |
96 | + TXT_PATTERN = _('txtPattern') |
97 | + TXT_SERVER = _('txtServer') |
98 | + TXT_USERNAME = _('txtUserName') |
99 | + TXT_PASSWORD = _('txtPassword') |
100 | + TBL_0 = _('tbl0') |
101 | + TBL_BOOKMARKS = _('tblBookmarks') |
102 | + |
103 | + VIEWS = [ MNU_RESETVIEWTODEFAULTS, |
104 | + MNU_COMPACTVIEW, |
105 | + MNU_ICONVIEW, |
106 | + MNU_LISTVIEW ] |
107 | + |
108 | + TOOLBARS = [ MNU_MAINTOOLBAR, |
109 | + MNU_SIDEPANE, |
110 | + MNU_LOCATIONBAR, |
111 | + MNU_STATUSBAR, |
112 | + MNU_EXTRAPANE ] |
113 | + |
114 | + ORGANIZE = [ MNU_BYNAME, |
115 | + MNU_BYSIZE, |
116 | + MNU_BYTYPE, |
117 | + MNU_BYEMBLEMS, |
118 | + MNU_BYMODIFICATIONDATE, |
119 | + MNU_COMPACTLAYOUT, |
120 | + MNU_REVERSEORDER ] |
121 | + |
122 | + PREFERENCES_TABS = [ PTAB_VIEWS, |
123 | + PTAB_BEHAVIOR, |
124 | + PTAB_DISPLAY, |
125 | + PTAB_LISTCOLUMNS, |
126 | + PTAB_PREVIEW, |
127 | + PTAB_MEDIA ] |
128 | + |
129 | + def nautilus_zoom_in_out(self, zoom): |
130 | + nautilus = ooldtp.context(self.WINDOW) |
131 | + |
132 | + if zoom: |
133 | + zoom = nautilus.getchild(self.BTN_ZOOMIN) |
134 | + else: |
135 | + zoom = nautilus.getchild(self.BTN_ZOOMOUT) |
136 | + |
137 | + while zoom.stateenabled(): |
138 | + zoom.click() |
139 | + ldtp.wait() |
140 | + |
141 | + def nautilus_zoom_normal(self): |
142 | + nautilus = ooldtp.context(self.WINDOW) |
143 | + nautilus.getchild(self.MNU_NORMALSIZE).selectmenuitem() |
144 | + |
145 | + def nautilus_change_views(self): |
146 | + nautilus = ooldtp.context(self.WINDOW) |
147 | + for v in self.VIEWS: |
148 | + nautilus.getchild(v).selectmenuitem() |
149 | + ldtp.wait(2) |
150 | + |
151 | + def nautilus_show_hidden_files(self, show): |
152 | + nautilus = ooldtp.context(self.WINDOW) |
153 | + if show: |
154 | + nautilus.getchild(self.MNU_SHOWHIDDENFILES).check() |
155 | + else: |
156 | + nautilus.getchild(self.MNU_SHOWHIDDENFILES).uncheck() |
157 | + |
158 | + def nautilus_enable_disable_toolbars(self, enable): |
159 | + nautilus = ooldtp.context(self.WINDOW) |
160 | + for t in self.TOOLBARS: |
161 | + if enable: |
162 | + nautilus.getchild(t).check() |
163 | + else: |
164 | + nautilus.getchild(t).uncheck() |
165 | + |
166 | + def nautilus_add_bookmark(self): |
167 | + nautilus = ooldtp.context(self.WINDOW) |
168 | + nautilus.getchild(self.MNU_ADDBOOKMARK).selectmenuitem() |
169 | + |
170 | + if not nautilus.doesrowexist(self.TBL_0, 'home'): |
171 | + return False |
172 | + |
173 | + return True |
174 | + |
175 | + def nautilus_remove_bookmark(self, bookmark): |
176 | + nautilus = ooldtp.context(self.WINDOW) |
177 | + nautilus.getchild(self.MNU_EDITBOOKMARKS).selectmenuitem() |
178 | + ldtp.wait(2) |
179 | + editBookmarks = ooldtp.context(self.DLG_EDITBOOKMARKS) |
180 | + |
181 | + if not editBookmarks.selectrow(self.TBL_BOOKMARKS, bookmark): |
182 | + return False |
183 | + |
184 | + editBookmarks.getchild(self.BTN_REMOVE).click() |
185 | + editBookmarks.getchild(self.BTN_CLOSE).click() |
186 | + |
187 | + return True |
188 | + |
189 | + def nautilus_connect_to_ftp(self, ftpaddress, folder): |
190 | + nautilus = ooldtp.context(self.WINDOW) |
191 | + nautilus.getchild(self.MNU_CONNECTTOSERVER).selectmenuitem() |
192 | + ldtp.wait(2) |
193 | + connectTo = ooldtp.context(self.DLG_CONNECTSERVER) |
194 | + connectTo.comboselect(self.CBO_SERVICETYPE, 'Public FTP') |
195 | + connectTo.settextvalue(self.TXT_SERVER, ftpaddress) |
196 | + connectTo.getchild(self.BTN_CONNECT).click() |
197 | + ldtp.wait(10) |
198 | + |
199 | + dlgs=[ w for w in ldtp.getwindowlist() if w.endswith(ftpaddress)] |
200 | + |
201 | + if dlgs: |
202 | + ftpdialog = ooldtp.context(dlgs[0]) |
203 | + |
204 | + #check if the folder is there. |
205 | + if not ftpdialog.guiexist('ico%s' % folder): |
206 | + return False |
207 | + |
208 | + #remove the ftp. |
209 | + ftpdialog.getchild(self.MNU_UNMOUNT).selectmenuitem() |
210 | + return True |
211 | + |
212 | + def nautilus_connect_to_ssh(self, sshaddress, username, password): |
213 | + nautilus = ooldtp.context(self.WINDOW) |
214 | + nautilus.getchild(self.MNU_CONNECTTOSERVER).selectmenuitem() |
215 | + ldtp.wait(2) |
216 | + connectTo = ooldtp.context(self.DLG_CONNECTSERVER) |
217 | + connectTo.comboselect(self.CBO_SERVICETYPE, 'SSH') |
218 | + connectTo.remap() |
219 | + ldtp.wait(2) |
220 | + connectTo.settextvalue(self.TXT_SERVER, sshaddress) |
221 | + connectTo.settextvalue(self.TXT_USERNAME, username) |
222 | + connectTo.getchild(self.BTN_CONNECT).click() |
223 | + ldtp.wait(5) |
224 | + passwordialog = ooldtp.context(self.DLG_0) |
225 | + passwordialog.settextvalue(self.TXT_PASSWORD, password) |
226 | + passwordialog.getchild(self.RBTN_FORGETPASSWORD).click() |
227 | + passwordialog.getchild(self.BTN_CONNECT).click() |
228 | + ldtp.wait(10) |
229 | + |
230 | + dlgs=[ w for w in ldtp.getwindowlist() if w.endswith(sshaddress)] |
231 | + |
232 | + if not dlgs: |
233 | + return False |
234 | + |
235 | + sshdialog = ooldtp.context(dlgs[0]) |
236 | + #unmount the ssh connection |
237 | + sshdialog.getchild(self.MNU_UNMOUNT).selectmenuitem() |
238 | + return True |
239 | + |
240 | + def nautilus_connect_to_webdav(self, server, username, password, folder): |
241 | + nautilus = ooldtp.context(self.WINDOW) |
242 | + nautilus.getchild(self.MNU_CONNECTTOSERVER).selectmenuitem() |
243 | + ldtp.wait(2) |
244 | + connectTo = ooldtp.context(self.DLG_CONNECTSERVER) |
245 | + connectTo.comboselect(self.CBO_SERVICETYPE, 'WebDAV (HTTP)') |
246 | + connectTo.remap() |
247 | + ldtp.wait(2) |
248 | + connectTo.settextvalue(self.TXT_SERVER, server) |
249 | + connectTo.settextvalue(self.TXT_USERNAME, username) |
250 | + connectTo.settextvalue(self.TXT_FOLDER, folder) |
251 | + connectTo.getchild(self.BTN_CONNECT).click() |
252 | + ldtp.wait(5) |
253 | + passwordialog = ooldtp.context(self.DLG_0) |
254 | + passwordialog.settextvalue(self.TXT_PASSWORD, password) |
255 | + passwordialog.getchild(self.RBTN_FORGETPASSWORD).click() |
256 | + passwordialog.getchild(self.BTN_CONNECT).click() |
257 | + ldtp.wait(10) |
258 | + |
259 | + dlgs=[ w for w in ldtp.getwindowlist() if w.endswith(folder)] |
260 | + |
261 | + if not dlgs: |
262 | + return False |
263 | + |
264 | + webdavdialog = ooldtp.context(dlgs[0]) |
265 | + webdavdialog.getchild(self.MNU_UNMOUNT).selectmenuitem() |
266 | + return True |
267 | + |
268 | + def nautilus_arrange_items(self): |
269 | + nautilus = ooldtp.context(self.WINDOW) |
270 | + |
271 | + for organizeby in self.ORGANIZE: |
272 | + nautilus.getchild(organizeby).selectmenuitem() |
273 | + ldtp.wait(2) |
274 | + |
275 | + def nautilus_go_to_location(self, location, window): |
276 | + nautilus = ooldtp.context(window) |
277 | + nautilus.getchild(self.MNU_LOCATION).selectmenuitem() |
278 | + nautilus.settextvalue(self.TXT_LOCATION, location) |
279 | + ldtp.generatekeyevent('<return>') |
280 | + ldtp.wait() |
281 | + |
282 | + def nautilus_move_to_trash(self, dirname, base): |
283 | + nautilus = ooldtp.context(self.WINDOW) |
284 | + self.nautilus_go_to_location(dirname, self.WINDOW) |
285 | + desktop = ooldtp.context(self.DESKTOP) |
286 | + desktop.getchild(self.MNU_SELECTITEMSMATCHING).selectmenuitem() |
287 | + ldtp.wait(2) |
288 | + selectitem = ooldtp.context(self.DLG_SELECTITEMSMATCHING) |
289 | + selectitem.settextvalue(self.TXT_PATTERN, base) |
290 | + selectitem.getchild(self.BTN_OK).click() |
291 | + ldtp.wait(2) |
292 | + desktop.getchild(self.MNU_MOVETOTRASH).selectmenuitem() |
293 | + desktop.getchild(self.MNU_TRASH).selectmenuitem() |
294 | + |
295 | + def nautilus_empty_trash(self): |
296 | + nautilus = ooldtp.context(self.TRASH) |
297 | + ldtp.wait() |
298 | + nautilus.getchild(self.MNU_EMPTYTRASH).selectmenuitem() |
299 | + ldtp.wait() |
300 | + confirm = ooldtp.context(self.DLG_0) |
301 | + confirm.getchild(self.BTN_EMPTYTRASH).click() |
302 | + self.nautilus_go_to_location('/home', self.TRASH) |
303 | + |
304 | + def nautilus_enable_disable_preferences(self, enable): |
305 | + nautilus = ooldtp.context(self.WINDOW) |
306 | + nautilus.getchild(self.MNU_PREFERENCES).selectmenuitem() |
307 | + preferences = ooldtp.context(self.DLG_PREFERENCES) |
308 | + ldtp.wait() |
309 | + |
310 | + self.nautilus_select_preferences_tabs() |
311 | + self.nautilus_list_columns_preferences(enable) |
312 | + |
313 | + preferences.getchild(self.BTN_CLOSE).click() |
314 | + |
315 | + def nautilus_select_preferences_tabs(self): |
316 | + preferences = ooldtp.context(self.DLG_PREFERENCES) |
317 | + for tab in self.PREFERENCES_TABS: |
318 | + preferences.getchild(self.PTL_0).selecttab(tab) |
319 | + ldtp.wait(2) |
320 | + |
321 | + def nautilus_display_preferences(): |
322 | + preferences = ooldtp.context(self.DLG_PREFERENCES) |
323 | + preferences.getchild(self.PTL_0).selecttab(self.PTAB_DISPLAY) |
324 | + |
325 | + def nautilus_list_columns_preferences(self, enable): |
326 | + preferences = ooldtp.context(self.DLG_PREFERENCES) |
327 | + preferences.getchild(self.PTL_0).selecttab(self.PTAB_LISTCOLUMNS) |
328 | + row = 0 |
329 | + while row < preferences.getrowcount(self.TBL_0): |
330 | + if enable: |
331 | + preferences.checkrow(self.TBL_0, row, 0) |
332 | + else: |
333 | + preferences.uncheckrow(self.TBL_0, row, 0) |
334 | + row+=1 |
335 | + |
336 | + |
337 | def runAboutdialog(self): |
338 | """ |
339 | This basic test simply verifies that the application launches |
340 | |
341 | === modified file 'mago/test_suite/nautilus.py' |
342 | --- mago/test_suite/nautilus.py 2010-11-23 22:02:09 +0000 |
343 | +++ mago/test_suite/nautilus.py 2010-12-22 18:09:14 +0000 |
344 | @@ -14,7 +14,12 @@ |
345 | self.application.open() |
346 | |
347 | def teardown(self): |
348 | - self.application.close() |
349 | + #somehow the following doesn't work: |
350 | + #self.application.set_close_name('mnuCloseAllWindows') |
351 | + #self.application.close() |
352 | + #so doing it the old way. |
353 | + nautilus = ooldtp.context('frmhome') |
354 | + nautilus.getchild('mnuCloseAllWindows').selectmenuitem() |
355 | |
356 | def cleanup(self): |
357 | - self.application.close() |
358 | + pass |
359 | |
360 | === modified file 'nautilus/README' |
361 | --- nautilus/README 2010-11-23 22:02:09 +0000 |
362 | +++ nautilus/README 2010-12-22 18:09:14 +0000 |
363 | @@ -0,0 +1,33 @@ |
364 | +NAUTILUS TESTS |
365 | +============== |
366 | + |
367 | +Safety |
368 | +------ |
369 | +None of these tests touches any configuration or system files. They are safe to run. |
370 | + |
371 | +Configuration |
372 | +------------- |
373 | +The following tests need to be setup before run: |
374 | + |
375 | + * SSH Test |
376 | + * Provide server, username and password on the xml file. |
377 | + * WebDAV Test |
378 | + * Provide server, username, password and the webdav folder (optional) |
379 | + |
380 | +Available Tests |
381 | +--------------- |
382 | + |
383 | + * Move to Trash. |
384 | + * Empty Trash. |
385 | + * Show/No Show Hidden files. |
386 | + * Change Zoom levels. |
387 | + * Change Views. |
388 | + * Add Bookmark. |
389 | + * Remove Bookmark. |
390 | + * Arrange by. |
391 | + * Enable/Disable Toolbars. |
392 | + * Connect to FTP. |
393 | + * Connect to SSH. |
394 | + * Connect to WebDAV. |
395 | + * Enable/Disable Preferences options. |
396 | + * Test About dialog. |
397 | |
398 | === modified file 'nautilus/nautilus_basics.py' |
399 | --- nautilus/nautilus_basics.py 2010-11-23 22:02:09 +0000 |
400 | +++ nautilus/nautilus_basics.py 2010-12-22 18:09:14 +0000 |
401 | @@ -5,9 +5,67 @@ |
402 | from mago.test_suite.nautilus import NautilusTestSuite |
403 | |
404 | class NautilusBasics(NautilusTestSuite): |
405 | + |
406 | def testAboutdialog(self, arg1=None): |
407 | self.application.runAboutdialog() |
408 | - |
409 | + |
410 | + def test_add_bookmark(self): |
411 | + if not self.application.nautilus_add_bookmark(): |
412 | + raise AssertionError, 'Failed to create the bookmark for the current directory' |
413 | + |
414 | + def test_remove_bookmark(self): |
415 | + if not self.application.nautilus_remove_bookmark('home'): |
416 | + raise AssertionError, 'Failed to remove the bookmark for the home directory' |
417 | + |
418 | + def test_zoom(self): |
419 | + self.application.nautilus_zoom_in_out(True) |
420 | + self.application.nautilus_zoom_in_out(False) |
421 | + self.application.nautilus_zoom_normal() |
422 | + |
423 | + def change_views(self): |
424 | + self.application.nautilus_change_views() |
425 | + |
426 | + def test_toolbars(self): |
427 | + self.application.nautilus_enable_disable_toolbars(False) |
428 | + self.application.nautilus_enable_disable_toolbars(True) |
429 | + |
430 | + def test_arrangeby(self): |
431 | + self.application.nautilus_arrange_items() |
432 | + |
433 | + def test_move_to_trash(self): |
434 | + filename = 'nautilus-trash-test.txt' |
435 | + file_path = open(os.getenv('HOME') + '/Desktop/' + filename, 'w') |
436 | + file_path.write('1234567890') |
437 | + file_path.close() |
438 | + dirname, base = os.path.split(file_path.name) |
439 | + self.application.nautilus_move_to_trash(dirname, base) |
440 | + |
441 | + if os.path.exists(file_path.name): |
442 | + raise AssertionError, 'The File: %s was not sent to trash.' % (file_path.name) |
443 | + |
444 | + def test_empty_trash(self): |
445 | + self.application.nautilus_empty_trash() |
446 | + |
447 | + def test_ftp(self, ftpaddress, folder): |
448 | + if not self.application.nautilus_connect_to_ftp(ftpaddress, folder): |
449 | + raise AssertionError, 'The FTP %s is either down or not having the folder %s' % (ftpaddress, folder) |
450 | + |
451 | + def test_ssh(self, sshaddress, username, password): |
452 | + if not self.application.nautilus_connect_to_ssh(sshaddress, username, password): |
453 | + raise AssertionError, 'The SSH %s is either down or the username/password are incorrect.' % (sshaddress) |
454 | + |
455 | + def test_webdav(self, server, username, password, folder): |
456 | + if not self.application.nautilus_connect_to_webdav(server, username, password, folder): |
457 | + raise AssertionError, 'The WebDAV location %s is either down or the username/password are incorrect.' % (server) |
458 | + |
459 | + def test_preferences(self): |
460 | + self.application.nautilus_enable_disable_preferences(False) |
461 | + self.application.nautilus_enable_disable_preferences(True) |
462 | + |
463 | + def test_hidden_files(self): |
464 | + self.application.nautilus_show_hidden_files(True) |
465 | + self.application.nautilus_show_hidden_files(False) |
466 | + |
467 | if __name__ == "__main__": |
468 | nautilus_test = NautilusBasics() |
469 | nautilus_test.run() |
470 | |
471 | === modified file 'nautilus/nautilus_basics.xml' |
472 | --- nautilus/nautilus_basics.xml 2010-11-23 22:02:09 +0000 |
473 | +++ nautilus/nautilus_basics.xml 2010-12-22 18:09:14 +0000 |
474 | @@ -4,11 +4,75 @@ |
475 | <description> |
476 | Tests which verify Nautilus basics functionality. |
477 | </description> |
478 | + <case name="test_move_to_trash"> |
479 | + <method>test_move_to_trash</method> |
480 | + <description>Test that move to trash works</description> |
481 | + </case> |
482 | + <case name="test_empty_trash"> |
483 | + <method>test_empty_trash</method> |
484 | + <description>Test that empty thrash works</description> |
485 | + </case> |
486 | + <case name="test_hidden_files"> |
487 | + <method>test_hidden_files</method> |
488 | + <description>Test that showing the hidden files works</description> |
489 | + </case> |
490 | + <case name="zoom_in"> |
491 | + <method>test_zoom</method> |
492 | + <description>Test that Zoom In/Out works</description> |
493 | + </case> |
494 | + <case name="change_views"> |
495 | + <method>change_views</method> |
496 | + <description>Change the views of nautilus</description> |
497 | + </case> |
498 | + <case name="test_add_bookmark"> |
499 | + <method>test_add_bookmark</method> |
500 | + <description>Test that adding bookmark works</description> |
501 | + </case> |
502 | + <case name="test_remove_bookmark"> |
503 | + <method>test_remove_bookmark</method> |
504 | + <description>Test that removing a bookmark works</description> |
505 | + </case> |
506 | + <case name="arrange_by"> |
507 | + <method>test_arrangeby</method> |
508 | + <description>Test that the arrange by works</description> |
509 | + </case> |
510 | + <case name="test_toolbars"> |
511 | + <method>test_toolbars</method> |
512 | + <description>Test the toolbars</description> |
513 | + </case> |
514 | + <case name="test_ftp"> |
515 | + <method>test_ftp</method> |
516 | + <description>Test that connect to FTP works</description> |
517 | + <args> |
518 | + <ftpaddress>ftp.ubuntu.com</ftpaddress> |
519 | + <folder>ubuntu</folder> |
520 | + </args> |
521 | + </case> |
522 | + <case name="test_ssh"> |
523 | + <method>test_ssh</method> |
524 | + <description>Test that connect to SSH works</description> |
525 | + <args> |
526 | + <sshaddress></sshaddress> |
527 | + <username></username> |
528 | + <password></password> |
529 | + </args> |
530 | + </case> |
531 | + <case name="test_webdav"> |
532 | + <method>test_webdav</method> |
533 | + <description>Test that connects to a WebDAV works</description> |
534 | + <args> |
535 | + <server></server> |
536 | + <username></username> |
537 | + <password></password> |
538 | + <folder></folder> |
539 | + </args> |
540 | + </case> |
541 | + <case name="test_preferences"> |
542 | + <method>test_preferences</method> |
543 | + <description>Test the preferences dialog</description> |
544 | + </case> |
545 | <case name="about_dialog"> |
546 | <method>testAboutdialog</method> |
547 | <description>Verify that the about dialog launches</description> |
548 | - <args> |
549 | - <arg1>Arg example</arg1> |
550 | - </args> |
551 | </case> |
552 | </suite> |
Looks okay to me