incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1378870 [4/6] - in /incubator/ooo/trunk/main/test: ./ inc/ prj/ source/ testcommon/ testcommon/source/org/openoffice/test/common/ testgui/source/testcase/gui/ testgui/source/testcase/gui/bvt/ testgui/source/testcase/gui/formula/catalog/ te...
Date Thu, 30 Aug 2012 09:27:23 GMT
Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java?rev=1378870&r1=1378869&r2=1378870&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java Thu Aug 30 09:27:21 2012
@@ -19,25 +19,22 @@
  * 
  *************************************************************/
 
-
-
 /**
  * 
  */
 package testcase.gui.sc.filter;
 
+import static org.junit.Assert.*;
 import static testlib.gui.AppUtil.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
-import static org.junit.Assert.*;
-import static org.openoffice.test.vcl.Tester.*;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
+import org.openoffice.test.common.Logger;
 
 import testlib.gui.CalcUtil;
-import testlib.gui.Log;
 
 /**
  * Test cases about Data->Filter in spreadsheet
@@ -45,7 +42,7 @@ import testlib.gui.Log;
 public class Fitler {
 
 	@Rule
-	public Log LOG = new Log();
+	public Logger log = Logger.getLogger(this);
 
 	@Before
 	public void setUp() throws Exception {
@@ -57,7 +54,7 @@ public class Fitler {
 
 	@After
 	public void tearDown() throws Exception {
-		
+
 	}
 
 	/**
@@ -66,9 +63,9 @@ public class Fitler {
 	 */
 	@Ignore("Bug 120076")
 	public void testAutoFilterWithPlusSign() {
-		String expect ="2+";
+		String expect = "2+";
 		CalcUtil.selectRange("A1");
 		typeKeys(expect + "<enter>");
-		assertEquals(expect,CalcUtil.getCellText("A1"));
+		assertEquals(expect, CalcUtil.getCellText("A1"));
 	}
 }

Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/rowcolumn/InsertRowAndColumn.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/rowcolumn/InsertRowAndColumn.java?rev=1378870&r1=1378869&r2=1378870&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/rowcolumn/InsertRowAndColumn.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/rowcolumn/InsertRowAndColumn.java Thu Aug 30 09:27:21 2012
@@ -21,21 +21,21 @@
 package testcase.gui.sc.rowcolumn;
 
 import static org.junit.Assert.*;
-import static testlib.gui.AppUtil.typeKeys;
+import static testlib.gui.AppUtil.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openoffice.test.common.Logger;
 
 import testlib.gui.CalcUtil;
-import testlib.gui.Log;
 
 public class InsertRowAndColumn {
-	
+
 	@Rule
-	public Log LOG = new Log();
+	public Logger log = Logger.getLogger(this);
 
 	@Before
 	public void setUp() throws Exception {
@@ -51,51 +51,42 @@ public class InsertRowAndColumn {
 
 	/**
 	 * Insert new entire row and column
+	 * 
 	 * @throws Exception
 	 */
-	
+
 	@Test
-	public void testInsertEntireRowColumn(){
-		
-		//insert data in cell A2 and B2
+	public void testInsertEntireRowColumn() {
+
+		// insert data in cell A2 and B2
 		CalcUtil.selectRange("Sheet1.A2");
 		typeKeys("123");
 		CalcUtil.selectRange("Sheet1.B2");
 		typeKeys("456");
-		
-		//Set expected result after executing insert one row
-	    String[][] expectedInsertRowResult = new String[][] {
-				{"",""},
-				{"",""},
-				{"123","456"},
-		};
-	    
-		//Select Cell A2
+
+		// Set expected result after executing insert one row
+		String[][] expectedInsertRowResult = new String[][] { { "", "" }, { "", "" }, { "123", "456" }, };
+
+		// Select Cell A2
 		CalcUtil.selectRange("Sheet1.A2");
-		
-	
-	
-		//Insert one entire Row via menu
+
+		// Insert one entire Row via menu
 		calc.menuItem("Insert->Rows").select();
-		
-		//Verify results after inserting one row
+
+		// Verify results after inserting one row
 		assertArrayEquals("Verify results after inserting one row", expectedInsertRowResult, CalcUtil.getCellTexts("A1:B3"));
-				
-		//Set expected result after executing insert column
-	    String[][] expectedInsertColumnResult = new String[][] {
-				{"","",""},
-				{"","",""},
-				{"","123","456"},
-	    };	
-		//Select Cell A3
+
+		// Set expected result after executing insert column
+		String[][] expectedInsertColumnResult = new String[][] { { "", "", "" }, { "", "", "" }, { "", "123", "456" }, };
+		// Select Cell A3
 		CalcUtil.selectRange("Sheet1.A3");
-		
-		//Insert one entire Column via menu
+
+		// Insert one entire Column via menu
 		calc.menuItem("Insert->Columns").select();
-		
-		//Verify results after inserting one column
-	    assertArrayEquals("Verify results after inserting one column", expectedInsertColumnResult, CalcUtil.getCellTexts("A1:C3"));
-						
+
+		// Verify results after inserting one column
+		assertArrayEquals("Verify results after inserting one column", expectedInsertColumnResult, CalcUtil.getCellTexts("A1:C3"));
+
 	}
 
 }

Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java?rev=1378870&r1=1378869&r2=1378870&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java Thu Aug 30 09:27:21 2012
@@ -27,19 +27,19 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-
-import testlib.gui.Log;
+import org.openoffice.test.common.Logger;
 
 /**
- * Before running the testing class, you need specify the AOO location firstly with system property openoffice.home.
+ * Before running the testing class, you need specify the AOO location firstly
+ * with system property openoffice.home.
+ * 
  * 
- *
  */
 
 public class InsertSheet {
 
 	@Rule
-	public Log LOG = new Log();
+	public Logger log = Logger.getLogger(this);
 
 	@Before
 	public void setUp() throws Exception {
@@ -50,22 +50,23 @@ public class InsertSheet {
 
 	@After
 	public void tearDown() throws Exception {
-		
+
 	}
 
 	/**
 	 * Insert one sheet in different place
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testInsertMultipleSheet(){
-		//Open Insert Sheet dialog via main menu Insert-> Sheet
+	public void testInsertMultipleSheet() {
+		// Open Insert Sheet dialog via main menu Insert-> Sheet
 		app.dispatch(".uno:Insert");
-		//Change new sheet number into 3 to insert 3 new sheet one time
+		// Change new sheet number into 3 to insert 3 new sheet one time
 		SCSheetNumber.setText("3");
-		//Click OK button to create sheet with default setting
+		// Click OK button to create sheet with default setting
 		SCInsertSheetDlg.ok();
-		//Verify new sheets have been inserted before Sheet1
+		// Verify new sheets have been inserted before Sheet1
 		app.dispatch(".uno:SelectTables");
 		// To support multi-language, just verify the number in the sheet name
 		assertTrue(SCSheetsList.getItemsText()[0].contains("4"));
@@ -79,15 +80,16 @@ public class InsertSheet {
 
 	/**
 	 * Insert one sheet in different place
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testInsertOneSheet(){
-		//Open Insert Sheet dialog via main menu Insert-> Sheet
+	public void testInsertOneSheet() {
+		// Open Insert Sheet dialog via main menu Insert-> Sheet
 		app.dispatch(".uno:Insert");
-		//Click OK button to create sheet with default setting
+		// Click OK button to create sheet with default setting
 		SCInsertSheetDlg.ok();
-		//Verify new sheet has been inserted before Sheet1
+		// Verify new sheet has been inserted before Sheet1
 		app.dispatch(".uno:SelectTables");
 		// To support multi-language, just verify the number in the sheet name
 		assertTrue(SCSheetsList.getItemsText()[0].contains("4"));

Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java?rev=1378870&r1=1378869&r2=1378870&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java Thu Aug 30 09:27:21 2012
@@ -19,27 +19,26 @@
  * 
  *************************************************************/
 
-
-
 /**
  * 
  */
 package testcase.gui.sc.sort;
 
-import static testlib.gui.AppUtil.*;
-import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
 import static org.openoffice.test.common.Testspace.*;
 import static org.openoffice.test.vcl.Tester.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
+import org.openoffice.test.common.Logger;
 
 import testlib.gui.CalcUtil;
-import testlib.gui.Log;
 
 /**
  * Test Data->Sort dialog setting
@@ -47,7 +46,7 @@ import testlib.gui.Log;
 public class SortDialogSetting {
 
 	@Rule
-	public Log LOG = new Log();
+	public Logger log = Logger.getLogger(this);
 
 	@Before
 	public void setUp() throws Exception {
@@ -60,41 +59,31 @@ public class SortDialogSetting {
 
 	@After
 	public void tearDown() throws Exception {
-		
+
 	}
 
 	/**
-	 * Test sort with options setting: case sensitive 
+	 * Test sort with options setting: case sensitive
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortOptionsCaseSensitive() throws Exception{
+	public void testSortOptionsCaseSensitive() throws Exception {
 
 		// Input some data: A1~A6: 1ColumnName,D,C,B,A,a
-		String[][] data = new String[][] {
-				{"D"},
-				{"C"},
-				{"B"},
-				{"A"},
-				{"a"},
-		};
-		String[][] expectedSortedResult = new String[][] {
-				{"a"},
-				{"A"},
-				{"B"},
-				{"C"},
-				{"D"},
-		};
+		String[][] data = new String[][] { { "D" }, { "C" }, { "B" }, { "A" }, { "a" }, };
+		String[][] expectedSortedResult = new String[][] { { "a" }, { "A" }, { "B" }, { "C" }, { "D" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("1ColumnName<down>D<down>C<down>B<down>A<down>a<down>");
 		CalcUtil.selectRange("A6");
-		app.dispatch(".uno:ChangeCaseToLower");	// In case SC capitalize first letter automatically
+		app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
+												// letter automatically
 
 		// "Data->Sort...", choose "Ascending", check "Case sensitive"
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_CaseSensitive.check();
-		SortOptionsPage.ok();		
+		SortOptionsPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result", expectedSortedResult, CalcUtil.getCellTexts("A2:A6"));
@@ -109,7 +98,7 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "RowsSortWithOptionsCaseSensitive.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -122,28 +111,22 @@ public class SortDialogSetting {
 
 	/**
 	 * Test sort with options setting: copy sort result to
+	 * 
 	 * @throws Exception
 	 */
 	@Ignore("Bug 119035")
-	public void testSortOptionsCopyResultTo() throws Exception{
+	public void testSortOptionsCopyResultTo() throws Exception {
 
 		// Input some data
-		//		String[][] data = new String[][] {
-		//				{"3", "D"},
-		//				{"5", "FLK"},
-		//				{"4", "E"},
-		//				{"2", "BC"},
-		//				{"6", "GE"},
-		//				{"1", "AB"},
-		//		};
-		String[][] expectedSortedResult = new String[][] {
-				{"1", "AB"},
-				{"2", "BC"},
-				{"3", "D"},
-				{"4", "E"},
-				{"5", "FLK"},
-				{"6", "GE"},
-		};
+		// String[][] data = new String[][] {
+		// {"3", "D"},
+		// {"5", "FLK"},
+		// {"4", "E"},
+		// {"2", "BC"},
+		// {"6", "GE"},
+		// {"1", "AB"},
+		// };
+		String[][] expectedSortedResult = new String[][] { { "1", "AB" }, { "2", "BC" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("3<down>5<down>4<down>2<down>6<down>1");
 		CalcUtil.selectRange("B1");
@@ -165,7 +148,8 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Redo");
 		assertArrayEquals("Redo sorted result", expectedSortedResult, CalcUtil.getCellTexts("$Sheet3.$A4:$B9"));
 
-		// Move focus to sheet2 then select a cell range, Insert->Names->Define...
+		// Move focus to sheet2 then select a cell range,
+		// Insert->Names->Define...
 		CalcUtil.selectRange("$Sheet2.$A1:$B3");
 		app.dispatch(".uno:DefineName");
 		DefineNamesDlg_NameEdit.setText("cellRange");
@@ -177,7 +161,7 @@ public class SortDialogSetting {
 		SortOptionsPage.select();
 		SortOptionsPage_CopyResultTo.check();
 		SortOptionsPage_CopyResultToCellRange.select("cellRange");
-		SortOptionsPage.ok();		
+		SortOptionsPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Copy sorted result to cell range", expectedSortedResult, CalcUtil.getCellTexts("$Sheet2.$A1:$B6"));
@@ -192,7 +176,7 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "RowsSortWithOptionsCopyResultTo.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -206,36 +190,16 @@ public class SortDialogSetting {
 
 	/**
 	 * Test sort criteria: sort first by
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortCriteriaSortFirstBy() throws Exception{
+	public void testSortCriteriaSortFirstBy() throws Exception {
 
 		// Input some data
-		String[][] data = new String[][] {
-				{"3", "D"},
-				{"5", "FLK"},
-				{"4", "E"},
-				{"2", "BC"},
-				{"6", "GE"},
-				{"1", "AB"},
-		};
-		String[][] expectedResultSortByColumnBAscending = new String[][] {
-				{"1", "AB"},
-				{"2", "BC"},
-				{"3", "D"},
-				{"4", "E"},
-				{"5", "FLK"},
-				{"6", "GE"},
-		};
-		String[][] expectedResultSortByColumnADescending = new String[][] {
-				{"6", "GE"},
-				{"5", "FLK"},
-				{"4", "E"},
-				{"3", "D"},
-				{"2", "BC"},
-				{"1", "AB"},
-		};
+		String[][] data = new String[][] { { "3", "D" }, { "5", "FLK" }, { "4", "E" }, { "2", "BC" }, { "6", "GE" }, { "1", "AB" }, };
+		String[][] expectedResultSortByColumnBAscending = new String[][] { { "1", "AB" }, { "2", "BC" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
+		String[][] expectedResultSortByColumnADescending = new String[][] { { "6", "GE" }, { "5", "FLK" }, { "4", "E" }, { "3", "D" }, { "2", "BC" }, { "1", "AB" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("3<down>5<down>4<down>2<down>6<down>1");
 		CalcUtil.selectRange("B1");
@@ -244,7 +208,7 @@ public class SortDialogSetting {
 		// "Data->Sort...", choose "Ascending", sort first by Column B
 		app.dispatch(".uno:DataSort");
 		SortPage_Ascending1.check();
-		SortPage_By1.select(2);	// "Column B"
+		SortPage_By1.select(2); // "Column B"
 		SortPage.ok();
 
 		// Verify sorted result
@@ -261,7 +225,7 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "SortCriteriaSortFirstBy.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -271,45 +235,25 @@ public class SortDialogSetting {
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:DataSort");
 		SortPage_Descending1.check();
-		SortPage_By1.select(1);	// "Column A"
-		SortPage.ok();		
+		SortPage_By1.select(1); // "Column A"
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Saved sorted result", expectedResultSortByColumnADescending, CalcUtil.getCellTexts("A1:B6"));
-	}	
+	}
 
 	/**
 	 * Test sort criteria: sort second by
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortCriteriaSortSecondBy() throws Exception{
+	public void testSortCriteriaSortSecondBy() throws Exception {
 
 		// Input some data
-		String[][] data = new String[][] {
-				{"3", "D"},
-				{"5", "FLK"},
-				{"4", "E"},
-				{"1", "AB"},
-				{"6", "GE"},
-				{"2", "AB"},
-		};
-		String[][] expectedResultSortFirstByB = new String[][] {
-				{"1", "AB"},
-				{"2", "AB"},
-				{"3", "D"},
-				{"4", "E"},
-				{"5", "FLK"},
-				{"6", "GE"},
-		};
-		String[][] expectedResultSortSecondByA= new String[][] {
-				{"2", "AB"},
-				{"1", "AB"},
-				{"3", "D"},
-				{"4", "E"},
-				{"5", "FLK"},
-				{"6", "GE"},
-		};
+		String[][] data = new String[][] { { "3", "D" }, { "5", "FLK" }, { "4", "E" }, { "1", "AB" }, { "6", "GE" }, { "2", "AB" }, };
+		String[][] expectedResultSortFirstByB = new String[][] { { "1", "AB" }, { "2", "AB" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
+		String[][] expectedResultSortSecondByA = new String[][] { { "2", "AB" }, { "1", "AB" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("3<down>5<down>4<down>1<down>6<down>2");
 		CalcUtil.selectRange("B1");
@@ -318,7 +262,7 @@ public class SortDialogSetting {
 		// "Data->Sort...", choose "Ascending", sort first by Column B
 		app.dispatch(".uno:DataSort");
 		SortPage_Ascending1.check();
-		SortPage_By1.select(2);	// "Column B"
+		SortPage_By1.select(2); // "Column B"
 		SortPage.ok();
 
 		// Verify sorted result
@@ -335,77 +279,43 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "SortCriteriaSortSecondBy.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
-		// Reopen, "Data->Sort...", sort first by Column B "Ascending", sort second by Column A "Descending"
+		// Reopen, "Data->Sort...", sort first by Column B "Ascending", sort
+		// second by Column A "Descending"
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:DataSort");
-		SortPage_By1.select(2);	// "Column B"
+		SortPage_By1.select(2); // "Column B"
 		SortPage_Ascending1.check();
-		SortPage_By2.select(1);	// "Column A"
+		SortPage_By2.select(1); // "Column A"
 		SortPage_Descending2.check();
 		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Saved sorted result", expectedResultSortSecondByA, CalcUtil.getCellTexts("A1:B6"));
-	}	
+	}
 
 	/**
 	 * Test sort criteria: sort third by
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortCriteriaSortThirdBy() throws Exception{
+	public void testSortCriteriaSortThirdBy() throws Exception {
 
 		// Input some data
-		String[][] data = new String[][] {
-				{"3", "AB", "2"},
-				{"8", "FLK", "5"},
-				{"6", "E", "4"},
-				{"1", "AB", "1"},
-				{"9", "GE", "6"},
-				{"2", "AB", "2"},
-				{"7", "EFYU", "7"},
-				{"5", "DS", "8"},
-				{"4", "AB", "1"},
-		};
-		String[][] expectedResultSortFirstByB = new String[][] {
-				{"3", "AB", "2"},
-				{"1", "AB", "1"},
-				{"2", "AB", "2"},
-				{"4", "AB", "1"},
-				{"5", "DS", "8"},
-				{"6", "E", "4"},
-				{"7", "EFYU", "7"},
-				{"8", "FLK", "5"},
-				{"9", "GE", "6"},
-		};
-		String[][] expectedResultSortSecondByC= new String[][] {
-				{"3", "AB", "2"},
-				{"2", "AB", "2"},
-				{"1", "AB", "1"},
-				{"4", "AB", "1"},
-				{"5", "DS", "8"},
-				{"6", "E", "4"},
-				{"7", "EFYU", "7"},
-				{"8", "FLK", "5"},
-				{"9", "GE", "6"},
-		};
-		String[][] expectedResultSortThirdByA= new String[][] {
-				{"3", "AB", "2"},
-				{"2", "AB", "2"},
-				{"4", "AB", "1"},
-				{"1", "AB", "1"},
-				{"5", "DS", "8"},
-				{"6", "E", "4"},
-				{"7", "EFYU", "7"},
-				{"8", "FLK", "5"},
-				{"9", "GE", "6"},
-		};
+		String[][] data = new String[][] { { "3", "AB", "2" }, { "8", "FLK", "5" }, { "6", "E", "4" }, { "1", "AB", "1" }, { "9", "GE", "6" }, { "2", "AB", "2" },
+				{ "7", "EFYU", "7" }, { "5", "DS", "8" }, { "4", "AB", "1" }, };
+		String[][] expectedResultSortFirstByB = new String[][] { { "3", "AB", "2" }, { "1", "AB", "1" }, { "2", "AB", "2" }, { "4", "AB", "1" }, { "5", "DS", "8" },
+				{ "6", "E", "4" }, { "7", "EFYU", "7" }, { "8", "FLK", "5" }, { "9", "GE", "6" }, };
+		String[][] expectedResultSortSecondByC = new String[][] { { "3", "AB", "2" }, { "2", "AB", "2" }, { "1", "AB", "1" }, { "4", "AB", "1" }, { "5", "DS", "8" },
+				{ "6", "E", "4" }, { "7", "EFYU", "7" }, { "8", "FLK", "5" }, { "9", "GE", "6" }, };
+		String[][] expectedResultSortThirdByA = new String[][] { { "3", "AB", "2" }, { "2", "AB", "2" }, { "4", "AB", "1" }, { "1", "AB", "1" }, { "5", "DS", "8" },
+				{ "6", "E", "4" }, { "7", "EFYU", "7" }, { "8", "FLK", "5" }, { "9", "GE", "6" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("3<down>8<down>6<down>1<down>9<down>2<down>7<down>5<down>4");
 		CalcUtil.selectRange("B1");
@@ -415,7 +325,7 @@ public class SortDialogSetting {
 
 		// "Data->Sort...", choose "Ascending", sort first by Column B
 		app.dispatch(".uno:DataSort");
-		SortPage_By1.select(2);	// "Column B"
+		SortPage_By1.select(2); // "Column B"
 		SortPage_Ascending1.check();
 		SortPage.ok();
 
@@ -433,36 +343,38 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "SortCriteriaSortThirdBy.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
-		// Reopen, "Data->Sort...", sort first by Column B "Ascending", sort second by Column C "Descending"
+		// Reopen, "Data->Sort...", sort first by Column B "Ascending", sort
+		// second by Column C "Descending"
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:DataSort");
-		SortPage_By1.select(2);	// "Column B"
+		SortPage_By1.select(2); // "Column B"
 		SortPage_Ascending1.check();
-		SortPage_By2.select(3);	// "Column C"
+		SortPage_By2.select(3); // "Column C"
 		SortPage_Descending2.check();
 		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result", expectedResultSortSecondByC, CalcUtil.getCellTexts("A1:C9"));
 
-		// "Data->Sort...", sort first by Column B "Ascending", sort second by Column C "Descending", sort third by Column A "Descending"
+		// "Data->Sort...", sort first by Column B "Ascending", sort second by
+		// Column C "Descending", sort third by Column A "Descending"
 		app.dispatch(".uno:DataSort");
-		SortPage_By1.select(2);	// "Column B"
+		SortPage_By1.select(2); // "Column B"
 		SortPage_Ascending1.check();
-		SortPage_By2.select(3);	// "Column C"
+		SortPage_By2.select(3); // "Column C"
 		SortPage_Descending2.check();
-		SortPage_By3.select(1);	// "Column A"
+		SortPage_By3.select(1); // "Column A"
 		SortPage_Descending3.check();
 		SortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedResultSortThirdByA, CalcUtil.getCellTexts("A1:C9"));	
+		assertArrayEquals("Sorted result", expectedResultSortThirdByA, CalcUtil.getCellTexts("A1:C9"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
@@ -474,7 +386,7 @@ public class SortDialogSetting {
 		saveTo = getPath("temp/" + "SortCriteriaSortThirdBy1.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -482,38 +394,42 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		assertArrayEquals("Saved sorted result", expectedResultSortThirdByA, CalcUtil.getCellTexts("A1:C9"));	
-	}	
+		assertArrayEquals("Saved sorted result", expectedResultSortThirdByA, CalcUtil.getCellTexts("A1:C9"));
+	}
 
 	/**
-	 * Test sort options: custom sort order, predefined in preferences from copy list
+	 * Test sort options: custom sort order, predefined in preferences from copy
+	 * list
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortOptionsCustomSortOrderPredefineFromCopyList() throws Exception{
+	public void testSortOptionsCustomSortOrderPredefineFromCopyList() throws Exception {
 
 		// Dependencies start
 		CalcUtil.selectRange("A1");
 		typeKeys("red<down>yellow<down>blue<down>green<down>white<down>black");
 		CalcUtil.selectRange("A1:A6");
-		app.dispatch(".uno:ChangeCaseToLower");	// In case SC capitalize first letter automatically
+		app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
+												// letter automatically
 
-		// Select the cell range, "Tools->Options...->OpenOffice.org Spreadsheets->Sort Lists"
+		// Select the cell range,
+		// "Tools->Options...->OpenOffice.org Spreadsheets->Sort Lists"
 		CalcUtil.selectRange("A1:A6");
 		app.dispatch(".uno:OptionsTreeDialog");
 		OptionsDlgList.collapseAll();
-//		// Select "Sort Lists": start. Shrink the tree list and select
-//		OptionsDlgList.select(0);
-//		typeKeys("<left>");
-//		for (int i=0; i<6; i++) {
-//			typeKeys("<down><left>");	
-//		}
+		// // Select "Sort Lists": start. Shrink the tree list and select
+		// OptionsDlgList.select(0);
+		// typeKeys("<left>");
+		// for (int i=0; i<6; i++) {
+		// typeKeys("<down><left>");
+		// }
 		OptionsDlgList.expand(3);
-//		typeKeys("<right>");
+		// typeKeys("<right>");
 		OptionsDlgList.select(7);
-//		// Select "Sort Lists": end
+		// // Select "Sort Lists": end
 
-		// Click "Copy" button, "OK", close the document		
+		// Click "Copy" button, "OK", close the document
 		OptionsDlg_SortListsTabCopy.click();
 		OptionsDlg.ok();
 		app.dispatch(".uno:CloseDoc");
@@ -524,48 +440,26 @@ public class SortDialogSetting {
 		app.dispatch("private:factory/scalc");
 
 		// Input some data
-		String[][] data = new String[][] {
-				{"Color"},
-				{"black"},
-				{"yellow"},
-				{"blue"},
-				{"black"},
-				{"white"},
-				{"red"},
-		};
-		String[][] expectedResultNoCustomSortOrder = new String[][] {
-				{"Color"},
-				{"black"},
-				{"black"},
-				{"blue"},
-				{"red"},
-				{"white"},
-				{"yellow"},
-		};
-		String[][] expectedResultCustomSortOrder = new String[][] {
-				{"Color"},
-				{"red"},
-				{"yellow"},
-				{"blue"},
-				{"white"},
-				{"black"},
-				{"black"},
-		};
+		String[][] data = new String[][] { { "Color" }, { "black" }, { "yellow" }, { "blue" }, { "black" }, { "white" }, { "red" }, };
+		String[][] expectedResultNoCustomSortOrder = new String[][] { { "Color" }, { "black" }, { "black" }, { "blue" }, { "red" }, { "white" }, { "yellow" }, };
+		String[][] expectedResultCustomSortOrder = new String[][] { { "Color" }, { "red" }, { "yellow" }, { "blue" }, { "white" }, { "black" }, { "black" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("Color<down>black<down>yellow<down>blue<down>black<down>white<down>red");
 		CalcUtil.selectRange("A2:A7");
-		app.dispatch(".uno:ChangeCaseToLower");	// In case SC capitalize first letter automatically
+		app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
+												// letter automatically
 
-		// "Data->Sort...", "Options" tab, check "Range contains column labels", no custom sort order, "Ascending", sort first by Color
+		// "Data->Sort...", "Options" tab, check "Range contains column labels",
+		// no custom sort order, "Ascending", sort first by Color
 		CalcUtil.selectRange("A1:A7");
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.check();
 		SortOptionsPage_CustomSortOrder.uncheck();
 		SortPage.select();
-		SortPage_By1.select(1);	// "Color"
+		SortPage_By1.select(1); // "Color"
 		SortPage_Ascending1.check();
-		SortPage.ok();	
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result without custom sort order", expectedResultNoCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
@@ -583,18 +477,19 @@ public class SortDialogSetting {
 		app.dispatch(".uno:SelectTables");
 		SCSheetsList.select(1);
 		SCSelectSheetsDlg.ok();
-		app.dispatch(".uno:Paste");	
+		app.dispatch(".uno:Paste");
 
-		// "Data->Sort...", "Options" tab, check "Range contains column labels", choose custom sort order, "Ascending", sort first by Color
+		// "Data->Sort...", "Options" tab, check "Range contains column labels",
+		// choose custom sort order, "Ascending", sort first by Color
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.check();
 		SortOptionsPage_CustomSortOrder.check();
 		SortOptionsPage_CustomSortOrderList.select("red,yellow,blue,green,white,black");
 		SortPage.select();
-		SortPage_By1.select(1);	// "Color"
+		SortPage_By1.select(1); // "Color"
 		SortPage_Ascending1.check();
-		SortPage.ok();	
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result with custom sort order", expectedResultCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
@@ -609,7 +504,7 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromCopyList.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -618,21 +513,23 @@ public class SortDialogSetting {
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(0);	// Sheet 1
+		SCSheetsList.select(0); // Sheet 1
 		SCSelectSheetsDlg.ok();
 		assertArrayEquals("Original data", data, CalcUtil.getCellTexts("$A1:$A7"));
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(1);	// Sheet 2
+		SCSheetsList.select(1); // Sheet 2
 		SCSelectSheetsDlg.ok();
 		assertArrayEquals("Saved sorted result", expectedResultCustomSortOrder, CalcUtil.getCellTexts("$A1:$A7"));
-	}	
+	}
 
 	/**
-	 * Test sort options: custom sort order, predefined in preferences from new list
+	 * Test sort options: custom sort order, predefined in preferences from new
+	 * list
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortOptionsCustomSortOrderPredefineFromNewList() throws Exception{
+	public void testSortOptionsCustomSortOrderPredefineFromNewList() throws Exception {
 
 		// Dependencies start
 		// "Tools->Options...->OpenOffice.org Spreadsheets->Sort Lists"
@@ -640,15 +537,16 @@ public class SortDialogSetting {
 		// Select "Sort Lists": start. Shrink the tree list and select
 		OptionsDlgList.select(0);
 		typeKeys("<left>");
-		for (int i=0; i<6; i++) {
-			typeKeys("<down><left>");	
+		for (int i = 0; i < 6; i++) {
+			typeKeys("<down><left>");
 		}
 		OptionsDlgList.select(3);
 		typeKeys("<right>");
 		OptionsDlgList.select(7);
 		// Select "Sort Lists": end
 
-		// Click "New" button, input "white,red,yellow,blue,green,black", press "Add" and "OK", close the document		
+		// Click "New" button, input "white,red,yellow,blue,green,black", press
+		// "Add" and "OK", close the document
 		OptionsDlg_SortListsTabNew.click();
 		typeKeys("white,red,yellow,blue,green,black");
 		OptionsDlg_SortListsTabAdd.click();
@@ -660,48 +558,26 @@ public class SortDialogSetting {
 		app.dispatch("private:factory/scalc");
 
 		// Input some data
-		String[][] data = new String[][] {
-				{"Color"},
-				{"black"},
-				{"yellow"},
-				{"blue"},
-				{"black"},
-				{"white"},
-				{"red"},
-		};
-		String[][] expectedResultNoCustomSortOrder = new String[][] {
-				{"Color"},
-				{"black"},
-				{"black"},
-				{"blue"},
-				{"red"},
-				{"white"},
-				{"yellow"},
-		};
-		String[][] expectedResultCustomSortOrder = new String[][] {
-				{"Color"},
-				{"white"},
-				{"red"},
-				{"yellow"},
-				{"blue"},
-				{"black"},
-				{"black"},
-		};
+		String[][] data = new String[][] { { "Color" }, { "black" }, { "yellow" }, { "blue" }, { "black" }, { "white" }, { "red" }, };
+		String[][] expectedResultNoCustomSortOrder = new String[][] { { "Color" }, { "black" }, { "black" }, { "blue" }, { "red" }, { "white" }, { "yellow" }, };
+		String[][] expectedResultCustomSortOrder = new String[][] { { "Color" }, { "white" }, { "red" }, { "yellow" }, { "blue" }, { "black" }, { "black" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("Color<down>black<down>yellow<down>blue<down>black<down>white<down>red");
 		CalcUtil.selectRange("A2:A7");
-		app.dispatch(".uno:ChangeCaseToLower");	// In case SC capitalize first letter automatically
+		app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
+												// letter automatically
 
-		// "Data->Sort...", "Options" tab, check "Range contains column labels", no custom sort order, "Ascending", sort first by Color
+		// "Data->Sort...", "Options" tab, check "Range contains column labels",
+		// no custom sort order, "Ascending", sort first by Color
 		CalcUtil.selectRange("A1:A7");
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.check();
 		SortOptionsPage_CustomSortOrder.uncheck();
 		SortPage.select();
-		SortPage_By1.select(1);	// "Color"
+		SortPage_By1.select(1); // "Color"
 		SortPage_Ascending1.check();
-		SortPage.ok();	
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result without custom sort order", expectedResultNoCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
@@ -717,20 +593,21 @@ public class SortDialogSetting {
 		CalcUtil.selectRange("A1:A7");
 		app.dispatch(".uno:Copy");
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(1);	// Sheet 2
+		SCSheetsList.select(1); // Sheet 2
 		SCSelectSheetsDlg.ok();
-		app.dispatch(".uno:Paste");	
+		app.dispatch(".uno:Paste");
 
-		// "Data->Sort...", "Options" tab, check "Range contains column labels", choose custom sort order, "Ascending", sort first by Color
+		// "Data->Sort...", "Options" tab, check "Range contains column labels",
+		// choose custom sort order, "Ascending", sort first by Color
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.check();
 		SortOptionsPage_CustomSortOrder.check();
 		SortOptionsPage_CustomSortOrderList.select("white,red,yellow,blue,green,black");
 		SortPage.select();
-		SortPage_By1.select(1);	// "Color"
+		SortPage_By1.select(1); // "Color"
 		SortPage_Ascending1.check();
-		SortPage.ok();	
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result with custom sort order", expectedResultCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
@@ -745,7 +622,7 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromNewList.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -754,43 +631,40 @@ public class SortDialogSetting {
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(0);	// Sheet 1
+		SCSheetsList.select(0); // Sheet 1
 		SCSelectSheetsDlg.ok();
 		assertArrayEquals("Original data", data, CalcUtil.getCellTexts("$A1:$A7"));
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(1);	// Sheet 2
+		SCSheetsList.select(1); // Sheet 2
 		SCSelectSheetsDlg.ok();
 		assertArrayEquals("Saved sorted result", expectedResultCustomSortOrder, CalcUtil.getCellTexts("$A1:$A7"));
-	}	
+	}
 
-	
 	/**
 	 * Test sort options: sort columns, direction "Left to right"
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortOptionsDirectionSortColumns() throws Exception{
+	public void testSortOptionsDirectionSortColumns() throws Exception {
 
 		// Input some data
-		String[][] data = new String[][] {
-				{"Units", "7", "27", "4", "12", "3", "6"},
-		};
-		String[][] expectedSortedResult = new String[][] {
-				{"Units", "3", "4", "6", "7", "12", "27"},
-		};
+		String[][] data = new String[][] { { "Units", "7", "27", "4", "12", "3", "6" }, };
+		String[][] expectedSortedResult = new String[][] { { "Units", "3", "4", "6", "7", "12", "27" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("Units<right>7<right>27<right>4<right>12<right>3<right>6");
-		sleep(1);	// If no sleep, some strings lost
+		sleep(1); // If no sleep, some strings lost
 
-		// "Data->Sort...", check "Range contains column labels", "Left to right", sort first by"Units", "Ascending"
+		// "Data->Sort...", check "Range contains column labels",
+		// "Left to right", sort first by"Units", "Ascending"
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.check();
 		SortOptionsPage_LeftToRight.check();
 		SortPage.select();
-		SortPage_By1.select(1);	// Choose "Units"
+		SortPage_By1.select(1); // Choose "Units"
 		SortPage_Ascending1.check();
-		SortPage.ok();		
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result", expectedSortedResult, CalcUtil.getCellTexts("A1:G1"));
@@ -805,7 +679,7 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "SortOptionsDirectionSortColumns.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -818,38 +692,18 @@ public class SortDialogSetting {
 
 	/**
 	 * Test sort options: "Include formats"
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortOptionsIncludeFormats() throws Exception{
+	public void testSortOptionsIncludeFormats() throws Exception {
 
-		String[][] dataWithCurrencyFormats = new String[][] {
-				{"Units"},
-				{"$32.00"},
-				{"57.00 \u20ac"},
-				{"\u20a4 74"},
-				{"R$ 50.00"},
-				{"\u062c.\u0645. 27"},
-				{"7.00 \u0440\u0443\u0431"},
-		};
-		String[][] expectedSortedResultIncludeFormat = new String[][] {
-				{"Units"},
-				{"7.00 \u0440\u0443\u0431"},
-				{"\u062c.\u0645. 27"},
-				{"$32.00"},
-				{"R$ 50.00"},
-				{"57.00 \u20ac"},
-				{"\u20a4 74"},
-		};
-		String[][] expectedSortedResultExcludeFormat = new String[][] {
-				{"Units"},
-				{"$7.00"},
-				{"27.00 \u20ac"},
-				{"\u20a4 32"},
-				{"R$ 50.00"},
-				{"\u062c.\u0645. 57"},
-				{"74.00 \u0440\u0443\u0431"},
-		};
+		String[][] dataWithCurrencyFormats = new String[][] { { "Units" }, { "$32.00" }, { "57.00 \u20ac" }, { "\u20a4 74" }, { "R$ 50.00" }, { "\u062c.\u0645. 27" },
+				{ "7.00 \u0440\u0443\u0431" }, };
+		String[][] expectedSortedResultIncludeFormat = new String[][] { { "Units" }, { "7.00 \u0440\u0443\u0431" }, { "\u062c.\u0645. 27" }, { "$32.00" }, { "R$ 50.00" },
+				{ "57.00 \u20ac" }, { "\u20a4 74" }, };
+		String[][] expectedSortedResultExcludeFormat = new String[][] { { "Units" }, { "$7.00" }, { "27.00 \u20ac" }, { "\u20a4 32" }, { "R$ 50.00" }, { "\u062c.\u0645. 57" },
+				{ "74.00 \u0440\u0443\u0431" }, };
 
 		// Open sample file to get source data
 		String file = prepareData("sc/SortOptionsIncludeFormats.ods");
@@ -859,15 +713,16 @@ public class SortDialogSetting {
 
 		assertArrayEquals("source", dataWithCurrencyFormats, CalcUtil.getCellTexts("A1:A7"));
 
-		// "Data->Sort...", check "Range contains column labels", check "Include formats", sort first by "Units", "Ascending"
+		// "Data->Sort...", check "Range contains column labels", check
+		// "Include formats", sort first by "Units", "Ascending"
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.check();
 		SortOptionsPage_IncludeFormats.check();
 		SortPage.select();
-		SortPage_By1.select(1);	// "Units"
+		SortPage_By1.select(1); // "Units"
 		SortPage_Ascending1.check();
-		SortPage.ok();		
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result include formats", expectedSortedResultIncludeFormat, CalcUtil.getCellTexts("A1:A7"));
@@ -883,20 +738,21 @@ public class SortDialogSetting {
 		CalcUtil.selectRange("A1:A7");
 		app.dispatch(".uno:Copy");
 		CalcUtil.selectRange("Sheet2.A1");
-		app.dispatch(".uno:Paste");	
+		app.dispatch(".uno:Paste");
 
-		// "Data->Sort...", check "Range contains column labels", uncheck "Include formats", sort first by "Units", "Ascending"
+		// "Data->Sort...", check "Range contains column labels", uncheck
+		// "Include formats", sort first by "Units", "Ascending"
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.check();
 		SortOptionsPage_IncludeFormats.uncheck();
 		SortPage.select();
-		SortPage_By1.select(1);	// "Units"
+		SortPage_By1.select(1); // "Units"
 		SortPage_Ascending1.check();
-		SortPage.ok();		
+		SortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result exclude formats", expectedSortedResultExcludeFormat, CalcUtil.getCellTexts("A1:A7"));	
+		assertArrayEquals("Sorted result exclude formats", expectedSortedResultExcludeFormat, CalcUtil.getCellTexts("A1:A7"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
@@ -908,7 +764,7 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "SortOptionsIncludeFormats.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -922,55 +778,30 @@ public class SortDialogSetting {
 
 	/**
 	 * Test sort options: multiple sort, data overlap
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortOptionsMultipleSortDataOverlap() throws Exception{
+	public void testSortOptionsMultipleSortDataOverlap() throws Exception {
 
 		// Input some data
-		String[][] data1 = new String[][] {
-				{"D"},
-				{"C"},
-				{"B"},
-				{"A"},
-				{"E"},
-		};
-		String[][] expectedSortedResult1 = new String[][] {
-				{"A"},
-				{"B"},
-				{"C"},
-				{"D"},
-				{"E"},
-		};
-		String[][] data2 = new String[][] {
-				{"4"},
-				{"2"},
-				{"5"},
-				{"1"},
-				{"3"},
-		};
-		String[][] expectedSortedResultDataOverlap = new String[][] {
-				{"A"},
-				{"B"},
-				{"C"},
-				{"1"},
-				{"2"},
-				{"3"},
-				{"4"},
-				{"5"},
-		};
+		String[][] data1 = new String[][] { { "D" }, { "C" }, { "B" }, { "A" }, { "E" }, };
+		String[][] expectedSortedResult1 = new String[][] { { "A" }, { "B" }, { "C" }, { "D" }, { "E" }, };
+		String[][] data2 = new String[][] { { "4" }, { "2" }, { "5" }, { "1" }, { "3" }, };
+		String[][] expectedSortedResultDataOverlap = new String[][] { { "A" }, { "B" }, { "C" }, { "1" }, { "2" }, { "3" }, { "4" }, { "5" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("D<down>C<down>B<down>A<down>E");
-		sleep(1);	// If no sleep, some strings lost
+		sleep(1); // If no sleep, some strings lost
 
-		// "Data->Sort...", uncheck "Range contains column labels", sort first by "Column A", "Ascending"
+		// "Data->Sort...", uncheck "Range contains column labels", sort first
+		// by "Column A", "Ascending"
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.uncheck();
 		SortPage.select();
-		SortPage_By1.select(1);	// "Column A"
+		SortPage_By1.select(1); // "Column A"
 		SortPage_Ascending1.check();
-		SortPage.ok();		
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result", expectedSortedResult1, CalcUtil.getCellTexts("A1:A5"));
@@ -985,7 +816,8 @@ public class SortDialogSetting {
 		CalcUtil.selectRange("G10");
 		typeKeys("4<down>2<down>5<down>1<down>3");
 
-		// Focus on data2, "Data->Sort...", "Copy result to" partially overlap with data1, sort first by "Column G", "Ascending"
+		// Focus on data2, "Data->Sort...", "Copy result to" partially overlap
+		// with data1, sort first by "Column G", "Ascending"
 		CalcUtil.selectRange("G10");
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
@@ -993,9 +825,9 @@ public class SortDialogSetting {
 		SortOptionsPage_CopyResultTo.check();
 		SortOptionsPage_CopyResultToEdit.setText("A4");
 		SortPage.select();
-		SortPage_By1.select(1);	// "Column G"
+		SortPage_By1.select(1); // "Column G"
 		SortPage_Ascending1.check();
-		SortPage.ok();			
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result data overlap", expectedSortedResultDataOverlap, CalcUtil.getCellTexts("A1:A8"));
@@ -1004,7 +836,7 @@ public class SortDialogSetting {
 		String saveTo = getPath("temp/" + "SortOptionsMultipleSortDataOverlap.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -1017,57 +849,35 @@ public class SortDialogSetting {
 	}
 
 	/**
-	 * Test sort options: multiple sort, no data overlap, sort parameter saved correctly
+	 * Test sort options: multiple sort, no data overlap, sort parameter saved
+	 * correctly
+	 * 
 	 * @throws Exception
 	 */
 	@Test
-	public void testSortOptionsMultipleSortSortParameterSaved() throws Exception{
+	public void testSortOptionsMultipleSortSortParameterSaved() throws Exception {
 
 		// Input some data
-		String[][] data1 = new String[][] {
-				{"D"},
-				{"C"},
-				{"B"},
-				{"A"},
-				{"E"},
-		};
-		String[][] expectedSortedResult1 = new String[][] {
-				{"A"},
-				{"B"},
-				{"C"},
-				{"D"},
-				{"E"},
-		};
-		String[][] data2 = new String[][] {
-				{"Numbers"},
-				{"4"},
-				{"2"},
-				{"5"},
-				{"1"},
-				{"3"},
-		};
-		String[][] expectedSortedResult2 = new String[][] {
-				{"Numbers"},
-				{"1"},
-				{"2"},
-				{"3"},
-				{"4"},
-				{"5"},
-		};
+		String[][] data1 = new String[][] { { "D" }, { "C" }, { "B" }, { "A" }, { "E" }, };
+		String[][] expectedSortedResult1 = new String[][] { { "A" }, { "B" }, { "C" }, { "D" }, { "E" }, };
+		String[][] data2 = new String[][] { { "Numbers" }, { "4" }, { "2" }, { "5" }, { "1" }, { "3" }, };
+		String[][] expectedSortedResult2 = new String[][] { { "Numbers" }, { "1" }, { "2" }, { "3" }, { "4" }, { "5" }, };
 		CalcUtil.selectRange("A1");
 		typeKeys("D<down>C<down>B<down>A<down>E");
-		sleep(1);	// If no sleep, some strings lost
+		sleep(1); // If no sleep, some strings lost
 
-		// "Data->Sort...", uncheck "Range contains column labels", check "Case sensitive" and "Include formats", sort first by "Column A", "Ascending"
+		// "Data->Sort...", uncheck "Range contains column labels", check
+		// "Case sensitive" and "Include formats", sort first by "Column A",
+		// "Ascending"
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
 		SortOptionsPage_RangeContainsColumnLabels.uncheck();
 		SortOptionsPage_CaseSensitive.check();
 		SortOptionsPage_IncludeFormats.check();
 		SortPage.select();
-		SortPage_By1.select(1);	// "Column A"
+		SortPage_By1.select(1); // "Column A"
 		SortPage_Ascending1.check();
-		SortPage.ok();		
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result1", expectedSortedResult1, CalcUtil.getCellTexts("A1:A5"));
@@ -1082,7 +892,9 @@ public class SortDialogSetting {
 		CalcUtil.selectRange("G10");
 		typeKeys("Numbers<down>4<down>2<down>5<down>1<down>3");
 
-		// Focus on data2, "Data->Sort...", check "Range contains column labels", uncheck "Case sensitive" and "Include formats", sort first by "Numbers", "Ascending"
+		// Focus on data2, "Data->Sort...", check
+		// "Range contains column labels", uncheck "Case sensitive" and
+		// "Include formats", sort first by "Numbers", "Ascending"
 		CalcUtil.selectRange("G10");
 		app.dispatch(".uno:DataSort");
 		SortOptionsPage.select();
@@ -1090,9 +902,9 @@ public class SortDialogSetting {
 		SortOptionsPage_CaseSensitive.uncheck();
 		SortOptionsPage_IncludeFormats.uncheck();
 		SortPage.select();
-		SortPage_By1.select(1);	// "Numbers"
+		SortPage_By1.select(1); // "Numbers"
 		SortPage_Ascending1.check();
-		SortPage.ok();			
+		SortPage.ok();
 
 		// Verify sorted result
 		assertArrayEquals("Sorted result2", expectedSortedResult2, CalcUtil.getCellTexts("G10:G15"));
@@ -1109,13 +921,13 @@ public class SortDialogSetting {
 		assertTrue("Range contains column labels should be checked", SortOptionsPage_RangeContainsColumnLabels.isChecked());
 		assertFalse("Case sensitive should not be checked", SortOptionsPage_CaseSensitive.isChecked());
 		assertFalse("Include formats should not be checked", SortOptionsPage_IncludeFormats.isChecked());
-		SortOptionsPage.ok();		
+		SortOptionsPage.ok();
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "SortOptionsMultipleSortParameterSaved.ods");
 		app.dispatch(".uno:SaveAs");
 		FileUtil.deleteFile(saveTo);
-		submitSaveDlg(saveTo);	
+		submitSaveDlg(saveTo);
 		app.dispatch(".uno:CloseDoc");
 		openStartcenter();
 
@@ -1130,7 +942,7 @@ public class SortDialogSetting {
 		assertTrue("Range contains column labels should be checked", SortOptionsPage_RangeContainsColumnLabels.isChecked());
 		assertFalse("Case sensitive should not be checked", SortOptionsPage_CaseSensitive.isChecked());
 		assertFalse("Include formats should not be checked", SortOptionsPage_IncludeFormats.isChecked());
-		SortOptionsPage.ok();	
+		SortOptionsPage.ok();
 	}
 
 }

Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java?rev=1378870&r1=1378869&r2=1378870&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java Thu Aug 30 09:27:21 2012
@@ -25,8 +25,8 @@
 package testcase.gui.sc.subtotals;
 
 import static org.junit.Assert.*;
-import static org.openoffice.test.vcl.Tester.*;
 import static org.openoffice.test.common.Testspace.*;
+import static org.openoffice.test.vcl.Tester.*;
 import static testlib.gui.AppUtil.*;
 import static testlib.gui.UIMap.*;
 
@@ -34,9 +34,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openoffice.test.common.Logger;
 
 import testlib.gui.CalcUtil;
-import testlib.gui.Log;
 
 /**
  * 
@@ -45,7 +45,7 @@ import testlib.gui.Log;
 public class SubtotalsFunctions {
 
 	@Rule
-	public Log LOG = new Log();
+	public Logger log = Logger.getLogger(this);
 
 	@Before
 	public void setUp() throws Exception {
@@ -60,187 +60,180 @@ public class SubtotalsFunctions {
 
 	@After
 	public void tearDown() throws Exception {
-		
+
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify Average function in SubTotals
+	 * Just support en-US language Verify Average function in SubTotals
 	 */
 	@Test
 	public void testAverage() {
-		SCSubTotalsGroupByListBox.select(4);	// "Team"
-//		SCCalcSubTotalForColumns.click(10, 25);	// In different platform, can not focus on same checkbox
+		SCSubTotalsGroupByListBox.select(4); // "Team"
+		// SCCalcSubTotalForColumns.click(10, 25); // In different platform, can
+		// not focus on same checkbox
 		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1);	// "Code"
+		SCCalcSubTotalForColumns.check(1); // "Code"
 		sleep(1);
-		SCCalcSubTotolsFuncionList.select(2);	// "Average"
+		SCCalcSubTotolsFuncionList.select(2); // "Average"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "2", "A", "Chcomic" },
-				{ "CS", "30", "5", "A", "Ally" }, { "MS", "10", "1", "A", "Joker" }, { "", "20", "", "A Average", "" }, { "BS", "20", "4", "B", "Elle" },
-				{ "MS", "10", "3", "B", "Kevin" }, { "", "15", "", "B Average", "" }, { "BS", "20", "6", "C", "Sweet" }, { "", "20", "", "C Average", "" },
-				{ "", "18.33333333", "", "Grand Total", "" } }, CalcUtil.getCellTexts("A1:E11"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "2", "A", "Chcomic" }, { "CS", "30", "5", "A", "Ally" },
+				{ "MS", "10", "1", "A", "Joker" }, { "", "20", "", "A Average", "" }, { "BS", "20", "4", "B", "Elle" }, { "MS", "10", "3", "B", "Kevin" },
+				{ "", "15", "", "B Average", "" }, { "BS", "20", "6", "C", "Sweet" }, { "", "20", "", "C Average", "" }, { "", "18.33333333", "", "Grand Total", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify Count Numbers only function in SubTotals
+	 * Just support en-US language Verify Count Numbers only function in
+	 * SubTotals
 	 */
 	@Test
 	public void testCountNumbersOnly() {
-//		SCCalcSubTotalForColumns.click(10, 45);
+		// SCCalcSubTotalForColumns.click(10, 45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
-		SCCalcSubTotolsFuncionList.select(6);	// "Count (numbers only)"
+		SCCalcSubTotalForColumns.check(2); // "No."
+		SCCalcSubTotolsFuncionList.select(6); // "Count (numbers only)"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
-				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS Count", "", "3", "", "" }, { "CS", "30", "5", "A", "Ally" },
-				{ "CS Count", "", "1", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Count", "", "2", "", "" },
-				{ "Grand Total", "", "6", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
+				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Count", "", "3", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Count", "", "1", "", "" },
+				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Count", "", "2", "", "" }, { "Grand Total", "", "6", "", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify Max Numbers function in SubTotals
+	 * Just support en-US language Verify Max Numbers function in SubTotals
 	 */
 	@Test
 	public void testMax() {
-//		SCCalcSubTotalForColumns.click(10, 45);
+		// SCCalcSubTotalForColumns.click(10, 45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
-		SCCalcSubTotolsFuncionList.select(3);	// "Max"
+		SCCalcSubTotalForColumns.check(2); // "No."
+		SCCalcSubTotolsFuncionList.select(3); // "Max"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
-				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS Max", "", "6", "", "" }, { "CS", "30", "5", "A", "Ally" },
-				{ "CS Max", "", "5", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Max", "", "3", "", "" },
-				{ "Grand Total", "", "6", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
+				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Max", "", "6", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Max", "", "5", "", "" },
+				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Max", "", "3", "", "" }, { "Grand Total", "", "6", "", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify Min Numbers function in SubTotals
+	 * Just support en-US language Verify Min Numbers function in SubTotals
 	 */
 	@Test
 	public void testMin() {
-//		SCCalcSubTotalForColumns.click(10, 45);
+		// SCCalcSubTotalForColumns.click(10, 45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
-		SCCalcSubTotolsFuncionList.select(4);	// "Min"
+		SCCalcSubTotalForColumns.check(2); // "No."
+		SCCalcSubTotolsFuncionList.select(4); // "Min"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
-				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS Min", "", "2", "", "" }, { "CS", "30", "5", "A", "Ally" },
-				{ "CS Min", "", "5", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Min", "", "1", "", "" },
-				{ "Grand Total", "", "1", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
+				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Min", "", "2", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Min", "", "5", "", "" },
+				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Min", "", "1", "", "" }, { "Grand Total", "", "1", "", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify Product function in SubTotals
+	 * Just support en-US language Verify Product function in SubTotals
 	 */
 	@Test
 	public void testProduct() {
-//		SCCalcSubTotalForColumns.click(10, 45);
+		// SCCalcSubTotalForColumns.click(10, 45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
-		SCCalcSubTotolsFuncionList.select(5);	// "Product"
+		SCCalcSubTotalForColumns.check(2); // "No."
+		SCCalcSubTotolsFuncionList.select(5); // "Product"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
-				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS Product", "", "48", "", "" }, { "CS", "30", "5", "A", "Ally" },
-				{ "CS Product", "", "5", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Product", "", "3", "", "" },
-				{ "Grand Total", "", "720", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
+				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Product", "", "48", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Product", "", "5", "", "" },
+				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Product", "", "3", "", "" }, { "Grand Total", "", "720", "", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify StDevP (Population) function in SubTotals
+	 * Just support en-US language Verify StDevP (Population) function in
+	 * SubTotals
 	 */
 	@Test
 	public void testStDevPPopulation() {
-//		SCCalcSubTotalForColumns.click(10, 45);
+		// SCCalcSubTotalForColumns.click(10, 45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
-		SCCalcSubTotolsFuncionList.select(8);	// "StDevP (Population)"
+		SCCalcSubTotalForColumns.check(2); // "No."
+		SCCalcSubTotolsFuncionList.select(8); // "StDevP (Population)"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
-				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS StDev", "", "1.63299316", "", "" },
-				{ "CS", "30", "5", "A", "Ally" }, { "CS StDev", "", "0", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" },
-				{ "MS StDev", "", "1", "", "" }, { "Grand Total", "", "1.70782513", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
+				{ "BS", "20", "2", "A", "Chcomic" }, { "BS StDev", "", "1.63299316", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS StDev", "", "0", "", "" },
+				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS StDev", "", "1", "", "" }, { "Grand Total", "", "1.70782513", "", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify sum function in SubTotals
+	 * Just support en-US language Verify sum function in SubTotals
 	 */
 	@Test
 	public void testSum() {
-//		SCCalcSubTotalForColumns.click(10, 45);
+		// SCCalcSubTotalForColumns.click(10, 45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
-		SCCalcSubTotolsFuncionList.select(0);	// "Sum"
+		SCCalcSubTotalForColumns.check(2); // "No."
+		SCCalcSubTotolsFuncionList.select(0); // "Sum"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
-				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS Sum", "", "12", "", "" }, { "CS", "30", "5", "A", "Ally" },
-				{ "CS Sum", "", "5", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Sum", "", "4", "", "" },
-				{ "Grand Total", "", "21", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
+				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Sum", "", "12", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Sum", "", "5", "", "" },
+				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Sum", "", "4", "", "" }, { "Grand Total", "", "21", "", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify Var Sample function in SubTotals
+	 * Just support en-US language Verify Var Sample function in SubTotals
 	 */
 	@Test
 	public void testVarSample() {
-//		SCCalcSubTotalForColumns.click(10, 45);
+		// SCCalcSubTotalForColumns.click(10, 45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
-		SCCalcSubTotolsFuncionList.select(9);	// "Var (Sample)"
+		SCCalcSubTotalForColumns.check(2); // "No."
+		SCCalcSubTotolsFuncionList.select(9); // "Var (Sample)"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
-				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS Var", "", "4", "", "" }, { "CS", "30", "5", "A", "Ally" },
-				{ "CS Var", "", "#DIV/0!", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Var", "", "2", "", "" },
-				{ "Grand Total", "", "3.5", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
+				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Var", "", "4", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Var", "", "#DIV/0!", "", "" },
+				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Var", "", "2", "", "" }, { "Grand Total", "", "3.5", "", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify Don't sort in Sub totals
+	 * Just support en-US language Verify Don't sort in Sub totals
 	 */
 	@Test
 	public void testDoNotSortOption() {
-		SCSubTotalsGroupByListBox.select(4);	// "Team"
-//		SCCalcSubTotalForColumns.click(10, 25);
+		SCSubTotalsGroupByListBox.select(4); // "Team"
+		// SCCalcSubTotalForColumns.click(10, 25);
 		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1);	// "Code"
+		SCCalcSubTotalForColumns.check(1); // "Code"
 		SCSubTotalsOptionsTabPage.select();
 		SCSubtotalsPreSortToGroupCheckBox.uncheck();
 		SCSubTotalsOptionsTabPage.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
-				{ "", "20", "", "B Sum", "" }, { "BS", "20", "6", "C", "Sweet" }, { "", "20", "", "C Sum", "" }, { "BS", "20", "2", "A", "Chcomic" },
-				{ "CS", "30", "5", "A", "Ally" }, { "MS", "10", "1", "A", "Joker" }, { "", "60", "", "A Sum", "" }, { "MS", "10", "3", "B", "Kevin" },
-				{ "", "10", "", "B Sum", "" }, { "", "110", "", "Grand Total", "" } }, CalcUtil.getCellTexts("A1:E12"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "", "20", "", "B Sum", "" },
+				{ "BS", "20", "6", "C", "Sweet" }, { "", "20", "", "C Sum", "" }, { "BS", "20", "2", "A", "Chcomic" }, { "CS", "30", "5", "A", "Ally" },
+				{ "MS", "10", "1", "A", "Joker" }, { "", "60", "", "A Sum", "" }, { "MS", "10", "3", "B", "Kevin" }, { "", "10", "", "B Sum", "" },
+				{ "", "110", "", "Grand Total", "" } }, CalcUtil.getCellTexts("A1:E12"));
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify SubTotals Options default UI
+	 * Just support en-US language Verify SubTotals Options default UI
 	 */
 	@Test
 	public void testDefaultUI() {
@@ -259,100 +252,99 @@ public class SubtotalsFunctions {
 	}
 
 	/**
-	 * Just support en-US language
-	 * Verify Subtotals using all group
+	 * Just support en-US language Verify Subtotals using all group
 	 */
 	@Test
 	public void testUsingAllGroup() {
 		SCSubTotalsGroup1Dialog.select();
-		SCSubTotalsGroupByListBox.select(1);	// "Level"
-//		SCCalcSubTotalForColumns.click(10, 45);
+		SCSubTotalsGroupByListBox.select(1); // "Level"
+		// SCCalcSubTotalForColumns.click(10, 45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
+		SCCalcSubTotalForColumns.check(2); // "No."
 		SCSubTotalsGroup2Dialog.select();
-		SCSubTotalsGroupByListBox.select(4);	// "Team"
-//		SCCalcSubTotalForColumns.click(10, 25);
+		SCSubTotalsGroupByListBox.select(4); // "Team"
+		// SCCalcSubTotalForColumns.click(10, 25);
 		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1);	// "Code"
-		SCCalcSubTotolsFuncionList.select(3);	// "Max"
+		SCCalcSubTotalForColumns.check(1); // "Code"
+		SCCalcSubTotolsFuncionList.select(3); // "Max"
 		SCSubTotalsGroup3Dialog.select();
-		SCSubTotalsGroupByListBox.select(5);	// "Name"
-//		SCCalcSubTotalForColumns.click(10, 25);
+		SCSubTotalsGroupByListBox.select(5); // "Name"
+		// SCCalcSubTotalForColumns.click(10, 25);
 		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1);	// "Code"
+		SCCalcSubTotalForColumns.check(1); // "Code"
 		SCSubTotalsGroup1Dialog.select();
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "2", "A", "Chcomic" },
-				{ "", "20", "", "", "Chcomic Sum" }, { "", "20", "", "A Max", "" }, { "BS", "20", "4", "B", "Elle" }, { "", "20", "", "", "Elle Sum" },
-				{ "", "20", "", "B Max", "" }, { "BS", "20", "6", "C", "Sweet" }, { "", "20", "", "", "Sweet Sum" }, { "", "20", "", "C Max", "" },
-				{ "BS Sum", "", "12", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "", "30", "", "", "Ally Sum" }, { "", "30", "", "A Max", "" },
-				{ "CS Sum", "", "5", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "", "10", "", "", "Joker Sum" }, { "", "10", "", "A Max", "" },
-				{ "MS", "10", "3", "B", "Kevin" }, { "", "10", "", "", "Kevin Sum" }, { "", "10", "", "B Max", "" }, { "MS Sum", "", "4", "", "" },
-				{ "Grand Total", "", "21", "", "" } }, CalcUtil.getCellTexts("A1:E23"));
+		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "2", "A", "Chcomic" }, { "", "20", "", "", "Chcomic Sum" },
+				{ "", "20", "", "A Max", "" }, { "BS", "20", "4", "B", "Elle" }, { "", "20", "", "", "Elle Sum" }, { "", "20", "", "B Max", "" },
+				{ "BS", "20", "6", "C", "Sweet" }, { "", "20", "", "", "Sweet Sum" }, { "", "20", "", "C Max", "" }, { "BS Sum", "", "12", "", "" },
+				{ "CS", "30", "5", "A", "Ally" }, { "", "30", "", "", "Ally Sum" }, { "", "30", "", "A Max", "" }, { "CS Sum", "", "5", "", "" },
+				{ "MS", "10", "1", "A", "Joker" }, { "", "10", "", "", "Joker Sum" }, { "", "10", "", "A Max", "" }, { "MS", "10", "3", "B", "Kevin" },
+				{ "", "10", "", "", "Kevin Sum" }, { "", "10", "", "B Max", "" }, { "MS Sum", "", "4", "", "" }, { "Grand Total", "", "21", "", "" } },
+				CalcUtil.getCellTexts("A1:E23"));
 	}
-	
-	
+
 	/**
-	 * Just support en-US language
-	 * Verify Subtotals_Recalculate and refresh results when data rows deleted.
+	 * Just support en-US language Verify Subtotals_Recalculate and refresh
+	 * results when data rows deleted.
 	 */
 	@Test
 	public void testRecalculateAfterRowDeleted() {
-//		SCCalcSubTotalForColumns.click(10,45);
+		// SCCalcSubTotalForColumns.click(10,45);
 		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2);	// "No."
+		SCCalcSubTotalForColumns.check(2); // "No."
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
-		
+
 		assertArrayEquals("Subtotal table before deleting row", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
 				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS Sum", "", "12", "", "" }, { "CS", "30", "5", "A", "Ally" },
 				{ "CS Sum", "", "5", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Sum", "", "4", "", "" },
 				{ "Grand Total", "", "21", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
-		
+
 		CalcUtil.selectRange("A3:E3");
 		app.dispatch(".uno:DeleteCell");
 		SCDeleteCellsDeleteRowsRadioButton.check();
 		SCDeleteCellsDialog.ok();
 		sleep(1);
-		
+
 		assertArrayEquals("Subtotal table after deleting row", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Sum", "", "6", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Sum", "", "5", "", "" },
-				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Sum", "", "4", "", "" }, { "Grand Total", "", "15", "", "" },
-				{ "", "", "", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
-		
+				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Sum", "", "4", "", "" }, { "Grand Total", "", "15", "", "" }, { "", "", "", "", "" } },
+				CalcUtil.getCellTexts("A1:E11"));
+
 	}
-	
+
 	/**
-	 * Verify Recalculates when source data changed with Average function in SubTotals
+	 * Verify Recalculates when source data changed with Average function in
+	 * SubTotals
 	 */
 	@Test
 	public void testRecalculateWhenDataChanged() {
-		SCSubTotalsGroupByListBox.select(4);	// "Team"
-//		SCCalcSubTotalForColumns.click(10,25);
+		SCSubTotalsGroupByListBox.select(4); // "Team"
+		// SCCalcSubTotalForColumns.click(10,25);
 		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1);	// "Code"
-		SCCalcSubTotolsFuncionList.select(2);	// "Average"
+		SCCalcSubTotalForColumns.check(1); // "Code"
+		SCCalcSubTotolsFuncionList.select(2); // "Average"
 		SCSubTotalsGroup1Dialog.ok();
 		sleep(1);
-		
+
 		CalcUtil.selectRange("B4");
 		typeKeys("40" + "<enter>");
 		sleep(1);
-		assertEquals("30",CalcUtil.getCellText("B5"));
-		assertEquals("23.33333333",CalcUtil.getCellText("B11"));
-		
+		assertEquals("30", CalcUtil.getCellText("B5"));
+		assertEquals("23.33333333", CalcUtil.getCellText("B11"));
+
 		CalcUtil.selectRange("B7");
 		typeKeys("50" + "<enter>");
 		sleep(1);
-		assertEquals("35",CalcUtil.getCellText("B8"));
-		assertEquals("30",CalcUtil.getCellText("B11"));
-		
+		assertEquals("35", CalcUtil.getCellText("B8"));
+		assertEquals("30", CalcUtil.getCellText("B11"));
+
 		CalcUtil.selectRange("B9");
 		typeKeys("30" + "<enter>");
 		sleep(1);
-		assertEquals("30",CalcUtil.getCellText("B10"));
-		assertEquals("31.66666667",CalcUtil.getCellText("B11"));
+		assertEquals("30", CalcUtil.getCellText("B10"));
+		assertEquals("31.66666667", CalcUtil.getCellText("B11"));
 	}
 }

Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java?rev=1378870&r1=1378869&r2=1378870&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java Thu Aug 30 09:27:21 2012
@@ -19,36 +19,30 @@
  * 
  *************************************************************/
 
-
-
 package testcase.gui.sc.validity;
 
+import static org.junit.Assert.*;
 import static testlib.gui.AppUtil.*;
 import static testlib.gui.UIMap.*;
 
 import java.io.File;
 
 import org.junit.After;
-import static org.junit.Assert.*;
-import static org.openoffice.test.vcl.Tester.*;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openoffice.test.common.Logger;
 import org.openoffice.test.vcl.IDList;
 import org.openoffice.test.vcl.widgets.VclMessageBox;
 
-
 import testlib.gui.CalcUtil;
-import testlib.gui.Log;
-
 
 public class ValidityDateSupport1024Columns {
 	private static IDList idList = new IDList(new File("./ids"));
 	public static final VclMessageBox ActiveMsgBox = new VclMessageBox(idList.getId("UID_ACTIVE"), "Message on message box.");
 
 	@Rule
-	public Log LOG = new Log();
+	public Logger log = Logger.getLogger(this);
 
 	@Before
 	public void setUp() throws Exception {
@@ -57,21 +51,22 @@ public class ValidityDateSupport1024Colu
 
 	@After
 	public void tearDown() throws Exception {
-		
+
 	}
 
 	/**
-	 * test Allow Greater than or equal to Date type in Validity, support 1024 columns.
+	 * test Allow Greater than or equal to Date type in Validity, support 1024
+	 * columns.
 	 */
 	@Test
 	public void testValidityDateSupport1024Columns() {
 		app.dispatch("private:factory/scalc");
-		CalcUtil.selectRange("ALM1000:ALO1005");	
+		CalcUtil.selectRange("ALM1000:ALO1005");
 		app.dispatch(".uno:Validation");
 
 		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(3);	// "Date"
-		SC_ValidityDecimalCompareOperator.select(2);	// "greater than"
+		SC_ValidityCriteriaAllowList.select(3); // "Date"
+		SC_ValidityDecimalCompareOperator.select(2); // "greater than"
 		SC_ValiditySourceInput.setText("01/01/08");
 		SC_ValidityErrorAlertTabPage.select();
 		SC_ValidityShowErrorMessage.check();
@@ -82,26 +77,25 @@ public class ValidityDateSupport1024Colu
 		CalcUtil.selectRange("ALM1001");
 		SC_InputBar_Input.activate();
 		typeKeys("02/01/08<enter>");
-		assertEquals("02/01/08",CalcUtil.getCellText("ALM1001"));
+		assertEquals("02/01/08", CalcUtil.getCellText("ALM1001"));
 
 		CalcUtil.selectRange("ALM1002");
 		SC_InputBar_Input.activate();
 		typeKeys("01/02/08<enter>");
-		assertEquals("01/02/08",CalcUtil.getCellText("ALM1002"));
+		assertEquals("01/02/08", CalcUtil.getCellText("ALM1002"));
 
 		CalcUtil.selectRange("ALM1003");
 		SC_InputBar_Input.activate();
 		typeKeys("01/01/08<enter>");
-		assertEquals("Invalid value",ActiveMsgBox.getMessage());
+		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("",CalcUtil.getCellText("ALM1003"));
+		assertEquals("", CalcUtil.getCellText("ALM1003"));
 
 		CalcUtil.selectRange("AML1003");
 		SC_InputBar_Input.activate();
 		typeKeys("12/31/07<enter>");
-		assertEquals("Invalid value",ActiveMsgBox.getMessage());
+		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("",CalcUtil.getCellText("AML1003"));
+		assertEquals("", CalcUtil.getCellText("AML1003"));
 	}
 }
-

Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java?rev=1378870&r1=1378869&r2=1378870&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java Thu Aug 30 09:27:21 2012
@@ -19,25 +19,21 @@
  * 
  *************************************************************/
 
-
-
 package testcase.gui.sc.validity;
 
+import static org.junit.Assert.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-
-import testlib.gui.Log;
-
+import org.openoffice.test.common.Logger;
 
 public class ValidityDialogDefaultValue {
 
 	@Rule
-	public Log LOG = new Log();
+	public Logger log = Logger.getLogger(this);
 
 	@Before
 	public void setUp() throws Exception {
@@ -50,7 +46,7 @@ public class ValidityDialogDefaultValue 
 
 	@After
 	public void tearDown() throws Exception {
-		
+
 	}
 
 	/**
@@ -60,15 +56,15 @@ public class ValidityDialogDefaultValue 
 	public void testValidityUICellRange() {
 
 		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(5);	// "Cell range"
+		SC_ValidityCriteriaAllowList.select(5); // "Cell range"
 
-		assertEquals(true,SC_ValidityAllowBlankCells.isChecked());
-		assertEquals(true,SC_ValidityShowSelectionList.isChecked());
-		assertEquals(false,SC_ValiditySortEntriesAscending.isChecked());
-		assertEquals(true,SC_ValidityAllowBlankCells.isEnabled());
-		assertEquals(true,SC_ValiditySortEntriesAscending.isEnabled());
-		assertEquals(true,SC_ValiditySortEntriesAscending.isEnabled());
-		assertEquals(true,SC_ValiditySourcePicker.isEnabled());
+		assertEquals(true, SC_ValidityAllowBlankCells.isChecked());
+		assertEquals(true, SC_ValidityShowSelectionList.isChecked());
+		assertEquals(false, SC_ValiditySortEntriesAscending.isChecked());
+		assertEquals(true, SC_ValidityAllowBlankCells.isEnabled());
+		assertEquals(true, SC_ValiditySortEntriesAscending.isEnabled());
+		assertEquals(true, SC_ValiditySortEntriesAscending.isEnabled());
+		assertEquals(true, SC_ValiditySourcePicker.isEnabled());
 	}
 
 	/**
@@ -78,15 +74,15 @@ public class ValidityDialogDefaultValue 
 	public void testValidityUIErrorAlert() {
 
 		SC_ValidityErrorAlertTabPage.select();
-		assertEquals(true,SC_ValidityErrorAlertActionList.isEnabled());
-//		assertEquals("Stop",SC_ValidityErrorAlertActionList.getSelText());	// Do not test this. Do it in GVT.
-		assertEquals(true,SC_ValidityErrorMessageTitle.isEnabled());
-		assertEquals("",SC_ValidityErrorMessageTitle.getText());
-		assertEquals(true,SC_ValidityErrorMessage.isEnabled());
-		assertEquals("",SC_ValidityErrorMessage.getText());
-		SC_ValidityErrorAlertActionList.select(3);	// "Macro"
-		assertEquals(true,SC_ValidityErrorBrowseButton.isEnabled());
+		assertEquals(true, SC_ValidityErrorAlertActionList.isEnabled());
+		// assertEquals("Stop",SC_ValidityErrorAlertActionList.getSelText()); //
+		// Do not test this. Do it in GVT.
+		assertEquals(true, SC_ValidityErrorMessageTitle.isEnabled());
+		assertEquals("", SC_ValidityErrorMessageTitle.getText());
+		assertEquals(true, SC_ValidityErrorMessage.isEnabled());
+		assertEquals("", SC_ValidityErrorMessage.getText());
+		SC_ValidityErrorAlertActionList.select(3); // "Macro"
+		assertEquals(true, SC_ValidityErrorBrowseButton.isEnabled());
 	}
 
 }
-



Mime
View raw message