Mercurial > hg > thermostat-ng > agent

changeset 1749:d8be05852d5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Skip Caciocavallo tests on JDK 1.8 PR2282 Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-June/013970.html Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-April/013493.html
author Jie Kang <jkang@redhat.com>
date Wed, 10 Jun 2015 11:39:13 -0400
parents 73496f1a1105
children 368907b4505c
files annotations/src/main/java/com/redhat/thermostat/annotations/internal/CacioTest.java client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/host/swing/DeadHostIconDecoratorTest.java client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/host/swing/HostIconDecoratorTest.java client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/vm/swing/VMFilterActivatorTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/MenuHelperTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/ActionButtonTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/FontAwesomeIconTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/HeaderPanelTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/RecentTimeSeriesChartPanelTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/SearchFieldTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/RecentTimeControlPanelTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/SingleValueChartPanelTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/components/models/NullSelectionModelTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/experimental/ComponentVisibilityNotifierTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/MainWindowTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/StatusBarTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/accordion/AccordionTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/accordion/TitledPaneTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/AgentInformationDisplayFrameTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/ClientConfigurationSwingTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/HostInformationPanelTest.java client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/VmInformationPanelTest.java common/pom.xml dev/perflog-analyzer/pom.xml numa/client-swing/src/test/java/com/redhat/thermostat/numa/client/swing/internal/NumaPanelTest.java pom.xml thread/client-swing/src/test/java/com/redhat/thermostat/thread/client/swing/impl/SwingThreadViewTest.java vm-classstat/client-swing/src/test/java/com/redhat/thermostat/vm/classstat/client/swing/VmClassStatPanelTest.java vm-gc/remote-collector-client-swing/src/test/java/com/redhat/thermostat/gc/remote/client/swing/ToolbarGCButtonTest.java vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapDetailsSwingTest.java vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapDumpListViewTest.java vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapSwingViewTest.java vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/ObjectDetailsPanelTest.java vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/ObjectRootsFrameTest.java vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/stats/OverlayComponentTest.java vm-jmx/client-swing/src/test/java/com/redhat/thermostat/vm/jmx/client/swing/internal/JmxNotificationsSwingViewProviderTest.java vm-memory/client-swing/src/test/java/com/redhat/thermostat/vm/memory/client/swing/internal/MemoryStatsViewImplTest.java vm-profiler/jvm-agent/pom.xml
diffstat 38 files changed, 175 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/annotations/src/main/java/com/redhat/thermostat/annotations/internal/CacioTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2012-2015 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.annotations.internal;
+
+/**
+ * Temporary workaround for PR2282: Caciocavallo tests fail with JDK 8 u40
+ * Use this annotation on test classes to exclude them from being run by the maven-surefire-plugin
+ */
+public interface CacioTest {
+}
--- a/client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/host/swing/DeadHostIconDecoratorTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/host/swing/DeadHostIconDecoratorTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -43,13 +43,16 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.UIDefaults;
 import com.redhat.thermostat.client.ui.PlatformIcon;
 import com.redhat.thermostat.storage.core.HostRef;
 import com.redhat.thermostat.storage.core.VmRef;
 import com.redhat.thermostat.storage.dao.HostInfoDAO;
 
+@Category(CacioTest.class)
 public class DeadHostIconDecoratorTest {
 
     private DeadHostIconDecorator decorator;
--- a/client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/host/swing/HostIconDecoratorTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/host/swing/HostIconDecoratorTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -45,12 +45,15 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.UIDefaults;
 import com.redhat.thermostat.client.ui.PlatformIcon;
 import com.redhat.thermostat.storage.core.HostRef;
 import com.redhat.thermostat.storage.core.VmRef;
 
+@Category(CacioTest.class)
 public class HostIconDecoratorTest {
 
     private HostIconDecorator decorator;
--- a/client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/vm/swing/VMFilterActivatorTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/vm/swing/VMFilterActivatorTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -41,9 +41,10 @@
 import static org.mockito.Mockito.when;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.filter.host.swing.DeadHostIconDecorator;
-import com.redhat.thermostat.client.filter.host.swing.HostIconDecorator;
 import com.redhat.thermostat.client.filter.host.swing.HostInfoLabelDecorator;
 import com.redhat.thermostat.client.swing.UIDefaults;
 import com.redhat.thermostat.client.ui.ReferenceFieldIconDecorator;
@@ -53,6 +54,7 @@
 import com.redhat.thermostat.storage.dao.VmInfoDAO;
 import com.redhat.thermostat.testutils.StubBundleContext;
 
+@Category(CacioTest.class)
 public class VMFilterActivatorTest {
     
     @Test
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/MenuHelperTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/MenuHelperTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -63,9 +63,11 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.ui.MenuAction;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class MenuHelperTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/ActionButtonTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/ActionButtonTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -57,10 +57,13 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class ActionButtonTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/FontAwesomeIconTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/FontAwesomeIconTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -43,7 +43,11 @@
 import java.awt.image.BufferedImage;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
+
+@Category(CacioTest.class)
 public class FontAwesomeIconTest {
 
     @Test
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/HeaderPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/HeaderPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -57,14 +57,17 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertEquals;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class HeaderPanelTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/RecentTimeSeriesChartPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/RecentTimeSeriesChartPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -41,6 +41,7 @@
 import java.util.concurrent.TimeUnit;
 import javax.swing.JFrame;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.ui.RecentTimeSeriesChartController;
 import net.java.openjdk.cacio.ctc.junit.CacioFESTRunner;
 import org.fest.swing.annotation.GUITest;
@@ -55,8 +56,10 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class RecentTimeSeriesChartPanelTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/SearchFieldTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/SearchFieldTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -62,11 +62,12 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
-import com.redhat.thermostat.client.swing.components.SearchField;
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class SearchFieldTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/RecentTimeControlPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/RecentTimeControlPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -46,6 +46,7 @@
 import javax.swing.JFrame;
 import javax.swing.JComboBox;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.experimental.Duration;
 import net.java.openjdk.cacio.ctc.junit.CacioFESTRunner;
 import org.fest.swing.annotation.GUITest;
@@ -58,8 +59,10 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class RecentTimeControlPanelTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/SingleValueChartPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/experimental/SingleValueChartPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -44,6 +44,7 @@
 import java.util.concurrent.TimeUnit;
 import javax.swing.JFrame;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.experimental.Duration;
 import net.java.openjdk.cacio.ctc.junit.CacioFESTRunner;
 import org.fest.swing.annotation.GUITest;
@@ -58,8 +59,10 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class SingleValueChartPanelTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/models/NullSelectionModelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/components/models/NullSelectionModelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -53,8 +53,12 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
+
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class NullSelectionModelTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/experimental/ComponentVisibilityNotifierTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/experimental/ComponentVisibilityNotifierTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -55,13 +55,13 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.views.BasicView;
 import com.redhat.thermostat.client.core.views.BasicView.Action;
-import com.redhat.thermostat.client.swing.experimental.ComponentVisibilityNotifier;
 import com.redhat.thermostat.common.ActionNotifier;
 
 @GUITest
-@Category(GUITest.class)
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class ComponentVisibilityNotifierTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/MainWindowTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/MainWindowTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -61,12 +61,14 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.views.BasicView;
 import com.redhat.thermostat.client.ui.MenuAction;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class MainWindowTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/StatusBarTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/StatusBarTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -58,10 +58,13 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class StatusBarTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/accordion/AccordionTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/accordion/AccordionTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -67,8 +67,10 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.components.EmptyIcon;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class AccordionTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/accordion/TitledPaneTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/accordion/TitledPaneTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -57,10 +57,13 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.components.VerticalLayout;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class TitledPaneTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/AgentInformationDisplayFrameTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/AgentInformationDisplayFrameTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -66,12 +66,13 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.views.AgentInformationDisplayView;
 import com.redhat.thermostat.client.core.views.AgentInformationDisplayView.ConfigurationAction;
-import com.redhat.thermostat.client.swing.internal.views.AgentInformationDisplayFrame;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class AgentInformationDisplayFrameTest {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/ClientConfigurationSwingTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/ClientConfigurationSwingTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -62,12 +62,13 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.views.ClientConfigurationView;
-import com.redhat.thermostat.client.swing.internal.views.ClientConfigurationSwing;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
 import com.redhat.thermostat.test.Bug;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class ClientConfigurationSwingTest {
     
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/HostInformationPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/HostInformationPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -48,13 +48,16 @@
 import org.fest.swing.edt.GuiActionRunner;
 import org.fest.swing.edt.GuiQuery;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.views.UIComponent;
 import com.redhat.thermostat.client.swing.FrameWithPanelTest;
 import com.redhat.thermostat.client.swing.TabbedPaneMatcher;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class HostInformationPanelTest extends FrameWithPanelTest<HostInformationPanel> {
 
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/VmInformationPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/views/VmInformationPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -43,12 +43,15 @@
 import org.fest.swing.edt.GuiActionRunner;
 import org.fest.swing.edt.GuiQuery;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.views.UIComponent;
 import com.redhat.thermostat.client.swing.FrameWithPanelTest;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class VmInformationPanelTest extends FrameWithPanelTest<VmInformationPanel> {
 
--- a/common/pom.xml	Mon Jun 08 16:33:12 2015 -0400
+++ b/common/pom.xml	Wed Jun 10 11:39:13 2015 -0400
@@ -56,6 +56,12 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.redhat.thermostat</groupId>
+      <artifactId>thermostat-annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <modules>
--- a/dev/perflog-analyzer/pom.xml	Mon Jun 08 16:33:12 2015 -0400
+++ b/dev/perflog-analyzer/pom.xml	Wed Jun 10 11:39:13 2015 -0400
@@ -62,6 +62,13 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.redhat.thermostat</groupId>
+      <artifactId>thermostat-annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   
   <build>
--- a/numa/client-swing/src/test/java/com/redhat/thermostat/numa/client/swing/internal/NumaPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/numa/client-swing/src/test/java/com/redhat/thermostat/numa/client/swing/internal/NumaPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -46,12 +46,15 @@
 import org.fest.swing.fixture.Containers;
 import org.fest.swing.fixture.FrameFixture;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.core.views.BasicView;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class NumaPanelTest {
 
--- a/pom.xml	Mon Jun 08 16:33:12 2015 -0400
+++ b/pom.xml	Wed Jun 10 11:39:13 2015 -0400
@@ -96,6 +96,25 @@
         <surefire-argline>-XX:-UseSplitVerifier -XX:MaxPermSize=300m</surefire-argline>
       </properties>
     </profile>
+    <profile>
+      <!-- Temporary workaround for PR2282: Caciocavallo tests fail with JDK 8 u40 -->
+      <id>java-8-skip-cacio-tests</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludedGroups>com.redhat.thermostat.annotations.internal.CacioTest</excludedGroups>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+
+    </profile>
     <!-- Development settings for web.xml. Release builds should
          have the "environment.type=release" property. -->
     <profile>
--- a/thread/client-swing/src/test/java/com/redhat/thermostat/thread/client/swing/impl/SwingThreadViewTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/thread/client-swing/src/test/java/com/redhat/thermostat/thread/client/swing/impl/SwingThreadViewTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -36,6 +36,7 @@
 
 package com.redhat.thermostat.thread.client.swing.impl;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.UIDefaults;
 import com.redhat.thermostat.shared.locale.Translate;
 import com.redhat.thermostat.thread.client.common.locale.LocaleResources;
@@ -61,6 +62,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class SwingThreadViewTest {
 
--- a/vm-classstat/client-swing/src/test/java/com/redhat/thermostat/vm/classstat/client/swing/VmClassStatPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-classstat/client-swing/src/test/java/com/redhat/thermostat/vm/classstat/client/swing/VmClassStatPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -51,10 +51,13 @@
 import org.fest.swing.edt.GuiTask;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.storage.model.DiscreteTimeData;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class VmClassStatPanelTest {
 
--- a/vm-gc/remote-collector-client-swing/src/test/java/com/redhat/thermostat/gc/remote/client/swing/ToolbarGCButtonTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-gc/remote-collector-client-swing/src/test/java/com/redhat/thermostat/gc/remote/client/swing/ToolbarGCButtonTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -57,12 +57,15 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.components.HeaderPanel;
 import com.redhat.thermostat.shared.locale.LocalizedString;
 import com.redhat.thermostat.gc.remote.client.common.RequestGCAction;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class ToolbarGCButtonTest {
 
--- a/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapDetailsSwingTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapDetailsSwingTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -58,14 +58,14 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.EdtHelper;
 import com.redhat.thermostat.shared.locale.LocalizedString;
-import com.redhat.thermostat.vm.heap.analysis.client.swing.internal.HeapDetailsSwing;
-import com.redhat.thermostat.vm.heap.analysis.client.swing.internal.HistogramPanel;
-import com.redhat.thermostat.vm.heap.analysis.client.swing.internal.ObjectDetailsPanel;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class HeapDetailsSwingTest {
 
--- a/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapDumpListViewTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapDumpListViewTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -59,8 +59,10 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
 import com.redhat.thermostat.vm.heap.analysis.client.core.HeapDumpListView;
@@ -68,6 +70,7 @@
 
 import net.java.openjdk.cacio.ctc.junit.CacioFESTRunner;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class HeapDumpListViewTest {
 
--- a/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapSwingViewTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/HeapSwingViewTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -48,7 +48,6 @@
 import net.java.openjdk.cacio.ctc.junit.CacioFESTRunner;
 
 import org.fest.swing.annotation.GUITest;
-import org.fest.swing.core.Robot;
 import org.fest.swing.edt.FailOnThreadViolationRepaintManager;
 import org.fest.swing.edt.GuiActionRunner;
 import org.fest.swing.edt.GuiTask;
@@ -65,8 +64,10 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.components.OverlayPanel;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
@@ -79,6 +80,7 @@
 import com.redhat.thermostat.vm.heap.analysis.common.HeapDump;
 import com.redhat.thermostat.vm.heap.analysis.common.model.HeapInfo;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class HeapSwingViewTest {
 
--- a/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/ObjectDetailsPanelTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/ObjectDetailsPanelTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -64,17 +64,19 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.client.swing.components.SearchField;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
 import com.redhat.thermostat.vm.heap.analysis.client.core.HeapObjectUI;
 import com.redhat.thermostat.vm.heap.analysis.client.core.ObjectDetailsView.ObjectAction;
-import com.redhat.thermostat.vm.heap.analysis.client.swing.internal.ObjectDetailsPanel;
 import com.sun.tools.hat.internal.model.JavaClass;
 import com.sun.tools.hat.internal.model.JavaHeapObject;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class ObjectDetailsPanelTest {
 
--- a/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/ObjectRootsFrameTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/ObjectRootsFrameTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -60,16 +60,18 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.common.ActionEvent;
 import com.redhat.thermostat.common.ActionListener;
 import com.redhat.thermostat.vm.heap.analysis.client.core.HeapObjectUI;
 import com.redhat.thermostat.vm.heap.analysis.client.core.ObjectRootsView;
 import com.redhat.thermostat.vm.heap.analysis.client.core.ObjectRootsView.Action;
-import com.redhat.thermostat.vm.heap.analysis.client.swing.internal.ObjectRootsFrame;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class ObjectRootsFrameTest {
 
--- a/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/stats/OverlayComponentTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-heap-analysis/client-swing/src/test/java/com/redhat/thermostat/vm/heap/analysis/client/swing/internal/stats/OverlayComponentTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -60,10 +60,13 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.vm.heap.analysis.common.HeapDump;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class OverlayComponentTest {
 
--- a/vm-jmx/client-swing/src/test/java/com/redhat/thermostat/vm/jmx/client/swing/internal/JmxNotificationsSwingViewProviderTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-jmx/client-swing/src/test/java/com/redhat/thermostat/vm/jmx/client/swing/internal/JmxNotificationsSwingViewProviderTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -39,7 +39,11 @@
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
+
+@Category(CacioTest.class)
 public class JmxNotificationsSwingViewProviderTest {
 
     @Test
--- a/vm-memory/client-swing/src/test/java/com/redhat/thermostat/vm/memory/client/swing/internal/MemoryStatsViewImplTest.java	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-memory/client-swing/src/test/java/com/redhat/thermostat/vm/memory/client/swing/internal/MemoryStatsViewImplTest.java	Wed Jun 10 11:39:13 2015 -0400
@@ -54,10 +54,12 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.redhat.thermostat.annotations.internal.CacioTest;
 import com.redhat.thermostat.vm.memory.client.core.MemoryStatsView;
 
 import net.java.openjdk.cacio.ctc.junit.CacioFESTRunner;
 
+@Category(CacioTest.class)
 @RunWith(CacioFESTRunner.class)
 public class MemoryStatsViewImplTest {
 
--- a/vm-profiler/jvm-agent/pom.xml	Mon Jun 08 16:33:12 2015 -0400
+++ b/vm-profiler/jvm-agent/pom.xml	Wed Jun 10 11:39:13 2015 -0400
@@ -96,5 +96,11 @@
       <artifactId>asm-all</artifactId>
       <version>${asm.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.redhat.thermostat</groupId>
+      <artifactId>thermostat-annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>