incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1380142 - in /incubator/ooo/trunk/test: testcommon/source/org/openoffice/test/common/ testgui/source/testcase/gui/sc/datapilot/ testgui/source/testcase/gui/sc/filter/ testuno/source/testcase/uno/sc/data/ testuno/source/testcase/uno/sw/field/
Date Mon, 03 Sep 2012 07:06:54 GMT
Author: liuzhe
Date: Mon Sep  3 07:06:53 2012
New Revision: 1380142

URL: http://svn.apache.org/viewvc?rev=1380142&view=rev
Log:
Fix code errors.

Modified:
    incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/FileUtil.java
    incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/datapilot/DataPivotTable.java
    incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/AdvanceFilter.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StandardFilterOption.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StardarFilterTest.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/CheckDateTimeField.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberField.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/SubjectField.java

Modified: incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/FileUtil.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/FileUtil.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/FileUtil.java (original)
+++ incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/common/FileUtil.java Mon Sep  3 07:06:53 2012
@@ -757,7 +757,7 @@ public class FileUtil {
 	
 	public static String getUrl(File file) {
 		try {
-			String url = file.toURL().toString();
+			String url = file.getCanonicalFile().toURL().toString();
 			return url.replace("file:/", "file:///");
 		} catch(Exception e) {
 			

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/datapilot/DataPivotTable.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/datapilot/DataPivotTable.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/datapilot/DataPivotTable.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/datapilot/DataPivotTable.java Mon Sep  3 07:06:53 2012
@@ -34,6 +34,7 @@ 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.Logger;
 import org.openoffice.test.common.SystemUtil;
 
@@ -65,6 +66,7 @@ public class DataPivotTable {
 	 * Verify copy and paste Data Pilot Table
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testCopyPasteDataPilotTable() {
 		// Open the sample file
 		String file = prepareData("source_data01.ods");
@@ -148,6 +150,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testDataPilotAddFieldsAutoUpdate() {
 		// open the sample file Create DataPilotTable and verify the content
 		String file = prepareData("source_data01.ods");
@@ -219,6 +222,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testDataPilotAddFieldsManualUpdate() {
 		// open the sample file Create DataPilotTable and verify the content
 		String file = prepareData("source_data01.ods");
@@ -313,6 +317,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testDataPilotChangeDataFieldOptionAutoUpdate() {
 		// open the sample file Create DataPilotTable and verify the content
 		String file = prepareData("source_data01.ods");
@@ -438,6 +443,7 @@ public class DataPivotTable {
 	 * Verify that Verify the Drag/Move function of Grouped field
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testDragMoveFunctionOfGroupedField() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -519,6 +525,7 @@ public class DataPivotTable {
 	 * source range.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testHideShowPanel() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -613,6 +620,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testMoveFieldInSameAreaManualUpdate() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -716,6 +724,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testMoveFieldToOtherAreaAutoUpdate() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -796,6 +805,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testMoveFieldToOtherAreaDiscardChange() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -885,6 +895,7 @@ public class DataPivotTable {
 	 * DataPilot table exist in the larger range, there will pop a warning.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testMoveTableNarrowSpaceToShowTheTable() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -954,6 +965,7 @@ public class DataPivotTable {
 	 * Verify the data pilot result table refresh after source data changed
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testOneMRowDataPilotRefresh() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -1014,6 +1026,7 @@ public class DataPivotTable {
 	 * on panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testRemoveFieldsDiscardChange() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -1101,6 +1114,7 @@ public class DataPivotTable {
 	 * Verify the Remove function of Grouped field
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testRemoveFunctionOfGroupedField() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -1170,6 +1184,7 @@ public class DataPivotTable {
 	 * on panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testRenameFieldAutoUpdate() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -1285,6 +1300,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testSortFunctionInGroupedField() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -1374,6 +1390,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testSubtotalsFunctionInGroupedField() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
@@ -1518,6 +1535,7 @@ public class DataPivotTable {
 	 * panel.
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
+	@Test
 	public void testTopNFunctionInGroupedField() {
 		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java Mon Sep  3 07:06:53 2012
@@ -32,6 +32,7 @@ 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.Logger;
 
 import testlib.gui.CalcUtil;
@@ -62,6 +63,7 @@ public class Fitler {
 	 * Verify 2+ won't be treated as 2
 	 */
 	@Ignore("Bug 120076")
+	@Test
 	public void testAutoFilterWithPlusSign() {
 		String expect = "2+";
 		CalcUtil.selectRange("A1");

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/AdvanceFilter.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/AdvanceFilter.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/AdvanceFilter.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/AdvanceFilter.java Mon Sep  3 07:06:53 2012
@@ -72,60 +72,44 @@ public class AdvanceFilter {
 	}
 
 	@AfterClass
-	public static void tearDownConnection() throws InterruptedException,
-			Exception {
+	public static void tearDownConnection() throws InterruptedException, Exception {
 
 	}
 
 	@Test
 	public void testStandardFilterForString() throws Exception {
 		// Prepare test data
-		Testspace.prepareData(filename);
-		String sample = Testspace.getPath("output/../data/" + filename);
+		String sample = Testspace.prepareData(filename);
 		// Open document
 		scDocument = SCUtil.openFile(sample, unoApp);
 		// Get cell range
-		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(
-				XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
 		XSpreadsheet currentsheet = SCUtil.getCurrentSheet(scDocument);
 
 		// Get the FilterCrit range and set the filter Critvalue
 		XCellRange FilterCritRange = currentsheet.getCellRangeByName("A15:F16");
-		XCellRangeData FilterCritData = (XCellRangeData) UnoRuntime
-				.queryInterface(XCellRangeData.class, FilterCritRange);
-		Object[][] aCritValues = {
-				{ "Name", "Age", "Weight", "Height", "Score", "Graduate" },
-				{ "", "", ">= 44", "", "", "" } };
+		XCellRangeData FilterCritData = (XCellRangeData) UnoRuntime.queryInterface(XCellRangeData.class, FilterCritRange);
+		Object[][] aCritValues = { { "Name", "Age", "Weight", "Height", "Score", "Graduate" }, { "", "", ">= 44", "", "", "" } };
 		FilterCritData.setDataArray(aCritValues);
 
 		// Filter the date
-		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime
-				.queryInterface(XSheetFilterable.class,
-						xdataRange.getCellRangeByName("A1:F6"));
-
-		XSheetFilterableEx xCriteria = (XSheetFilterableEx) UnoRuntime
-				.queryInterface(XSheetFilterableEx.class,
-						xdataRange.getCellRangeByName("A15:F16"));
-		XSheetFilterDescriptor xFilterDesc = xCriteria
-				.createFilterDescriptorByObject(xFilter);
+		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime.queryInterface(XSheetFilterable.class, xdataRange.getCellRangeByName("A1:F6"));
+
+		XSheetFilterableEx xCriteria = (XSheetFilterableEx) UnoRuntime.queryInterface(XSheetFilterableEx.class, xdataRange.getCellRangeByName("A15:F16"));
+		XSheetFilterDescriptor xFilterDesc = xCriteria.createFilterDescriptorByObject(xFilter);
 		if (xFilterDesc != null)
 			xFilter.filter(xFilterDesc);
 
 		// Verify filter result
-		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("A1:F6"));
+		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		XTableRows Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
 			if (i == 1 | i == 4) {
-				assertFalse("Expect should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertTrue("Expect should be true",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Expect should be true", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 		// Save and reload the document
@@ -134,21 +118,16 @@ public class AdvanceFilter {
 		scDocument = SCUtil.openFile(sample, unoApp);
 
 		// Verify the result agains
-		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class,
-				SCUtil.getCurrentSheet(scDocument));
-		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(
-				XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
+		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
 			if (i == 1 | i == 4) {
-				assertFalse("Expect should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertTrue("Expect should be true",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Expect should be true", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 	}

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StandardFilterOption.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StandardFilterOption.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StandardFilterOption.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StandardFilterOption.java Mon Sep  3 07:06:53 2012
@@ -77,28 +77,22 @@ public class StandardFilterOption {
 	}
 
 	@AfterClass
-	public static void tearDownConnection() throws InterruptedException,
-			Exception {
+	public static void tearDownConnection() throws InterruptedException, Exception {
 
 	}
 
 	@Test
 	public void testStandardFilterForString() throws Exception {
 		// Prepare test data
-		Testspace.prepareData(filename);
-		String sample = Testspace.getPath("output/../data/" + filename);
+		String sample = Testspace.prepareData(filename);
 		// Open document
 		scDocument = SCUtil.openFile(sample, unoApp);
 		// Get cell range
-		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(
-				XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
 
 		// Set filter property and filter the cell range
-		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime
-				.queryInterface(XSheetFilterable.class,
-						xdataRange.getCellRangeByName("A1:F6"));
-		XSheetFilterDescriptor xFilterDesc = xFilter
-				.createFilterDescriptor(true);
+		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime.queryInterface(XSheetFilterable.class, xdataRange.getCellRangeByName("A1:F6"));
+		XSheetFilterDescriptor xFilterDesc = xFilter.createFilterDescriptor(true);
 		TableFilterField[] aFilterFields = new TableFilterField[1];
 		aFilterFields[0] = new TableFilterField();
 		aFilterFields[0].Field = 0;
@@ -106,26 +100,20 @@ public class StandardFilterOption {
 		aFilterFields[0].Operator = FilterOperator.EQUAL;
 		aFilterFields[0].StringValue = "Tom";
 		xFilterDesc.setFilterFields(aFilterFields);
-		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(
-				XPropertySet.class, xFilterDesc);
+		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xFilterDesc);
 		xFilterProp.setPropertyValue("ContainsHeader", new Boolean(true));
 		xFilter.filter(xFilterDesc);
 
 		// Verify filter result
-		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("A1:E6"));
+		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:E6"));
 		XTableRows Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
 			if (i == 0 | i == 5) {
-				assertTrue("Verify row is invisible.",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Verify row is invisible.", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertFalse("Verify row is invisible.",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Verify row is invisible.", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 		// Save and reload the document
@@ -134,21 +122,16 @@ public class StandardFilterOption {
 		scDocument = SCUtil.openFile(sample, unoApp);
 
 		// Verify the result agains
-		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class,
-				SCUtil.getCurrentSheet(scDocument));
-		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(
-				XColumnRowRange.class, xdataRange.getCellRangeByName("A1:E6"));
+		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:E6"));
 		Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
 			if (i == 0 | i == 5) {
-				assertTrue("Verify row is invisible.",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Verify row is invisible.", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertFalse("Verify row is invisible.",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Verify row is invisible.", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 	}
@@ -156,20 +139,15 @@ public class StandardFilterOption {
 	@Test
 	public void testStandardFilterOptionCaseSensitive() throws Exception {
 		// Prepare test data
-		Testspace.prepareData(filename);
-		String sample = Testspace.getPath("output/../data/" + filename);
+		String sample = Testspace.prepareData(filename);
 		// Open document
 		scDocument = SCUtil.openFile(sample, unoApp);
 		// Get cell range
-		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(
-				XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
 
 		// Set filter property and filter the cell range
-		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime
-				.queryInterface(XSheetFilterable.class,
-						xdataRange.getCellRangeByName("A1:F6"));
-		XSheetFilterDescriptor xFilterDesc = xFilter
-				.createFilterDescriptor(true);
+		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime.queryInterface(XSheetFilterable.class, xdataRange.getCellRangeByName("A1:F6"));
+		XSheetFilterDescriptor xFilterDesc = xFilter.createFilterDescriptor(true);
 		TableFilterField[] aFilterFields = new TableFilterField[1];
 		aFilterFields[0] = new TableFilterField();
 		aFilterFields[0].Field = 5;
@@ -177,88 +155,68 @@ public class StandardFilterOption {
 		aFilterFields[0].Operator = FilterOperator.EQUAL;
 		aFilterFields[0].StringValue = "No";
 		xFilterDesc.setFilterFields(aFilterFields);
-		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(
-				XPropertySet.class, xFilterDesc);
+		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xFilterDesc);
 		xFilterProp.setPropertyValue("ContainsHeader", new Boolean(true));
 		xFilterProp.setPropertyValue("IsCaseSensitive", false);
 		xFilter.filter(xFilterDesc);
 
 		// Verify filter result
-		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("A1:F6"));
+		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		XTableRows Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-			if (i == 0|i==1|i==5) {
-				assertTrue("Expect should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			if (i == 0 | i == 1 | i == 5) {
+				assertTrue("Expect should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertFalse("Expect should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
-		
-		//Change to CaseSenstive
+
+		// Change to CaseSenstive
 		xFilterProp.setPropertyValue("IsCaseSensitive", true);
 		xFilter.filter(xFilterDesc);
-		
-		//Verify result
+
+		// Verify result
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-			if (i == 0|i==5) {
-				assertTrue("Expect should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			if (i == 0 | i == 5) {
+				assertTrue("Expect should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertFalse("Expect should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
-		
-		
+
 		// Save and reload the document
 		SCUtil.save(scDocument);
 		SCUtil.closeFile(scDocument);
 		scDocument = SCUtil.openFile(sample, unoApp);
 
 		// Verify the result again
-		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class,
-				SCUtil.getCurrentSheet(scDocument));
-		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(
-				XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
+		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-			if (i == 0|i==5) {
-				assertTrue("Expect should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			if (i == 0 | i == 5) {
+				assertTrue("Expect should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertFalse("Expect should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 	}
 
 	@Test
 	public void testStandardFilterOptionContainsHeader() throws Exception {
 		// Prepare test data
-		Testspace.prepareData(filename);
-		String sample = Testspace.getPath("output/../data/" + filename);
+		String sample = Testspace.prepareData(filename);
 		// Open document
 		scDocument = SCUtil.openFile(sample, unoApp);
 		// Get cell range
-		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(
-				XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
 
 		// Set filter property and filter the cell range
-		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime
-				.queryInterface(XSheetFilterable.class,
-						xdataRange.getCellRangeByName("A1:F6"));
-		XSheetFilterDescriptor xFilterDesc = xFilter
-				.createFilterDescriptor(true);
+		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime.queryInterface(XSheetFilterable.class, xdataRange.getCellRangeByName("A1:F6"));
+		XSheetFilterDescriptor xFilterDesc = xFilter.createFilterDescriptor(true);
 		TableFilterField[] aFilterFields = new TableFilterField[1];
 		aFilterFields[0] = new TableFilterField();
 		aFilterFields[0].Field = 2;
@@ -266,66 +224,52 @@ public class StandardFilterOption {
 		aFilterFields[0].Operator = FilterOperator.LESS;
 		aFilterFields[0].NumericValue = 44;
 		xFilterDesc.setFilterFields(aFilterFields);
-		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(
-				XPropertySet.class, xFilterDesc);
+		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xFilterDesc);
 		xFilterProp.setPropertyValue("ContainsHeader", new Boolean(true));
 		xFilter.filter(xFilterDesc);
 
 		// Verify filter result
-		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("A1:E6"));
+		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:E6"));
 		XTableRows Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
 			if (i == 0 | i == 1 | i == 4) {
-				assertTrue("Expect result should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Expect result should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertFalse("Expect result should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Expect result should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
-		
-		//Change to not contain header
+
+		// Change to not contain header
 		xFilterProp.setPropertyValue("ContainsHeader", new Boolean(false));
 		xFilter.filter(xFilterDesc);
-		
-		//Verify result
+
+		// Verify result
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
 			if (i == 1 | i == 4) {
-				assertTrue("Expect result should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Expect result should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertFalse("Expect result should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Expect result should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
-		
+
 		// Save the document
 		SCUtil.save(scDocument);
 		SCUtil.closeFile(scDocument);
 		scDocument = SCUtil.openFile(sample, unoApp);
 
 		// Verify filter result again
-		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class,
-				SCUtil.getCurrentSheet(scDocument));
-		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(
-				XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
+		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
 			if (i == 1 | i == 4) {
-				assertTrue("Expect result should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Expect result should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertFalse("Expect result should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Expect result should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 	}
@@ -333,29 +277,23 @@ public class StandardFilterOption {
 	@Test
 	public void testStandardFilterOptionCopyOutput() throws Exception {
 		// Prepare test data
-		Testspace.prepareData(filename);
-		String sample = Testspace.getPath("output/../data/" + filename);
+		String sample = Testspace.prepareData(filename);
 		// Open document
 		scDocument = SCUtil.openFile(sample, unoApp);
 		// Get cell range
-		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(
-				XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
 		XSpreadsheet currentSheet = SCUtil.getCurrentSheet(scDocument);
-		//Get the value before filter
-		String[][] souce =SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 5);
-		
-		//Copy to cell postion
+		// Get the value before filter
+		String[][] souce = SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 5);
+
+		// Copy to cell postion
 		XCell cell = currentSheet.getCellByPosition(7, 7);
-		XCellAddressable xCellAddr = (XCellAddressable)
-			     UnoRuntime.queryInterface(XCellAddressable.class, cell);
-			 CellAddress copytoAddress = xCellAddr.getCellAddress();
-		
+		XCellAddressable xCellAddr = (XCellAddressable) UnoRuntime.queryInterface(XCellAddressable.class, cell);
+		CellAddress copytoAddress = xCellAddr.getCellAddress();
+
 		// Set filter property and filter the cell range
-		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime
-				.queryInterface(XSheetFilterable.class,
-						xdataRange.getCellRangeByName("A1:F6"));
-		XSheetFilterDescriptor xFilterDesc = xFilter
-				.createFilterDescriptor(true);
+		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime.queryInterface(XSheetFilterable.class, xdataRange.getCellRangeByName("A1:F6"));
+		XSheetFilterDescriptor xFilterDesc = xFilter.createFilterDescriptor(true);
 		TableFilterField[] aFilterFields = new TableFilterField[1];
 		aFilterFields[0] = new TableFilterField();
 		aFilterFields[0].Field = 3;
@@ -363,113 +301,90 @@ public class StandardFilterOption {
 		aFilterFields[0].Operator = FilterOperator.GREATER;
 		aFilterFields[0].NumericValue = 155;
 		xFilterDesc.setFilterFields(aFilterFields);
-		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(
-				XPropertySet.class, xFilterDesc);
+		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xFilterDesc);
 		xFilterProp.setPropertyValue("ContainsHeader", new Boolean(true));
-		xFilterProp.setPropertyValue("CopyOutputData",new Boolean(true));
-		xFilterProp.setPropertyValue("OutputPosition",copytoAddress);
+		xFilterProp.setPropertyValue("CopyOutputData", new Boolean(true));
+		xFilterProp.setPropertyValue("OutputPosition", copytoAddress);
 		xFilter.filter(xFilterDesc);
 
 		// Verify source range not changed
-		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("A1:F6"));
+		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		XTableRows Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-				assertTrue("Expect should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			assertTrue("Expect should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
-		
-		//Get the data after filter
+
+		// Get the data after filter
 		String[][] dataafterFilter = SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 5);
-		assertArrayEquals(souce,dataafterFilter);
+		assertArrayEquals(souce, dataafterFilter);
 
-		//Get the copyto filter result, verify it
-		ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("H8:M10"));
+		// Get the copyto filter result, verify it
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("H8:M10"));
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-				assertTrue("Expect should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
-		}
-		//Verify the first filter line data
-		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 0),SCUtil.getTextFromCellRange(currentSheet, 7, 7, 12, 7));
-		
-		//Verify the Second filter line data
-		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 1, 5, 1),SCUtil.getTextFromCellRange(currentSheet, 7, 8, 12, 8));
-		
-		//Verify the Last filter line data
-		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 4, 5, 4),SCUtil.getTextFromCellRange(currentSheet, 7, 9, 12, 9));
-		
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			assertTrue("Expect should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
+		}
+		// Verify the first filter line data
+		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 0), SCUtil.getTextFromCellRange(currentSheet, 7, 7, 12, 7));
+
+		// Verify the Second filter line data
+		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 1, 5, 1), SCUtil.getTextFromCellRange(currentSheet, 7, 8, 12, 8));
+
+		// Verify the Last filter line data
+		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 4, 5, 4), SCUtil.getTextFromCellRange(currentSheet, 7, 9, 12, 9));
+
 		// Save the document
 		SCUtil.save(scDocument);
 		SCUtil.closeFile(scDocument);
 		scDocument = SCUtil.openFile(sample, unoApp);
 
 		// Verify filter result again
-		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class,
-				SCUtil.getCurrentSheet(scDocument));
-		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(
-				XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
+		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-				assertTrue("Expect should be true",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			assertTrue("Expect should be true", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
-		
-		//Get the data after filter
+
+		// Get the data after filter
 		currentSheet = SCUtil.getCurrentSheet(scDocument);
 		dataafterFilter = SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 5);
-		assertArrayEquals(souce,dataafterFilter);
-		
-		
-		//Get the copyto filter result, verify it
-		ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("H8:M10"));
+		assertArrayEquals(souce, dataafterFilter);
+
+		// Get the copyto filter result, verify it
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("H8:M10"));
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-				assertTrue("Expect should be True",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
-		}
-		//Verify the first filter line data
-		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 0),SCUtil.getTextFromCellRange(currentSheet, 7, 7, 12, 7));
-		
-		//Verify the Second filter line data
-		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 1, 5, 1),SCUtil.getTextFromCellRange(currentSheet, 7, 8, 12, 8));
-		
-		//Verify the Last filter line data
-		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 4, 5, 4),SCUtil.getTextFromCellRange(currentSheet, 7, 9, 12, 9));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			assertTrue("Expect should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
+		}
+		// Verify the first filter line data
+		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 0, 5, 0), SCUtil.getTextFromCellRange(currentSheet, 7, 7, 12, 7));
+
+		// Verify the Second filter line data
+		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 1, 5, 1), SCUtil.getTextFromCellRange(currentSheet, 7, 8, 12, 8));
+
+		// Verify the Last filter line data
+		assertArrayEquals(SCUtil.getTextFromCellRange(currentSheet, 0, 4, 5, 4), SCUtil.getTextFromCellRange(currentSheet, 7, 9, 12, 9));
 	}
-	
+
 	@Test
 	public void testStandardFilterOptionSkipDuplicates() throws Exception {
 		// Prepare test data
-		Testspace.prepareData(filename);
-		String sample = Testspace.getPath("output/../data/" + filename);
+		String sample = Testspace.prepareData(filename);
 		// Open document
 		scDocument = SCUtil.openFile(sample, unoApp);
 		// Get cell range
-		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(
-				XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
 
 		// Set filter property and filter the cell range
-		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime
-				.queryInterface(XSheetFilterable.class,
-						xdataRange.getCellRangeByName("A1:E6"));
-		XSheetFilterDescriptor xFilterDesc = xFilter
-				.createFilterDescriptor(true);
+		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime.queryInterface(XSheetFilterable.class, xdataRange.getCellRangeByName("A1:E6"));
+		XSheetFilterDescriptor xFilterDesc = xFilter.createFilterDescriptor(true);
 		TableFilterField[] aFilterFields = new TableFilterField[1];
 		aFilterFields[0] = new TableFilterField();
 		aFilterFields[0].Field = 3;
@@ -477,92 +392,71 @@ public class StandardFilterOption {
 		aFilterFields[0].Operator = FilterOperator.GREATER_EQUAL;
 		aFilterFields[0].NumericValue = 155;
 		xFilterDesc.setFilterFields(aFilterFields);
-		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(
-				XPropertySet.class, xFilterDesc);
+		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xFilterDesc);
 		xFilterProp.setPropertyValue("ContainsHeader", new Boolean(true));
 		xFilterProp.setPropertyValue("SkipDuplicates", new Boolean(true));
 		xFilter.filter(xFilterDesc);
 
 		// Verify filter result
-		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("A1:E6"));
+		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:E6"));
 		XTableRows Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
 			if (i == 2) {
-				assertFalse("Verify row is invisible.",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertFalse("Verify row is invisible.", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertTrue("Verify row is invisible.",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Verify row is invisible.", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
-		
-		//Change to skip Dulicates
+
+		// Change to skip Dulicates
 		xFilterProp.setPropertyValue("SkipDuplicates", new Boolean(false));
 		xFilter.filter(xFilterDesc);
-		
+
 		// Verify filter result
-				ColRowRange = (XColumnRowRange) UnoRuntime
-						.queryInterface(XColumnRowRange.class,
-								xdataRange.getCellRangeByName("A1:E6"));
-				Rows = ColRowRange.getRows();
-				for (int i = 0; i < Rows.getCount(); i++) {
-					Object aRowObj = Rows.getByIndex(i);
-					XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-							XPropertySet.class, aRowObj);
-					if (i == 2|i==6) {
-						assertFalse("Expect should be false",
-								(Boolean) PropSet.getPropertyValue("IsVisible"));
-					} else
-						assertTrue("Expect should be True",
-								(Boolean) PropSet.getPropertyValue("IsVisible"));
-				}
-		
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:E6"));
+		Rows = ColRowRange.getRows();
+		for (int i = 0; i < Rows.getCount(); i++) {
+			Object aRowObj = Rows.getByIndex(i);
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			if (i == 2 | i == 6) {
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
+			} else
+				assertTrue("Expect should be True", (Boolean) PropSet.getPropertyValue("IsVisible"));
+		}
+
 		// Save the document
 		SCUtil.save(scDocument);
 		SCUtil.closeFile(scDocument);
 		scDocument = SCUtil.openFile(sample, unoApp);
 
 		// Verify filter result again
-		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class,
-				SCUtil.getCurrentSheet(scDocument));
-		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(
-				XColumnRowRange.class, xdataRange.getCellRangeByName("A1:E6"));
+		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:E6"));
 		Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-			if (i == 2|i==6 ) {
-				assertFalse("Expect should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			if (i == 2 | i == 6) {
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertTrue("Expect should be true",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Expect should be true", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 	}
-	
+
 	@Test
 	public void testStandardFilterOptionUseRegularExpressions() throws Exception {
 		// Prepare test data
-		Testspace.prepareData(filename);
-		String sample = Testspace.getPath("output/../data/" + filename);
+		String sample = Testspace.prepareData(filename);
 		// Open document
 		scDocument = SCUtil.openFile(sample, unoApp);
 		// Get cell range
-		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(
-				XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
 
 		// Set filter property and filter the cell range
-		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime
-				.queryInterface(XSheetFilterable.class,
-						xdataRange.getCellRangeByName("A1:F6"));
-		XSheetFilterDescriptor xFilterDesc = xFilter
-				.createFilterDescriptor(true);
+		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime.queryInterface(XSheetFilterable.class, xdataRange.getCellRangeByName("A1:F6"));
+		XSheetFilterDescriptor xFilterDesc = xFilter.createFilterDescriptor(true);
 		TableFilterField[] aFilterFields = new TableFilterField[1];
 		aFilterFields[0] = new TableFilterField();
 		aFilterFields[0].Field = 0;
@@ -570,27 +464,21 @@ public class StandardFilterOption {
 		aFilterFields[0].Operator = FilterOperator.EQUAL;
 		aFilterFields[0].StringValue = "^.{3}$";
 		xFilterDesc.setFilterFields(aFilterFields);
-		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(
-				XPropertySet.class, xFilterDesc);
+		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xFilterDesc);
 		xFilterProp.setPropertyValue("ContainsHeader", new Boolean(true));
 		xFilterProp.setPropertyValue("UseRegularExpressions", new Boolean(true));
 		xFilter.filter(xFilterDesc);
-		
+
 		// Verify filter result
-		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("A1:F6"));
+		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		XTableRows Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-			if (i==2|i==4) {
-				assertFalse("Expect should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			if (i == 2 | i == 4) {
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertTrue("Expect should be true",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Expect should be true", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 		// Save the document
@@ -599,21 +487,16 @@ public class StandardFilterOption {
 		scDocument = SCUtil.openFile(sample, unoApp);
 
 		// Verify filter result again
-		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class,
-				SCUtil.getCurrentSheet(scDocument));
-		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(
-				XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
+		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount(); i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-			if (i==2|i==4 ) {
-				assertFalse("Expect should be false",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			if (i == 2 | i == 4) {
+				assertFalse("Expect should be false", (Boolean) PropSet.getPropertyValue("IsVisible"));
 			} else
-				assertTrue("Expect should be true",
-						(Boolean) PropSet.getPropertyValue("IsVisible"));
+				assertTrue("Expect should be true", (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 	}

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StardarFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StardarFilterTest.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StardarFilterTest.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sc/data/StardarFilterTest.java Mon Sep  3 07:06:53 2012
@@ -19,10 +19,12 @@
  * 
  *************************************************************/
 package testcase.uno.sc.data;
+
 import static org.junit.Assert.*;
 
 import java.util.Arrays;
 import java.util.Collection;
+
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -33,7 +35,9 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.openoffice.test.common.Testspace;
 import org.openoffice.test.uno.UnoApp;
+
 import testlib.uno.SCUtil;
+
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XComponent;
 import com.sun.star.sheet.FilterOperator;
@@ -47,7 +51,6 @@ import com.sun.star.table.XTableRows;
 import com.sun.star.uno.Enum;
 import com.sun.star.uno.UnoRuntime;
 
-
 @RunWith(value = Parameterized.class)
 public class StardarFilterTest {
 	private static final UnoApp app = new UnoApp();
@@ -59,39 +62,28 @@ public class StardarFilterTest {
 	private int column;
 	private boolean[] rowshow;
 	private int value;
-	
+
 	@Parameters
 	public static Collection<Object[]> data() throws Exception {
-		boolean[] rowshow1 ={true,true,false,true,false,false};
-		boolean[] rowshow2 ={true,true,true,true,true,false};
-		boolean[] rowshow3 ={true,false,false,true,false,false};
-		boolean[] rowshow4 ={true,false,true,true,false,false};
-		boolean[] rowshow5 ={true,false,false,false,false,true};
-		boolean[] rowshow6 ={true,false,true,true,false,true};
-		boolean[] rowshow7 ={true,false,true,false,false,false};
-		boolean[] rowshow8 ={true,false,true,true,false,true};
-		boolean[] rowshow9 ={true,true,true,false,true,true};
-		boolean[] rowshow10 ={true,true,false,false,true,true};
-		boolean[] rowshow11 ={true,true,false,false,false,false};
-		boolean[] rowshow12 ={true,true,true,true,false,false};
-		
-		return Arrays.asList(new Object[][] {
-				{FilterOperator.BOTTOM_PERCENT, 1, 30,rowshow1},
-				{FilterOperator.BOTTOM_VALUES, 2, 4,rowshow2},
-				{FilterOperator.EMPTY, 5,1 ,rowshow3},
-				{FilterOperator.EQUAL,2,44,rowshow4},
-				{FilterOperator.GREATER, 2,44,rowshow5},
-				{FilterOperator.GREATER_EQUAL, 2,44,rowshow6},
-				{FilterOperator.LESS, 3,155,rowshow7},
-				{FilterOperator.LESS_EQUAL,3, 155,rowshow8},
-				{FilterOperator.NOT_EMPTY,5,44, rowshow9},
-				{FilterOperator.NOT_EQUAL,4, 85,rowshow10},
-				{FilterOperator.TOP_PERCENT,4, 30,rowshow11},
-				{FilterOperator.TOP_VALUES, 4,3,rowshow12},
-		});
-	    }  
-		
-	
+		boolean[] rowshow1 = { true, true, false, true, false, false };
+		boolean[] rowshow2 = { true, true, true, true, true, false };
+		boolean[] rowshow3 = { true, false, false, true, false, false };
+		boolean[] rowshow4 = { true, false, true, true, false, false };
+		boolean[] rowshow5 = { true, false, false, false, false, true };
+		boolean[] rowshow6 = { true, false, true, true, false, true };
+		boolean[] rowshow7 = { true, false, true, false, false, false };
+		boolean[] rowshow8 = { true, false, true, true, false, true };
+		boolean[] rowshow9 = { true, true, true, false, true, true };
+		boolean[] rowshow10 = { true, true, false, false, true, true };
+		boolean[] rowshow11 = { true, true, false, false, false, false };
+		boolean[] rowshow12 = { true, true, true, true, false, false };
+
+		return Arrays.asList(new Object[][] { { FilterOperator.BOTTOM_PERCENT, 1, 30, rowshow1 }, { FilterOperator.BOTTOM_VALUES, 2, 4, rowshow2 },
+				{ FilterOperator.EMPTY, 5, 1, rowshow3 }, { FilterOperator.EQUAL, 2, 44, rowshow4 }, { FilterOperator.GREATER, 2, 44, rowshow5 },
+				{ FilterOperator.GREATER_EQUAL, 2, 44, rowshow6 }, { FilterOperator.LESS, 3, 155, rowshow7 }, { FilterOperator.LESS_EQUAL, 3, 155, rowshow8 },
+				{ FilterOperator.NOT_EMPTY, 5, 44, rowshow9 }, { FilterOperator.NOT_EQUAL, 4, 85, rowshow10 }, { FilterOperator.TOP_PERCENT, 4, 30, rowshow11 },
+				{ FilterOperator.TOP_VALUES, 4, 3, rowshow12 }, });
+	}
 
 	@Before
 	public void setUpDocument() throws Exception {
@@ -111,37 +103,30 @@ public class StardarFilterTest {
 	}
 
 	@AfterClass
-	public static void tearDownConnection() throws InterruptedException,
-			Exception {
+	public static void tearDownConnection() throws InterruptedException, Exception {
 
 	}
 
-	public StardarFilterTest(Enum operator, int column,int value, boolean[] rowshow) {
+	public StardarFilterTest(Enum operator, int column, int value, boolean[] rowshow) {
 		this.operator = operator;
 		this.column = column;
 		this.rowshow = rowshow;
 		this.value = value;
 	}
-	
+
 	@Test
 	public void testStandardFilter() throws Exception {
-		// Prepare test data
-		Testspace.prepareData(filename);
-		String sample = Testspace.getPath("output/../data/" + filename);
-		
+		String sample = Testspace.prepareData(filename);
+
 		// Open document
 		scDocument = SCUtil.openFile(sample, unoApp);
-		
+
 		// Get cell range
-		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(
-				XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		XCellRange xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
 
 		// Set filter property and filter the cell range
-		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime
-				.queryInterface(XSheetFilterable.class,
-						xdataRange.getCellRangeByName("A1:F6"));
-		XSheetFilterDescriptor xFilterDesc = xFilter
-				.createFilterDescriptor(true);
+		XSheetFilterable xFilter = (XSheetFilterable) UnoRuntime.queryInterface(XSheetFilterable.class, xdataRange.getCellRangeByName("A1:F6"));
+		XSheetFilterDescriptor xFilterDesc = xFilter.createFilterDescriptor(true);
 		TableFilterField[] aFilterFields = new TableFilterField[1];
 		aFilterFields[0] = new TableFilterField();
 		aFilterFields[0].Field = column;
@@ -149,21 +134,17 @@ public class StardarFilterTest {
 		aFilterFields[0].Operator = (FilterOperator) operator;
 		aFilterFields[0].NumericValue = value;
 		xFilterDesc.setFilterFields(aFilterFields);
-		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(
-				XPropertySet.class, xFilterDesc);
+		XPropertySet xFilterProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xFilterDesc);
 		xFilterProp.setPropertyValue("ContainsHeader", new Boolean(true));
 		xFilter.filter(xFilterDesc);
-		
+
 		// Verify filter result
-		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime
-				.queryInterface(XColumnRowRange.class,
-						xdataRange.getCellRangeByName("A1:F6"));
+		XColumnRowRange ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		XTableRows Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-			assertEquals(rowshow[i],(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			assertEquals(rowshow[i], (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 
 		// Save and reload the document
@@ -172,16 +153,13 @@ public class StardarFilterTest {
 		scDocument = SCUtil.openFile(sample, unoApp);
 
 		// Verify the result agains
-		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class,
-				SCUtil.getCurrentSheet(scDocument));
-		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(
-				XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
+		xdataRange = (XCellRange) UnoRuntime.queryInterface(XCellRange.class, SCUtil.getCurrentSheet(scDocument));
+		ColRowRange = (XColumnRowRange) UnoRuntime.queryInterface(XColumnRowRange.class, xdataRange.getCellRangeByName("A1:F6"));
 		Rows = ColRowRange.getRows();
 		for (int i = 0; i < Rows.getCount() - 1; i++) {
 			Object aRowObj = Rows.getByIndex(i);
-			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(
-					XPropertySet.class, aRowObj);
-			assertEquals(rowshow[i],(Boolean) PropSet.getPropertyValue("IsVisible"));
+			XPropertySet PropSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, aRowObj);
+			assertEquals(rowshow[i], (Boolean) PropSet.getPropertyValue("IsVisible"));
 		}
 		SCUtil.save(scDocument);
 	}

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/CheckDateTimeField.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/CheckDateTimeField.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/CheckDateTimeField.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/CheckDateTimeField.java Mon Sep  3 07:06:53 2012
@@ -54,7 +54,7 @@ public class CheckDateTimeField {
 	
 
 	
-	private String tempPath = "testcase/uno/sw/temp/" ;
+	private String tempPath = "uno/sw/temp/" ;
 	private String tempFileName =  String.valueOf(System.currentTimeMillis());
 	private static final UnoApp app = new UnoApp();
 	

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.java Mon Sep  3 07:06:53 2012
@@ -48,11 +48,11 @@ public class PageCountField {
 	private static final UnoApp app = new UnoApp();
 	private static XTextDocument odtDocument = null;
 	private static XTextDocument docDocument = null;
-	private  static String odtSample = "testcase/uno/sw/field/PageCountField.odt";
-	private static String docSample = "testcase/uno/sw/field/PageCountField.doc";
+	private  static String odtSample = "uno/sw/field/PageCountField.odt";
+	private static String docSample = "uno/sw/field/PageCountField.doc";
 	
-	private  static String odtSaveAsDocSample = "testcase/uno/sw/field/PageCountFieldNewSave.doc";
-	private static String docSaveAsODTSample = "testcase/uno/sw/field/PageCountFieldNewSave.odt";
+	private  static String odtSaveAsDocSample = "uno/sw/field/PageCountFieldNewSave.doc";
+	private static String docSaveAsODTSample = "uno/sw/field/PageCountFieldNewSave.odt";
 
 	@Before
 	public void setUpDocument() throws Exception {

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberField.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberField.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberField.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberField.java Mon Sep  3 07:06:53 2012
@@ -48,11 +48,11 @@ public class PageNumberField {
 	private static final UnoApp app = new UnoApp();
 	private static XTextDocument odtDocument = null;
 	private static XTextDocument docDocument = null;
-	private  static String odtSample = "testcase/uno/sw/field/PageNumberFieldTest.odt";
-	private static String docSample = "testcase/uno/sw/field/PageNumberFieldTest.doc";
+	private  static String odtSample = "uno/sw/field/PageNumberFieldTest.odt";
+	private static String docSample = "uno/sw/field/PageNumberFieldTest.doc";
 	
-	private  static String odtSaveAsDocSample = "testcase/uno/sw/field/PageNumberFieldTest_1.doc";
-	private static String docSaveAsODTSample = "testcase/uno/sw/field/PageNumberFieldTest_1.odt";
+	private  static String odtSaveAsDocSample = "uno/sw/field/PageNumberFieldTest_1.doc";
+	private static String docSaveAsODTSample = "uno/sw/field/PageNumberFieldTest_1.odt";
 	
 	@Before
 	public void setUpDocument() throws Exception {

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/SubjectField.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/SubjectField.java?rev=1380142&r1=1380141&r2=1380142&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/SubjectField.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/SubjectField.java Mon Sep  3 07:06:53 2012
@@ -45,11 +45,11 @@ public class SubjectField {
 	private static final UnoApp app = new UnoApp();
 	private static XTextDocument odtDocument = null;
 	private static XTextDocument docDocument = null;
-	private  static String odtSample = "testcase/uno/sw/field/SubjectField.odt";
-	private static String docSample = "testcase/uno/sw/field/Test_Sample.doc";
+	private  static String odtSample = "uno/sw/field/SubjectField.odt";
+	private static String docSample = "uno/sw/field/Test_Sample.doc";
 	
-	private  static String odtSaveAsDocSample = "testcase/uno/sw/field/odtSaveAsDOC.doc";
-	private static String docSaveAsODTSample = "testcase/uno/sw/field/docSaveAsODT.odt";
+	private  static String odtSaveAsDocSample = "uno/sw/field/odtSaveAsDOC.doc";
+	private static String docSaveAsODTSample = "uno/sw/field/docSaveAsODT.odt";
 
 	@Before
 	public void setUpDocument() throws Exception {



Mime
View raw message