[RM] Bug Error message correction
MODIFY
BackEnd/Extension/extension-aml-3/src/main/java/com/exactpro/sf/aml/generator/NewImpl.java
BackEnd/Extension/extension-aml-3/src/main/java/com/exactpro/sf/aml/generator/NewImpl.java
@@ -1394,7 +1394,7 @@ public class NewImpl {
if(dictionary != null && !dictionary.matches(actionDictionary)) {
alertCollector.add(new Alert(action.getLine(), action.getUID(), action.getReference(), fieldName, format(
- "Subaction dictionary '%s' differs from action dictionary '%s'", dictionary, actionDictionary)));
+ "Sub-action dictionary '%s' differs from action dictionary '%s'", dictionary, actionDictionary)));
return;
}
@@ -1408,13 +1408,13 @@ public class NewImpl {
subAction.setMessageTypeColumn(msgType);
} else if(!subMsgType.equals(msgType)) {
alertCollector.add(new Alert(lineNumber, action.getUID(), action.getReference(), fieldName, format(
- "Subaction message type '%s' differs from action message type '%s'", subMsgType, msgType)));
+ "Sub-action message type '%s' differs from action message type '%s'", subMsgType, msgType)));
return;
}
} else {
alertCollector.add(new Alert(lineNumber, action.getUID(), action.getReference(), fieldName, format(
- "Subaction must predefined to use references to it's fields.")));
+ "Sub-action must be predefined to use references to its fields.")));
return;
}
}

MODIFY
BackEnd/Extension/extension-aml-3/src/test/java/com/exactpro/sf/aml/TestAML3_0.java
BackEnd/Extension/extension-aml-3/src/test/java/com/exactpro/sf/aml/TestAML3_0.java
@@ -233,7 +233,7 @@ public class TestAML3_0 extends TestAML3Base {
Assert.assertTrue(alert.toString(), source.remove(alert));
alert = new Alert(15, "", "VWAP", "Reference 'statistics' is not yet defined in column 'VWAP': '${statistics:Turnover}/${statistics:Volume}'.", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
- alert = new Alert(15, "", "VWAP", "Subaction must predefined to use references to it's fields.", AlertType.ERROR);
+ alert = new Alert(15, "", "VWAP", "Sub-action must be predefined to use references to its fields.", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
alert = new Alert(18, "ss1", "Unable to resolve utility function: random", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
@@ -243,15 +243,15 @@ public class TestAML3_0 extends TestAML3Base {
Assert.assertTrue(alert.toString(), source.remove(alert));
alert = new Alert(21, "ss4", "#static_value", "Invalid URI: com.exactpro.sf.actions.MiscUtils.random", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
- alert = new Alert(27, "ref1", "FInteger", "Subaction must predefined to use references to it's fields.", AlertType.ERROR);
+ alert = new Alert(27, "ref1", "FInteger", "Sub-action must be predefined to use references to its fields.", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
alert = new Alert(27, "ref1", "FInteger", "Reference 'rs1' is not yet defined in column 'FInteger': '10 + ${rs1:FInteger}'.", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
- alert = new Alert(28, "ref2", "FInteger", "Subaction must predefined to use references to it's fields.", AlertType.ERROR);
+ alert = new Alert(28, "ref2", "FInteger", "Sub-action must be predefined to use references to its fields.", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
alert = new Alert(28, "ref2", "FInteger", "Reference 'rs2' is not yet defined in column 'FInteger': '10 + ${rs2:FInteger}'.", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
- alert = new Alert(29, "ref3", "FInteger", "Subaction must predefined to use references to it's fields.", AlertType.ERROR);
+ alert = new Alert(29, "ref3", "FInteger", "Sub-action must be predefined to use references to its fields.", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));
alert = new Alert(29, "ref3", "FInteger", "Reference 'rs3' is not yet defined in column 'FInteger': '10 + ${rs3:TInteger}'.", AlertType.ERROR);
Assert.assertTrue(alert.toString(), source.remove(alert));

MODIFY
FrontEnd/Sailfish-EndToEndTest/src/test/java/com/exactpro/sf/TestAMLSyntaxNegative.java
FrontEnd/Sailfish-EndToEndTest/src/test/java/com/exactpro/sf/TestAMLSyntaxNegative.java
@@ -201,9 +201,9 @@ public class TestAMLSyntaxNegative extends TestMatrix {
public void testMissingReference() {
logger.info("Start testMissingReference()");
try {
- checkErrorPresents("Found 2 error(s) during preparing script:Error in line 4 column 'ClOrdID': Subaction must predefined to use references to it's fields.", errorsReferenceNameMatrix);
+ checkErrorPresents("Error in line 4 column 'ClOrdID': Sub-action must be predefined to use references to its fields.", errorsReferenceNameMatrix);
- checkErrorPresents("Error in line 4 column 'ClOrdID': Reference 'new_order' is not yet defined in column 'ClOrdID': '${new_order:ClOrdID}'.", errorsReferenceNameMatrix);
+ checkErrorPresents("Found 2 error(s) during preparing script:Error in line 4 column 'ClOrdID': Reference 'new_order' is not yet defined in column 'ClOrdID': '${new_order:ClOrdID}'.", errorsReferenceNameMatrix);
} catch (Exception e) {
logger.error(e.getMessage(), e);
throw e;

[RM] Bug #70852. Error message correction

Change-Id: Ief1d809d8ea10a4a88fe0900e982ab03f5be0ee3