lttng.control: Change the short name of the LogLevelType.ALL to "All"

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>

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/model/impl/EventInfoTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/model/impl/EventInfoTest.java
index 4adb7400742fd3c58bd903ab938f045ac4deccd1..2a1e0111d12d6c489b887b558b470b8c0767c900 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/model/impl/EventInfoTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/model/impl/EventInfoTest.java
@@ -220,9 +220,9 @@ public class EventInfoTest {
         assertEquals("LOGLEVEL", fixture.getLogLevelType().name());
         assertEquals("<=", fixture.getLogLevelType().getShortName());
 
-        fixture.setLogLevelType("");
+        fixture.setLogLevelType("All");
         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());
@@ -234,7 +234,7 @@ public class EventInfoTest {
 
         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());

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/model/impl/LoggerInfoTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/model/impl/LoggerInfoTest.java
index a04c1c06948665b49a507974cd4f41abb8463295..d1a09aa4933fbec9e457f29de12e104b403fd92f 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/model/impl/LoggerInfoTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/model/impl/LoggerInfoTest.java
@@ -84,7 +84,7 @@ public class LoggerInfoTest {
 
         // 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());
@@ -193,9 +193,9 @@ public class LoggerInfoTest {
         assertEquals("LOGLEVEL", fixture.getLogLevelType().name());
         assertEquals("<=", fixture.getLogLevelType().getShortName());
 
-        fixture.setLogLevelType("");
+        fixture.setLogLevelType("All");
         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());
@@ -207,7 +207,7 @@ public class LoggerInfoTest {
 
         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());

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.core/src/org/eclipse/tracecompass/internal/lttng2/control/core/model/LogLevelType.java b/lttng/org.eclipse.tracecompass.lttng2.control.core/src/org/eclipse/tracecompass/internal/lttng2/control/core/model/LogLevelType.java
index d152e10332602f4ff4873d205a8081a529498568..dda10e6a83ac5344532acf55eba2d5cdd3ba1370 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.control.core/src/org/eclipse/tracecompass/internal/lttng2/control/core/model/LogLevelType.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.core/src/org/eclipse/tracecompass/internal/lttng2/control/core/model/LogLevelType.java
@@ -26,7 +26,7 @@ public enum LogLevelType {
     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$

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java
index 335a48706a7307c14b528e14fe1e3dc8d2cf57fa..43e623c67cb519865eedac849a3b65612dd45603 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java
@@ -292,23 +292,19 @@ public class ControlViewLoggerTest extends ControlViewTest {
      */
     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;
-            logLevel1 = "All";
-            logLevel2 = "<= Warning";
+            logLevel = "<= Warning";
             break;
         case LOG4J:
             domainName = ControlViewSwtBotUtil.LOG4J_DOMAIN_NAME;
-            logLevel1 = "All";
-            logLevel2 = "<= Fatal";
+            logLevel = "<= Fatal";
             break;
         case PYTHON:
             domainName = ControlViewSwtBotUtil.PYTHON_DOMAIN_NAME;
-            logLevel1 = "Debug";
-            logLevel2 = "<= Critical";
+            logLevel = "<= Critical";
             break;
             //$CASES-OMITTED$
         default:
@@ -340,7 +336,7 @@ public class ControlViewLoggerTest extends ControlViewTest {
 
         // 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();
@@ -364,7 +360,7 @@ public class ControlViewLoggerTest extends ControlViewTest {
 
         // 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);

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/property/TraceLoggerPropertySource.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/property/TraceLoggerPropertySource.java
index 70fed4d0be337c64ee3ba462e91adc3ca368f0d2..da4dbeaedf671f90cf15367ea98eba2f970c6df0 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/property/TraceLoggerPropertySource.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/property/TraceLoggerPropertySource.java
@@ -102,11 +102,12 @@ public class TraceLoggerPropertySource extends BasePropertySource {
             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.getLogLevel().getInName());
             }
-            buffer.append(fLogger.getLogLevel().getInName());
             return buffer.toString();
         } else if (TRACE_LOGGER_STATE_PROPERTY_ID.equals(id)) {
             return fLogger.getState().name();