Kaydet (Commit) db8c7032 authored tarafından Noel Grandin's avatar Noel Grandin

convert PASSED to COMPLETED in 'make check' test messages

Change-Id: I5501f4f40024d3a47bb7007896e07c6252151cf6
üst 6f1313b3
...@@ -200,7 +200,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest ...@@ -200,7 +200,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest
subEntry.ErrorMsg = (msg == null ? "" : msg); subEntry.ErrorMsg = (msg == null ? "" : msg);
continue; continue;
} }
subEntry.State = (bSuccessful ? "PASSED.OK" : message); subEntry.State = (bSuccessful ? "COMPLETED.OK" : message);
subEntry.hasErrorMsg = !bSuccessful; subEntry.hasErrorMsg = !bSuccessful;
subEntry.ErrorMsg = message; subEntry.ErrorMsg = message;
} }
......
...@@ -36,7 +36,7 @@ class SimpleStatus { ...@@ -36,7 +36,7 @@ class SimpleStatus {
private final RunState runState; 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. * or user defined. Deriving classes can overwrite it for own run states.
*/ */
protected String runStateString; protected String runStateString;
......
...@@ -23,7 +23,7 @@ package lib; ...@@ -23,7 +23,7 @@ package lib;
* described in two ways: state and runtime state. The state describes if the * 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 * activity was successful (OK state) or not (FAILED state). The runtime state
* describes what happened during the activity: the test can be: * 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) * FAILED state)
* - SKIPPED - the activity was not performed because of a reason (it also can * - SKIPPED - the activity was not performed because of a reason (it also can
* has OK or FAILED state) * has OK or FAILED state)
...@@ -38,7 +38,7 @@ public class Status extends SimpleStatus { ...@@ -38,7 +38,7 @@ public class Status extends SimpleStatus {
/** /**
* Construct a status: use runState and state * Construct a status: use runState and state
* @param runState either PASSED, SKIPPED, etc. * @param runState either COMPLETED, SKIPPED, etc.
* @param bSuccessful OK or FAILED. * @param bSuccessful OK or FAILED.
*/ */
public Status(RunState runState, boolean bSuccessful ) { public Status(RunState runState, boolean bSuccessful ) {
...@@ -102,7 +102,7 @@ public class Status extends SimpleStatus { ...@@ -102,7 +102,7 @@ public class Status extends SimpleStatus {
* The method returns a human-readable description of the status. * The method returns a human-readable description of the status.
* The Status implementation of the method returns the status state * The Status implementation of the method returns the status state
* description and appends to it the reason, for example: * description and appends to it the reason, for example:
* "FAILED.The getLabel works wrong", "PASSED.OK". * "FAILED.The getLabel works wrong", "COMPLETED.OK".
*/ */
@Override @Override
public String toString() { public String toString() {
......
...@@ -47,11 +47,11 @@ public class Summarizer ...@@ -47,11 +47,11 @@ public class Summarizer
{ {
if (entry.SubEntries[i].State == null) 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")) if (entry.SubEntries[i].State.equals("known issue"))
{ {
entry.SubEntries[i].State = "PASSED.OK"; entry.SubEntries[i].State = "COMPLETED.OK";
knownIssues++; knownIssues++;
} }
if (!entry.SubEntries[i].State.endsWith("OK")) if (!entry.SubEntries[i].State.endsWith("OK"))
...@@ -64,12 +64,12 @@ public class Summarizer ...@@ -64,12 +64,12 @@ public class Summarizer
if (failures.size() > 0) if (failures.size() > 0)
{ {
String errMsg = ""; String errMsg = "";
String state = "PASSED.FAILED"; String state = "COMPLETED.FAILED";
for (int j = 0; j < failures.size(); j++) for (int j = 0; j < failures.size(); j++)
{ {
if (states.get(j).equals("not part of the job")) 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 else
{ {
...@@ -83,11 +83,11 @@ public class Summarizer ...@@ -83,11 +83,11 @@ public class Summarizer
} }
else if (entry.EntryType.equals("component") && knownIssues > 0) else if (entry.EntryType.equals("component") && knownIssues > 0)
{ {
entry.State = "PASSED(with known issues).OK"; entry.State = "COMPLETED(with known issues).OK";
} }
else else
{ {
entry.State = "PASSED.OK"; entry.State = "COMPLETED.OK";
} }
} }
......
...@@ -90,7 +90,7 @@ public class UnitConversion ...@@ -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. * 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 * 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 @Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment