delete child-workspace + eis long dead foo

Change-Id: I33faa4b960ae78d31c026bcbd114cb7c5d5b5aea

3 files changed, 2 insertions, 226 deletions

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index a39f64e9aaca..b32a791f96b0 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/runner/helper/ConfigHelper \
     qadevOOo/runner/helper/ConfigurationRead \
     qadevOOo/runner/helper/ContextMenuInterceptor \
-    qadevOOo/runner/helper/CwsDataExchangeImpl \
     qadevOOo/runner/helper/FileTools \
     qadevOOo/runner/helper/LoggingThread \
     qadevOOo/runner/helper/OfficeProvider \
diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/runner/helper/CwsDataExchangeImpl.java
deleted file mode 100644
index 01dc2bc5fe07..000000000000
--- a/qadevOOo/runner/helper/CwsDataExchangeImpl.java
+++ /dev/null
@@ -1,153 +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 helper;
-
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import lib.TestParameters;
-import share.LogWriter;
-import util.PropertyName;
-import util.utils;
-
-/**
- * Exchange information to the EIS database
- *
- */
-public class CwsDataExchangeImpl
-{
-
-    private final TestParameters param;
-    private final LogWriter log;
-    private final BuildEnvTools bet;
-    private final boolean mDebug;
-
-    public CwsDataExchangeImpl(TestParameters param, LogWriter log) throws ParameterNotFoundException
-    {
-        this.param = param;
-        this.log = log;
-        this.bet = new BuildEnvTools(param, log);
-        mDebug = param.getBool(PropertyName.DEBUG_IS_ACTIVE);
-    }
-
-    /**
-     * Returns all module names which are added to the specified childworkspace
-     * @return a String array of all added modules
-     */
-    public ArrayList<String> getModules()
-    {
-        // the cwstouched command send its version information to StdErr.
-        // A piping from StdErr to SdtOut the tcsh does not support.
-        // To find the output easily the echo command is used
-        final String[] commands =
-        {
-            "echo cwstouched starts here",
-            "cwstouched",
-            "echo cwstouched ends here"
-        };
-
-        final ProcessHandler procHdl = bet.runCommandsInEnvironmentShell(commands, null, 20000);
-
-        if (mDebug)
-        {
-            log.println("---> Output of getModules:");
-            log.println(procHdl.getOutputText());
-            log.println("<--- Output of getModules");
-            log.println("---> Error output of getModules");
-            log.println(procHdl.getErrorText());
-            log.println("<--- Error output of getModules");
-        }
-
-        final String[] outs = procHdl.getOutputText().split("\n");
-
-        final ArrayList<String> moduleNames = new ArrayList<String>();
-        boolean bStart = false;
-        for (int i = 0; i < outs.length; i++)
-        {
-            final String line = outs[i];
-            if (line.startsWith("cwstouched starts here"))
-            {
-                bStart = true;
-                continue;
-            }
-            if (line.startsWith("cwstouched ends here"))
-            {
-                bStart = false;
-                continue;
-            }
-            if (bStart && line.length() > 1)
-            {
-                moduleNames.add(line);
-            }
-        }
-
-        return moduleNames;
-    }
-
-    /**
-     * Set the test status of cws related UnoAPI tests to the EIS database
-     * @param status the status of the UnoAPI test
-     */
-    public void setUnoApiCwsStatus(boolean status)
-    {
-
-        FileWriter out = null;
-        String statusFile = null;
-        try
-        {
-
-            final String stat = status ? ".PASSED.OK" : ".PASSED.FAILED";
-
-            statusFile = utils.getUsersTempDir() +
-                    System.getProperty("file.separator") +
-                    "UnoApiCwsStatus." +
-                    (String) param.get(PropertyName.VERSION) +
-                    "_" + param.get(PropertyName.OPERATING_SYSTEM) + stat + ".txt";
-
-            out = new FileWriter(statusFile);
-
-            out.write(stat);
-            out.flush();
-            out.close();
-
-            final String[] commands =
-            {
-                "cwsattach " + statusFile
-            };
-
-            bet.runCommandsInEnvironmentShell(commands, null, 5000);
-
-        }
-        catch (IOException ex)
-        {
-            System.out.println("ERROR: could not attach file '" + statusFile + "' to cws\n" + ex.toString());
-        }
-        finally
-        {
-            try
-            {
-                out.close();
-            }
-            catch (IOException ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index 28e36240843b..d8f7f8ab6a25 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -28,7 +28,6 @@ import helper.ProcessHandler;
 import com.sun.star.lang.XMultiServiceFactory;
 import helper.BuildEnvTools;
 import helper.ComplexDescGetter;
-import helper.CwsDataExchangeImpl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -186,11 +185,8 @@ public class CheckModuleAPI extends ComplexTestCase
 
     private String[] getAllModuleCommand()
     {
-        String[] checkModules;
-
         final String[] names = getModulesFromSourceRoot();
-        checkModules = getCheckModuleCommand(names);
-
+        String[] checkModules = getCheckModuleCommand(names);
         return checkModules;
     }
 
@@ -254,47 +250,6 @@ public class CheckModuleAPI extends ComplexTestCase
         return cmdLines;
     }
 
-    private String[] getCwsModuleCommand()
-    {
-        String[] checkModules;
-        final String version = (String) param.get(PropertyName.VERSION);
-        String[] names = null;
-        if (version.startsWith("cws_"))
-        {
-            try
-            {
-                final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log);
-                final ArrayList<String> addedModules = cde.getModules();
-
-                final ArrayList<String> moduleNames = new ArrayList<String>();
-                Iterator<String> iterator = addedModules.iterator();
-                while (iterator.hasNext())
-                {
-                    String sModuleName = iterator.next();
-                    if (doesQaUnoApiFolderExist(mSRC_ROOT, sModuleName))
-                    {
-                        moduleNames.add(sModuleName);
-                    }
-                }
-                names = moduleNames.toArray(new String[moduleNames.size()]);
-            }
-            catch (ParameterNotFoundException ex)
-            {
-                this.failed(ex.toString(), false);
-            }
-
-
-        }
-        else
-        {
-            // major version: all modules must be tested
-            names = getModulesFromSourceRoot();
-        }
-        checkModules = getCheckModuleCommand(names);
-
-        return checkModules;
-    }
-
     private String[] getDefinedModuleCommand(String module)
     {
         String[] checkModules = null;
@@ -464,14 +419,10 @@ public class CheckModuleAPI extends ComplexTestCase
         all: check all modules which contains a qa/unoapi folder
         auto: check all modules which contains a qa/unoapi folder except the module is not added
          */
-        if (module.equals("all"))
+        if (module.equals("all") || module.equals("auto"))
         {
             checkModules = getAllModuleCommand();
         }
-        else if (module.equals("auto"))
-        {
-            checkModules = getCwsModuleCommand();
-        }
         else
         {
             module = getTranslatedNames(module);
@@ -498,27 +449,6 @@ public class CheckModuleAPI extends ComplexTestCase
             log.println("No modules containing qa/unoapi folder found => OK");
             state = true;
         }
-
-        setUnoApiCwsStatus(state);
-
-    }
-
-    private void setUnoApiCwsStatus(boolean status)
-    {
-        final String version = (String) param.get(PropertyName.VERSION);
-        if (version.startsWith("cws_"))
-        {
-            try
-            {
-
-                final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log);
-                cde.setUnoApiCwsStatus(status);
-            }
-            catch (ParameterNotFoundException ex)
-            {
-                log.println("ERROR: could not wirte status to EIS database: " + ex.toString());
-            }
-        }
     }
 
     @Override