CWS-TOOLING: integrate CWS qadev33

1 files changed, 2 insertions, 269 deletions

diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java
index 2a7c54bdd848..4fb5d757fb0e 100644
--- a/qadevOOo/runner/complexlib/ComplexTestCase.java
+++ b/qadevOOo/runner/complexlib/ComplexTestCase.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ComplexTestCase.java,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.2.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -42,7 +42,7 @@ import java.io.PrintWriter;
 /**
  * Base class for all complex tests.
  */
-public abstract class ComplexTestCase implements ComplexTest {
+public abstract class ComplexTestCase extends Assurance implements ComplexTest {
 
     /** The test parameters **/
     protected static TestParameters param = null;
@@ -50,10 +50,6 @@ public abstract class ComplexTestCase implements ComplexTest {
     protected static LogWriter log = null;
     /** Description entry **/
     protected DescEntry subEntry = null;
-    /** State of the current test method **/
-    protected boolean state = true;
-    /** The message if the test did fail **/
-    protected String message = null;
     /**
      * The method name which will be written into f.e. the data base
      **/
@@ -240,268 +236,5 @@ public abstract class ComplexTestCase implements ComplexTest {
         return this.getClass().getName();
     }
 
-    /**
-     * Assure that s is true.
-     * This function generates "Assure failed." as standard message.
-     * @param s The condition that should be true.
-     */
-    protected void assure(boolean s) {
-        assure("Assure failed.", s, false);
-    }
-
-    /**
-     * Assure that s is true.
-     * The given message will be only evaluated, if s is false.
-     * @param msg The message that is evaluated.
-     * @param s The condition that should be true.
-     */
-    protected void assure(String msg, boolean s) {
-        assure(msg, s, false);
-    }
-
-    /**
-     * Assure that two boolean values are equal
-     * @param expected specifies the expected boolean value
-     * @param actual specifies the actual boolean value
-     */
-    protected void assureEquals( boolean expected, boolean actual ) {
-        assureEquals( "Equality test failed", new Boolean( expected ), new Boolean( actual ), false );
-    }
-
-    /**
-     * Assure that two boolean values are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected boolean value
-     * @param actual specifies the actual boolean value
-     */
-    protected void assureEquals( String message, boolean expected, boolean actual ) {
-        assureEquals( message, new Boolean( expected ), new Boolean( actual ), false );
-    }
-
-    /**
-     * Assure that two byte values are equal
-     * @param expected specifies the expected byte value
-     * @param actual specifies the actual byte value
-     */
-    protected void assureEquals( byte expected, byte actual ) {
-        assureEquals( "Equality test failed", new Byte( expected ), new Byte( actual ), false );
-    }
-
-    /**
-     * Assure that two byte values are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected byte value
-     * @param actual specifies the actual byte value
-     */
-    protected void assureEquals( String message, byte expected, byte actual ) {
-        assureEquals( message, new Byte( expected ), new Byte( actual ), false );
-    }
-
-    /**
-     * Assure that two double values are equal
-     * @param expected specifies the expected double value
-     * @param actual specifies the actual double value
-     */
-    protected void assureEquals( double expected, double actual ) {
-        assureEquals( "Equality test failed", new Double( expected ), new Double( actual ), false );
-    }
-
-    /**
-     * Assure that two double values are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected double value
-     * @param actual specifies the actual double value
-     */
-    protected void assureEquals( String message, double expected, double actual ) {
-        assureEquals( message, new Double( expected ), new Double( actual ), false );
-    }
-
-    /**
-     * Assure that two float values are equal
-     * @param expected specifies the expected float value
-     * @param actual specifies the actual float value
-     */
-    protected void assureEquals( float expected, float actual ) {
-        assureEquals( "Equality test failed", new Float( expected ), new Float( actual ), false );
-    }
-
-    /**
-     * Assure that two float values are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected float value
-     * @param actual specifies the actual float value
-     */
-    protected void assureEquals( String message, float expected, float actual ) {
-        assureEquals( message, new Float( expected ), new Float( actual ), false );
-    }
-
-    /**
-     * Assure that two short values are equal
-     * @param expected specifies the expected short value
-     * @param actual specifies the actual short value
-     */
-    protected void assureEquals( short expected, short actual ) {
-        assureEquals( "Equality test failed", new Short( expected ), new Short( actual ), false );
-    }
-
-    /**
-     * Assure that two short values are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected short value
-     * @param actual specifies the actual short value
-     */
-    protected void assureEquals( String message, short expected, short actual ) {
-        assureEquals( message, new Short( expected ), new Short( actual ), false );
-    }
-
-    /**
-     * Assure that two int values are equal
-     * @param expected specifies the expected int value
-     * @param actual specifies the actual int value
-     */
-    protected void assureEquals( int expected, int actual ) {
-        assureEquals( "Equality test failed", new Integer( expected ), new Integer( actual ), false );
-    }
-
-    /**
-     * Assure that two int values are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected int value
-     * @param actual specifies the actual int value
-     */
-    protected void assureEquals( String message, int expected, int actual ) {
-        assureEquals( message, new Integer( expected ), new Integer( actual ), false );
-    }
-
-    /**
-     * Assure that two long values are equal
-     * @param expected specifies the expected long value
-     * @param actual specifies the actual long value
-     */
-    protected void assureEquals( long expected, long actual ) {
-        assureEquals( "Equality test failed", new Long( expected ), new Long( actual ), false );
-    }
-
-    /**
-     * Assure that two long values are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected long value
-     * @param actual specifies the actual long value
-     */
-    protected void assureEquals( String message, long expected, long actual ) {
-        assureEquals( message, new Long( expected ), new Long( actual ), false );
-    }
-
-    /**
-     * Assure that two string values are equal
-     * @param expected specifies the expected string value
-     * @param actual specifies the actual string value
-     */
-    protected void assureEquals( String expected, String actual ) {
-        assureEquals( "Equality test failed", expected, actual, false );
-    }
 
-    /**
-     * Assure that two string values are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected string value
-     * @param actual specifies the actual string value
-     */
-    protected void assureEquals( String message, String expected, String actual ) {
-        assureEquals( message, expected, actual, false );
-    }
-
-    /**
-     * Assure that two object are equal
-     * @param expected specifies the expected object value
-     * @param actual specifies the actual object value
-     */
-    protected void assureEquals( Object expected, Object actual ) {
-        assureEquals( "Equality test failed", expected, actual, false );
-    }
-
-    /**
-     * Assure that two objects are equal
-     * @param message the message to print when the equality test fails
-     * @param expected specifies the expected object value
-     * @param actual specifies the actual object value
-     */
-    protected void assureEquals( String message, Object expected, Object actual ) {
-        assureEquals( message, expected, actual, false );
-    }
-
-    /**
-     * Mark the currently executed method as failed.
-     * This function generates "Test did fail." as standard message.
-     */
-    protected void failed() {
-        assure("Test did fail.", false, false);
-    }
-
-    /**
-     * Mark the currently executed method as failed.
-     * with the given message.
-     * @param msg The message of the failure.
-     */
-    protected void failed(String msg) {
-        assure(msg, false, false);
-    }
-
-    /**
-     * Assure that s is true.
-     * The given message will be only evaluated, if s is false.
-     * Normally, assure() leaves the current test method, and the next one
-     * is executed. With the parameter 'cont' set to true, the current test
-     * method will continue.<br>
-     * The current method will of course marked as failed.
-     * @param msg The message that is evaluated.
-     * @param s The condition that should be true.
-     * @param cont Continue with test method, even if s is false.
-     */
-    protected void assure(String msg, boolean s, boolean cont) {
-        state &= s;
-        if (!s) {
-            message += msg + "\r\n";
-            log.println(msg);
-            if (!cont) {
-                throw new AssureException(msg);
-            }
-        }
-    }
-
-    protected void assureEquals( String message, Object expected, Object actual, boolean cont ) {
-        assure( message + " (expected: " + expected.toString() + ", actual: " + actual.toString() + ")",
-            expected.equals( actual ), cont );
-    }
-
-    /**
-     * Mark the currently executed method as failed.
-     * with the given message.
-     * The given message will be only evaluated, if s is false.
-     * With the parameter 'cont' set to true, the current test
-     * method will continue.<br>
-     * The current method will of course marked as failed.
-     * @param msg The message that is evaluated.
-     * @param cont Continue with test method, even if s is false.
-     */
-    protected void failed(String msg, boolean cont) {
-        assure(msg, false, cont);
-    }
-
-    /**
-     * @deprecated
-     */
-    protected void addResult(String message, boolean state) {
-        String msg = message + " - " + state;
-        this.state &= state;
-        this.message += msg + "\r\n";
-        log.println(msg);
-    }
-
-    public class AssureException extends RuntimeException {
-
-        public AssureException(String msg) {
-            super(msg);
-        }
-    }
 }
\ No newline at end of file