summaryrefslogtreecommitdiffstats
path: root/qadevOOo
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-16 10:58:08 +0200
committerNoel Grandin <noel@peralex.com>2015-10-16 11:23:12 +0200
commitdb8c70324091f9608a9e71e0df7bbdf9a371bf3b (patch)
tree201ec8f15e0096cd97d4ccac61c151566c662b47 /qadevOOo
parentconvert Link<> to typed (diff)
downloadcore-db8c70324091f9608a9e71e0df7bbdf9a371bf3b.tar.gz
core-db8c70324091f9608a9e71e0df7bbdf9a371bf3b.zip
convert PASSED to COMPLETED in 'make check' test messages
Change-Id: I5501f4f40024d3a47bb7007896e07c6252151cf6
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/runner/complexlib/ComplexTestCase.java2
-rw-r--r--qadevOOo/runner/lib/SimpleStatus.java2
-rw-r--r--qadevOOo/runner/lib/Status.java6
-rw-r--r--qadevOOo/runner/stats/Summarizer.java12
4 files changed, 11 insertions, 11 deletions
diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java
index dd8afc6e2e88..56bc0b986198 100644
--- a/qadevOOo/runner/complexlib/ComplexTestCase.java
+++ b/qadevOOo/runner/complexlib/ComplexTestCase.java
@@ -200,7 +200,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest
subEntry.ErrorMsg = (msg == null ? "" : msg);
continue;
}
- subEntry.State = (bSuccessful ? "PASSED.OK" : message);
+ subEntry.State = (bSuccessful ? "COMPLETED.OK" : message);
subEntry.hasErrorMsg = !bSuccessful;
subEntry.ErrorMsg = message;
}
diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java
index b404dcb4a7c3..177bfb3f7d02 100644
--- a/qadevOOo/runner/lib/SimpleStatus.java
+++ b/qadevOOo/runner/lib/SimpleStatus.java
@@ -36,7 +36,7 @@ class SimpleStatus {
private final RunState runState;
/**
- * This is the run state: either SKIPPED, PASSED, etc.
+ * This is the run state: either SKIPPED, COMPLETED, etc.
* or user defined. Deriving classes can overwrite it for own run states.
*/
protected String runStateString;
diff --git a/qadevOOo/runner/lib/Status.java b/qadevOOo/runner/lib/Status.java
index e96e4ef8bbff..ae7f97ecfdfc 100644
--- a/qadevOOo/runner/lib/Status.java
+++ b/qadevOOo/runner/lib/Status.java
@@ -23,7 +23,7 @@ package lib;
* described in two ways: state and runtime state. The state describes if the
* activity was successful (OK state) or not (FAILED state). The runtime state
* describes what happened during the activity: the test can be:
- * - PASSED - the activity completed normally (although it can complete with
+ * - COMPLETED - the activity completed normally (although it can complete with
* FAILED state)
* - SKIPPED - the activity was not performed because of a reason (it also can
* has OK or FAILED state)
@@ -38,7 +38,7 @@ public class Status extends SimpleStatus {
/**
* Construct a status: use runState and state
- * @param runState either PASSED, SKIPPED, etc.
+ * @param runState either COMPLETED, SKIPPED, etc.
* @param bSuccessful OK or FAILED.
*/
public Status(RunState runState, boolean bSuccessful ) {
@@ -102,7 +102,7 @@ public class Status extends SimpleStatus {
* The method returns a human-readable description of the status.
* The Status implementation of the method returns the status state
* description and appends to it the reason, for example:
- * "FAILED.The getLabel works wrong", "PASSED.OK".
+ * "FAILED.The getLabel works wrong", "COMPLETED.OK".
*/
@Override
public String toString() {
diff --git a/qadevOOo/runner/stats/Summarizer.java b/qadevOOo/runner/stats/Summarizer.java
index 48478df9f618..ced7e3c8649c 100644
--- a/qadevOOo/runner/stats/Summarizer.java
+++ b/qadevOOo/runner/stats/Summarizer.java
@@ -47,11 +47,11 @@ public class Summarizer
{
if (entry.SubEntries[i].State == null)
{
- entry.SubEntries[i].State = "PASSED.FAILED";
+ entry.SubEntries[i].State = "COMPLETED.FAILED";
}
if (entry.SubEntries[i].State.equals("known issue"))
{
- entry.SubEntries[i].State = "PASSED.OK";
+ entry.SubEntries[i].State = "COMPLETED.OK";
knownIssues++;
}
if (!entry.SubEntries[i].State.endsWith("OK"))
@@ -64,12 +64,12 @@ public class Summarizer
if (failures.size() > 0)
{
String errMsg = "";
- String state = "PASSED.FAILED";
+ String state = "COMPLETED.FAILED";
for (int j = 0; j < failures.size(); j++)
{
if (states.get(j).equals("not part of the job"))
{
- state = "PASSED(some interfaces/services not tested).OK";
+ state = "COMPLETED(some interfaces/services not tested).OK";
}
else
{
@@ -83,11 +83,11 @@ public class Summarizer
}
else if (entry.EntryType.equals("component") && knownIssues > 0)
{
- entry.State = "PASSED(with known issues).OK";
+ entry.State = "COMPLETED(with known issues).OK";
}
else
{
- entry.State = "PASSED.OK";
+ entry.State = "COMPLETED.OK";
}
}