incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1380112 - in /incubator/ooo/trunk/test: ./ testgui/ testgui/data/ testgui/data/image/ testgui/source/testcase/gui/bvt/ testgui/source/testcase/gui/svt/ testuno/data/uno/ testuno/data/uno/sw/ testuno/data/uno/sw/field/ testuno/source/testca...
Date Mon, 03 Sep 2012 02:16:56 GMT
Author: liuzhe
Date: Mon Sep  3 02:16:54 2012
New Revision: 1380112

URL: http://svn.apache.org/viewvc?rev=1380112&view=rev
Log:
Move all data files from source to data dir. Make eclipse to avoid copy these files during compiling.

Added:
    incubator/ooo/trunk/test/testgui/data/image/
    incubator/ooo/trunk/test/testgui/data/image/black_256x256.bmp   (with props)
    incubator/ooo/trunk/test/testgui/data/image/black_256x256.jpg   (with props)
    incubator/ooo/trunk/test/testgui/data/image/black_256x256.png   (with props)
    incubator/ooo/trunk/test/testgui/data/image/blue_256x256.bmp   (with props)
    incubator/ooo/trunk/test/testgui/data/image/blue_256x256.jpg   (with props)
    incubator/ooo/trunk/test/testgui/data/image/blue_256x256.png   (with props)
    incubator/ooo/trunk/test/testgui/data/image/green_256x256.bmp   (with props)
    incubator/ooo/trunk/test/testgui/data/image/green_256x256.jpg   (with props)
    incubator/ooo/trunk/test/testgui/data/image/green_256x256.png   (with props)
    incubator/ooo/trunk/test/testgui/data/image/green_64x64.bmp
      - copied unchanged from r1380105, incubator/ooo/trunk/test/testgui/data/pure_green_64x64.bmp
    incubator/ooo/trunk/test/testgui/data/image/green_64x64.png
      - copied unchanged from r1380105, incubator/ooo/trunk/test/testgui/data/pure_green_64x64.png
    incubator/ooo/trunk/test/testgui/data/image/red_256x256.bmp   (with props)
    incubator/ooo/trunk/test/testgui/data/image/red_256x256.jpg   (with props)
    incubator/ooo/trunk/test/testgui/data/image/red_256x256.png   (with props)
    incubator/ooo/trunk/test/testgui/data/image/red_64x64.bmp
      - copied unchanged from r1380105, incubator/ooo/trunk/test/testgui/data/pure_red_64x64.bmp
    incubator/ooo/trunk/test/testgui/data/image/red_64x64.png
      - copied unchanged from r1380105, incubator/ooo/trunk/test/testgui/data/pure_red_64x64.png
    incubator/ooo/trunk/test/testuno/data/uno/
    incubator/ooo/trunk/test/testuno/data/uno/Desert.jpg
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/paragraph/Desert.jpg
    incubator/ooo/trunk/test/testuno/data/uno/sw/
    incubator/ooo/trunk/test/testuno/data/uno/sw/CheckCrossReferences.odt
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/CheckCrossReferences.odt
    incubator/ooo/trunk/test/testuno/data/uno/sw/CheckFlies.odt
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/CheckFlies.odt
    incubator/ooo/trunk/test/testuno/data/uno/sw/DocumentTest.odt
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.odt
    incubator/ooo/trunk/test/testuno/data/uno/sw/DocumentTest.ott
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.ott
    incubator/ooo/trunk/test/testuno/data/uno/sw/field/
    incubator/ooo/trunk/test/testuno/data/uno/sw/field/PageCountField.doc
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.doc
    incubator/ooo/trunk/test/testuno/data/uno/sw/field/PageCountField.odt
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.odt
    incubator/ooo/trunk/test/testuno/data/uno/sw/field/PageNumberFieldTest.doc
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberFieldTest.doc
    incubator/ooo/trunk/test/testuno/data/uno/sw/field/PageNumberFieldTest.odt
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberFieldTest.odt
    incubator/ooo/trunk/test/testuno/data/uno/sw/field/SubjectField.odt
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/SubjectField.odt
    incubator/ooo/trunk/test/testuno/data/uno/sw/field/Test_Sample.doc
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/Test_Sample.doc
    incubator/ooo/trunk/test/testuno/data/uno/sw/field/Test_Sample.odt
      - copied unchanged from r1379285, incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/Test_Sample.odt
Removed:
    incubator/ooo/trunk/test/testgui/data/pure_green_64x64.bmp
    incubator/ooo/trunk/test/testgui/data/pure_green_64x64.png
    incubator/ooo/trunk/test/testgui/data/pure_red_64x64.bmp
    incubator/ooo/trunk/test/testgui/data/pure_red_64x64.png
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/CheckCrossReferences.odt
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/CheckFlies.odt
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.odt
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.ott
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.doc
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageCountField.odt
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberFieldTest.doc
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/PageNumberFieldTest.odt
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/SubjectField.odt
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/Test_Sample.doc
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/field/Test_Sample.odt
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/paragraph/Desert.jpg
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/puretext/Desert.jpg
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/table/Desert.jpg
Modified:
    incubator/ooo/trunk/test/build.xml
    incubator/ooo/trunk/test/testgui/.classpath
    incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/BasicFunctionTest.java
    incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/FileTypeTest.java
    incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/crossreference/CheckCrossReferences.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/frame/CheckFrames.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/paragraph/ParagraphBackGraphic.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/puretext/CharacterHyperlink.java
    incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/table/TableBasic.java

Modified: incubator/ooo/trunk/test/build.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/build.xml?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/build.xml (original)
+++ incubator/ooo/trunk/test/build.xml Mon Sep  3 02:16:54 2012
@@ -56,7 +56,7 @@
 	</target>
 
 	<target name="testcommon.compile" depends="testcommon.init, prepare.junit">
-		<javac destdir="${classes}" debug="on" source="1.6" includeantruntime="false">
+		<javac destdir="${classes}" debug="on" source="1.6" encoding="utf-8" includeantruntime="false">
 			<src path="testcommon/source"/>
 			<classpath>
 				<path refid="junit.classpath"/>
@@ -71,17 +71,11 @@
 				<exclude name="**/*.java" />
 			</fileset>
 		</copy>
-		<copy includeemptydirs="false" todir="${classes}">
-			<fileset dir="testgui/data">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
 	</target>
 
 	<target name="testgui.compile" depends="testgui.init, prepare.junit">
-		<javac destdir="${classes}" debug="on" source="1.6" includeantruntime="false">
+		<javac destdir="${classes}" debug="on" source="1.6" encoding="utf-8" includeantruntime="false">
 			<src path="testgui/source"/>
-			<src path="testgui/data"/>
 			<classpath>
 				<pathelement location="${classes}" />
 				<path refid="junit.classpath"/>
@@ -107,7 +101,7 @@
 				<include name="**/jurt.jar" />
 			</fileset>
 		</path>
-		<javac destdir="${classes}" debug="on" source="1.6" includeantruntime="false">
+		<javac destdir="${classes}" debug="on" source="1.6" encoding="utf-8" includeantruntime="false">
 			<src path="testuno/source"/>
 			<classpath>
 				<pathelement location="${classes}" />
@@ -270,6 +264,8 @@
 			<formatter type="xml" />
 			<classpath>
 				<pathelement location="${classes}" />
+                <pathelement location="testgui/data" />
+                <pathelement location="testuno/data" />
 				<path refid="junit.classpath"/>
 				<path refid="uno.classpath"/>
 			</classpath>

Modified: incubator/ooo/trunk/test/testgui/.classpath
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/.classpath?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/.classpath (original)
+++ incubator/ooo/trunk/test/testgui/.classpath Mon Sep  3 02:16:54 2012
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="src" path="data"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/testcommon"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="var" path="openoffice.home"/>
 	<classpathentry kind="var" path="JRE_LIB"/>
+	<classpathentry kind="lib" path="data"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Added: incubator/ooo/trunk/test/testgui/data/image/black_256x256.bmp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/black_256x256.bmp?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/black_256x256.bmp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/black_256x256.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/black_256x256.jpg
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/black_256x256.jpg?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/black_256x256.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/black_256x256.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/black_256x256.png
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/black_256x256.png?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/black_256x256.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/black_256x256.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.bmp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/blue_256x256.bmp?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.bmp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.jpg
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/blue_256x256.jpg?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.png
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/blue_256x256.png?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/blue_256x256.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/green_256x256.bmp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/green_256x256.bmp?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/green_256x256.bmp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/green_256x256.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/green_256x256.jpg
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/green_256x256.jpg?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/green_256x256.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/green_256x256.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/green_256x256.png
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/green_256x256.png?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/green_256x256.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/green_256x256.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/red_256x256.bmp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/red_256x256.bmp?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/red_256x256.bmp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/red_256x256.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/red_256x256.jpg
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/red_256x256.jpg?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/red_256x256.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/red_256x256.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ooo/trunk/test/testgui/data/image/red_256x256.png
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/data/image/red_256x256.png?rev=1380112&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/trunk/test/testgui/data/image/red_256x256.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/ooo/trunk/test/testgui/data/image/red_256x256.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/BasicFunctionTest.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/BasicFunctionTest.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/BasicFunctionTest.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/BasicFunctionTest.java Mon Sep  3 02:16:54 2012
@@ -151,8 +151,8 @@ public class BasicFunctionTest {
 
 	@Test
 	public void testInsertPictureInDocument() throws Exception {
-		String bmp_green = prepareData("pure_green_64x64.bmp");
-		String bmp_red = prepareData("pure_red_64x64.bmp");
+		String bmp_green = prepareData("image/green_256x256.bmp");
+		String bmp_red = prepareData("image/red_256x256.bmp");
 
 		// Create a new text document
 		app.dispatch("private:factory/swriter");
@@ -162,8 +162,8 @@ public class BasicFunctionTest {
 		writer.click(400, 400);
 		app.dispatch(".uno:InsertGraphic");
 		submitOpenDlg(bmp_green);
-		sleep(3);
-		writer.click(0.5, 0.5);
+		sleep(2);
+		writer.click(10,200);
 		sleep(1);
 
 		// Verify if the picture is inserted successfully
@@ -174,8 +174,8 @@ public class BasicFunctionTest {
 		// insert another picture
 		app.dispatch(".uno:InsertGraphic");
 		submitOpenDlg(bmp_red);
-		sleep(3);
-		writer.click(0.5, 0.5);
+		sleep(2);
+		writer.click(10, 200);
 		sleep(1);
 		// Verify if the picture is inserted successfully
 		rectangle = GraphicsUtil.findRectangle(writer.getScreenRectangle(), 0xFFFF0000);
@@ -184,8 +184,8 @@ public class BasicFunctionTest {
 
 	@Test
 	public void testInsertPictureInSpreadsheet() throws Exception {
-		String bmp_green = prepareData("pure_green_64x64.bmp");
-		String bmp_red = prepareData("pure_red_64x64.bmp");
+		String bmp_green = prepareData("image/green_256x256.bmp");
+		String bmp_red = prepareData("image/red_256x256.bmp");
 
 		// Create a new text document
 		app.dispatch("private:factory/scalc");
@@ -217,8 +217,8 @@ public class BasicFunctionTest {
 
 	@Test
 	public void testInsertPictureInPresentation() throws Exception {
-		String bmp_green = prepareData("pure_green_64x64.bmp");
-		String bmp_red = prepareData("pure_red_64x64.bmp");
+		String bmp_green = prepareData("image/green_256x256.bmp");
+		String bmp_red = prepareData("image/red_256x256.bmp");
 
 		// Create a new text document
 		app.dispatch("private:factory/simpress?slot=6686");

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/FileTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/FileTypeTest.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/FileTypeTest.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/bvt/FileTypeTest.java Mon Sep  3 02:16:54 2012
@@ -306,7 +306,7 @@ public class FileTypeTest {
 	 */
 	public void saveNewDrawing(String filename) {
 		String saveTo = getPath("temp/" + filename);
-		String bmp_green = prepareData("pure_green_64x64.bmp");
+		String bmp_green = prepareData("image/green_256x256.bmp");
 
 		// Create a new drawing document
 		app.dispatch("private:factory/sdraw");

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java Mon Sep  3 02:16:54 2012
@@ -255,7 +255,7 @@ public class LongRun {
 	 */
 	public void saveNewDrawing(String filename) {
 		String saveTo = getPath("temp/" + filename);
-		String bmp_green = prepareData("pure_green_64x64.bmp");
+		String bmp_green = prepareData("image/green_64x64.bmp");
 
 		// Create a new drawing document
 		writer.menuItem("File->New->Drawing").select();

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/DocumentTest.java Mon Sep  3 02:16:54 2012
@@ -43,8 +43,8 @@ public class DocumentTest {
 		temp.mkdirs();
 		
 		//copy sample file to temp folder
-		String originalFilePath = prepareData("testcase/uno/sw/DocumentTest.odt");	
-		String originalTemplatePath = prepareData("testcase/uno/sw/DocumentTest.ott");	
+		String originalFilePath = prepareData("uno/sw/DocumentTest.odt");	
+		String originalTemplatePath = prepareData("uno/sw/DocumentTest.ott");	
 		workingFilePath = temp + "/DocumentTest.odt";
 		workingTemplatePath = temp + "/DocumentTest.ott";
 		FileUtil.copyFile(new File(originalFilePath), new File(workingFilePath));	

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/crossreference/CheckCrossReferences.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/crossreference/CheckCrossReferences.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/crossreference/CheckCrossReferences.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/crossreference/CheckCrossReferences.java Mon Sep  3 02:16:54 2012
@@ -61,7 +61,7 @@ public class CheckCrossReferences {
 	@Before
 	public void setUpDocument() throws Exception {
 		app.start();
-		document = UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.prepareData("testcase/uno/sw/CheckCrossReferences.odt")));
+		document = UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.prepareData("uno/sw/CheckCrossReferences.odt")));
 	}
 
 	@After

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/frame/CheckFrames.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/frame/CheckFrames.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/frame/CheckFrames.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/frame/CheckFrames.java Mon Sep  3 02:16:54 2012
@@ -49,7 +49,7 @@ public class CheckFrames {
 
 	@Test(expected = NoSuchElementException.class)
 	public void testLoadTextFrame() throws Exception {
-		document = (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.prepareData("testcase/uno/sw/CheckFlies.odt")));
+		document = (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.prepareData("uno/sw/CheckFlies.odt")));
 		XTextFramesSupplier xTFS = UnoRuntime.queryInterface(XTextFramesSupplier.class, document);
 		String[] expectedNames = { "Frame1", "Frame2" };
 		String[] expectedContents = { "PageBoundFrame", "ParaBoundFrame" };

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/paragraph/ParagraphBackGraphic.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/paragraph/ParagraphBackGraphic.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/paragraph/ParagraphBackGraphic.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/paragraph/ParagraphBackGraphic.java Mon Sep  3 02:16:54 2012
@@ -47,7 +47,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.LEFT_BOTTOM);
 		//save to odt 
@@ -78,7 +78,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.LEFT_BOTTOM,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -86,7 +86,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.LEFT_BOTTOM,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -107,7 +107,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.LEFT_MIDDLE);
 		//save to odt 
@@ -138,7 +138,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.LEFT_MIDDLE,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -146,7 +146,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.LEFT_MIDDLE,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -167,7 +167,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.LEFT_TOP);
 		//save to odt 
@@ -198,7 +198,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.LEFT_TOP,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -206,7 +206,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.LEFT_TOP,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -227,7 +227,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.MIDDLE_BOTTOM);
 		//save to odt 
@@ -258,7 +258,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_BOTTOM,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -266,7 +266,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_BOTTOM,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -287,7 +287,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.MIDDLE_MIDDLE);
 		//save to odt 
@@ -318,7 +318,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_MIDDLE,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -326,7 +326,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_MIDDLE,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -347,7 +347,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.MIDDLE_TOP);
 		//save and reload text document
@@ -379,7 +379,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_TOP,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -387,7 +387,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_TOP,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -408,7 +408,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.RIGHT_BOTTOM);
 		//save to odt 
@@ -439,7 +439,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_BOTTOM,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -447,7 +447,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_BOTTOM,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -468,7 +468,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.RIGHT_MIDDLE);
 		//save to odt 
@@ -499,7 +499,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_MIDDLE,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -507,7 +507,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_MIDDLE,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -528,7 +528,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.RIGHT_TOP);
 		//save to odt 
@@ -559,7 +559,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_TOP,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -567,7 +567,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_TOP,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -588,7 +588,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.AREA);
 		//save to odt 
@@ -619,7 +619,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.AREA,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -627,7 +627,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.AREA,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic
@@ -648,7 +648,7 @@ public class ParagraphBackGraphic {
 		XTextCursor xTextCursor = xText.createTextCursor();
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		//set paragraph background color
-		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")));
+		xCursorProps.setPropertyValue("ParaBackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("ParaBackGraphicFilter","draw_jpg_Export");
 		xCursorProps.setPropertyValue("ParaBackGraphicLocation",com.sun.star.style.GraphicLocation.TILED);
 		//save to odt 
@@ -679,7 +679,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.TILED,xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraphtable/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/sw/paragraphtable/Desert.jpg")),xCursorProps_Assert_odt.getPropertyValue("ParaBackGraphicURL"));
 		
 		//reopen the document 
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
@@ -687,7 +687,7 @@ public class ParagraphBackGraphic {
 		//verify paragraph background graphic
 		assertEquals("verify paragraph backgraphic location",com.sun.star.style.GraphicLocation.TILED,xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicLocation"));
 		assertEquals("verify paragraph backgraphic fileter","draw_jpg_Export",xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicFilter"));
-		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/paragraph/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
+		assertEquals("verify paragraph backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_Assert_doc.getPropertyValue("ParaBackGraphicURL"));
 	}
 	/*
 	 * test paragraph background graphic

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/puretext/CharacterHyperlink.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/puretext/CharacterHyperlink.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/puretext/CharacterHyperlink.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/puretext/CharacterHyperlink.java Mon Sep  3 02:16:54 2012
@@ -40,7 +40,7 @@ public class CharacterHyperlink {
 		XPropertySet xCursorProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTextCursor);
 		xTextCursor.gotoStart(false);
 		xTextCursor.goRight((short) 102, true);
-		xCursorProps.setPropertyValue("HyperLinkURL", FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/puretext/Desert.jpg")));
+		xCursorProps.setPropertyValue("HyperLinkURL", FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xCursorProps.setPropertyValue("HyperLinkTarget","picture");
 		xCursorProps.setPropertyValue("HyperLinkName","testCharacterHyperlink");
 		
@@ -70,7 +70,7 @@ public class CharacterHyperlink {
 		XTextDocument assertDocument_odt=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.odt")));
 		XPropertySet xCursorProps_assert_odt = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, assertDocument_odt.getText().createTextCursor());
 		//verify set property
-		assertEquals("assert character hyperlink URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/puretext/Desert.jpg")),xCursorProps_assert_odt.getPropertyValue("HyperLinkURL"));
+		assertEquals("assert character hyperlink URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_assert_odt.getPropertyValue("HyperLinkURL"));
 		assertEquals("assert character hyperlink target name","picture",xCursorProps_assert_odt.getPropertyValue("HyperLinkTarget"));
 		assertEquals("assert character hyperlink name","testCharacterHyperlink",xCursorProps_assert_odt.getPropertyValue("HyperLinkName"));
 		
@@ -78,7 +78,7 @@ public class CharacterHyperlink {
 		XTextDocument assertDocument_doc=(XTextDocument)UnoRuntime.queryInterface(XTextDocument.class, app.loadDocument(Testspace.getPath("output/test.doc")));
 		XPropertySet xCursorProps_assert_doc = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, assertDocument_doc.getText().createTextCursor());
 		//verify set property
-		assertEquals("assert character hyperlink URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/puretext/Desert.jpg")),xCursorProps_assert_doc.getPropertyValue("HyperLinkURL"));
+		assertEquals("assert character hyperlink URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xCursorProps_assert_doc.getPropertyValue("HyperLinkURL"));
 		assertEquals("assert character hyperlink target name","picture",xCursorProps_assert_doc.getPropertyValue("HyperLinkTarget"));
 		assertEquals("assert character hyperlink name","testCharacterHyperlink",xCursorProps_assert_doc.getPropertyValue("HyperLinkName"));
 	}

Modified: incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/table/TableBasic.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/table/TableBasic.java?rev=1380112&r1=1380111&r2=1380112&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/table/TableBasic.java (original)
+++ incubator/ooo/trunk/test/testuno/source/testcase/uno/sw/table/TableBasic.java Mon Sep  3 02:16:54 2012
@@ -581,77 +581,77 @@ public class TableBasic {
 		XTextTable xTable1 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable1,false);
 		XPropertySet xTableProps1 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable1);
-		xTableProps1.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps1.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps1.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps1.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.LEFT_BOTTOM);
 		
 		XTextTable xTable2 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable2,false);
 		XPropertySet xTableProps2 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable2);
-		xTableProps2.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps2.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps2.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps2.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.LEFT_MIDDLE);
 
 		XTextTable xTable3 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable3,false);
 		XPropertySet xTableProps3 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable3);
-		xTableProps3.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps3.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps3.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps3.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.LEFT_TOP);		
 
 		XTextTable xTable4 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable4,false);
 		XPropertySet xTableProps4 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable4);
-		xTableProps4.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps4.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps4.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps4.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.MIDDLE_BOTTOM);
 		
 		XTextTable xTable5 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable5,false);
 		XPropertySet xTableProps5 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable5);
-		xTableProps5.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps5.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps5.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps5.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.MIDDLE_MIDDLE);
 		
 		XTextTable xTable6 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable6,false);
 		XPropertySet xTableProps6 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable6);
-		xTableProps6.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps6.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps6.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps6.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.MIDDLE_TOP);	
 		
 		XTextTable xTable7 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable7,false);
 		XPropertySet xTableProps7 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable7);
-		xTableProps7.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps7.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps7.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps7.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.NONE);
 		
 		XTextTable xTable8 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable8,false);
 		XPropertySet xTableProps8 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable8);
-		xTableProps8.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps8.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps8.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps8.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.RIGHT_BOTTOM);
 		
 		XTextTable xTable9 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable9,false);
 		XPropertySet xTableProps9 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable9);
-		xTableProps9.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps9.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps9.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps9.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.RIGHT_MIDDLE);
 		
 		XTextTable xTable10 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable10,false);
 		XPropertySet xTableProps10 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable10);
-		xTableProps10.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps10.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps10.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps10.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.RIGHT_TOP);
 		
 		XTextTable xTable11 = (XTextTable)UnoRuntime.queryInterface(XTextTable.class, xWriterFactory.createInstance("com.sun.star.text.TextTable"));
 		xText.insertTextContent(xTextCursor,xTable11,false);
 		XPropertySet xTableProps11 = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xTable11);
-		xTableProps11.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")));
+		xTableProps11.setPropertyValue("BackGraphicURL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")));
 		xTableProps11.setPropertyValue("BackGraphicFilter","draw_jpg_Export");
 		xTableProps11.setPropertyValue("BackGraphicLocation",com.sun.star.style.GraphicLocation.AREA);		
 		//save and reload text document
@@ -675,42 +675,42 @@ public class TableBasic {
 		XPropertySet xTableProps1_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert1);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.LEFT_BOTTOM,xTableProps1_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps1_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps1_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps1_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj2=xIndexedTables.getByIndex(1);
 		XTextTable xTable_Assert2=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj2);
 		XPropertySet xTableProps2_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert2);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.LEFT_MIDDLE,xTableProps2_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps2_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps2_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps2_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj3=xIndexedTables.getByIndex(2);
 		XTextTable xTable_Assert3=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj3);
 		XPropertySet xTableProps3_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert3);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.LEFT_TOP,xTableProps3_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps3_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps3_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps3_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj4=xIndexedTables.getByIndex(3);
 		XTextTable xTable_Assert4=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj4);
 		XPropertySet xTableProps4_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert4);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_BOTTOM,xTableProps4_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps4_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps4_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps4_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj5=xIndexedTables.getByIndex(4);
 		XTextTable xTable_Assert5=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj5);
 		XPropertySet xTableProps5_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert5);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_MIDDLE,xTableProps5_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps5_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps5_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps5_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj6=xIndexedTables.getByIndex(5);
 		XTextTable xTable_Assert6=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj6);
 		XPropertySet xTableProps6_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert6);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.MIDDLE_TOP,xTableProps6_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps6_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps6_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps6_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj7=xIndexedTables.getByIndex(6);
 		XTextTable xTable_Assert7=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj7);
@@ -722,28 +722,28 @@ public class TableBasic {
 		XPropertySet xTableProps8_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert8);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_BOTTOM,xTableProps8_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps8_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps8_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps8_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj9=xIndexedTables.getByIndex(8);
 		XTextTable xTable_Assert9=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj9);
 		XPropertySet xTableProps9_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert9);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_MIDDLE,xTableProps9_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps9_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps9_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps9_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj10=xIndexedTables.getByIndex(9);
 		XTextTable xTable_Assert10=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj10);
 		XPropertySet xTableProps10_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert10);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.RIGHT_TOP,xTableProps10_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps10_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps10_assert.getPropertyValue("BackGraphicURL"));
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps10_assert.getPropertyValue("BackGraphicURL"));
 		
 		Object xTable_obj11=xIndexedTables.getByIndex(10);
 		XTextTable xTable_Assert11=(XTextTable) UnoRuntime.queryInterface(XTextTable.class, xTable_obj11);
 		XPropertySet xTableProps11_assert = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xTable_Assert11);
 		assertEquals("verify table backgraphic location",com.sun.star.style.GraphicLocation.AREA,xTableProps11_assert.getPropertyValue("BackGraphicLocation"));
 		assertEquals("verify table backgraphic fileter","draw_jpg_Export",xTableProps11_assert.getPropertyValue("BackGraphicFilter"));
-		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("testcase/uno/sw/table/Desert.jpg")),xTableProps11_assert.getPropertyValue("BackGraphicURL"));				
+		assertEquals("verify table backgraphic URL",FileUtil.getUrl(Testspace.prepareData("uno/Desert.jpg")),xTableProps11_assert.getPropertyValue("BackGraphicURL"));				
 	}	
 }
 



Mime
View raw message