summaryrefslogtreecommitdiff
path: root/framework/qa
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2011-01-11 21:16:21 +0100
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2011-01-11 21:16:21 +0100
commitf27dec459621543c9dcd94c72ab6af8147b8b4d6 (patch)
tree6a10b93a8ef8afa598052d814ad38e2a6e44bd50 /framework/qa
parentcc72dd1a32cf6acaba613fa6ea289a7bd89ef1d2 (diff)
gnumake3: more work on junit subsequenttest migration
Diffstat (limited to 'framework/qa')
-rw-r--r--framework/qa/complex/broken_document/TestDocument.java3
-rw-r--r--framework/qa/unoapi/Test.java5
2 files changed, 5 insertions, 3 deletions
diff --git a/framework/qa/complex/broken_document/TestDocument.java b/framework/qa/complex/broken_document/TestDocument.java
index c282790211e3..47a5176734d5 100644
--- a/framework/qa/complex/broken_document/TestDocument.java
+++ b/framework/qa/complex/broken_document/TestDocument.java
@@ -29,12 +29,13 @@ package complex.broken_document;
import java.io.File;
import org.openoffice.test.OfficeFileUrl;
+import org.openoffice.test.Argument;
final class TestDocument
{
public static String getUrl(String name)
{
- return OfficeFileUrl.getAbsolute(new File("test_documents", name));
+ return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
}
private TestDocument() {}
diff --git a/framework/qa/unoapi/Test.java b/framework/qa/unoapi/Test.java
index da9bb3bd5020..71774b4a62bb 100644
--- a/framework/qa/unoapi/Test.java
+++ b/framework/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.framework.qa.unoapi;
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
import static org.junit.Assert.*;
public final class Test {
@@ -43,8 +44,8 @@ public final class Test {
@org.junit.Test public void test() {
assertTrue(
Runner.run(
- "-sce", "framework.sce", "-xcl", "knownissues.xcl", "-tdoc",
- "testdocuments", "-cs", connection.getDescription()));
+ "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+ Argument.get("tdoc"), "-cs", connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();