Change the short name of the LogLevelType.ALL to "All" instead of an
empty string. This is because when all loglevel (LogLevelType.ALL) are
enabled for a Python logger, the loglevel is set to debug but we still
want to show the user "All".
Change-Id: I18e5800bc3261c11a74e124e76517ad316e2c4a3
Signed-off-by: Bruno Roy <bruno.roy@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/79215
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
assertEquals("LOGLEVEL", fixture.getLogLevelType().name());
assertEquals("<=", fixture.getLogLevelType().getShortName());
assertEquals("LOGLEVEL", fixture.getLogLevelType().name());
assertEquals("<=", fixture.getLogLevelType().getShortName());
- fixture.setLogLevelType("");
+ fixture.setLogLevelType("All");
assertEquals("LOGLEVEL_ALL", fixture.getLogLevelType().name());
assertEquals("LOGLEVEL_ALL", fixture.getLogLevelType().name());
- assertEquals("", fixture.getLogLevelType().getShortName());
+ assertEquals("All", fixture.getLogLevelType().getShortName());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_ONLY);
assertEquals("LOGLEVEL_ONLY", fixture.getLogLevelType().name());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_ONLY);
assertEquals("LOGLEVEL_ONLY", fixture.getLogLevelType().name());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_ALL);
assertEquals("LOGLEVEL_ALL", fixture.getLogLevelType().name());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_ALL);
assertEquals("LOGLEVEL_ALL", fixture.getLogLevelType().name());
- assertEquals("", fixture.getLogLevelType().getShortName());
+ assertEquals("All", fixture.getLogLevelType().getShortName());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_NONE);
assertEquals("LOGLEVEL_NONE", fixture.getLogLevelType().name());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_NONE);
assertEquals("LOGLEVEL_NONE", fixture.getLogLevelType().name());
// Log level type
LogLevelType logType = fixture.getLogLevelType();
// Log level type
LogLevelType logType = fixture.getLogLevelType();
- assertEquals("", logType.getShortName());
+ assertEquals("All", logType.getShortName());
assertEquals("LOGLEVEL_ALL", logType.name());
assertEquals("LOGLEVEL_ALL", logType.toString());
assertEquals(0, state.ordinal());
assertEquals("LOGLEVEL_ALL", logType.name());
assertEquals("LOGLEVEL_ALL", logType.toString());
assertEquals(0, state.ordinal());
assertEquals("LOGLEVEL", fixture.getLogLevelType().name());
assertEquals("<=", fixture.getLogLevelType().getShortName());
assertEquals("LOGLEVEL", fixture.getLogLevelType().name());
assertEquals("<=", fixture.getLogLevelType().getShortName());
- fixture.setLogLevelType("");
+ fixture.setLogLevelType("All");
assertEquals("LOGLEVEL_ALL", fixture.getLogLevelType().name());
assertEquals("LOGLEVEL_ALL", fixture.getLogLevelType().name());
- assertEquals("", fixture.getLogLevelType().getShortName());
+ assertEquals("All", fixture.getLogLevelType().getShortName());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_ONLY);
assertEquals("LOGLEVEL_ONLY", fixture.getLogLevelType().name());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_ONLY);
assertEquals("LOGLEVEL_ONLY", fixture.getLogLevelType().name());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_ALL);
assertEquals("LOGLEVEL_ALL", fixture.getLogLevelType().name());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_ALL);
assertEquals("LOGLEVEL_ALL", fixture.getLogLevelType().name());
- assertEquals("", fixture.getLogLevelType().getShortName());
+ assertEquals("All", fixture.getLogLevelType().getShortName());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_NONE);
assertEquals("LOGLEVEL_NONE", fixture.getLogLevelType().name());
fixture.setLogLevelType(LogLevelType.LOGLEVEL_NONE);
assertEquals("LOGLEVEL_NONE", fixture.getLogLevelType().name());
LOGLEVEL("<=", "RANGE"), //$NON-NLS-1$ //$NON-NLS-2$
/** all log level */
LOGLEVEL("<=", "RANGE"), //$NON-NLS-1$ //$NON-NLS-2$
/** all log level */
- LOGLEVEL_ALL("", "ALL"), //$NON-NLS-1$//$NON-NLS-2$
+ LOGLEVEL_ALL("All", "ALL"), //$NON-NLS-1$//$NON-NLS-2$
/** single log level */
LOGLEVEL_ONLY("==", "SINGLE"), //$NON-NLS-1$ //$NON-NLS-2$
/** single log level */
LOGLEVEL_ONLY("==", "SINGLE"), //$NON-NLS-1$ //$NON-NLS-2$
*/
protected void testLoggerProperties(TraceDomainType domain) {
String domainName = new String();
*/
protected void testLoggerProperties(TraceDomainType domain) {
String domainName = new String();
- String logLevel1 = new String();
- String logLevel2 = new String();
+ String logLevel = new String();
switch (domain) {
case JUL:
domainName = ControlViewSwtBotUtil.JUL_DOMAIN_NAME;
switch (domain) {
case JUL:
domainName = ControlViewSwtBotUtil.JUL_DOMAIN_NAME;
- logLevel1 = "All";
- logLevel2 = "<= Warning";
+ logLevel = "<= Warning";
break;
case LOG4J:
domainName = ControlViewSwtBotUtil.LOG4J_DOMAIN_NAME;
break;
case LOG4J:
domainName = ControlViewSwtBotUtil.LOG4J_DOMAIN_NAME;
- logLevel1 = "All";
- logLevel2 = "<= Fatal";
break;
case PYTHON:
domainName = ControlViewSwtBotUtil.PYTHON_DOMAIN_NAME;
break;
case PYTHON:
domainName = ControlViewSwtBotUtil.PYTHON_DOMAIN_NAME;
- logLevel1 = "Debug";
- logLevel2 = "<= Critical";
+ logLevel = "<= Critical";
break;
//$CASES-OMITTED$
default:
break;
//$CASES-OMITTED$
default:
// Assert that the expression in the Properties view is the same as
// the one we entered
// Assert that the expression in the Properties view is the same as
// the one we entered
- assertEquals(logLevel1, loglevelExpression);
+ assertEquals("All", loglevelExpression);
// Case 2: Select the "anotherLogger" logger in the Control view
fBot.viewById(ControlView.ID).show();
// Case 2: Select the "anotherLogger" logger in the Control view
fBot.viewById(ControlView.ID).show();
// Assert that the expression in the Properties view is the same as
// the one we entered
// Assert that the expression in the Properties view is the same as
// the one we entered
- assertEquals(logLevel2, loglevelExpression);
+ assertEquals(logLevel, loglevelExpression);
// Close the Properties view
SWTBotUtils.closeView(PROPERTIES_VIEW, fBot);
// Close the Properties view
SWTBotUtils.closeView(PROPERTIES_VIEW, fBot);
return fLogger.getName();
} else if (TRACE_LOGGER_LOGLEVEL_PROPERTY_ID.equals(id)) {
StringBuffer buffer = new StringBuffer();
return fLogger.getName();
} else if (TRACE_LOGGER_LOGLEVEL_PROPERTY_ID.equals(id)) {
StringBuffer buffer = new StringBuffer();
- if (!fLogger.getLogLevelType().equals(LogLevelType.LOGLEVEL_NONE) &&
- !fLogger.getLogLevelType().equals(LogLevelType.LOGLEVEL_ALL)) {
+ if (fLogger.getLogLevelType().equals(LogLevelType.LOGLEVEL_ALL)) {
+ buffer.append(fLogger.getLogLevelType().getShortName());
+ } else {
buffer.append(fLogger.getLogLevelType().getShortName()).append(" "); //$NON-NLS-1$
buffer.append(fLogger.getLogLevelType().getShortName()).append(" "); //$NON-NLS-1$
+ buffer.append(fLogger.getLogLevel().getInName());
- buffer.append(fLogger.getLogLevel().getInName());
return buffer.toString();
} else if (TRACE_LOGGER_STATE_PROPERTY_ID.equals(id)) {
return fLogger.getState().name();
return buffer.toString();
} else if (TRACE_LOGGER_STATE_PROPERTY_ID.equals(id)) {
return fLogger.getState().name();