Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMartin Weber2020-06-30 18:00:23 +0000
committerJonah Graham2020-08-13 18:18:47 +0000
commit9e303185f96303b772b5c3d3a3a8de7b7ee9e358 (patch)
treec85f070f43e00db7f057a92ddddd32257c76d8e4 /build
parenta025f75771f06c23cec07612def5c19acad9b204 (diff)
downloadorg.eclipse.cdt-master.tar.gz
org.eclipse.cdt-master.tar.xz
org.eclipse.cdt-master.zip
Bug 564002: Restore the default pattern of the surefire-pluginHEADmaster
Sets the pattern to the default of upcoming tycho 2.0 in advance. Signed-off-by: Martin Weber <fifteenknots505@gmail.com> Change-Id: I31b3fc733d0cb888fbf6f566995ce2043f6cd621
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java8
-rw-r--r--build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject0Test.java (renamed from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest0.java)2
-rw-r--r--build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject1Test.java (renamed from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java)2
-rw-r--r--build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject2Test.java (renamed from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest2.java)2
-rw-r--r--build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/EditorTestSuite.java (renamed from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/EditorTests.java)2
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java27
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameterTest.java (renamed from build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java)4
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestEnvironmentVars.java2
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestMakeTargets.java2
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestToolActions.java2
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTestSuite.java (renamed from build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTests.java)2
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java20
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java20
-rw-r--r--build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java4
-rw-r--r--build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTestSuite.java (renamed from build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTests.java)8
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java22
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/ManagedBuilderPreconditionsTests.java (renamed from build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/Preconditions.java)6
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953Test.java (renamed from build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953.java)2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTestSuite.java (renamed from build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTests.java)10
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCore20Tests.java (renamed from build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java)26
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCore_SharedToolOptionsTests.java (renamed from build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java)14
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTestSuite.java (renamed from build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTests.java)8
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTestSuite.java (renamed from build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTests.java)4
23 files changed, 115 insertions, 84 deletions
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java
index c234c492750..d73d172b525 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java
@@ -13,14 +13,14 @@
*******************************************************************************/
package org.eclipse.cdt.autotools.tests;
-import org.eclipse.cdt.autotools.tests.editors.EditorTests;
+import org.eclipse.cdt.autotools.tests.editors.EditorTestSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
/** On Windows requires either Cygwin or MinGW to be in PATH */
@RunWith(Suite.class)
-@Suite.SuiteClasses({ AutotoolsProjectTest0.class, AutotoolsProjectNatureTest.class, AutotoolsProjectTest1.class,
- AutotoolsProjectTest2.class, AutotoolsVirtualFolderTest.class, AutotoolsEnvironmentVarTest.class,
- LibtoolGCCBuildCommandParserTest.class, UpdateConfigureTest.class, EditorTests.class })
+@Suite.SuiteClasses({ AutotoolsProject0Test.class, AutotoolsProjectNatureTest.class, AutotoolsProject1Test.class,
+ AutotoolsProject2Test.class, AutotoolsVirtualFolderTest.class, AutotoolsEnvironmentVarTest.class,
+ LibtoolGCCBuildCommandParserTest.class, UpdateConfigureTest.class, EditorTestSuite.class })
public class AutomatedIntegrationSuite {
}
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest0.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject0Test.java
index 7fcbbbce0b5..cb3a95b6459 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest0.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject0Test.java
@@ -27,7 +27,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class AutotoolsProjectTest0 {
+public class AutotoolsProject0Test {
private IProject testProject;
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject1Test.java
index 44b99e9a190..07fb1dba23e 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest1.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject1Test.java
@@ -27,7 +27,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class AutotoolsProjectTest1 {
+public class AutotoolsProject1Test {
private IProject testProject;
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest2.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject2Test.java
index 99c1ef2cd8f..832fa41b852 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProjectTest2.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutotoolsProject2Test.java
@@ -30,7 +30,7 @@ import org.junit.Test;
// This test verifies an autogen.sh project that builds configure, but
// does not run it.
-public class AutotoolsProjectTest2 {
+public class AutotoolsProject2Test {
private IProject testProject;
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/EditorTests.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/EditorTestSuite.java
index 0a41b9b1968..6647e5de52c 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/EditorTests.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/editors/EditorTestSuite.java
@@ -18,5 +18,5 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({ AutomakeColourizationTests.class, AutomakeTextHoverTest.class, AutomakeEditorTests.class })
-public class EditorTests {
+public class EditorTestSuite {
}
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java
index 23582ac83c5..57740306baa 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java
@@ -14,12 +14,7 @@
*******************************************************************************/
package org.eclipse.cdt.autotools.ui.tests;
-import java.io.IOException;
-
-import org.eclipse.cdt.autotools.ui.tests.autoconf.AutoconfTests;
-import org.eclipse.cdt.utils.spawner.ProcessFactory;
-import org.junit.Assume;
-import org.junit.BeforeClass;
+import org.eclipse.cdt.autotools.ui.tests.autoconf.AutoconfTestSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -30,25 +25,9 @@ import org.junit.runners.Suite;
* TestToolActions.class,
* TestEnvironmentVars.class,
* TestMakeTargets.class,
- * SetConfigurationParameter.class,
+ * SetConfigurationParameterTest.class,
*/
- AutoconfTests.class })
+ AutoconfTestSuite.class })
public class AutomatedIntegrationSuite {
- // needed for this class to compile
- @BeforeClass
- public static void beforeClassMethod() {
- // Verify that the necessary binaries are available, and if they are not,
- // the tests will be ignored.
- String[] testBinaryCommands = { "libtool --version", "autoconf --version", "automake --version" };
- try {
- for (String cmd : testBinaryCommands) {
- Process process = ProcessFactory.getFactory().exec(cmd);
- process.destroy();
- }
- } catch (IOException e) {
- // If we cannot find any binary, just ignore the tests.
- Assume.assumeNoException(e);
- }
- }
}
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameterTest.java
index fcf978d3718..19ca5536edf 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameter.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/SetConfigurationParameterTest.java
@@ -39,6 +39,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
@@ -48,9 +49,10 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+@Ignore("Unstable tests exluded from build. See Bug 509248 and Bug 564002")
@RunWith(SWTBotJunit4ClassRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class SetConfigurationParameter extends AbstractTest {
+public class SetConfigurationParameterTest extends AbstractTest {
@BeforeClass
public static void initClass() {
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestEnvironmentVars.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestEnvironmentVars.java
index 945753a967f..d5dca2a894e 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestEnvironmentVars.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestEnvironmentVars.java
@@ -29,10 +29,12 @@ import org.eclipse.swtbot.swt.finder.waits.Conditions;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
import org.junit.FixMethodOrder;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+@Ignore("Unstable tests exluded from build. See Bug 509248 and Bug 564002")
@RunWith(SWTBotJunit4ClassRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestEnvironmentVars extends AbstractTest {
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestMakeTargets.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestMakeTargets.java
index 3c3cf0be8b1..bb89f85a905 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestMakeTargets.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestMakeTargets.java
@@ -29,10 +29,12 @@ import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.waits.Conditions;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.junit.FixMethodOrder;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+@Ignore("Unstable tests exluded from build. See Bug 509248 and Bug 564002")
@RunWith(SWTBotJunit4ClassRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestMakeTargets extends AbstractTest {
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestToolActions.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestToolActions.java
index ace227104b6..66e67582be9 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestToolActions.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/TestToolActions.java
@@ -24,10 +24,12 @@ import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.junit.FixMethodOrder;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
+@Ignore("Unstable tests exluded from build. See Bug 509248 and Bug 564002")
@RunWith(SWTBotJunit4ClassRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestToolActions extends AbstractTest {
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTests.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTestSuite.java
index 88e0a34a242..bc987881a0c 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTests.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/AutoconfTestSuite.java
@@ -18,6 +18,6 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({ TestMacroParser.class, TestTokenizer.class, TestShellParser.class })
-public class AutoconfTests {
+public class AutoconfTestSuite {
}
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java
index 6f6e87b6638..864da2fad67 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/BaseParserTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -30,9 +31,12 @@ import org.eclipse.cdt.autotools.ui.editors.parser.AutoconfParser;
import org.eclipse.cdt.autotools.ui.editors.parser.IAutoconfErrorHandler;
import org.eclipse.cdt.autotools.ui.editors.parser.IAutoconfMacroValidator;
import org.eclipse.cdt.autotools.ui.editors.parser.ParseException;
+import org.eclipse.cdt.utils.spawner.ProcessFactory;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
+import org.junit.Assume;
import org.junit.Before;
+import org.junit.BeforeClass;
public abstract class BaseParserTest {
@@ -42,6 +46,22 @@ public abstract class BaseParserTest {
private Set<String> macroNames;
private AutoconfMacroDetector macroDetector;
+ @BeforeClass
+ public static void beforeClassMethod() {
+ // Verify that the necessary binaries are available, and if they are not,
+ // the tests will be ignored.
+ String[] testBinaryCommands = { "libtool --version", "autoconf --version", "automake --version" };
+ try {
+ for (String cmd : testBinaryCommands) {
+ Process process = ProcessFactory.getFactory().exec(cmd);
+ process.destroy();
+ }
+ } catch (IOException e) {
+ // If we cannot find any binary, just ignore the tests.
+ Assume.assumeNoException(e);
+ }
+ }
+
@Before
public void setUp() {
errors = new ArrayList<>();
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java
index b75d58f7be7..f498ad8b59b 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/autoconf/TestTokenizer.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -26,8 +27,11 @@ import org.eclipse.cdt.autotools.ui.editors.parser.AutoconfTokenizer;
import org.eclipse.cdt.autotools.ui.editors.parser.ITokenConstants;
import org.eclipse.cdt.autotools.ui.editors.parser.ParseException;
import org.eclipse.cdt.autotools.ui.editors.parser.Token;
+import org.eclipse.cdt.utils.spawner.ProcessFactory;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
+import org.junit.Assume;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -40,6 +44,22 @@ public class TestTokenizer {
private ArrayList<ParseException> tokenizerErrors;
+ @BeforeClass
+ public static void beforeClassMethod() {
+ // Verify that the necessary binaries are available, and if they are not,
+ // the tests will be ignored.
+ String[] testBinaryCommands = { "libtool --version", "autoconf --version", "automake --version" };
+ try {
+ for (String cmd : testBinaryCommands) {
+ Process process = ProcessFactory.getFactory().exec(cmd);
+ process.destroy();
+ }
+ } catch (IOException e) {
+ // If we cannot find any binary, just ignore the tests.
+ Assume.assumeNoException(e);
+ }
+ }
+
protected IDocument createDocument(String text) {
return new Document(text);
}
diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java
index be00630f21a..e5fbbf3e410 100644
--- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java
+++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java
@@ -15,7 +15,7 @@
package org.eclipse.cdt.make.core.tests;
import org.eclipse.cdt.make.builder.tests.StandardBuildTests;
-import org.eclipse.cdt.make.scannerdiscovery.ScannerDiscoveryTests;
+import org.eclipse.cdt.make.scannerdiscovery.ScannerDiscoveryTestSuite;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -42,7 +42,7 @@ public class AutomatedIntegrationSuite extends TestSuite {
final AutomatedIntegrationSuite suite = new AutomatedIntegrationSuite();
suite.addTest(StandardBuildTests.suite());
- suite.addTest(ScannerDiscoveryTests.suite());
+ suite.addTest(ScannerDiscoveryTestSuite.suite());
suite.addTest(MakefileReaderProviderTests.suite());
return suite;
}
diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTestSuite.java
index 30fb0266122..780c02936d1 100644
--- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTests.java
+++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerDiscoveryTestSuite.java
@@ -16,14 +16,14 @@ package org.eclipse.cdt.make.scannerdiscovery;
import junit.framework.TestSuite;
-public class ScannerDiscoveryTests extends TestSuite {
+public class ScannerDiscoveryTestSuite extends TestSuite {
public static TestSuite suite() {
- return new ScannerDiscoveryTests();
+ return new ScannerDiscoveryTestSuite();
}
- public ScannerDiscoveryTests() {
- super(ScannerDiscoveryTests.class.getName());
+ public ScannerDiscoveryTestSuite() {
+ super(ScannerDiscoveryTestSuite.class.getName());
addTestSuite(ScannerConfigDiscoveryTests.class);
addTest(GCCScannerInfoConsoleParserTests.suite());
addTest(GCCPerFileBOPConsoleParserTests.suite());
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java
index 9be71132fd4..df8a5912c8a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java
@@ -19,12 +19,12 @@ import org.eclipse.cdt.build.core.scannerconfig.tests.CfgScannerConfigProfileMan
import org.eclipse.cdt.build.core.scannerconfig.tests.GCCSpecsConsoleParserTest;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.IPDOMManager;
-import org.eclipse.cdt.managedbuilder.core.regressions.RegressionTests;
+import org.eclipse.cdt.managedbuilder.core.regressions.RegressionTestSuite;
import org.eclipse.cdt.managedbuilder.core.tests.BuildDescriptionModelTests;
import org.eclipse.cdt.managedbuilder.core.tests.BuildSystem40Tests;
import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests;
-import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests20;
-import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests_SharedToolOptions;
+import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCore20Tests;
+import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCore_SharedToolOptionsTests;
import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildDependencyCalculatorTests;
import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildDependencyLibsTests;
import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildEnvironmentTests;
@@ -39,8 +39,8 @@ import org.eclipse.cdt.managedbuilder.core.tests.OptionCategoryEnablementTests;
import org.eclipse.cdt.managedbuilder.core.tests.OptionEnablementTests;
import org.eclipse.cdt.managedbuilder.core.tests.PathConverterTest;
import org.eclipse.cdt.managedbuilder.core.tests.ResourceBuildCoreTests;
-import org.eclipse.cdt.managedbuilder.language.settings.providers.tests.AllLanguageSettingsProvidersMBSTests;
-import org.eclipse.cdt.managedbuilder.templateengine.tests.AllTemplateEngineTests;
+import org.eclipse.cdt.managedbuilder.language.settings.providers.tests.AllLanguageSettingsProvidersMBSTestSuite;
+import org.eclipse.cdt.managedbuilder.templateengine.tests.AllTemplateEngineTestSuite;
import org.eclipse.cdt.projectmodel.tests.BackwardCompatiblityTests;
import org.eclipse.cdt.projectmodel.tests.CProjectDescriptionSerializationTests;
import org.eclipse.cdt.projectmodel.tests.OptionStringListValueTests;
@@ -64,18 +64,18 @@ public class AutomatedIntegrationSuite {
TestSuite suite = new TestSuite("Test for org.eclipse.cdt.managedbuild.core.tests");
//$JUnit-BEGIN$
// Preconditions
- suite.addTestSuite(Preconditions.class);
+ suite.addTestSuite(ManagedBuilderPreconditionsTests.class);
// build.core.scannerconfig.tests
suite.addTest(CfgScannerConfigProfileManagerTests.suite());
suite.addTestSuite(GCCSpecsConsoleParserTest.class);
// language settings providers tests
- suite.addTest(AllLanguageSettingsProvidersMBSTests.suite());
+ suite.addTest(AllLanguageSettingsProvidersMBSTestSuite.suite());
// managedbuilder.core.tests
suite.addTest(ManagedBuildDependencyLibsTests.suite());
- suite.addTest(ManagedBuildCoreTests20.suite());
+ suite.addTest(ManagedBuildCore20Tests.suite());
suite.addTest(ManagedBuildCoreTests.suite());
suite.addTest(ManagedProjectUpdateTests.suite());
suite.addTest(ManagedCommandLineGeneratorTest.suite());
@@ -83,7 +83,7 @@ public class AutomatedIntegrationSuite {
suite.addTest(ManagedProject21MakefileTests.suite());
suite.addTest(ManagedProject30MakefileTests.suite());
suite.addTest(BuildSystem40Tests.suite());
- suite.addTest(ManagedBuildCoreTests_SharedToolOptions.suite());
+ suite.addTest(ManagedBuildCore_SharedToolOptionsTests.suite());
suite.addTest(ManagedBuildEnvironmentTests.suite());
suite.addTest(ManagedBuildMacrosTests.suite());
suite.addTest(ManagedBuildTCSupportedTest.suite());
@@ -95,7 +95,7 @@ public class AutomatedIntegrationSuite {
suite.addTest(PathConverterTest.suite());
// managedbuilder.templateengine.tests
- suite.addTest(AllTemplateEngineTests.suite());
+ suite.addTest(AllTemplateEngineTestSuite.suite());
// projectmodel.tests
suite.addTest(BackwardCompatiblityTests.suite());
@@ -104,7 +104,7 @@ public class AutomatedIntegrationSuite {
suite.addTest(ProjectModelTests.suite());
// regression tests
- suite.addTest(RegressionTests.suite());
+ suite.addTest(RegressionTestSuite.suite());
//$JUnit-END$
return suite;
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/Preconditions.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/ManagedBuilderPreconditionsTests.java
index 68094517dae..3a99f2e9b84 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/Preconditions.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/ManagedBuilderPreconditionsTests.java
@@ -26,7 +26,11 @@ import org.eclipse.core.runtime.content.IContentTypeManager;
import junit.framework.TestCase;
-public class Preconditions extends TestCase {
+/**
+ * Check that preconditions for running managed builder tests are in place,
+ * see individual tests in this class for details.
+ */
+public class ManagedBuilderPreconditionsTests extends TestCase {
@Override
protected void setUp() throws Exception {
}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953Test.java
index d032b63ecdd..70f1554f63d 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953Test.java
@@ -32,7 +32,7 @@ import org.eclipse.core.runtime.CoreException;
* causes the subdir.mk to be regenerated, and associated dervied
* files should be deleted.
*/
-public class Bug_303953 extends AbstractBuilderTest {
+public class Bug_303953Test extends AbstractBuilderTest {
public void testBuildAfterSourcefileDelete() throws CoreException {
setWorkspace("regressions");
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTestSuite.java
index 026d1055d7f..55af3fcb28a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/RegressionTestSuite.java
@@ -20,22 +20,22 @@ import junit.framework.TestSuite;
/**
* Regression tests for builder bugs
*/
-public class RegressionTests extends TestCase {
+public class RegressionTestSuite extends TestCase {
public static Test suite() {
- TestSuite suite = new TestSuite(RegressionTests.class.getName());
+ TestSuite suite = new TestSuite(RegressionTestSuite.class.getName());
// Test that common builder does the correct amount of work.
- suite.addTestSuite(Bug_303953.class);
+ suite.addTestSuite(Bug_303953Test.class);
return suite;
}
- public RegressionTests() {
+ public RegressionTestSuite() {
super(null);
}
- public RegressionTests(String name) {
+ public RegressionTestSuite(String name) {
super(name);
}
}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCore20Tests.java
index 70e2d552418..b92fdb2db5c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCore20Tests.java
@@ -63,7 +63,7 @@ import junit.framework.TestSuite;
/*
* These tests exercise CDT 2.0 manifest file functionality
*/
-public class ManagedBuildCoreTests20 extends TestCase {
+public class ManagedBuildCore20Tests extends TestCase {
private static final boolean boolVal = true;
private static final String testConfigId = "test.config.override";
private static final String testConfigName = "Tester";
@@ -78,24 +78,24 @@ public class ManagedBuildCoreTests20 extends TestCase {
private static final String anotherStringVal = "thevalue";
private static final String subExt = "bus";
- public ManagedBuildCoreTests20(String name) {
+ public ManagedBuildCore20Tests(String name) {
super(name);
}
public static Test suite() {
- TestSuite suite = new TestSuite(ManagedBuildCoreTests20.class.getName());
+ TestSuite suite = new TestSuite(ManagedBuildCore20Tests.class.getName());
// Note that some of the tests are dependent on others so run the suite as a whole
- suite.addTest(new ManagedBuildCoreTests20("testExtensions"));
- suite.addTest(new ManagedBuildCoreTests20("testProjectCreation"));
- suite.addTest(new ManagedBuildCoreTests20("testConfigurations"));
- suite.addTest(new ManagedBuildCoreTests20("testConfigurationReset"));
- suite.addTest(new ManagedBuildCoreTests20("testConfigBuildArtifact"));
- suite.addTest(new ManagedBuildCoreTests20("testMakeCommandManipulation"));
- suite.addTest(new ManagedBuildCoreTests20("testScannerInfoInterface"));
- suite.addTest(new ManagedBuildCoreTests20("testProjectRename"));
- suite.addTest(new ManagedBuildCoreTests20("testErrorParsers"));
- suite.addTest(new ManagedBuildCoreTests20("cleanup"));
+ suite.addTest(new ManagedBuildCore20Tests("testExtensions"));
+ suite.addTest(new ManagedBuildCore20Tests("testProjectCreation"));
+ suite.addTest(new ManagedBuildCore20Tests("testConfigurations"));
+ suite.addTest(new ManagedBuildCore20Tests("testConfigurationReset"));
+ suite.addTest(new ManagedBuildCore20Tests("testConfigBuildArtifact"));
+ suite.addTest(new ManagedBuildCore20Tests("testMakeCommandManipulation"));
+ suite.addTest(new ManagedBuildCore20Tests("testScannerInfoInterface"));
+ suite.addTest(new ManagedBuildCore20Tests("testProjectRename"));
+ suite.addTest(new ManagedBuildCore20Tests("testErrorParsers"));
+ suite.addTest(new ManagedBuildCore20Tests("cleanup"));
return suite;
}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCore_SharedToolOptionsTests.java
index ff8afb403b1..72b25cd1b9a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests_SharedToolOptions.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCore_SharedToolOptionsTests.java
@@ -56,7 +56,7 @@ import junit.framework.TestSuite;
/*
* These tests exercise CDT 3.0 shared tool options extensions
*/
-public class ManagedBuildCoreTests_SharedToolOptions extends TestCase {
+public class ManagedBuildCore_SharedToolOptionsTests extends TestCase {
class IconComparator {
static final int None = 0;
@@ -173,7 +173,7 @@ public class ManagedBuildCoreTests_SharedToolOptions extends TestCase {
private IconComparator iconComparator;
private ValueHandlerComparator valueHandlerComparator;
- public ManagedBuildCoreTests_SharedToolOptions(String name) {
+ public ManagedBuildCore_SharedToolOptionsTests(String name) {
super(name);
iconComparator = new IconComparator();
@@ -181,12 +181,12 @@ public class ManagedBuildCoreTests_SharedToolOptions extends TestCase {
}
public static Test suite() {
- TestSuite suite = new TestSuite(ManagedBuildCoreTests_SharedToolOptions.class.getName());
+ TestSuite suite = new TestSuite(ManagedBuildCore_SharedToolOptionsTests.class.getName());
- suite.addTest(new ManagedBuildCoreTests_SharedToolOptions("testIcons"));
- suite.addTest(new ManagedBuildCoreTests_SharedToolOptions("testValueHandlers"));
- suite.addTest(new ManagedBuildCoreTests_SharedToolOptions("testOptions"));
- suite.addTest(new ManagedBuildCoreTests_SharedToolOptions("testConfiguration"));
+ suite.addTest(new ManagedBuildCore_SharedToolOptionsTests("testIcons"));
+ suite.addTest(new ManagedBuildCore_SharedToolOptionsTests("testValueHandlers"));
+ suite.addTest(new ManagedBuildCore_SharedToolOptionsTests("testOptions"));
+ suite.addTest(new ManagedBuildCore_SharedToolOptionsTests("testConfiguration"));
return suite;
}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTestSuite.java
index e638ee210a1..87fc4cfe990 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTestSuite.java
@@ -19,14 +19,14 @@ import junit.framework.TestSuite;
/**
* Test suite to test language settings providers defined in cdt.managedbuilder.core.
*/
-public class AllLanguageSettingsProvidersMBSTests extends TestSuite {
+public class AllLanguageSettingsProvidersMBSTestSuite extends TestSuite {
public static TestSuite suite() {
- return new AllLanguageSettingsProvidersMBSTests();
+ return new AllLanguageSettingsProvidersMBSTestSuite();
}
- public AllLanguageSettingsProvidersMBSTests() {
- super(AllLanguageSettingsProvidersMBSTests.class.getName());
+ public AllLanguageSettingsProvidersMBSTestSuite() {
+ super(AllLanguageSettingsProvidersMBSTestSuite.class.getName());
addTestSuite(LanguageSettingsProvidersMBSTest.class);
addTestSuite(GCCBuildCommandParserTest.class);
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTestSuite.java
index ba5313791b7..ece48e30e79 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/AllTemplateEngineTestSuite.java
@@ -23,10 +23,10 @@ import junit.framework.TestSuite;
*
* @since 4.0
*/
-public class AllTemplateEngineTests extends TestSuite {
+public class AllTemplateEngineTestSuite extends TestSuite {
public static void main(String[] args) {
- junit.textui.TestRunner.run(AllTemplateEngineTests.suite());
+ junit.textui.TestRunner.run(AllTemplateEngineTestSuite.suite());
}
/**

Back to the top