run tests via a suite so we can more easily disable the failing ones - tests/org.eclipse.datatools.enablement.oda.xml.tests no tests in org.eclipse.datatools.enablement.oda.xml.BaseTest, so remove from src/org/eclipse/datatools/enablement/oda/xml/test/AllTestSuites.java Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/.project b/tests/org.eclipse.datatools.enablement.oda.xml.tests/.project index 82ab313..a97e37d 100644 --- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/.project +++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/.project
@@ -20,8 +20,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> </natures>
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.datatools.enablement.oda.xml.tests/META-INF/MANIFEST.MF index 94b5ee8..614351c 100644 --- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: DTP ODA XML Tests Suite Bundle-SymbolicName: org.eclipse.datatools.enablement.oda.xml.tests;singleton:=true -Bundle-Version: 1.0.2.qualifier +Bundle-Version: 1.0.3.qualifier Bundle-Localization: plugin Bundle-Vendor: Eclipse.org Require-Bundle: org.eclipse.datatools.connectivity.oda;bundle-version="[3.0.1,4.0.0)",
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/pom.xml b/tests/org.eclipse.datatools.enablement.oda.xml.tests/pom.xml index e481b66..b7f9442 100644 --- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/pom.xml +++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/pom.xml
@@ -9,6 +9,19 @@ </parent> <groupId>org.eclipse.datatools.tests</groupId> <artifactId>org.eclipse.datatools.enablement.oda.xml.tests</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.3-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <testSuite>org.eclipse.datatools.enablement.oda.xml.test</testSuite> + <testClass>org.eclipse.datatools.enablement.oda.xml.test.AllTestSuites</testClass> + </configuration> + </plugin> + </plugins> + </build> </project>
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/AllTestSuites.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/AllTestSuites.java new file mode 100644 index 0000000..d052489 --- /dev/null +++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/AllTestSuites.java
@@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2018 Red Hat Inc and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + *******************************************************************************/ + +package org.eclipse.datatools.enablement.oda.xml.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AllTestSuites extends TestSuite { + public static Test suite() { + return new AllTestSuites(); + } + + public AllTestSuites() { + super("Unit Tests"); + addTestSuite(org.eclipse.datatools.enablement.oda.xml.ConnectionTest.class); +// addTestSuite(org.eclipse.datatools.enablement.oda.xml.PerformanceTest.class); +// addTestSuite(org.eclipse.datatools.enablement.oda.xml.QueryTest.class); + addTestSuite(org.eclipse.datatools.enablement.oda.xml.RelationInformationTest.class); +// addTestSuite(org.eclipse.datatools.enablement.oda.xml.ResultSetTest.class); +// addTestSuite(org.eclipse.datatools.enablement.oda.xml.SpecialEncodingTest.class); +// addTestSuite(org.eclipse.datatools.enablement.oda.xml.util.date.DateUtilTest.class); + addTestSuite(org.eclipse.datatools.enablement.oda.xml.util.MappedTablesTest.class); +// addTestSuite(org.eclipse.datatools.enablement.oda.xml.util.SaxParserTest.class); +// addTestSuite(org.eclipse.datatools.enablement.oda.xml.util.ui.SchemaPopulationUtilTest.class); + addTestSuite(org.eclipse.datatools.enablement.oda.xml.util.ui.XPathPopulationUtilTest.class); + addTestSuite(org.eclipse.datatools.enablement.oda.xml.util.XPathParserTest.class); + } + +}