[Libreoffice-commits] core.git: qadevOOo/runner toolkit/qa

[Noel Grandin]

 qadevOOo/runner/complexlib/ComplexTestCase.java |    2 +-
 qadevOOo/runner/lib/SimpleStatus.java           |    2 +-
 qadevOOo/runner/lib/Status.java                 |    6 +++---
 qadevOOo/runner/stats/Summarizer.java           |   12 ++++++------
 toolkit/qa/complex/toolkit/UnitConversion.java  |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit db8c70324091f9608a9e71e0df7bbdf9a371bf3b
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Oct 16 10:58:08 2015 +0200

    convert PASSED to COMPLETED in 'make check' test messages
    
    Change-Id: I5501f4f40024d3a47bb7007896e07c6252151cf6

diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java
index dd8afc6..56bc0b9 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 b404dcb..177bfb3 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 e96e4ef..ae7f97e 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 48478df..ced7e3c 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";
         }
     }
 
diff --git a/toolkit/qa/complex/toolkit/UnitConversion.java b/toolkit/qa/complex/toolkit/UnitConversion.java
index cfe2662..15b67fc 100644
--- a/toolkit/qa/complex/toolkit/UnitConversion.java
+++ b/toolkit/qa/complex/toolkit/UnitConversion.java
@@ -90,7 +90,7 @@ public class UnitConversion
      * 4. try to resize and move the window to an other position, so we get a well knowing position and size.
      * 5. run some more tests
      *
-     * If no test fails, the test is well done and returns with 'PASSED, OK'
+     * If no test fails, the test is well done and returns with 'COMPLETED.OK'
      *
      */
     @Test