Repository: ant-ivy Updated Branches: refs/heads/master c2abba8f1 -> 90274e109
A few loose bits in JUnit 4 migration Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/fbbf092e Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/fbbf092e Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/fbbf092e Branch: refs/heads/master Commit: fbbf092e4986635703bf9a3bfd57d4f639c86095 Parents: 36e9942 Author: twogee <[email protected]> Authored: Fri May 26 14:00:16 2017 +0200 Committer: twogee <[email protected]> Committed: Fri May 26 14:00:16 2017 +0200 ---------------------------------------------------------------------- .../test/filter/AbstractTestFilter.java | 59 +++++++++----------- test/java/org/apache/ivy/TestFixture.java | 2 +- test/java/org/apache/ivy/TestHelper.java | 4 +- .../org/apache/ivy/ant/AntCallTriggerTest.java | 8 +-- .../org/apache/ivy/ant/BuildOBRTaskTest.java | 2 + .../java/org/apache/ivy/ant/IvyResolveTest.java | 6 +- .../ivy/ant/testutil/AntTestListener.java | 12 ++-- .../DefaultRepositoryCacheManagerTest.java | 5 +- .../apache/ivy/core/resolve/ResolveTest.java | 28 +++++----- .../core/settings/XmlSettingsParserTest.java | 2 +- .../java/org/apache/ivy/core/sort/SortTest.java | 2 +- .../IgnoreCircularDependencyStrategyTest.java | 5 +- .../xml/XmlModuleDescriptorWriterTest.java | 8 +-- .../apache/ivy/plugins/parser/xml/test-info.xml | 2 +- .../ivy/plugins/parser/xml/test-write-info.xml | 2 +- .../repository/vfs/VfsRepositoryTest.java | 10 ++-- .../plugins/repository/vfs/VfsResourceTest.java | 2 +- .../plugins/repository/vfs/VfsTestHelper.java | 2 +- .../ivy/plugins/repository/vfs/VfsURI.java | 6 +- .../plugins/resolver/BintrayResolverTest.java | 1 - .../resolver/FileSystemResolverTest.java | 2 +- .../plugins/resolver/IBiblioResolverTest.java | 2 +- .../plugins/resolver/ResolverTestHelper.java | 3 +- .../version/PatternVersionMatcherTest.java | 4 +- .../ivy/util/url/ApacheURLListerTest.java | 5 +- 25 files changed, 91 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java ---------------------------------------------------------------------- diff --git a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java index 1260513..5d7e133 100644 --- a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java +++ b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java @@ -17,54 +17,45 @@ */ package filter; -import junit.framework.TestCase; +import org.junit.Test; -public abstract class AbstractTestFilter extends TestCase { - - public void testFilterNull() { - Exception err = null; - try { - getIFilter().filter(null, null); - } catch (NullPointerException npe) { - err = npe; - } - assertNull(err); - } +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +public abstract class AbstractTestFilter { /** - * @return + * @return IFilter */ public abstract IFilter getIFilter(); - + + @Test(expected = NullPointerException.class) + public void testFilterNull() { + getIFilter().filter(null, null); + } + + @Test(expected = NullPointerException.class) public void testFilterNullValues() { - Exception err = null; - try { - getIFilter().filter(null, "test"); - } catch (NullPointerException npe) { - err = npe; - } - assertNull(err); + getIFilter().filter(null, "test"); } - + + @Test(expected = NullPointerException.class) public void testFilterNullPrefix() { - Exception err = null; - try { - getIFilter().filter(new String[]{"test"}, null); - } catch (NullPointerException npe) { - err = npe; - } - assertNull(err); + getIFilter().filter(new String[]{"test"}, null); } - + + @Test public void testFilter() { - String[] result = getIFilter().filter( - new String[]{"test", "nogood", "mustbe filtered"}, "t"); + String[] result = getIFilter().filter(new String[]{"test", + "nogood", "mustbe filtered"}, "t"); assertNotNull(result); assertEquals(result.length, 1); } - + + @Test public void testFilterWithNullValues() { - String[] result = getIFilter().filter(new String[]{"test", null, "mustbe filtered"}, "t"); + String[] result = getIFilter().filter(new String[]{"test", + null, "mustbe filtered"}, "t"); assertNotNull(result); assertEquals(result.length, 1); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/TestFixture.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/TestFixture.java b/test/java/org/apache/ivy/TestFixture.java index 3ebb13d..9690978 100644 --- a/test/java/org/apache/ivy/TestFixture.java +++ b/test/java/org/apache/ivy/TestFixture.java @@ -35,7 +35,7 @@ import org.apache.ivy.plugins.resolver.util.ResolvedResource; * Fixture easing the development of tests requiring to set up a simple repository with some * modules, using micro ivy format to describe the repository. <br/> * Example of use: - * + * * <pre> * public class MyTest { * private TestFixture fixture; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/TestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java index e434cc9..35b6783 100644 --- a/test/java/org/apache/ivy/TestHelper.java +++ b/test/java/org/apache/ivy/TestHelper.java @@ -88,7 +88,7 @@ public class TestHelper { * <p> * Expected mrids is given as a String of comma separated string representations of * {@link ModuleRevisionId}. - * + * * @param expectedMrids * the expected set of mrids * @param mrids @@ -103,7 +103,7 @@ public class TestHelper { /** * Returns a Set of {@link ModuleRevisionId} corresponding to the given comma separated list of * their text representation. - * + * * @param mrids * the text representation of the {@link ModuleRevisionId} * @return a collection of {@link ModuleRevisionId} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/ant/AntCallTriggerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java index c3a20a0..d1f79c7 100644 --- a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java +++ b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java @@ -163,7 +163,7 @@ public class AntCallTriggerTest { /** * Adds the listeners specified in the command line arguments, along with the default listener, * to the specified project. - * + * * @param project * The project to add listeners to. Must not be <code>null</code>. */ @@ -176,7 +176,7 @@ public class AntCallTriggerTest { /** * Creates the InputHandler and adds it to the project. - * + * * @param project * the project instance. * @param inputHandlerClassname @@ -191,7 +191,7 @@ public class AntCallTriggerTest { handler = new DefaultInputHandler(); } else { try { - handler = (InputHandler) (Class.forName(inputHandlerClassname).newInstance()); + handler = (InputHandler) Class.forName(inputHandlerClassname).newInstance(); if (project != null) { project.setProjectReference(handler); } @@ -214,7 +214,7 @@ public class AntCallTriggerTest { // loggers could have failed to be created due to this failure)? /** * Creates the default build logger for sending build events to the ant log. - * + * * @return the logger instance for this build. */ private BuildLogger createLogger(int level) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java b/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java index 128b133..7451bd3 100644 --- a/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java +++ b/test/java/org/apache/ivy/ant/BuildOBRTaskTest.java @@ -84,6 +84,7 @@ public class BuildOBRTaskTest { assertEquals(14, CollectionUtils.toList(obr.getModules()).size()); } + @Test public void testEmptyDir() throws Exception { buildObr.setBaseDir(new File("test/test-p2/composite")); File obrFile = new File("build/cache/obr.xml"); @@ -95,6 +96,7 @@ public class BuildOBRTaskTest { assertEquals(0, CollectionUtils.toList(obr.getModules()).size()); } + @Test public void testResolve() throws Exception { Project otherProject = TestHelper.newProject(); otherProject.setProperty("ivy.settings.file", "test/test-repo/bundlerepo/ivysettings.xml"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/ant/IvyResolveTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/ant/IvyResolveTest.java b/test/java/org/apache/ivy/ant/IvyResolveTest.java index fe0c7b3..49cfd91 100644 --- a/test/java/org/apache/ivy/ant/IvyResolveTest.java +++ b/test/java/org/apache/ivy/ant/IvyResolveTest.java @@ -28,7 +28,11 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Parallel; -import org.junit.*; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; import org.junit.rules.ExpectedException; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/ant/testutil/AntTestListener.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/ant/testutil/AntTestListener.java b/test/java/org/apache/ivy/ant/testutil/AntTestListener.java index e95537e..ef89fa6 100644 --- a/test/java/org/apache/ivy/ant/testutil/AntTestListener.java +++ b/test/java/org/apache/ivy/ant/testutil/AntTestListener.java @@ -44,7 +44,7 @@ public class AntTestListener implements BuildListener { /** * Fired after the last target has finished. This event will still be thrown if an error * occurred during the build. - * + * * @see BuildEvent#getException() */ public void buildFinished(BuildEvent event) { @@ -52,7 +52,7 @@ public class AntTestListener implements BuildListener { /** * Fired when a target is started. - * + * * @see BuildEvent#getTarget() */ public void targetStarted(BuildEvent event) { @@ -62,7 +62,7 @@ public class AntTestListener implements BuildListener { /** * Fired when a target has finished. This event will still be thrown if an error occurred during * the build. - * + * * @see BuildEvent#getException() */ public void targetFinished(BuildEvent event) { @@ -71,7 +71,7 @@ public class AntTestListener implements BuildListener { /** * Fired when a task is started. - * + * * @see BuildEvent#getTask() */ public void taskStarted(BuildEvent event) { @@ -81,7 +81,7 @@ public class AntTestListener implements BuildListener { /** * Fired when a task has finished. This event will still be throw if an error occurred during * the build. - * + * * @see BuildEvent#getException() */ public void taskFinished(BuildEvent event) { @@ -90,7 +90,7 @@ public class AntTestListener implements BuildListener { /** * Fired whenever a message is logged. - * + * * @see BuildEvent#getMessage() * @see BuildEvent#getPriority() */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java b/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java index 0b29645..7c817ce 100644 --- a/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java +++ b/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java @@ -45,6 +45,7 @@ import org.apache.ivy.util.DefaultMessageLogger; import org.apache.ivy.util.Message; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; + import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -57,7 +58,7 @@ import static org.junit.Assert.assertTrue; * @see DefaultResolutionCacheManager */ public class DefaultRepositoryCacheManagerTest { - + private DefaultRepositoryCacheManager cacheManager; private Artifact artifact; private ArtifactOrigin origin; @@ -70,7 +71,7 @@ public class DefaultRepositoryCacheManagerTest { ivy.configureDefault(); ivy.getLoggerEngine().setDefaultLogger(new DefaultMessageLogger(Message.MSG_DEBUG)); IvyContext.pushNewContext().setIvy(ivy); - + IvySettings settings = ivy.getSettings(); f.delete(); // we want to use the file as a directory, so we delete the file itself cacheManager = new DefaultRepositoryCacheManager(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/core/resolve/ResolveTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/resolve/ResolveTest.java b/test/java/org/apache/ivy/core/resolve/ResolveTest.java index 008ed0e..c274129 100644 --- a/test/java/org/apache/ivy/core/resolve/ResolveTest.java +++ b/test/java/org/apache/ivy/core/resolve/ResolveTest.java @@ -782,7 +782,7 @@ public class ResolveTest { * Configures an Ivy instance using a resolver locating modules on file system, in a * build/testCache2 location which is created for the test and removed after, and can thus * easily simulate a repository availability problem - * + * * @return the configured ivy instance */ private Ivy ivyTestCache() { @@ -4694,11 +4694,11 @@ public class ResolveTest { @Test public void testResolveMaven2ParentPomDualResolver() throws Exception { // test has a dependency on test2 but there is no version listed. test - // has a parent of parent(2.0) then parent2. Both parents have a - // dependencyManagement element for test2, and each list the version as + // has a parent of parent(2.0) then parent2. Both parents have a + // dependencyManagement element for test2, and each list the version as // ${pom.version}. The parent version should take precedence over - // parent2, so the version should be test2 version 2.0. Test3 is also a - // dependency of parent, and it's version is listed + // parent2, so the version should be test2 version 2.0. Test3 is also a + // dependency of parent, and it's version is listed // as 1.0 in parent2. (dependencies inherited from parent comes after) // now run tests with dual resolver @@ -4759,12 +4759,12 @@ public class ResolveTest { // test;2.0 has a dependency on test2;3.0. // test has a parent of parent(2.0) then parent2. // Both parents have a dependencyManagement element for test2, and each - // list the version as ${pom.version}. The version for test2 in test - // should take precedence, so the version should be test2 version 3.0. + // list the version as ${pom.version}. The version for test2 in test + // should take precedence, so the version should be test2 version 3.0. // test2;3.0 -> test4;2.0, but parent has a dependencyManagement - // section specifying test4;1.0. + // section specifying test4;1.0. // since maven 2.0.6, the information in parent should override - // transitive dependency version, and thus we should get test4;1.0 + // transitive dependency version, and thus we should get test4;1.0 Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/parentPom/ivysettings.xml")); ivy.getSettings().setDefaultResolver("parentChain"); @@ -5700,13 +5700,13 @@ public class ResolveTest { "releasebranch", "1"); // check that the resolve report has the expected results, namely that - // trunk/5 is considered later than branch/1 purely because 5>1. Of - // course it is more likely that we would want to consider this a + // trunk/5 is considered later than branch/1 purely because 5>1. Of + // course it is more likely that we would want to consider this a // 'bad comparison', but this Unit Test is not about that. It is about - // inconsistency of results between the resolve report and the + // inconsistency of results between the resolve report and the // delivered descriptor. In fact the delivered descriptor is out of - // step, because retrieve and the report both agree that trunk/5 is - // selected. Deliver begs to differ. + // step, because retrieve and the report both agree that trunk/5 is + // selected. Deliver begs to differ. Set<ModuleRevisionId> reportMrids = report.getConfigurationReport("default") .getModuleRevisionIds(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java index 59dfffc..c75ffcf 100644 --- a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java +++ b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java @@ -255,7 +255,7 @@ public class XmlSettingsParserTest { } /** - * Test of esolver referencing a non existent cache. + * Test of resolver referencing a non existent cache. * * @throws Exception */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/core/sort/SortTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/sort/SortTest.java b/test/java/org/apache/ivy/core/sort/SortTest.java index 1b89e27..4a8477d 100644 --- a/test/java/org/apache/ivy/core/sort/SortTest.java +++ b/test/java/org/apache/ivy/core/sort/SortTest.java @@ -300,7 +300,7 @@ public class SortTest { /** * Verifies that sorted in one of the list of listOfPossibleSort. - * + * * @param listOfPossibleSort * array of possible sort result * @param sorted http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java b/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java index f2bb3b3..60f1fd3 100644 --- a/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java +++ b/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java @@ -22,6 +22,8 @@ import org.apache.ivy.core.IvyContext; import org.apache.ivy.util.Message; import org.apache.ivy.util.MessageLoggerEngine; import org.apache.ivy.util.MockMessageLogger; + +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -41,7 +43,8 @@ public class IgnoreCircularDependencyStrategyTest { messageLoggerEngine = setupMockLogger(mockMessageImpl); } - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { resetMockLogger(messageLoggerEngine); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java index b085933..14edef1 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java +++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java @@ -188,9 +188,9 @@ public class XmlModuleDescriptorWriterTest { /** * Test that the transitive attribute is written for non-transitive configurations. - * + * * <code><conf ... transitive="false" ... /></code> - * + * * @see <a href="https://issues.apache.org/jira/browse/IVY-1207";>IVY-1207</a> * @throws Exception */ @@ -215,10 +215,10 @@ public class XmlModuleDescriptorWriterTest { /** * Test that the transitive attribute is not written when the configuration IS transitive. - * + * * This is the default and writing it will only add noise and cause a deviation from the known * behavior (before fixing IVY-1207). - * + * * @see <a href="https://issues.apache.org/jira/browse/IVY-1207";>IVY-1207</a> * @throws Exception */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/parser/xml/test-info.xml ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-info.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-info.xml index 960fa4c..f3f9df9 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/test-info.xml +++ b/test/java/org/apache/ivy/plugins/parser/xml/test-info.xml @@ -19,7 +19,7 @@ <ivy-module version="1.0"> <info organisation="myorg" module="mymodule"> - <license name="Apache Sofware License" url="http://www.apache.org/licenses/LICENSE-2.0.txt"; /> + <license name="Apache Software License" url="http://www.apache.org/licenses/LICENSE-2.0.txt"; /> <description homepage="http://myorg.com/mymodule";> My module description. </description> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml index 476aae8..8773d29 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml +++ b/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml @@ -24,7 +24,7 @@ status="integration" publication="20050501110000" > - <license name="Apache Sofware License" url="http://www.apache.org/licenses/LICENSE-2.0.txt"; /> + <license name="Apache Software License" url="http://www.apache.org/licenses/LICENSE-2.0.txt"; /> <description homepage="http://myorg.com/mymodule";> My module description. </description> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java index 0b0abac..2624d49 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java @@ -70,7 +70,7 @@ public class VfsRepositoryTest { /** * Basic validation of happy path put - valid VFS URI and no conflict with existing file - * + * * @throws Exception */ @Test @@ -100,7 +100,7 @@ public class VfsRepositoryTest { /** * Validate that we can overwrite an existing file - * + * * @throws Exception */ @Test @@ -138,7 +138,7 @@ public class VfsRepositoryTest { /** * Validate that we put will respect a request not to overwrite an existing file - * + * * @throws Exception */ @Test(expected = IOException.class) @@ -159,7 +159,7 @@ public class VfsRepositoryTest { /** * Test the retrieval of an artifact from the repository creating a new artifact - * + * * @throws Exception */ @Test @@ -187,7 +187,7 @@ public class VfsRepositoryTest { /** * Test the retrieval of an artifact from the repository overwriting an existing artifact - * + * * @throws Exception */ @Test http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java index 893fb98..07e2161 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java @@ -75,7 +75,7 @@ public class VfsResourceTest { /** * Escape invalid URL characters (Copied from Wicket, just use StringUtils instead of Strings) - * + * * @param queryString * The original querystring * @return url The querystring with invalid characters escaped http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java index 9bbe0a0..f64255f 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java @@ -70,7 +70,7 @@ public class VfsTestHelper { /** * Generate a set of well-formed VFS resource identifiers - * + * * @param resource * name of the resource * @return <class>List</class> of well-formed VFS resource identifiers http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java index 0247373..1dac7b0 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java @@ -84,7 +84,7 @@ public class VfsURI { /** * Create a wellformed VFS resource identifier - * + * * @param scheme * the name of the scheme used to access the resource * @param user @@ -122,7 +122,7 @@ public class VfsURI { /** * Return a well-formed VFS Resource identifier - * + * * @return <code>String<code> representing a well formed VFS resource identifier */ public String getVfsURI() { @@ -153,7 +153,7 @@ public class VfsURI { /** * Convert a resource path to the format required for a VFS resource identifier - * + * * @param path * <code>String</code> path to the resource * @return <code>String</code> representing a normalized resource path http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java index 8a1c59d..1bec25a 100644 --- a/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java @@ -136,7 +136,6 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { @Test public void testBintray() throws Exception { - BintrayResolver resolver = new BintrayResolver(); resolver.setSettings(_settings); ModuleRevisionId mrid = ModuleRevisionId http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java index 181300c..d93b4c5 100644 --- a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java @@ -265,7 +265,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest { * Tests that <code>SHA-256</code> algorithm can be used for checksums on resolvers * @throws Exception */ - @Test + @Test public void testSHA256Checksum() throws Exception { final FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("sha256-checksum-resolver"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java index 6749dd8..79cfe61 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java @@ -54,7 +54,7 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * + * */ public class IBiblioResolverTest extends AbstractDependencyResolverTest { // remote.test http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java b/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java index 84da8aa..1182ae7 100644 --- a/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java +++ b/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java @@ -26,7 +26,7 @@ import org.apache.ivy.core.search.RevisionEntry; import static org.junit.Assert.*; /** - * + * */ public class ResolverTestHelper { static void assertOrganisationEntries(DependencyResolver resolver, String[] orgNames, @@ -122,5 +122,4 @@ public class ResolverTestHelper { fail("module not found: " + name); return null; // for compilation only } - } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java index 8baa381..b705885 100644 --- a/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java +++ b/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java @@ -59,7 +59,7 @@ public class PatternVersionMatcherTest { /** * Generates a Match instance that has the following xml representation: <match revision="foo" * pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" /> - * + * * @return Match */ private Match generateRegexpMatch1() { @@ -75,7 +75,7 @@ public class PatternVersionMatcherTest { /** * Generates a Match instance that has the following xml representation: <match revision="foo" * pattern="${major}\.${minor}" args="major, minor" matcher="regexp" /> - * + * * @return Match */ private Match generateRegexpMatch2() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fbbf092e/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java index dfca614..3af35e6 100644 --- a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java +++ b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java @@ -31,10 +31,9 @@ import static org.junit.Assert.assertTrue; * Tests {@link ApacheURLLister}. */ public class ApacheURLListerTest { - /** * Tests {@link ApacheURLLister#retrieveListing(URL, boolean, boolean)}. - * + * * @throws Exception */ @Test @@ -64,7 +63,7 @@ public class ApacheURLListerTest { /** * Tests {@link ApacheURLLister#retrieveListing(URL, boolean, boolean)}. - * + * * @throws Exception */ @Test
