Kaydet (Commit) c3da8110 authored tarafından Michael Stahl's avatar Michael Stahl

sfx2: DocumentInfo test should use a private temp dir

At least it failed on me once trying to store to its temp file, maybe
the predictable file name was the problem...

Change-Id: I78918ada1615c8337e4c8692d34aa285010bc820
üst 2171077c
...@@ -51,7 +51,7 @@ public class DocumentInfo ...@@ -51,7 +51,7 @@ public class DocumentInfo
XTextDocument xTextDoc = null; XTextDocument xTextDoc = null;
XTextDocument xTextDocSecond = null; XTextDocument xTextDocSecond = null;
@Test public void checkDocInfo() @Test public void checkDocInfo() throws Exception
{ {
m_xMSF = getMSF(); m_xMSF = getMSF();
...@@ -59,8 +59,7 @@ public class DocumentInfo ...@@ -59,8 +59,7 @@ public class DocumentInfo
assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF);
// TODO: need other temp directory! String tempdir = util.utils.getOfficeTemp/*Dir*/(m_xMSF);
String tempdir = System.getProperty("java.io.tmpdir");
String fs = System.getProperty("file.separator"); String fs = System.getProperty("file.separator");
if (!tempdir.endsWith(fs)) if (!tempdir.endsWith(fs))
...@@ -127,16 +126,9 @@ public class DocumentInfo ...@@ -127,16 +126,9 @@ public class DocumentInfo
System.out.println("Storing the document"); System.out.println("Storing the document");
try XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc);
{ store.storeToURL(sTempDocument, new PropertyValue[] {});
XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc); DesktopTools.closeDoc(xTextDoc);
store.storeToURL(sTempDocument, new PropertyValue[] {});
DesktopTools.closeDoc(xTextDoc);
}
catch (Exception e)
{
fail("Couldn't store document");
}
System.out.println("...done"); System.out.println("...done");
} }
...@@ -146,16 +138,9 @@ public class DocumentInfo ...@@ -146,16 +138,9 @@ public class DocumentInfo
{ {
System.out.println("loading the document"); System.out.println("loading the document");
try XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop"));
{ XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {});
XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp);
XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {});
xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp);
}
catch (Exception e)
{
fail("Couldn't load document");
}
System.out.println("...done"); System.out.println("...done");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment