From b8fce145c234c435e9aae02eb9547e9bad405b52 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

---
 toolkit/qa/unoapi/Test.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'toolkit/qa')

diff --git a/toolkit/qa/unoapi/Test.java b/toolkit/qa/unoapi/Test.java
index f27d882314d2..0543fee83f9f 100644
--- a/toolkit/qa/unoapi/Test.java
+++ b/toolkit/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.toolkit.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", "toolkit.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 153a326981896a84523d3e6ff5340b2c3497136c 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

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

(limited to 'toolkit/qa')

diff --git a/toolkit/qa/unoapi/makefile.mk b/toolkit/qa/unoapi/makefile.mk
deleted file mode 100644
index 9517601c3917..000000000000
--- a/toolkit/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 = toolkit
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/toolkit/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 


From 7c3026b4aa032e6c1c477c2f2ebe47f45275c03d Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Fri, 4 Feb 2011 19:02:26 +0100
Subject: gnumake3: toolkit: disable unoapi test UnoControlDialogModel

---
 toolkit/qa/unoapi/knownissues.xcl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'toolkit/qa')

diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl
index 273b4b72dbe2..7dd58463c5f3 100644
--- a/toolkit/qa/unoapi/knownissues.xcl
+++ b/toolkit/qa/unoapi/knownissues.xcl
@@ -258,3 +258,6 @@ toolkit.AccessibleMenu::com::sun::star::accessibility::XAccessibleSelection
 ### i114636 ###
 toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleAction
 toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleContext
+
+### i116814 ###
+toolkit.UnoControlDialogModel::com::sun::star::util::XCloneable
-- 
cgit 


From 1d01bcd09541115b5c094fbdf772e181a7e1ae9a Mon Sep 17 00:00:00 2001
From: "Jens-Heiner Rechtien [hr]" <jens-heiner.rechtien@oracle.com>
Date: Thu, 10 Feb 2011 15:20:01 +0100
Subject: DEV300 masterfix: #i116814,i116838#: re-enable test (XCloneable)

---
 toolkit/qa/unoapi/knownissues.xcl | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'toolkit/qa')

diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl
index 7dd58463c5f3..273b4b72dbe2 100644
--- a/toolkit/qa/unoapi/knownissues.xcl
+++ b/toolkit/qa/unoapi/knownissues.xcl
@@ -258,6 +258,3 @@ toolkit.AccessibleMenu::com::sun::star::accessibility::XAccessibleSelection
 ### i114636 ###
 toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleAction
 toolkit.AccessibleScrollBar::com::sun::star::accessibility::XAccessibleContext
-
-### i116814 ###
-toolkit.UnoControlDialogModel::com::sun::star::util::XCloneable
-- 
cgit