From a060947e8c1538cedae5dee6b2a4e7a15d434d66 Mon Sep 17 00:00:00 2001
From: Jens Carl <j.carl43@gmx.de>
Date: Fri, 8 Sep 2017 08:48:08 +0000
Subject: tdf#45904: Move _XSubTotalDescriptor Java tests to C++

Change-Id: Ie1ec8879972f77c5278992aadf9324f755859d96
Reviewed-on: https://gerrit.libreoffice.org/42096
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
---
 qadevOOo/Jar_OOoRunner.mk                          |  1 -
 ...n.star.comp.office.ScSubTotalDescriptorBase.csv |  2 -
 .../tests/java/ifc/sheet/_XSubTotalDescriptor.java | 69 ----------------------
 3 files changed, 72 deletions(-)
 delete mode 100644 qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java

(limited to 'qadevOOo')

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index fb9e160cde8e..14c2ee32d281 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -633,7 +633,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/sheet/_XSpreadsheet \
     qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \
     qadevOOo/tests/java/ifc/sheet/_XSubTotalCalculatable \
-    qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor \
     qadevOOo/tests/java/ifc/style/_CharacterProperties \
     qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \
     qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
index 0e6e5e9933a5..32ad24f94880 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
@@ -1,7 +1,5 @@
 "ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getCount()"
 "ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getByIndex()"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::XSubTotalDescriptor";"addNew()"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::XSubTotalDescriptor";"clear()"
 "ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"hasElements()"
 "ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"InsertPageBreaks"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java
deleted file mode 100644
index 923beaa2103c..000000000000
--- a/qadevOOo/tests/java/ifc/sheet/_XSubTotalDescriptor.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package ifc.sheet;
-
-import com.sun.star.sheet.GeneralFunction;
-import com.sun.star.sheet.SubTotalColumn;
-import com.sun.star.sheet.XSubTotalDescriptor;
-
-import lib.MultiMethodTest;
-
-
-/**
-* Testing <code>com.sun.star.sheet.XSubTotalDescriptor</code>
-* interface methods :
-* <ul>
-*  <li><code> addNew()</code></li>
-*  <li><code> clear()</code></li>
-* </ul> <p>
-* @see com.sun.star.sheet.XSubTotalDescriptor
-*/
-public class _XSubTotalDescriptor extends MultiMethodTest {
-    public XSubTotalDescriptor oObj = null;
-
-    /**
-    * Test creates a subtotal field definition and adds it to the descriptor.<p>
-    * Has <b> OK </b> status if the method successfully returns. <p>
-    */
-    public void _addNew() {
-        SubTotalColumn[] columns = new SubTotalColumn[1];
-        SubTotalColumn column = new SubTotalColumn();
-        column.Column = 5;
-        column.Function = GeneralFunction.SUM;
-        columns[0] = column;
-        oObj.addNew(columns, 1);
-        tRes.tested("addNew()", true);
-    }
-
-    /**
-    * Test just calls the method. <p>
-    * Has <b> OK </b> status if the method successfully returns. <p>
-    */
-    public void _clear() {
-        oObj.clear();
-        tRes.tested("clear()", true);
-    }
-
-    /**
-    * Forces environment recreation.
-    */
-    @Override
-    protected void after() {
-        disposeEnvironment();
-    }
-} // finish class _XSubTotalDescriptor
-- 
cgit