summaryrefslogtreecommitdiff
path: root/qadevOOo/runner
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-16 10:45:52 +0200
committerNoel Grandin <noel@peralex.com>2015-10-16 10:56:03 +0200
commita3a89c15230317710ba32753c0eafdb4733730ef (patch)
treee69c45fb3393b5bbba5b57177d3f12ab1fbcf4bb /qadevOOo/runner
parentc429df73d5d7f6091b830c4ad2a9bdafdfb96ad7 (diff)
rename state to bSuccessful in Assurance
Change-Id: Ifc86275163a78dd1a61b207f3c6c55d9bf5902d7
Diffstat (limited to 'qadevOOo/runner')
-rw-r--r--qadevOOo/runner/complexlib/Assurance.java4
-rw-r--r--qadevOOo/runner/complexlib/ComplexTestCase.java10
2 files changed, 7 insertions, 7 deletions
diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java
index 9e7d269d6f16..d3c98e38f41a 100644
--- a/qadevOOo/runner/complexlib/Assurance.java
+++ b/qadevOOo/runner/complexlib/Assurance.java
@@ -27,7 +27,7 @@ public class Assurance
public static final boolean CONTINUE = true;
/** State of the current test method **/
- protected boolean state = true;
+ protected boolean bSuccessful = true;
/** The message if the test did fail **/
protected String message = null;
@@ -106,7 +106,7 @@ public class Assurance
* @param cont Continue with test method, even if s is false.
*/
protected void assure(String msg, boolean s, boolean cont) {
- state &= s;
+ bSuccessful &= s;
if (!s) {
message += msg + "\r\n";
if (!cont) {
diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java
index 124107a4807c..dd8afc6e2e88 100644
--- a/qadevOOo/runner/complexlib/ComplexTestCase.java
+++ b/qadevOOo/runner/complexlib/ComplexTestCase.java
@@ -65,14 +65,14 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest
catch (java.lang.reflect.InvocationTargetException e)
{
Throwable t = e.getTargetException();
- if (!(t instanceof RuntimeException) || state)
+ if (!(t instanceof RuntimeException) || bSuccessful)
{
log.println(t.toString());
if (message == null)
{
message = "Exception in before() method.\n\r" + t.getMessage();
}
- state = false;
+ bSuccessful = false;
t.printStackTrace((PrintWriter) log);
}
}
@@ -99,7 +99,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest
DescEntry subEntry = _entry.SubEntries[i];
if (m_bBeforeCalled)
{
- state = true;
+ bSuccessful = true;
message = "";
}
else
@@ -200,8 +200,8 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest
subEntry.ErrorMsg = (msg == null ? "" : msg);
continue;
}
- subEntry.State = (state ? "PASSED.OK" : message);
- subEntry.hasErrorMsg = !state;
+ subEntry.State = (bSuccessful ? "PASSED.OK" : message);
+ subEntry.hasErrorMsg = !bSuccessful;
subEntry.ErrorMsg = message;
}
}