sb118: various improvement/cleanup of qadevOOo code

1 files changed, 1 insertions, 19 deletions

diff --git a/qadevOOo/runner/lib/TestCase.java b/qadevOOo/runner/lib/TestCase.java
index 353a1cee46d1..66e7f4cc5432 100644
--- a/qadevOOo/runner/lib/TestCase.java
+++ b/qadevOOo/runner/lib/TestCase.java
@@ -143,18 +143,16 @@ public abstract class TestCase {
                 message = e.toString();
             System.out.println("Exception while getting Environment "+message);
             e.printStackTrace();
+            cleanup(tParam, log);
         }
         return tEnv;
     }
 
     /**
      * Disposes the <code>TestEnvironment</code> when it is not needed anymore.
-     * The method calls <code>cleanupTestEnvironment()</code>.
      *
      * @param tEnv the environment to dispose
      * @param tParam test parameters
-     *
-     * @see #cleanupTestEnvironment()
      */
     public synchronized void disposeTestEnvironment( TestEnvironment tEnv,
         TestParameters tParam ) {
@@ -177,22 +175,6 @@ public abstract class TestCase {
             TestParameters tParam, PrintWriter log );
 
     /**
-     * Called while disposing a <code>TestEnvironment</code>. In the
-     * implementation does nothing. Subclasses can override to clean up
-     * the environments created by them.
-     *
-     * @param tParam test parameters
-     * @param tEnv the environment to cleanup
-     * @param log writer to log information while testing
-     *
-     * @see TestEnvironment
-     * @see #disposeTestEnvironment()
-     */
-    protected void cleanupTestEnvironment( TestParameters Param,
-            TestEnvironment tEnv, PrintWriter log ) {
-    }
-
-    /**
      * @return the name of the object
      */
     public String getObjectName() {