Remove suite classes from systemtap plugins.
Change-Id: I3b3a157c4de8d15478ff5cde929e8cdf32c6e67f
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/linuxtools/org.eclipse.linuxtools/+/176458
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
index 7b2308f..449e54e 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
@@ -23,25 +23,4 @@
<name>Linux Tools Callgraph Launch Tests Plug-in</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <excludes>
- <!-- test mojo matches TestProject be default and treats it as PojoTest -->
- <exclude>**/Test*.class</exclude>
- </excludes>
- <testSuite>org.eclipse.linuxtools.callgraph.launch.tests</testSuite>
- <testClass>org.eclipse.linuxtools.callgraph.launch.tests.AllTests</testClass>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <product>org.eclipse.platform.ide</product>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java
index 1ad311f..5e847af 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java
@@ -27,7 +27,6 @@
import org.eclipse.linuxtools.profiling.tests.AbstractTest;
import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
import org.junit.After;
-import org.junit.Before;
import org.osgi.framework.FrameworkUtil;
public class AbstractStapTest extends AbstractTest {
@@ -56,12 +55,7 @@
}
}
- private List<ILaunch> launches;
-
- @Before
- public void setUp() {
- launches = new ArrayList<>();
- }
+ private List<ILaunch> launches = new ArrayList<>();
@After
public void tearDown() {
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AllTests.java b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AllTests.java
deleted file mode 100644
index 4cdf1ee..0000000
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AllTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.callgraph.launch.tests;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ SystemTapCommandTest.class, ConfigurationTest.class,
- SystemTapCommandGeneratorTest.class, SystemTapTabTest.class,
- LaunchShortcutsTest.class, SystemTapErrorHandlerTest.class })
-public class AllTests {
-}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
index 688db1b..f9491d3 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
@@ -24,25 +24,4 @@
<name>Linux Tools SystemTap Graphing Tests Plug-in</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <excludes>
- <!-- test mojo matches TestProject be default and treats it as PojoTest -->
- <exclude>**/Test*.class</exclude>
- </excludes>
- <testSuite>org.eclipse.linuxtools.systemtap.graphing.core.tests</testSuite>
- <testClass>org.eclipse.linuxtools.systemtap.graphing.core.tests.AllTests</testClass>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <product>org.eclipse.platform.ide</product>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/src/org/eclipse/linuxtools/systemtap/graphing/core/tests/AllTests.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/src/org/eclipse/linuxtools/systemtap/graphing/core/tests/AllTests.java
deleted file mode 100644
index 5541589..0000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/src/org/eclipse/linuxtools/systemtap/graphing/core/tests/AllTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2017 IBM Corporation and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.graphing.core.tests;
-
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.aggregates.AverageAggregateTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.aggregates.CountAggregateTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.aggregates.MaxAggregateTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.aggregates.MinAggregateTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.aggregates.SumAggregateTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.datasets.row.FilteredRowDataSetTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.datasets.row.RowDataSetTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.datasets.row.RowEntryTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.datasets.row.RowParserTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.datasets.table.FilteredTableDataSetTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.datasets.table.TableDataSetTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.datasets.table.TableEntryTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.datasets.table.TableParserTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.filters.MatchFilterTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.filters.RangeFilterTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.filters.SortFilterTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.filters.UniqueFilterTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.structures.ChartStreamDaemonTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.structures.NumberTypeTest;
-import org.eclipse.linuxtools.systemtap.graphing.core.tests.structures.UpdateManagerTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({// Aggregates
- AverageAggregateTest.class,
- CountAggregateTest.class,
- MaxAggregateTest.class,
- MinAggregateTest.class,
- SumAggregateTest.class,
-
- // DataSets
-
- // DataSets.Row
- FilteredRowDataSetTest.class,
- RowDataSetTest.class,
- RowEntryTest.class,
- RowParserTest.class,
-
- // DataSets.Table
- FilteredTableDataSetTest.class, TableDataSetTest.class,
- TableEntryTest.class,
- TableParserTest.class,
-
- // Filters
- MatchFilterTest.class, RangeFilterTest.class, SortFilterTest.class,
- UniqueFilterTest.class,
-
- // Structures
- ChartStreamDaemonTest.class, NumberTypeTest.class,
- UpdateManagerTest.class })
-public class AllTests {
-}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
index 155face..830c0c9 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
@@ -24,25 +24,4 @@
<name>Linux Tools SystemTap Structures Tests Plug-in</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <excludes>
- <!-- test mojo matches TestProject be default and treats it as PojoTest -->
- <exclude>**/Test*.class</exclude>
- </excludes>
- <testSuite>org.eclipse.linuxtools.systemtap.structures.tests</testSuite>
- <testClass>org.eclipse.linuxtools.systemtap.structures.tests.AllTests</testClass>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <product>org.eclipse.platform.ide</product>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/src/org/eclipse/linuxtools/systemtap/structures/tests/AllTests.java b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/src/org/eclipse/linuxtools/systemtap/structures/tests/AllTests.java
deleted file mode 100644
index fea4666..0000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/src/org/eclipse/linuxtools/systemtap/structures/tests/AllTests.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.structures.tests;
-
-import org.eclipse.linuxtools.systemtap.structures.tests.runnable.CommandTest;
-import org.eclipse.linuxtools.systemtap.structures.tests.runnable.StreamGobblerTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ CCodeFileFilterTest.class, CommandTest.class,
- CopierTest.class, IndexedObjectTest.class, KernelSourceTreeTest.class,
- LoggingStreamDaemonTest.class, SortTest.class, StreamGobblerTest.class,
- StringFormatterTest.class, TreeDefinitionNodeTest.class,
- TreeNodeTest.class})
-public class AllTests {
-}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
index 8ff3035..2d0e68e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
@@ -23,25 +23,4 @@
<name>Linux Tools SystemTap ConsoleLog Tests Plug-in</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <excludes>
- <!-- test mojo matches TestProject be default and treats it as PojoTest -->
- <exclude>**/Test*.class</exclude>
- </excludes>
- <testSuite>org.eclipse.linuxtools.systemtap.ui.consolelog.tests</testSuite>
- <testClass>org.eclipse.linuxtools.systemtap.ui.consolelog.test.AllTests</testClass>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <product>org.eclipse.platform.ide</product>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/src/org/eclipse/linuxtools/systemtap/ui/consolelog/test/AllTests.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/src/org/eclipse/linuxtools/systemtap/ui/consolelog/test/AllTests.java
deleted file mode 100644
index ef46273..0000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/src/org/eclipse/linuxtools/systemtap/ui/consolelog/test/AllTests.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.ui.consolelog.test;
-
-import org.eclipse.linuxtools.systemtap.ui.consolelog.test.structures.ConsoleStreamDaemonTest;
-import org.eclipse.linuxtools.systemtap.ui.consolelog.test.structures.ErrorStreamDaemonTest;
-import org.eclipse.linuxtools.systemtap.ui.consolelog.test.structures.ScriptConsoleTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ ConsoleStreamDaemonTest.class,
- ErrorStreamDaemonTest.class, ScriptConsoleTest.class })
-public class AllTests {
-}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
index e14141c..3aea067 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
@@ -24,20 +24,4 @@
<name>Linux Tools SystemTap IDE Tests Plug-in</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <useUIThread>false</useUIThread>
- <product>org.eclipse.platform.ide</product>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/AllTests.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/AllTests.java
deleted file mode 100644
index 09efad4..0000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/AllTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * IBM Corporation - Jeff Briggs, Henry Hughes, Ryan Morse
- *******************************************************************************/
-
-package org.eclipse.linuxtools.systemtap.ui.ide.test;
-
-import org.eclipse.linuxtools.systemtap.ui.ide.test.editors.stp.STPCompletionProcessorTest;
-import org.eclipse.linuxtools.systemtap.ui.ide.test.editors.stp.STPFormattingTest;
-import org.eclipse.linuxtools.systemtap.ui.ide.test.editors.stp.STPIndenterTest;
-import org.eclipse.linuxtools.systemtap.ui.ide.test.editors.stp.STPToggleCommentTest;
-import org.eclipse.linuxtools.systemtap.ui.ide.test.structures.StapErrorParserTest;
-import org.eclipse.linuxtools.systemtap.ui.ide.test.structures.TreeSettingsTest;
-import org.eclipse.linuxtools.systemtap.ui.ide.test.swtbot.TestCreateSystemtapScript;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({ StapErrorParserTest.class, TreeSettingsTest.class,
- STPCompletionProcessorTest.class, STPToggleCommentTest.class,
- TestCreateSystemtapScript.class, ConditionalExpressionValidatorTest.class,
- DirectoryValidatorTest.class, STPFormattingTest.class, STPIndenterTest.class })
-public class AllTests {
-}
