diff options
8 files changed, 21 insertions, 76 deletions
@@ -70,6 +70,10 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <reportFormat>plain</reportFormat> + <excludes> + <exclude>**/TestInstalledDevStudioLinker.java</exclude> + <exclude>**/TestMetaObjectCompiler.java</exclude> + </excludes> </configuration> </plugin> <plugin> @@ -168,17 +172,16 @@ </execution> </executions> </plugin> - <!-- plugin> + <plugin> <artifactId>maven-javadoc-plugin</artifactId> <executions> <execution> <goals> <goal>jar</goal> - <goal>javadoc</goal> </goals> </execution> </executions> - </plugin --> + </plugin> <plugin> <artifactId>maven-source-plugin</artifactId> <executions> @@ -204,6 +207,11 @@ <artifactId>ant</artifactId> <version>1.6.5</version> </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.1</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java index c21a6f6..80d2aac 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java @@ -133,7 +133,7 @@ public abstract class DevStudioCompatibleLinker extends CommandLineLinker { * @param versionInfo version information * @param linkType link type * @param isDebug true if debug build - * @param executableName name of generated executable + * @param outputFile name of generated executable * @param objDir directory for generated files * @param matcher bidded fileset */ diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java b/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java index cb7c55c..0796353 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java @@ -28,12 +28,6 @@ import org.xml.sax.SAXException; */ public class TestDependencyTable extends TestXMLConsumer { /** - * Default constructor - */ - public TestDependencyTable() { - super(); - } - /** * Constructor * * @param testName diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestXMLConsumer.java b/src/test/java/net/sf/antcontrib/cpptasks/TestXMLConsumer.java index 7c8c86f..fdfeae1 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/TestXMLConsumer.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/TestXMLConsumer.java @@ -28,7 +28,7 @@ import junit.framework.TestCase; * @author Curt Arnold * */ -public class TestXMLConsumer extends TestCase { +public abstract class TestXMLConsumer extends TestCase { /** * Loads a TargetHistoryTable from a resource * @@ -88,13 +88,9 @@ public class TestXMLConsumer extends TestCase { } } /** - * @param arg0 + * @param testName */ - protected TestXMLConsumer(String testName) { + protected TestXMLConsumer(final String testName) { super(testName); } - - protected TestXMLConsumer() { - super("TestXMLConsumer"); - } } diff --git a/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudio.java b/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudio.java deleted file mode 100644 index 3e29c91..0000000 --- a/src/test/java/net/sf/antcontrib/cpptasks/devstudio/TestInstalledDevStudio.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * - * Copyright 2002-2004 The Ant-Contrib project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.sf.antcontrib.cpptasks.devstudio; -import junit.framework.TestSuite; -/** - * Tests that depend on DevStudio being installed - * - */ -public class TestInstalledDevStudio extends TestSuite { - public static TestSuite suite() { - return new TestInstalledDevStudio("TestInstalledDevStudio"); - } - public TestInstalledDevStudio(String name) { - super(name); - addTestSuite(net.sf.antcontrib.cpptasks.devstudio.TestInstalledDevStudioLinker.class); - } -} diff --git a/src/test/java/net/sf/antcontrib/cpptasks/parser/TestAbstractParser.java b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestAbstractParser.java deleted file mode 100644 index 5f7eb2a..0000000 --- a/src/test/java/net/sf/antcontrib/cpptasks/parser/TestAbstractParser.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * - * Copyright 2002-2004 The Ant-Contrib project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.sf.antcontrib.cpptasks.parser; -import junit.framework.TestCase; -/** - * Tests for the CParser class - */ -public class TestAbstractParser extends TestCase { - public TestAbstractParser(String name) { - super(name); - } -} diff --git a/src/test/java/net/sf/antcontrib/cpptasks/parser/TestCParser.java b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestCParser.java index cbecdfb..d5e9888 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/parser/TestCParser.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestCParser.java @@ -16,6 +16,8 @@ */ package net.sf.antcontrib.cpptasks.parser; +import junit.framework.TestCase; + import java.io.CharArrayReader; import java.io.IOException; @@ -23,7 +25,7 @@ import java.io.IOException; * Tests for the CParser class. */ public final class TestCParser - extends TestAbstractParser { + extends TestCase { /** * Constructor. * @param name String test name diff --git a/src/test/java/net/sf/antcontrib/cpptasks/parser/TestFortranParser.java b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestFortranParser.java index 8078331..61756a9 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/parser/TestFortranParser.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/parser/TestFortranParser.java @@ -16,6 +16,8 @@ */ package net.sf.antcontrib.cpptasks.parser; +import junit.framework.TestCase; + import java.io.CharArrayReader; import java.io.IOException; @@ -23,7 +25,7 @@ import java.io.IOException; * Tests for the CParser class. */ public final class TestFortranParser - extends TestAbstractParser { + extends TestCase { /** * Constructor. * @param name String test name |