Mercurial > hg > release > thermostat-2.0

changeset 2535:2454fc3dce1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix testMetricsTableWithMetrics in SwingVmBytemanViewTest This patch fixes a test failure that was introduced in f623de4ce913 Reviewed by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-November/021695.html
author Alex Macdonald <almacdon@redhat.com>
date Wed, 23 Nov 2016 09:45:38 -0500
parents f623de4ce913
children 8b9ec59e8c2d
files vm-byteman/client-cli/src/main/java/com/redhat/thermostat/vm/byteman/client/cli/BytemanControlCommand.java vm-byteman/client-swing/src/main/java/com/redhat/thermostat/vm/byteman/client/swing/internal/SwingVmBytemanView.java vm-byteman/client-swing/src/test/java/com/redhat/thermostat/vm/byteman/client/swing/internal/SwingVmBytemanViewTest.java
diffstat 3 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/vm-byteman/client-cli/src/main/java/com/redhat/thermostat/vm/byteman/client/cli/BytemanControlCommand.java	Mon Nov 21 11:14:28 2016 -0500
+++ b/vm-byteman/client-cli/src/main/java/com/redhat/thermostat/vm/byteman/client/cli/BytemanControlCommand.java	Wed Nov 23 09:45:38 2016 -0500
@@ -255,7 +255,7 @@
         if (metrics.isEmpty()) {
             out.println(translator.localize(LocaleResources.NO_METRICS_AVAILABLE, vmId.get()).getContents());
         } else {
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map;
             for (BytemanMetric m : metrics) {
                 String timestring = Clock.DEFAULT_DATE_FORMAT.format(new Date(m.getTimeStamp()));
                 map = m.getDataAsMap();
--- a/vm-byteman/client-swing/src/main/java/com/redhat/thermostat/vm/byteman/client/swing/internal/SwingVmBytemanView.java	Mon Nov 21 11:14:28 2016 -0500
+++ b/vm-byteman/client-swing/src/main/java/com/redhat/thermostat/vm/byteman/client/swing/internal/SwingVmBytemanView.java	Wed Nov 23 09:45:38 2016 -0500
@@ -916,7 +916,7 @@
                         metricsTable.setModel(tableModel);
                         metricsTable.setAutoCreateColumnsFromModel(true);
                     } else {
-                        Map<String, Object> map = new HashMap<>();
+                        Map<String, Object> map;
                         int previousNameSetSize = metricsNameSet.size();
                         String selectedMetric = metricsComboBox.getSelectedItem().toString();
                         tableModel.addColumn(t.localize(LocaleResources.HEADER_TIMESTAMP).getContents());
--- a/vm-byteman/client-swing/src/test/java/com/redhat/thermostat/vm/byteman/client/swing/internal/SwingVmBytemanViewTest.java	Mon Nov 21 11:14:28 2016 -0500
+++ b/vm-byteman/client-swing/src/test/java/com/redhat/thermostat/vm/byteman/client/swing/internal/SwingVmBytemanViewTest.java	Wed Nov 23 09:45:38 2016 -0500
@@ -306,6 +306,7 @@
         comboBox = getMetricsComboBox();
         table = getMetricsTable();
         verifyComboItemAt(comboBox, t.localize(LocaleResources.COMBO_ALL_METRICS).getContents(), 0);
+        sortTableElements(table, 2);
         verifyTableValueAt(table, "bar", 0, 2);
         verifyTableValueAt(table, "value2", 0, 3);
         verifyTableValueAt(table, "baz", 1, 2);
@@ -440,6 +441,15 @@
         return (JTable) tableFixture.component();
     }
 
+    private void sortTableElements(final JTable table, final int column) {
+        GuiActionRunner.execute(new GuiTask() {
+            @Override
+            protected void executeInEDT() throws Throwable {
+                table.getRowSorter().toggleSortOrder(column);
+            }
+        });
+    }
+
     private void verifyTableValueAt(final JTable table, final Object expected, final int row, final int column) {
         GuiActionRunner.execute(new GuiTask() {
             @Override