Mercurial > hg > thermostat-ng > agent
changeset 2431:e477b15804cb
SpinningPanel visibility set in accordance with enabled state
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-August/020665.html
author | Andrew Azores <aazores@redhat.com> |
---|---|
date | Thu, 25 Aug 2016 12:36:07 -0400 |
parents | 1a237d1821fa |
children | b36e89aa7070 |
files | vm-profiler/client-swing/src/main/java/com/redhat/thermostat/vm/profiler/client/swing/internal/SpinningPanel.java vm-profiler/client-swing/src/test/java/com/redhat/thermostat/vm/profiler/client/swing/internal/SpinningPanelTest.java |
diffstat | 2 files changed, 144 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/vm-profiler/client-swing/src/main/java/com/redhat/thermostat/vm/profiler/client/swing/internal/SpinningPanel.java Thu Aug 25 11:17:12 2016 -0400 +++ b/vm-profiler/client-swing/src/main/java/com/redhat/thermostat/vm/profiler/client/swing/internal/SpinningPanel.java Thu Aug 25 12:36:07 2016 -0400 @@ -145,6 +145,8 @@ createHelpMessage(); content.add(spinnerLayer, BorderLayout.CENTER); + + setVisible(false); } private void createHelpMessage() { @@ -174,6 +176,7 @@ spinnerLayerUI.stop(); removeAll(); } + setVisible(enable); revalidate(); repaint();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vm-profiler/client-swing/src/test/java/com/redhat/thermostat/vm/profiler/client/swing/internal/SpinningPanelTest.java Thu Aug 25 12:36:07 2016 -0400 @@ -0,0 +1,141 @@ +/* + * Copyright 2012-2016 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.vm.profiler.client.swing.internal; + +import com.redhat.thermostat.annotations.internal.CacioTest; +import com.redhat.thermostat.client.swing.internal.vmlist.UIDefaultsImpl; +import net.java.openjdk.cacio.ctc.junit.CacioFESTRunner; +import org.fest.swing.annotation.GUITest; +import org.fest.swing.edt.FailOnThreadViolationRepaintManager; +import org.fest.swing.edt.GuiActionRunner; +import org.fest.swing.edt.GuiTask; +import org.fest.swing.fixture.Containers; +import org.fest.swing.fixture.FrameFixture; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +@Category(CacioTest.class) +@RunWith(CacioFESTRunner.class) +public class SpinningPanelTest { + + private SpinningPanel panel; + + private FrameFixture frame; + + @BeforeClass + public static void setUpOnce() { + FailOnThreadViolationRepaintManager.install(); + } + + @Before + public void setup() { + GuiActionRunner.execute(new GuiTask() { + @Override + protected void executeInEDT() throws Throwable { + panel = new SpinningPanel(new UIDefaultsImpl()); + } + }); + frame = Containers.frameFixtureFor(panel); + } + + @After + public void tearDown() { + frame.cleanUp(); + frame = null; + panel = null; + } + + @GUITest + @Test + public void testPanelIsInitiallyDisabled() { + assertThat(panel.isSpinnerEnabled(), is(false)); + } + + @GUITest + @Test + public void testPanelIsInitiallyInvisible() { + assertThat(panel.isVisible(), is(false)); + } + + @GUITest + @Test + public void testEnableSpinnerWorks() { + GuiActionRunner.execute(new GuiTask() { + @Override + protected void executeInEDT() throws Throwable { + panel.enableSpinner(true); + } + }); + assertThat(panel.isSpinnerEnabled(), is(true)); + + GuiActionRunner.execute(new GuiTask() { + @Override + protected void executeInEDT() throws Throwable { + panel.enableSpinner(false); + } + }); + assertThat(panel.isSpinnerEnabled(), is(false)); + } + + @GUITest + @Test + public void testEnableSpinnerAlsoSetsVisibility() { + GuiActionRunner.execute(new GuiTask() { + @Override + protected void executeInEDT() throws Throwable { + panel.enableSpinner(true); + } + }); + assertThat(panel.isVisible(), is(true)); + + GuiActionRunner.execute(new GuiTask() { + @Override + protected void executeInEDT() throws Throwable { + panel.enableSpinner(false); + } + }); + assertThat(panel.isVisible(), is(false)); + } + +}