From f27dec459621543c9dcd94c72ab6af8147b8b4d6 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Tue, 11 Jan 2011 21:16:21 +0100
Subject: gnumake3: more work on junit subsequenttest migration

---
 framework/qa/complex/broken_document/TestDocument.java | 3 ++-
 framework/qa/unoapi/Test.java                          | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'framework/qa')

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();
-- 
cgit 


From d171285f3780a4b1b1e0cad4b40b8b9bc52b62f9 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Tue, 1 Feb 2011 19:21:09 +0100
Subject: gnumake3: remove dmake files for tests in converted modules

---
 framework/qa/unoapi/makefile.mk | 48 -----------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 framework/qa/unoapi/makefile.mk

(limited to 'framework/qa')

diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk
deleted file mode 100644
index 38a6cf7cced8..000000000000
--- a/framework/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = framework
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/framework/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-- 
cgit