SortDialogSetting.java (4a13b48e) SortDialogSetting.java (424494b0)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 24 unchanged lines hidden (view full) ---

33import org.junit.After;
34import org.junit.Before;
35import org.junit.Ignore;
36import org.junit.Rule;
37import org.junit.Test;
38import org.openoffice.test.common.FileUtil;
39import org.openoffice.test.common.Logger;
40
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 24 unchanged lines hidden (view full) ---

33import org.junit.After;
34import org.junit.Before;
35import org.junit.Ignore;
36import org.junit.Rule;
37import org.junit.Test;
38import org.openoffice.test.common.FileUtil;
39import org.openoffice.test.common.Logger;
40
41import testlib.gui.AppTool;
41import testlib.gui.SCTool;
42
43/**
44 * Test Data->Sort dialog setting
45 */
46public class SortDialogSetting {
47
42import testlib.gui.SCTool;
43
44/**
45 * Test Data->Sort dialog setting
46 */
47public class SortDialogSetting {
48
48 @Rule
49 public Logger log = Logger.getLogger(this);
50
51 @Before
52 public void setUp() throws Exception {
53 app.start(true);
49 @Before
50 public void setUp() throws Exception {
51 app.start(true);
54
55 // Create a new spreadsheet document
56 app.dispatch("private:factory/scalc");
57 calc.waitForExistence(10, 2);
52 AppTool.newSpreadsheet();
58 }
59
60 @After
61 public void tearDown() throws Exception {
62 app.stop();
63 }
64
65 /**

--- 5 unchanged lines hidden (view full) ---

71 public void testSortOptionsCaseSensitive() throws Exception {
72
73 // Input some data: A1~A6: 1ColumnName,D,C,B,A,a
74 String[][] data = new String[][] { { "D" }, { "C" }, { "B" }, { "A" }, { "a" }, };
75 String[][] expectedSortedResult = new String[][] { { "a" }, { "A" }, { "B" }, { "C" }, { "D" }, };
76 SCTool.selectRange("A1");
77 typeKeys("1ColumnName<down>D<down>C<down>B<down>A<down>a<down>");
78 SCTool.selectRange("A6");
53 }
54
55 @After
56 public void tearDown() throws Exception {
57 app.stop();
58 }
59
60 /**

--- 5 unchanged lines hidden (view full) ---

66 public void testSortOptionsCaseSensitive() throws Exception {
67
68 // Input some data: A1~A6: 1ColumnName,D,C,B,A,a
69 String[][] data = new String[][] { { "D" }, { "C" }, { "B" }, { "A" }, { "a" }, };
70 String[][] expectedSortedResult = new String[][] { { "a" }, { "A" }, { "B" }, { "C" }, { "D" }, };
71 SCTool.selectRange("A1");
72 typeKeys("1ColumnName<down>D<down>C<down>B<down>A<down>a<down>");
73 SCTool.selectRange("A6");
79 app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
80 // letter automatically
81
74 app.dispatch(".uno:ChangeCaseToLower");
75 // In case SC capitalize first letter automatically
82 // "Data->Sort...", choose "Ascending", check "Case sensitive"
83 app.dispatch(".uno:DataSort");
84 sortOptionsPage.select();
85 sortOptionsPageCaseSensitive.check();
86 sortOptionsPage.ok();
87
88 // Verify sorted result
76 // "Data->Sort...", choose "Ascending", check "Case sensitive"
77 app.dispatch(".uno:DataSort");
78 sortOptionsPage.select();
79 sortOptionsPageCaseSensitive.check();
80 sortOptionsPage.ok();
81
82 // Verify sorted result
89 assertArrayEquals("Sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
83 assertArrayEquals("Wrong Sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
90
91 // Uodo/redo
92 app.dispatch(".uno:Undo");
84
85 // Uodo/redo
86 app.dispatch(".uno:Undo");
93 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A2:A6"));
87 assertArrayEquals("Wrong Undo sorted result", data, SCTool.getCellTexts("A2:A6"));
94 app.dispatch(".uno:Redo");
88 app.dispatch(".uno:Redo");
95 assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
89 assertArrayEquals("Wrong Redo sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
96
97 // Save and close document
98 String saveTo = getPath("temp/" + "RowsSortWithOptionsCaseSensitive.ods");
90
91 // Save and close document
92 String saveTo = getPath("temp/" + "RowsSortWithOptionsCaseSensitive.ods");
99 app.dispatch(".uno:SaveAs");
100 FileUtil.deleteFile(saveTo);
93 FileUtil.deleteFile(saveTo);
101 submitSaveDlg(saveTo);
102 if (activeMsgBox.exists()) {
103 activeMsgBox.yes();
104 sleep(2);
105 }
106 sleep(5);
107 app.dispatch(".uno:CloseDoc");
108 openStartcenter();
109
110 // Reopen and verify sorted result
111 app.dispatch(".uno:Open");
112 submitOpenDlg(saveTo);
94 saveAndReopen(saveTo);
113 calc.waitForExistence(10, 2);
114 assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
115 }
116
117 /**
118 * Test sort with options setting: copy sort result to
119 *
120 * @throws Exception
121 */
95 calc.waitForExistence(10, 2);
96 assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
97 }
98
99 /**
100 * Test sort with options setting: copy sort result to
101 *
102 * @throws Exception
103 */
122 @Ignore("Bug #119035")
104 @Ignore("Bug #119035 - Redo is not work when sort result to other postion")
123 public void testSortOptionsCopyResultTo() throws Exception {
124
105 public void testSortOptionsCopyResultTo() throws Exception {
106
125 // Input some data
126 // String[][] data = new String[][] {
127 // {"3", "D"},
128 // {"5", "FLK"},
129 // {"4", "E"},
130 // {"2", "BC"},
131 // {"6", "GE"},
132 // {"1", "AB"},
133 // };
134 String[][] expectedSortedResult = new String[][] { { "1", "AB" }, { "2", "BC" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
135 SCTool.selectRange("A1");
136 typeKeys("3<down>5<down>4<down>2<down>6<down>1");
137 SCTool.selectRange("B1");
138 typeKeys("D<down>FLK<down>E<down>BC<down>GE<down>AB");
139
140 // Data->Sort..., choose "Ascending", check "Copy sort results to:"
141 app.dispatch(".uno:DataSort");

--- 32 unchanged lines hidden (view full) ---

174 // Uodo/redo
175 app.dispatch(".uno:Undo");
176 assertEquals("Undo sorted result", "", SCTool.getCellText("$Sheet2.$A1"));
177 app.dispatch(".uno:Redo");
178 assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("$Sheet2.$A1:$B6"));
179
180 // Save and close document
181 String saveTo = getPath("temp/" + "RowsSortWithOptionsCopyResultTo.ods");
107 String[][] expectedSortedResult = new String[][] { { "1", "AB" }, { "2", "BC" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
108 SCTool.selectRange("A1");
109 typeKeys("3<down>5<down>4<down>2<down>6<down>1");
110 SCTool.selectRange("B1");
111 typeKeys("D<down>FLK<down>E<down>BC<down>GE<down>AB");
112
113 // Data->Sort..., choose "Ascending", check "Copy sort results to:"
114 app.dispatch(".uno:DataSort");

--- 32 unchanged lines hidden (view full) ---

147 // Uodo/redo
148 app.dispatch(".uno:Undo");
149 assertEquals("Undo sorted result", "", SCTool.getCellText("$Sheet2.$A1"));
150 app.dispatch(".uno:Redo");
151 assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("$Sheet2.$A1:$B6"));
152
153 // Save and close document
154 String saveTo = getPath("temp/" + "RowsSortWithOptionsCopyResultTo.ods");
182 app.dispatch(".uno:SaveAs");
183 FileUtil.deleteFile(saveTo);
155 FileUtil.deleteFile(saveTo);
184 submitSaveDlg(saveTo);
185 app.dispatch(".uno:CloseDoc");
186 openStartcenter();
187
188 // Reopen and verify sorted result
189 app.dispatch(".uno:Open");
190 submitOpenDlg(saveTo);
156 saveAndReopen(saveTo);
157
191 calc.waitForExistence(10, 2);
192 assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("$Sheet3.$A4:$B9"));
193 assertArrayEquals("Saved sorted result to cell range", expectedSortedResult, SCTool.getCellTexts("$Sheet2.$A1:$B6"));
194 }
195
196 /**
197 * Test sort criteria: sort first by
198 *

--- 24 unchanged lines hidden (view full) ---

223 app.dispatch(".uno:Undo");
224 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:B6"));
225 app.dispatch(".uno:Redo");
226 assertArrayEquals("Redo sorted result", expectedResultSortByColumnBAscending, SCTool.getCellTexts("A1:B6"));
227 app.dispatch(".uno:Undo");
228
229 // Save and close document
230 String saveTo = getPath("temp/" + "SortCriteriaSortFirstBy.ods");
158 calc.waitForExistence(10, 2);
159 assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("$Sheet3.$A4:$B9"));
160 assertArrayEquals("Saved sorted result to cell range", expectedSortedResult, SCTool.getCellTexts("$Sheet2.$A1:$B6"));
161 }
162
163 /**
164 * Test sort criteria: sort first by
165 *

--- 24 unchanged lines hidden (view full) ---

190 app.dispatch(".uno:Undo");
191 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:B6"));
192 app.dispatch(".uno:Redo");
193 assertArrayEquals("Redo sorted result", expectedResultSortByColumnBAscending, SCTool.getCellTexts("A1:B6"));
194 app.dispatch(".uno:Undo");
195
196 // Save and close document
197 String saveTo = getPath("temp/" + "SortCriteriaSortFirstBy.ods");
231 app.dispatch(".uno:SaveAs");
232 FileUtil.deleteFile(saveTo);
198 FileUtil.deleteFile(saveTo);
233 submitSaveDlg(saveTo);
234 if (activeMsgBox.exists()) {
235 activeMsgBox.yes();
236 sleep(2);
237 }
238 sleep(5);
239 app.dispatch(".uno:CloseDoc");
240 openStartcenter();
241
242 // Reopen, "Data->Sort...", choose "Descending", sort first by Column A
243 app.dispatch(".uno:Open");
244 submitOpenDlg(saveTo);
199 saveAndReopen(saveTo);
200
245 calc.waitForExistence(10, 2);
201 calc.waitForExistence(10, 2);
202 // "Data->Sort...", choose "Descending", sort first by Column A
246 app.dispatch(".uno:DataSort");
247 sortPageDescending1.check();
248 sortPageBy1.select(1); // "Column A"
249 sortPage.ok();
250
251 // Verify sorted result
252 assertArrayEquals("Saved sorted result", expectedResultSortByColumnADescending, SCTool.getCellTexts("A1:B6"));
253 }

--- 28 unchanged lines hidden (view full) ---

282 app.dispatch(".uno:Undo");
283 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:B6"));
284 app.dispatch(".uno:Redo");
285 assertArrayEquals("Redo sorted result", expectedResultSortFirstByB, SCTool.getCellTexts("A1:B6"));
286 app.dispatch(".uno:Undo");
287
288 // Save and close document
289 String saveTo = getPath("temp/" + "SortCriteriaSortSecondBy.ods");
203 app.dispatch(".uno:DataSort");
204 sortPageDescending1.check();
205 sortPageBy1.select(1); // "Column A"
206 sortPage.ok();
207
208 // Verify sorted result
209 assertArrayEquals("Saved sorted result", expectedResultSortByColumnADescending, SCTool.getCellTexts("A1:B6"));
210 }

--- 28 unchanged lines hidden (view full) ---

239 app.dispatch(".uno:Undo");
240 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:B6"));
241 app.dispatch(".uno:Redo");
242 assertArrayEquals("Redo sorted result", expectedResultSortFirstByB, SCTool.getCellTexts("A1:B6"));
243 app.dispatch(".uno:Undo");
244
245 // Save and close document
246 String saveTo = getPath("temp/" + "SortCriteriaSortSecondBy.ods");
290 app.dispatch(".uno:SaveAs");
291 FileUtil.deleteFile(saveTo);
247 FileUtil.deleteFile(saveTo);
292 submitSaveDlg(saveTo);
293 if (activeMsgBox.exists()) {
294 activeMsgBox.yes();
295 sleep(2);
296 }
297 sleep(5);
298 app.dispatch(".uno:CloseDoc");
299 openStartcenter();
300
301 // Reopen, "Data->Sort...", sort first by Column B "Ascending", sort
302 // second by Column A "Descending"
303 app.dispatch(".uno:Open");
304 submitOpenDlg(saveTo);
248 saveAndReopen(saveTo);
249
250// // "Data->Sort...", sort first by Column B "Ascending", sort
251// // second by Column A "Descending"
305 calc.waitForExistence(10, 2);
306 app.dispatch(".uno:DataSort");
307 sortPageBy1.select(2); // "Column B"
308 sortPageAscending1.check();
309 sortPageBy2.select(1); // "Column A"
310 sortPageDescending2.check();
311 sortPage.ok();
312

--- 38 unchanged lines hidden (view full) ---

351 app.dispatch(".uno:Undo");
352 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:C9"));
353 app.dispatch(".uno:Redo");
354 assertArrayEquals("Redo sorted result", expectedResultSortFirstByB, SCTool.getCellTexts("A1:C9"));
355 app.dispatch(".uno:Undo");
356
357 // Save and close document
358 String saveTo = getPath("temp/" + "SortCriteriaSortThirdBy.ods");
252 calc.waitForExistence(10, 2);
253 app.dispatch(".uno:DataSort");
254 sortPageBy1.select(2); // "Column B"
255 sortPageAscending1.check();
256 sortPageBy2.select(1); // "Column A"
257 sortPageDescending2.check();
258 sortPage.ok();
259

--- 38 unchanged lines hidden (view full) ---

298 app.dispatch(".uno:Undo");
299 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:C9"));
300 app.dispatch(".uno:Redo");
301 assertArrayEquals("Redo sorted result", expectedResultSortFirstByB, SCTool.getCellTexts("A1:C9"));
302 app.dispatch(".uno:Undo");
303
304 // Save and close document
305 String saveTo = getPath("temp/" + "SortCriteriaSortThirdBy.ods");
359 app.dispatch(".uno:SaveAs");
360 FileUtil.deleteFile(saveTo);
306 FileUtil.deleteFile(saveTo);
361 submitSaveDlg(saveTo);
362 if (activeMsgBox.exists()) {
363 activeMsgBox.yes();
364 sleep(2);
365 }
366 sleep(5);
367 app.dispatch(".uno:CloseDoc");
368 openStartcenter();
369
307 saveAndReopen(saveTo);
308
370 // Reopen, "Data->Sort...", sort first by Column B "Ascending", sort
371 // second by Column C "Descending"
309 // Reopen, "Data->Sort...", sort first by Column B "Ascending", sort
310 // second by Column C "Descending"
372 app.dispatch(".uno:Open");
373 submitOpenDlg(saveTo);
374 calc.waitForExistence(10, 2);
375 app.dispatch(".uno:DataSort");
376 sortPageBy1.select(2); // "Column B"
377 sortPageAscending1.check();
378 sortPageBy2.select(3); // "Column C"
379 sortPageDescending2.check();
380 sortPage.ok();
381

--- 17 unchanged lines hidden (view full) ---

399 // Uodo/redo
400 app.dispatch(".uno:Undo");
401 assertArrayEquals("Undo sorted result", expectedResultSortSecondByC, SCTool.getCellTexts("A1:C9"));
402 app.dispatch(".uno:Redo");
403 assertArrayEquals("Redo sorted result", expectedResultSortThirdByA, SCTool.getCellTexts("A1:C9"));
404
405 // Save and close document
406 saveTo = getPath("temp/" + "SortCriteriaSortThirdBy1.ods");
311 calc.waitForExistence(10, 2);
312 app.dispatch(".uno:DataSort");
313 sortPageBy1.select(2); // "Column B"
314 sortPageAscending1.check();
315 sortPageBy2.select(3); // "Column C"
316 sortPageDescending2.check();
317 sortPage.ok();
318

--- 17 unchanged lines hidden (view full) ---

336 // Uodo/redo
337 app.dispatch(".uno:Undo");
338 assertArrayEquals("Undo sorted result", expectedResultSortSecondByC, SCTool.getCellTexts("A1:C9"));
339 app.dispatch(".uno:Redo");
340 assertArrayEquals("Redo sorted result", expectedResultSortThirdByA, SCTool.getCellTexts("A1:C9"));
341
342 // Save and close document
343 saveTo = getPath("temp/" + "SortCriteriaSortThirdBy1.ods");
407 app.dispatch(".uno:SaveAs");
408 FileUtil.deleteFile(saveTo);
344 FileUtil.deleteFile(saveTo);
409 submitSaveDlg(saveTo);
410 if (activeMsgBox.exists()) {
411 activeMsgBox.yes();
412 sleep(2);
413 }
414 sleep(5);
415 app.dispatch(".uno:CloseDoc");
416 openStartcenter();
345 saveAndReopen(saveTo);
417
346
418 // Reopen and verify data sort is not lost
419 app.dispatch(".uno:Open");
420 submitOpenDlg(saveTo);
421 calc.waitForExistence(10, 2);
422 assertArrayEquals("Saved sorted result", expectedResultSortThirdByA, SCTool.getCellTexts("A1:C9"));
423 }
424
425 /**
426 * Test sort options: custom sort order, predefined in preferences from copy
427 * list
428 *

--- 93 unchanged lines hidden (view full) ---

522 // Uodo/redo
523 app.dispatch(".uno:Undo");
524 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:A7"));
525 app.dispatch(".uno:Redo");
526 assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, SCTool.getCellTexts("A1:A7"));
527
528 // Save and close document
529 String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromCopyList.ods");
347 calc.waitForExistence(10, 2);
348 assertArrayEquals("Saved sorted result", expectedResultSortThirdByA, SCTool.getCellTexts("A1:C9"));
349 }
350
351 /**
352 * Test sort options: custom sort order, predefined in preferences from copy
353 * list
354 *

--- 93 unchanged lines hidden (view full) ---

448 // Uodo/redo
449 app.dispatch(".uno:Undo");
450 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:A7"));
451 app.dispatch(".uno:Redo");
452 assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, SCTool.getCellTexts("A1:A7"));
453
454 // Save and close document
455 String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromCopyList.ods");
530 app.dispatch(".uno:SaveAs");
531 FileUtil.deleteFile(saveTo);
456 FileUtil.deleteFile(saveTo);
532 submitSaveDlg(saveTo);
533 if (activeMsgBox.exists()) {
534 activeMsgBox.yes();
535 sleep(2);
536 }
537 sleep(5);
538 app.dispatch(".uno:CloseDoc");
539 openStartcenter();
457 saveAndReopen(saveTo);
540
458
541 // Reopen and verify sorted result
542 app.dispatch(".uno:Open");
543 submitOpenDlg(saveTo);
544 calc.waitForExistence(10, 2);
545 app.dispatch(".uno:SelectTables");
546 scSheetsList.select(0); // Sheet 1
547 scSelectSheetsDlg.ok();
548 assertArrayEquals("Original data", data, SCTool.getCellTexts("$A1:$A7"));
549 app.dispatch(".uno:SelectTables");
550 scSheetsList.select(1); // Sheet 2
551 scSelectSheetsDlg.ok();

--- 27 unchanged lines hidden (view full) ---

579 // "Add" and "OK", close the document
580 optionsDlgSortListsTabNew.click();
581 typeKeys("white,red,yellow,blue,green,black");
582 optionsDlgSortListsTabAdd.click();
583 optionsDlg.ok();
584 app.dispatch(".uno:CloseDoc");
585 // Dependencies end
586
459 calc.waitForExistence(10, 2);
460 app.dispatch(".uno:SelectTables");
461 scSheetsList.select(0); // Sheet 1
462 scSelectSheetsDlg.ok();
463 assertArrayEquals("Original data", data, SCTool.getCellTexts("$A1:$A7"));
464 app.dispatch(".uno:SelectTables");
465 scSheetsList.select(1); // Sheet 2
466 scSelectSheetsDlg.ok();

--- 27 unchanged lines hidden (view full) ---

494 // "Add" and "OK", close the document
495 optionsDlgSortListsTabNew.click();
496 typeKeys("white,red,yellow,blue,green,black");
497 optionsDlgSortListsTabAdd.click();
498 optionsDlg.ok();
499 app.dispatch(".uno:CloseDoc");
500 // Dependencies end
501
587 // Create a new spreadsheet document
588 app.dispatch("private:factory/scalc");
502 AppTool.newSpreadsheet();
589
590 // Input some data
591 String[][] data = new String[][] { { "Color" }, { "black" }, { "yellow" }, { "blue" }, { "black" }, { "white" }, { "red" }, };
592 String[][] expectedResultNoCustomSortOrder = new String[][] { { "Color" }, { "black" }, { "black" }, { "blue" }, { "red" }, { "white" }, { "yellow" }, };
593 String[][] expectedResultCustomSortOrder = new String[][] { { "Color" }, { "white" }, { "red" }, { "yellow" }, { "blue" }, { "black" }, { "black" }, };
594 SCTool.selectRange("A1");
595 typeKeys("Color<down>black<down>yellow<down>blue<down>black<down>white<down>red");
596 SCTool.selectRange("A2:A7");

--- 48 unchanged lines hidden (view full) ---

645 // Uodo/redo
646 app.dispatch(".uno:Undo");
647 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:A7"));
648 app.dispatch(".uno:Redo");
649 assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, SCTool.getCellTexts("A1:A7"));
650
651 // Save and close document
652 String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromNewList.ods");
503
504 // Input some data
505 String[][] data = new String[][] { { "Color" }, { "black" }, { "yellow" }, { "blue" }, { "black" }, { "white" }, { "red" }, };
506 String[][] expectedResultNoCustomSortOrder = new String[][] { { "Color" }, { "black" }, { "black" }, { "blue" }, { "red" }, { "white" }, { "yellow" }, };
507 String[][] expectedResultCustomSortOrder = new String[][] { { "Color" }, { "white" }, { "red" }, { "yellow" }, { "blue" }, { "black" }, { "black" }, };
508 SCTool.selectRange("A1");
509 typeKeys("Color<down>black<down>yellow<down>blue<down>black<down>white<down>red");
510 SCTool.selectRange("A2:A7");

--- 48 unchanged lines hidden (view full) ---

559 // Uodo/redo
560 app.dispatch(".uno:Undo");
561 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:A7"));
562 app.dispatch(".uno:Redo");
563 assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, SCTool.getCellTexts("A1:A7"));
564
565 // Save and close document
566 String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromNewList.ods");
653 app.dispatch(".uno:SaveAs");
654 FileUtil.deleteFile(saveTo);
567 FileUtil.deleteFile(saveTo);
655 submitSaveDlg(saveTo);
656 if (activeMsgBox.exists()) {
657 activeMsgBox.yes();
658 sleep(2);
659 }
660 sleep(5);
661 app.dispatch(".uno:CloseDoc");
662 openStartcenter();
663
664 // Reopen and verify sorted result
665 app.dispatch(".uno:Open");
666 submitOpenDlg(saveTo);
568 saveAndReopen(saveTo);
569
667 calc.waitForExistence(10, 2);
668 app.dispatch(".uno:SelectTables");
669 scSheetsList.select(0); // Sheet 1
670 scSelectSheetsDlg.ok();
671 assertArrayEquals("Original data", data, SCTool.getCellTexts("$A1:$A7"));
672 app.dispatch(".uno:SelectTables");
673 scSheetsList.select(1); // Sheet 2
674 scSelectSheetsDlg.ok();

--- 32 unchanged lines hidden (view full) ---

707 // Uodo/redo
708 app.dispatch(".uno:Undo");
709 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:G1"));
710 app.dispatch(".uno:Redo");
711 assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("A1:G1"));
712
713 // Save and close document
714 String saveTo = getPath("temp/" + "SortOptionsDirectionSortColumns.ods");
570 calc.waitForExistence(10, 2);
571 app.dispatch(".uno:SelectTables");
572 scSheetsList.select(0); // Sheet 1
573 scSelectSheetsDlg.ok();
574 assertArrayEquals("Original data", data, SCTool.getCellTexts("$A1:$A7"));
575 app.dispatch(".uno:SelectTables");
576 scSheetsList.select(1); // Sheet 2
577 scSelectSheetsDlg.ok();

--- 32 unchanged lines hidden (view full) ---

610 // Uodo/redo
611 app.dispatch(".uno:Undo");
612 assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:G1"));
613 app.dispatch(".uno:Redo");
614 assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("A1:G1"));
615
616 // Save and close document
617 String saveTo = getPath("temp/" + "SortOptionsDirectionSortColumns.ods");
715 app.dispatch(".uno:SaveAs");
716 FileUtil.deleteFile(saveTo);
618 FileUtil.deleteFile(saveTo);
717 submitSaveDlg(saveTo);
718 if (activeMsgBox.exists()) {
719 activeMsgBox.yes();
720 sleep(2);
721 }
722 sleep(5);
723 app.dispatch(".uno:CloseDoc");
724 openStartcenter();
619 saveAndReopen(saveTo);
725
620
726 // Reopen and verify sorted result
727 app.dispatch(".uno:Open");
728 submitOpenDlg(saveTo);
729 calc.waitForExistence(10, 2);
730 assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("A1:G1"));
731 }
732
733 /**
734 * Test sort options: "Include formats"
735 *
736 * @throws Exception

--- 60 unchanged lines hidden (view full) ---

797 // Uodo/redo
798 app.dispatch(".uno:Undo");
799 assertArrayEquals("Undo sorted result", dataWithCurrencyFormats, SCTool.getCellTexts("A1:A7"));
800 app.dispatch(".uno:Redo");
801 assertArrayEquals("Redo sorted result", expectedSortedResultExcludeFormat, SCTool.getCellTexts("A1:A7"));
802
803 // Save and close document
804 String saveTo = getPath("temp/" + "SortOptionsIncludeFormats.ods");
621 calc.waitForExistence(10, 2);
622 assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("A1:G1"));
623 }
624
625 /**
626 * Test sort options: "Include formats"
627 *
628 * @throws Exception

--- 60 unchanged lines hidden (view full) ---

689 // Uodo/redo
690 app.dispatch(".uno:Undo");
691 assertArrayEquals("Undo sorted result", dataWithCurrencyFormats, SCTool.getCellTexts("A1:A7"));
692 app.dispatch(".uno:Redo");
693 assertArrayEquals("Redo sorted result", expectedSortedResultExcludeFormat, SCTool.getCellTexts("A1:A7"));
694
695 // Save and close document
696 String saveTo = getPath("temp/" + "SortOptionsIncludeFormats.ods");
805 app.dispatch(".uno:SaveAs");
806 FileUtil.deleteFile(saveTo);
697 FileUtil.deleteFile(saveTo);
807 submitSaveDlg(saveTo);
808 if (activeMsgBox.exists()) {
809 activeMsgBox.yes();
810 sleep(2);
811 }
812 sleep(5);
813 app.dispatch(".uno:CloseDoc");
814 openStartcenter();
698 saveAndReopen(saveTo);
815
699
816 // Reopen and verify sorted result
817 app.dispatch(".uno:Open");
818 submitOpenDlg(saveTo);
819 calc.waitForExistence(10, 2);
820 assertArrayEquals("Original data", dataWithCurrencyFormats, SCTool.getCellTexts("$Sheet1.$A1:$A7"));
821 assertArrayEquals("Saved sorted result exclude format", expectedSortedResultExcludeFormat, SCTool.getCellTexts("$Sheet2.$A1:$A7"));
822 }
823
824 /**
825 * Test sort options: multiple sort, data overlap
826 *

--- 47 unchanged lines hidden (view full) ---

874 sortPageAscending1.check();
875 sortPage.ok();
876
877 // Verify sorted result
878 assertArrayEquals("Sorted result data overlap", expectedSortedResultDataOverlap, SCTool.getCellTexts("A1:A8"));
879
880 // Save and close document
881 String saveTo = getPath("temp/" + "SortOptionsMultipleSortDataOverlap.ods");
700 calc.waitForExistence(10, 2);
701 assertArrayEquals("Original data", dataWithCurrencyFormats, SCTool.getCellTexts("$Sheet1.$A1:$A7"));
702 assertArrayEquals("Saved sorted result exclude format", expectedSortedResultExcludeFormat, SCTool.getCellTexts("$Sheet2.$A1:$A7"));
703 }
704
705 /**
706 * Test sort options: multiple sort, data overlap
707 *

--- 47 unchanged lines hidden (view full) ---

755 sortPageAscending1.check();
756 sortPage.ok();
757
758 // Verify sorted result
759 assertArrayEquals("Sorted result data overlap", expectedSortedResultDataOverlap, SCTool.getCellTexts("A1:A8"));
760
761 // Save and close document
762 String saveTo = getPath("temp/" + "SortOptionsMultipleSortDataOverlap.ods");
882 app.dispatch(".uno:SaveAs");
883 FileUtil.deleteFile(saveTo);
763 FileUtil.deleteFile(saveTo);
884 submitSaveDlg(saveTo);
885 if (activeMsgBox.exists()) {
886 activeMsgBox.yes();
887 sleep(2);
888 }
889 sleep(5);
890 app.dispatch(".uno:CloseDoc");
891 openStartcenter();
764 saveAndReopen(saveTo);
892
765
893 // Reopen and verify sorted result
894 app.dispatch(".uno:Open");
895 submitOpenDlg(saveTo);
896 calc.waitForExistence(10, 2);
897 assertArrayEquals("Saved sorted result", expectedSortedResultDataOverlap, SCTool.getCellTexts("A1:A8"));
898 assertArrayEquals("Original data2", data2, SCTool.getCellTexts("G10:G14"));
899 }
900
901 /**
902 * Test sort options: multiple sort, no data overlap, sort parameter saved
903 * correctly

--- 66 unchanged lines hidden (view full) ---

970 sortOptionsPage.select();
971 assertTrue("Range contains column labels should be checked", sortOptionsPageRangeContainsColumnLabels.isChecked());
972 assertFalse("Case sensitive should not be checked", sortOptionsPageCaseSensitive.isChecked());
973 assertFalse("Include formats should not be checked", sortOptionsPageIncludeFormats.isChecked());
974 sortOptionsPage.ok();
975
976 // Save and close document
977 String saveTo = getPath("temp/" + "SortOptionsMultipleSortParameterSaved.ods");
766 calc.waitForExistence(10, 2);
767 assertArrayEquals("Saved sorted result", expectedSortedResultDataOverlap, SCTool.getCellTexts("A1:A8"));
768 assertArrayEquals("Original data2", data2, SCTool.getCellTexts("G10:G14"));
769 }
770
771 /**
772 * Test sort options: multiple sort, no data overlap, sort parameter saved
773 * correctly

--- 66 unchanged lines hidden (view full) ---

840 sortOptionsPage.select();
841 assertTrue("Range contains column labels should be checked", sortOptionsPageRangeContainsColumnLabels.isChecked());
842 assertFalse("Case sensitive should not be checked", sortOptionsPageCaseSensitive.isChecked());
843 assertFalse("Include formats should not be checked", sortOptionsPageIncludeFormats.isChecked());
844 sortOptionsPage.ok();
845
846 // Save and close document
847 String saveTo = getPath("temp/" + "SortOptionsMultipleSortParameterSaved.ods");
978 app.dispatch(".uno:SaveAs");
979 FileUtil.deleteFile(saveTo);
848 FileUtil.deleteFile(saveTo);
980 submitSaveDlg(saveTo);
981 if (activeMsgBox.exists()) {
982 activeMsgBox.yes();
983 sleep(2);
984 }
985 sleep(5);
986 app.dispatch(".uno:CloseDoc");
987 openStartcenter();
849 saveAndReopen(saveTo);
988
850
989 // Reopen and verify sorted result and sort parameters
990 app.dispatch(".uno:Open");
991 submitOpenDlg(saveTo);
992 calc.waitForExistence(10, 2);
993 assertArrayEquals("Saved sorted result1", expectedSortedResult1, SCTool.getCellTexts("A1:A5"));
994 assertArrayEquals("Saved sorted result2", expectedSortedResult2, SCTool.getCellTexts("G10:G15"));
995 app.dispatch(".uno:DataSort");
996 sortOptionsPage.select();
997 assertTrue("Range contains column labels should be checked", sortOptionsPageRangeContainsColumnLabels.isChecked());
998 assertFalse("Case sensitive should not be checked", sortOptionsPageCaseSensitive.isChecked());
999 assertFalse("Include formats should not be checked", sortOptionsPageIncludeFormats.isChecked());
1000 sortOptionsPage.ok();
1001 }
1002
851 calc.waitForExistence(10, 2);
852 assertArrayEquals("Saved sorted result1", expectedSortedResult1, SCTool.getCellTexts("A1:A5"));
853 assertArrayEquals("Saved sorted result2", expectedSortedResult2, SCTool.getCellTexts("G10:G15"));
854 app.dispatch(".uno:DataSort");
855 sortOptionsPage.select();
856 assertTrue("Range contains column labels should be checked", sortOptionsPageRangeContainsColumnLabels.isChecked());
857 assertFalse("Case sensitive should not be checked", sortOptionsPageCaseSensitive.isChecked());
858 assertFalse("Include formats should not be checked", sortOptionsPageIncludeFormats.isChecked());
859 sortOptionsPage.ok();
860 }
861
862
1003}
863}