From 463a2c89c3840c35ceadd786a6b1781e0e8fd5a3 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Sat, 19 Aug 2017 06:44:37 +0200 Subject: [PATCH] add a target to generate javadoc for test cases; fix javadoc for doclint --- build.properties | 1 + build.xml | 21 +- .../ivy/core/retrieve/RetrieveOptions.java | 5 +- .../ivy/osgi/repo/RelativeURLRepository.java | 2 +- .../ivy/plugins/repository/ssh/SshCache.java | 1 + src/java/org/apache/ivy/util/FileUtil.java | 2 +- .../org/apache/ivy/util/url/URLHandler.java | 40 +- test/java/org/apache/ivy/MainTest.java | 9 +- test/java/org/apache/ivy/TestFixture.java | 11 +- test/java/org/apache/ivy/TestHelper.java | 25 +- .../java/org/apache/ivy/ant/FileUtilTest.java | 4 +- .../ivy/ant/IvyAntSettingsBuildFileTest.java | 12 +- .../ivy/ant/IvyArtifactPropertyTest.java | 2 +- .../apache/ivy/ant/IvyBuildNumberTest.java | 7 +- .../apache/ivy/ant/IvyCacheFilesetTest.java | 11 +- .../org/apache/ivy/ant/IvyCachePathTest.java | 2 +- .../org/apache/ivy/ant/IvyCleanCacheTest.java | 2 +- .../org/apache/ivy/ant/IvyConfigureTest.java | 13 +- .../org/apache/ivy/ant/IvyDeliverTest.java | 21 +- .../apache/ivy/ant/IvyDependencyTreeTest.java | 9 +- .../ant/IvyDependencyUpdateCheckerTest.java | 22 +- test/java/org/apache/ivy/ant/IvyInfoTest.java | 12 + .../org/apache/ivy/ant/IvyInstallTest.java | 25 +- .../org/apache/ivy/ant/IvyPublishTest.java | 26 +- .../org/apache/ivy/ant/IvyResolveTest.java | 33 +- .../org/apache/ivy/ant/IvyRetrieveTest.java | 30 +- .../apache/ivy/core/deliver/DeliverTest.java | 6 + .../module/descriptor/IvyMakePomTest.java | 10 +- .../ivy/core/publish/PublishEventsTest.java | 6 + .../apache/ivy/core/resolve/ResolveTest.java | 479 ++++++++++++++++-- .../ivy/core/retrieve/RetrieveTest.java | 40 +- .../core/settings/XmlSettingsParserTest.java | 31 +- .../org/apache/ivy/core/sort/SortTest.java | 21 +- .../ivy/osgi/core/OSGiManifestParserTest.java | 6 +- .../LatestCompatibleConflictManagerTest.java | 4 +- .../conflict/LatestConflictManagerTest.java | 49 +- .../conflict/StrictConflictManagerTest.java | 4 +- .../m2/PomModuleDescriptorParserTest.java | 46 +- .../xml/XmlModuleDescriptorParserTest.java | 20 +- .../xml/XmlModuleDescriptorWriterTest.java | 6 +- .../parser/xml/XmlModuleUpdaterTest.java | 7 +- .../repository/vfs/VfsRepositoryTest.java | 44 +- .../repository/vfs/VfsResourceTest.java | 12 + .../plugins/repository/vfs/VfsTestHelper.java | 2 +- .../ivy/plugins/repository/vfs/VfsURI.java | 2 +- .../plugins/resolver/ChainResolverTest.java | 22 +- .../plugins/resolver/DualResolverTest.java | 6 +- .../resolver/FileSystemResolverTest.java | 18 +- .../plugins/resolver/IvyRepResolverTest.java | 5 +- .../ivy/plugins/resolver/URLResolverTest.java | 2 +- .../org/apache/ivy/util/TestXmlHelper.java | 4 +- .../ivy/util/url/AbstractURLHandlerTest.java | 10 +- .../ivy/util/url/ApacheURLListerTest.java | 4 +- .../util/url/HttpclientURLHandlerTest.java | 9 +- .../ivy/util/url/IvyAuthenticatorTest.java | 2 +- 55 files changed, 947 insertions(+), 278 deletions(-) diff --git a/build.properties b/build.properties index b291a819..60606d95 100644 --- a/build.properties +++ b/build.properties @@ -37,6 +37,7 @@ jacoco.log=${build.dir}/jacoco.data test.report.dir=${reports.dir}/test/html coverage.report.dir=${reports.dir}/coverage javadoc.build.dir=${reports.dir}/api +test.javadoc.build.dir=${reports.dir}/test-api ivy.report.dir=${reports.dir}/ivy doc.src.dir=${basedir}/asciidoc checkstyle.report.dir=${reports.dir}/checkstyle diff --git a/build.xml b/build.xml index 834123f1..660cc8be 100644 --- a/build.xml +++ b/build.xml @@ -90,7 +90,6 @@ - @@ -101,6 +100,10 @@ + + + + @@ -518,6 +521,22 @@ + + + + + + + + + + + diff --git a/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java b/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java index 304a3512..c74e13e9 100644 --- a/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java +++ b/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java @@ -158,11 +158,12 @@ public class RetrieveOptions extends LogOptions { return makeSymlinks || makeSymlinksInMass; } - @Deprecated /** + * @return false * @deprecated Starting 2.5, creating symlinks in mass is no longer supported and this * method will always return false */ + @Deprecated public boolean isMakeSymlinksInMass() { return false; } @@ -173,6 +174,8 @@ public class RetrieveOptions extends LogOptions { } /** + * @param makeSymlinksInMass ditto + * @return RetrieveOptions * @deprecated Starting 2.5, creating symlinks in mass is no longer supported and this * method plays no role in creation of symlinks. Use {@link #setMakeSymlinks(boolean)} instead */ diff --git a/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java b/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java index 8ab90cb6..fbcb21dc 100644 --- a/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java +++ b/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java @@ -40,7 +40,7 @@ public class RelativeURLRepository extends URLRepository { /** * - * @param baseUrl + * @param baseUrl ditto * @deprecated Since 2.5. Use {@link #RelativeURLRepository(URL, TimeoutConstraint)} instead */ @Deprecated diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java b/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java index 04ac8b5f..004b3909 100644 --- a/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java +++ b/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java @@ -263,6 +263,7 @@ public final class SshCache { * @param session * to connect to * @return channelSftp or null if not successful (channel not existent or dead) + * @throws IOException should never happen */ public ChannelSftp getChannelSftp(Session session) throws IOException { ChannelSftp channel = null; diff --git a/src/java/org/apache/ivy/util/FileUtil.java b/src/java/org/apache/ivy/util/FileUtil.java index 138a9ce4..957e8dea 100644 --- a/src/java/org/apache/ivy/util/FileUtil.java +++ b/src/java/org/apache/ivy/util/FileUtil.java @@ -70,7 +70,7 @@ public final class FileUtil { * @param overwrite {@code true} if any existing file at {@code link} has to be overwritten. False otherwise * @return Returns true if the symlink was successfully created. Returns false if the symlink creation couldn't * be done - * @throws IOException + * @throws IOException if {@link Files#createSymbolicLink} fails */ public static boolean symlink(final File target, final File link, final boolean overwrite) throws IOException { diff --git a/src/java/org/apache/ivy/util/url/URLHandler.java b/src/java/org/apache/ivy/util/url/URLHandler.java index 0b31c5ec..5f75479d 100644 --- a/src/java/org/apache/ivy/util/url/URLHandler.java +++ b/src/java/org/apache/ivy/util/url/URLHandler.java @@ -109,11 +109,12 @@ public interface URLHandler { *

* Please use {@link #getURLInfo(URL, TimeoutConstraint)} if more one information about the url * is needed + *

* * @param url The URL to access * @param timeoutConstraint The connectivity timeout constraints. Can be null, in which case the timeouts * are implementation specific - * @return + * @return boolean * @since 2.5 */ boolean isReachable(URL url, TimeoutConstraint timeoutConstraint); @@ -147,7 +148,7 @@ public interface URLHandler { * @param url The URL to access * @param timeoutConstraint The connectivity timeout constraints. Can be null, in which case the timeouts * are implementation specific - * @return + * @return long * @since 2.5 */ long getContentLength(URL url, TimeoutConstraint timeoutConstraint); @@ -178,11 +179,12 @@ public interface URLHandler { *

* Please use {@link #getURLInfo(URL, TimeoutConstraint)} if more one information about the url * is needed + *

* * @param url The URL to access * @param timeoutConstraint The connectivity timeout constraints. Can be null, in which case the timeouts * are implementation specific - * @return + * @return long * @since 2.5 */ long getLastModified(URL url, TimeoutConstraint timeoutConstraint); @@ -213,15 +215,15 @@ public interface URLHandler { * @param url The URL for which the information is to be retrieved * @param timeoutConstraint The connectivity timeout constraints. Can be null, in which case the timeouts * are implementation specific - * @return + * @return URLInfo * @since 2.5 */ URLInfo getURLInfo(URL url, TimeoutConstraint timeoutConstraint); /** - * @param url - * @return - * @throws IOException + * @param url ditto + * @return InputStream + * @throws IOException if something goes wrong * @deprecated Use {@link #openStream(URL, TimeoutConstraint)} instead */ @Deprecated @@ -233,17 +235,17 @@ public interface URLHandler { * @param url The URL to which an {@link InputStream} has to be opened * @param timeoutConstraint The connectivity timeout constraints. Can be null, in which case the timeouts * are implementation specific - * @return - * @throws IOException + * @return InputStream + * @throws IOException if something goes wrong * @since 2.5 */ InputStream openStream(URL url, TimeoutConstraint timeoutConstraint) throws IOException; /** - * @param src - * @param dest - * @param l - * @throws IOException + * @param src URL + * @param dest File + * @param l CopyProgressListener + * @throws IOException if something goes wrong * @deprecated Use {@link #download(URL, File, CopyProgressListener, TimeoutConstraint)} instead */ @Deprecated @@ -257,16 +259,16 @@ public interface URLHandler { * @param listener The listener that will be notified of the download progress * @param timeoutConstraint The connectivity timeout constraints. Can be null, in which case the timeouts * are implementation specific - * @throws IOException + * @throws IOException if something goes wrong * @since 2.5 */ void download(URL src, File dest, CopyProgressListener listener, TimeoutConstraint timeoutConstraint) throws IOException; /** - * @param src - * @param dest - * @param l - * @throws IOException + * @param src File + * @param dest URL + * @param l CopyProgressListener + * @throws IOException if something goes wrong * @deprecated Use {@link #upload(File, URL, CopyProgressListener, TimeoutConstraint)} instead */ @Deprecated @@ -280,7 +282,7 @@ public interface URLHandler { * @param listener The listener that will be notified of the upload progress * @param timeoutConstraint The connectivity timeout constraints. Can be null, in which case the timeouts * are implementation specific - * @throws IOException + * @throws IOException if something goes wrong * @since 2.5 */ void upload(File src, URL dest, CopyProgressListener listener, TimeoutConstraint timeoutConstraint) throws IOException; diff --git a/test/java/org/apache/ivy/MainTest.java b/test/java/org/apache/ivy/MainTest.java index 427f97c3..256906b7 100644 --- a/test/java/org/apache/ivy/MainTest.java +++ b/test/java/org/apache/ivy/MainTest.java @@ -136,10 +136,11 @@ public class MainTest { } /** - * Tests that the {@code types} argument to the command line is parsed correctly when it's passed - * more than one value for the argument + * Test case for IVY-1355. + * {@code types} argument to the command line must be parsed correctly when it's passed + * more than one value for the argument. * - * @throws Exception + * @throws Exception if something goes wrong * @see IVY-1355 */ @Test @@ -160,7 +161,7 @@ public class MainTest { /** * Tests that the {@code overwriteMode} passed for the retrieve command works as expected * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testRetrieveOverwriteMode() throws Exception { diff --git a/test/java/org/apache/ivy/TestFixture.java b/test/java/org/apache/ivy/TestFixture.java index 7886ead9..374711ed 100644 --- a/test/java/org/apache/ivy/TestFixture.java +++ b/test/java/org/apache/ivy/TestFixture.java @@ -34,25 +34,26 @@ 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.
+ * modules, using micro ivy format to describe the repository. + *

* Example of use: - * + *

* 
  * public class MyTest {
  *     private TestFixture fixture;
  *
- *     @Before
+ *     @Before
  *     public void setUp() throws Exception {
  *         fixture = new TestFixture();
  *         // additional setup here
  *     }
  *
- *     @After
+ *     @After
  *     public void tearDown() throws Exception {
  *         fixture.clean();
  *     }
  *
- *     @Test
+ *     @Test
  *     public void testXXX() throws Exception {
  *         fixture.addMD("#A;1-> { #B;[1.5,1.6] #C;2.5 }").addMD("#B;1.5->#D;2.0")
  *                 .addMD("#B;1.6->#D;2.0").addMD("#C;2.5->#D;[1.0,1.6]").addMD("#D;1.5")
diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java
index e206d3b4..57303bd9 100644
--- a/test/java/org/apache/ivy/TestHelper.java
+++ b/test/java/org/apache/ivy/TestHelper.java
@@ -43,7 +43,6 @@ import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Delete;
 
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -144,25 +143,19 @@ public class TestHelper {
      * Parses a string representation of a module descriptor in micro ivy format.
      * 

      * Examples:
-     *
+     * 

      * 
      * #A;1
      * 

-     *
-     * 

-     *
+     * 

      * 
-     * #A;2-> #B;[1.0,1.5]
+     * #A;2-> #B;[1.0,1.5]
      * 

-     *
-     * 

-     *
+     * 

      * 
-     * #A;3-> { #B;[1.0,1.5] #C;[2.0,2.5] }
+     * #A;3-> { #B;[1.0,1.5] #C;[2.0,2.5] }
      * 

      *
-     * 

-     *
      * @param microIvy
      *            the micro ivy description of the module descriptor
      * @return the parsed module descriptor
@@ -391,8 +384,8 @@ public class TestHelper {
      * @param serverAddress           The address to which the server will be bound
      * @param webAppContext           The context root of the application which will be handling the requests to the server
      * @param localFilesystemRepoRoot The path to the root directory containing the module descriptors and artifacts
-     * @return
-     * @throws IOException
+     * @return AutoCloseable
+     * @throws IOException if something goes wrong
      */
     public static AutoCloseable createHttpServerBackedRepository(final InetSocketAddress serverAddress, final String webAppContext,
                                                                  final Path localFilesystemRepoRoot) throws IOException {
@@ -426,8 +419,8 @@ public class TestHelper {
      * @param realm                   The realm to use for the {@code BASIC} auth mechanism
      * @param validCredentials        A {@link Map} of valid credentials, the key being the user name and the value being the password,
      *                                that the server will use during the authentication process of the incoming requests
-     * @return
-     * @throws IOException
+     * @return AutoCloseable
+     * @throws IOException if something goes wrong
      */
     public static AutoCloseable createBasicAuthHttpServerBackedRepo(final InetSocketAddress serverAddress, final String webAppContext,
                                                                     final Path localFilesystemRepoRoot, final String realm,
diff --git a/test/java/org/apache/ivy/ant/FileUtilTest.java b/test/java/org/apache/ivy/ant/FileUtilTest.java
index 902d1a15..4056e868 100644
--- a/test/java/org/apache/ivy/ant/FileUtilTest.java
+++ b/test/java/org/apache/ivy/ant/FileUtilTest.java
@@ -36,7 +36,7 @@ public class FileUtilTest {
     /**
      * Tests that {@link FileUtil#normalize(String)} works as expected for some basic file paths
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testSimpleNormalize() throws Exception {
@@ -50,7 +50,7 @@ public class FileUtilTest {
      * Tests that {@link FileUtil#normalize(String)} works as expected when passed a path that starts with
      * {@link File#listRoots() filesystem roots}
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testNormalizeOfFileSystemRootPath() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java b/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
index 13d0cd8c..22b32571 100644
--- a/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
+++ b/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
@@ -62,9 +62,13 @@ public class IvyAntSettingsBuildFileTest {
                 buildRule.getProject().getReference("ivy.instance"));
     }
 
+    /**
+     * Test case for IVY-925.
+     *
+     * @see IVY-925
+     */
     @Test
     public void testSettingsWithIdIvyInstance() {
-        // IVY-925
         buildRule.executeTarget("testSettingsWithPropertyAsId");
         ResolveReport report = buildRule.getProject().getReference("ivy.resolved.report");
         assertNotNull(report);
@@ -72,9 +76,13 @@ public class IvyAntSettingsBuildFileTest {
         assertEquals(1, report.getDependencies().size());
     }
 
+    /**
+     * Test case for IVY-924.
+     *
+     * @see IVY-924
+     */
     @Test
     public void testStackOverflow() {
-        // IVY-924
         buildRule.configureProject("test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileStackOverflow.xml");
         buildRule.executeTarget("testStackOverflow");
         ResolveReport report = buildRule.getProject().getReference("ivy.resolved.report");
diff --git a/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java b/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
index 44365c6f..60e84590 100644
--- a/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
+++ b/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
@@ -91,7 +91,7 @@ public class IvyArtifactPropertyTest {
     /**
      * Test must fail because no resolve was performed
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testWithResolveIdWithoutResolve() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java b/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
index 73d4bff0..96333266 100644
--- a/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
+++ b/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
@@ -180,9 +180,14 @@ public class IvyBuildNumberTest {
         assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
     }
 
+    /**
+     * Test case for IVY-1037.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1037
+     */
     @Test
     public void testChainResolver() throws Exception {
-        // IVY-1037
         Project project = TestHelper.newProject();
         project.setProperty("ivy.settings.file", "test/repositories/IVY-1037/ivysettings.xml");
 
diff --git a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
index cc52a66e..3d8a489e 100644
--- a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
@@ -112,7 +112,7 @@ public class IvyCacheFilesetTest {
     /**
      * Test must fail with default haltonfailure setting.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testFailure() throws Exception {
@@ -124,7 +124,7 @@ public class IvyCacheFilesetTest {
     /**
      * Test must fail with default haltonfailure setting.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testInvalidPattern() throws Exception {
@@ -202,10 +202,11 @@ public class IvyCacheFilesetTest {
     }
 
     /**
-     * Tests that the {@link IvyCacheFileset} fails with an exception if it can't determine a common base directory
-     * while dealing with cached artifacts
+     * Test case for IVY-1475.
+     * {@link IvyCacheFileset} must fail with an exception if it cannot determine
+     * a common base directory while dealing with cached artifacts.
      *
-     * @see IVY-1475 for more details
+     * @see IVY-1475
      */
     @Test
     public void getBaseDirNoCommonBaseDir() {
diff --git a/test/java/org/apache/ivy/ant/IvyCachePathTest.java b/test/java/org/apache/ivy/ant/IvyCachePathTest.java
index 00b1d4cb..536022b1 100644
--- a/test/java/org/apache/ivy/ant/IvyCachePathTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCachePathTest.java
@@ -135,7 +135,7 @@ public class IvyCachePathTest {
     /**
      * Test must fail with default haltonfailure setting.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testFailure() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java b/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
index e8b69327..87dc6a96 100644
--- a/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
@@ -104,7 +104,7 @@ public class IvyCleanCacheTest {
     /**
      * clean cache must fail with unknown cache
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testUnknownCache() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyConfigureTest.java b/test/java/org/apache/ivy/ant/IvyConfigureTest.java
index 11fdd694..49f62a97 100644
--- a/test/java/org/apache/ivy/ant/IvyConfigureTest.java
+++ b/test/java/org/apache/ivy/ant/IvyConfigureTest.java
@@ -222,9 +222,14 @@ public class IvyConfigureTest {
         assertEquals("value", configure.getProject().getProperty("ivy.test.variable.this.id"));
     }
 
+    /**
+     * Test case for IVY-601.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-601
+     */
     @Test
     public void testIncludeTwice() throws Exception {
-        // IVY-601
         configure.setFile(new File("test/java/org/apache/ivy/ant/ivysettings-include-twice.xml"));
 
         configure.execute();
@@ -270,7 +275,7 @@ public class IvyConfigureTest {
     /**
      * Calling settings twice with the same id with override=notallowed must fail
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testOverrideNotAllowed() throws Exception {
@@ -295,7 +300,7 @@ public class IvyConfigureTest {
     /**
      * Settings override with invalid value must fail.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testInvalidOverride() throws Exception {
@@ -310,7 +315,7 @@ public class IvyConfigureTest {
      * Tests that if the Ivy settings file includes another file as optional,
      * then the absence of that file doesn't lead to failures
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testOptionalFileInclude() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyDeliverTest.java b/test/java/org/apache/ivy/ant/IvyDeliverTest.java
index 5bcc689e..056e9e7c 100644
--- a/test/java/org/apache/ivy/ant/IvyDeliverTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDeliverTest.java
@@ -297,9 +297,14 @@ public class IvyDeliverTest {
             md.getModuleRevisionId());
     }
 
+    /**
+     * Test case for IVY-404.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-404
+     */
     @Test
     public void testWithBranch() throws Exception {
-        // test case for IVY-404
         project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest-branch.xml");
         IvyResolve res = new IvyResolve();
         res.setProject(project);
@@ -358,9 +363,14 @@ public class IvyDeliverTest {
             dds[0].getDynamicConstraintDependencyRevisionId());
     }
 
+    /**
+     * Test case for IVY-415.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-415
+     */
     @Test
     public void testWithExtraAttributes() throws Exception {
-        // test case for IVY-415
         project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest-extra.xml");
         IvyResolve res = new IvyResolve();
         res.setValidate(false);
@@ -432,10 +442,15 @@ public class IvyDeliverTest {
             expectedFileSet, actualFileSet);
     }
 
+    /**
+     * Test case for IVY-707.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-707
+     */
     @Test
     public void testWithDynEvicted2() throws Exception {
         // same as previous but dynamic dependency is placed after the one causing the conflict
-        // test case for IVY-707
         project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-dyn-evicted2.xml");
         IvyResolve res = new IvyResolve();
         res.setValidate(false);
diff --git a/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java b/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
index bf41b276..633f0a37 100644
--- a/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
@@ -87,7 +87,7 @@ public class IvyDependencyTreeTest extends AntTaskTestCase {
     /**
      * Task must fail because no resolve was performed.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testWithResolveIdWithoutResolve() throws Exception {
@@ -118,10 +118,11 @@ public class IvyDependencyTreeTest extends AntTaskTestCase {
     }
 
     /**
-     * Tests that dependency tree task doesn't run into an infinite loop due to circular dependencies
+     * Test case for IVY-1540.
+     * Dependency tree task must not run into an infinite loop due to circular dependencies.
      *
-     * @throws Exception
-     * @see IVY-1540 for more details
+     * @throws Exception if something goes wrong
+     * @see IVY-1540
      */
     @Test
     public void testCircularDep() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java b/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
index ed8c4ab7..9501a1b8 100644
--- a/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
@@ -120,7 +120,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
     /**
      * Test must fail with default haltonfailure setting.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testInlineForNonExistingModule() throws Exception {
@@ -135,7 +135,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
     /**
      * Test must fail with default haltonfailure setting.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testFailure() throws Exception {
@@ -147,7 +147,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
     /**
      * Test must fail because of missing configurations.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testFailureWithMissingConfigurations() throws Exception {
@@ -163,7 +163,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
     /**
      * Test must fail with default haltonfailure setting.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testFailureOnBadDependencyIvyFile() throws Exception {
@@ -175,7 +175,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
     /**
      * Test must fail with default haltonfailure setting.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testFailureOnBadStatusInDependencyIvyFile() throws Exception {
@@ -215,9 +215,13 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
         assertFalse(project.getProperty("ivy.resolved.configurations").contains("default"));
     }
 
+    /**
+     * Test case for IVY-396.
+     *
+     * @see IVY-396
+     */
     @Test
     public void testResolveWithAbsoluteFile() {
-        // IVY-396
         File ivyFile = new File("test/java/org/apache/ivy/ant/ivy-simple.xml");
         dependencyUpdateChecker.getProject().setProperty("ivy.dep.file", ivyFile.getAbsolutePath());
         dependencyUpdateChecker.execute();
@@ -226,9 +230,13 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
         // ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
     }
 
+    /**
+     * Test case for IVY-396.
+     *
+     * @see IVY-396
+     */
     @Test
     public void testResolveWithRelativeFile() {
-        // IVY-396
         dependencyUpdateChecker.getProject().setProperty("ivy.dep.file",
             "test/java/org/apache/ivy/ant/ivy-simple.xml");
         dependencyUpdateChecker.execute();
diff --git a/test/java/org/apache/ivy/ant/IvyInfoTest.java b/test/java/org/apache/ivy/ant/IvyInfoTest.java
index 3930a9db..5d52a22f 100644
--- a/test/java/org/apache/ivy/ant/IvyInfoTest.java
+++ b/test/java/org/apache/ivy/ant/IvyInfoTest.java
@@ -75,6 +75,12 @@ public class IvyInfoTest {
         assertNull(info.getProject().getProperty("ivy.configuration.private.desc"));
     }
 
+    /**
+     * Test case for IVY-726.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-726
+     */
     @Test
     public void testIVY726() throws Exception {
         info.setFile(new File("test/java/org/apache/ivy/ant/ivy-info-all.xml"));
@@ -83,6 +89,12 @@ public class IvyInfoTest {
         assertTrue(info.getProject().getProperty("ivy.extra.branch") == null);
     }
 
+    /**
+     * Test case for IVY-395.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-395
+     */
     @Test
     public void testIVY395() throws Exception {
         info.setFile(new File("test/java/org/apache/ivy/ant/ivy-artifact-info.xml"));
diff --git a/test/java/org/apache/ivy/ant/IvyInstallTest.java b/test/java/org/apache/ivy/ant/IvyInstallTest.java
index 1f24f7a9..69c7873e 100644
--- a/test/java/org/apache/ivy/ant/IvyInstallTest.java
+++ b/test/java/org/apache/ivy/ant/IvyInstallTest.java
@@ -127,7 +127,7 @@ public class IvyInstallTest {
     }
 
     /**
-     * Normal case; no confs set (should use the default->* configuration).
+     * Normal case; no confs set (should use the default->* configuration).
      */
     @Test
     public void testInstallWithConfsDefaultSettings() {
@@ -147,7 +147,10 @@ public class IvyInstallTest {
     }
 
     /**
-     * Test retrieving artifacts under only the master and runtime configuration.
+     * Test case for IVY-1313.
+     * Retrieve artifacts only for the master and runtime configuration.
+     *
+     * @see IVY-1313
      */
     @Test
     public void testInstallWithConfsRuntimeOnly() {
@@ -167,9 +170,14 @@ public class IvyInstallTest {
         assertFalse(new File("build/test/install/org1/mod3/jars/mod3-1.0.jar").exists());
     }
 
+    /**
+     * Test case for IVY-1324.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1324
+     */
     @Test
     public void testInstallWithClassifiers() throws Exception {
-        // IVY-1324
         project.setProperty("ivy.settings.url", new File("test/repositories/m2/ivysettings.xml")
                 .toURI().toURL().toExternalForm());
         install.setOrganisation("org.apache");
@@ -236,6 +244,11 @@ public class IvyInstallTest {
         assertTrue(new File("build/test/install/org.apache/test/test-1.0.pom").exists());
     }
 
+    /**
+     * Test case for IVY-843.
+     *
+     * @see IVY-843
+     */
     @Test
     public void testIVY843() {
         project.setProperty("ivy.settings.file", "test/repositories/ivysettings-IVY843.xml");
@@ -288,9 +301,9 @@ public class IvyInstallTest {
     }
 
     /**
-     * Installing a module with namespace coordinates instead of system one should fail.
+     * Installing a module with namespace coordinates instead of system one must fail.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testInstallWithNamespace2() throws Exception {
@@ -323,7 +336,7 @@ public class IvyInstallTest {
     /**
      * Fail on unknown dependency when haltonfailure=true.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testDependencyNotFoundFailure() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyPublishTest.java b/test/java/org/apache/ivy/ant/IvyPublishTest.java
index e20c0ad3..4109c2c1 100644
--- a/test/java/org/apache/ivy/ant/IvyPublishTest.java
+++ b/test/java/org/apache/ivy/ant/IvyPublishTest.java
@@ -160,12 +160,17 @@ public class IvyPublishTest {
         }
     }
 
+    /**
+     * Test case for IVY-1248.
+     *
+     * @throws IOException if something goes wrong
+     * @throws ParseException if something goes wrong
+     * @see IVY-1248
+     */
     @Test
     public void testMergeParentWithoutPublishingParent() throws IOException, ParseException {
         // here we directly publish a module extending ivy-multiconf.xml,
         // the module parent is not published not yet in cache
-        // See : IVY-1248
-
         // update=true implies merge=true
         // project.setProperty("ivy.dep.file",
         // "test/java/org/apache/ivy/ant/ivy-extends-multiconf.xml");
@@ -185,13 +190,18 @@ public class IvyPublishTest {
         checkPublishedFile(published, "ivy-extends-merged.xml");
     }
 
+    /**
+     * Test case for IVY-1248.
+     * Here we directly publish a module extending ivy-multiconf.xml,
+     * the module parent is not published not yet in cache.
+     *
+     * @throws IOException if something goes wrong
+     * @throws ParseException if something goes wrong
+     * @see IVY-1248
+     */
     @Test
     public void testMergeParentWithoutPublishingParentForceDeliver()
             throws IOException, ParseException {
-        // here we directly publish a module extending ivy-multiconf.xml,
-        // the module parent is not published not yet in cache
-        // See : IVY-1248
-
         IvyResolve resolve = new IvyResolve();
         resolve.setProject(project);
         resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-extends-multiconf.xml"));
@@ -218,8 +228,6 @@ public class IvyPublishTest {
 
     @Test
     public void testMergeParentWithoutLocationAttribute() throws IOException, ParseException {
-        // See : IVY-XXX
-
         IvyResolve resolve = new IvyResolve();
         resolve.setProject(project);
         resolve.setFile(new File("test/java/org/apache/ivy/ant/extends/child1/ivy-child1.xml"));
@@ -711,7 +719,7 @@ public class IvyPublishTest {
     /**
      * Test must not publish ivy file with bad revision.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testBadNoDeliver() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyResolveTest.java b/test/java/org/apache/ivy/ant/IvyResolveTest.java
index ee220e9f..3e2ebb2d 100644
--- a/test/java/org/apache/ivy/ant/IvyResolveTest.java
+++ b/test/java/org/apache/ivy/ant/IvyResolveTest.java
@@ -62,6 +62,12 @@ public class IvyResolveTest {
         TestHelper.cleanCache();
     }
 
+    /**
+     * Test case for IVY-1455.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1455
+     */
     @Test
     public void testIVY1455() throws Exception {
         project.setProperty("ivy.settings.file", "test/repositories/IVY-1455/ivysettings.xml");
@@ -87,6 +93,12 @@ public class IvyResolveTest {
         parallel.execute();
     }
 
+    /**
+     * Test case for IVY-779.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-779
+     */
     @Test
     public void testIVY779() throws Exception {
         Project project = TestHelper.newProject();
@@ -122,9 +134,14 @@ public class IvyResolveTest {
         assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-630.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-630
+     */
     @Test
     public void testResolveWithoutIvyFile() throws Exception {
-        // IVY-630
         resolve.getProject().setProperty("ivy.settings.file",
             "test/repositories/IVY-630/ivysettings.xml");
 
@@ -444,9 +461,13 @@ public class IvyResolveTest {
         assertFalse(project.getProperty("ivy.resolved.configurations").contains("default"));
     }
 
+    /**
+     * Test case for IVY-396.
+     *
+     * @see IVY-396
+     */
     @Test
     public void testResolveWithAbsoluteFile() {
-        // IVY-396
         File ivyFile = new File("test/java/org/apache/ivy/ant/ivy-simple.xml");
         resolve.getProject().setProperty("ivy.dep.file", ivyFile.getAbsolutePath());
         resolve.execute();
@@ -455,9 +476,13 @@ public class IvyResolveTest {
             ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
     }
 
+    /**
+     * Test case for IVY-396.
+     *
+     * @see IVY-396
+     */
     @Test
     public void testResolveWithRelativeFile() {
-        // IVY-396
         resolve.getProject().setProperty("ivy.dep.file",
             "test/java/org/apache/ivy/ant/ivy-simple.xml");
         resolve.execute();
@@ -615,7 +640,7 @@ public class IvyResolveTest {
     /**
      * Test a failing resolve.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testChildsFail() throws Exception {
diff --git a/test/java/org/apache/ivy/ant/IvyRetrieveTest.java b/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
index 422513d5..692360ad 100644
--- a/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
+++ b/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
@@ -89,9 +89,14 @@ public class IvyRetrieveTest {
             "mod3.2", "jar", "jar", "private")).exists());
     }
 
+    /**
+     * Test case for IVY-992.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-992
+     */
     @Test
     public void testValidateInIvySettings() throws Exception {
-        // cfr IVY-992
         project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest-extra.xml");
         retrieve.getSettings().setValidate(false);
         retrieve.execute();
@@ -222,9 +227,14 @@ public class IvyRetrieveTest {
             "mod1.2", "jar", "jar")).exists());
     }
 
+    /**
+     * Test case for IVY-304.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-304
+     */
     @Test
     public void testUseOrigin() throws Exception {
-        // test case for IVY-304
         // first we do a resolve with useOrigin=true in another project
         Project project = TestHelper.newProject();
         project.init();
@@ -268,6 +278,12 @@ public class IvyRetrieveTest {
             "ivy", "ivy", "xml")).exists());
     }
 
+    /**
+     * Test case for IVY-631.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-631
+     */
     @Test
     public void testRetrieveWithOriginalNamePattern() throws Exception {
         retrieve.setFile(new File("test/java/org/apache/ivy/ant/ivy-631.xml"));
@@ -282,7 +298,7 @@ public class IvyRetrieveTest {
     /**
      * Retrieve without previous resolve must fail.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testFailureWithoutAPreviousResolve() throws Exception {
@@ -295,7 +311,7 @@ public class IvyRetrieveTest {
     /**
      * Test must fail with default haltonfailure setting.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = BuildException.class)
     public void testFailure() throws Exception {
@@ -392,9 +408,13 @@ public class IvyRetrieveTest {
         assertFalse(new File("build/test/lib/default/unknown").exists());
     }
 
+    /**
+     * Test case for IVY-315.
+     *
+     * @see IVY-315
+     */
     @Test
     public void testDoubleRetrieveWithDifferentConfigurations() {
-        // IVY-315
         project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-doubleretrieve.xml");
 
         retrieve.setConf("compile");
diff --git a/test/java/org/apache/ivy/core/deliver/DeliverTest.java b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
index 70dcd585..2b52e1ff 100644
--- a/test/java/org/apache/ivy/core/deliver/DeliverTest.java
+++ b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
@@ -70,6 +70,12 @@ public class DeliverTest {
         cache.mkdirs();
     }
 
+    /**
+     * Test case for IVY-1111.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1111
+     */
     @Test
     public void testIVY1111() throws Exception {
         Project project = ivyDeliver.getProject();
diff --git a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
index 04c06e4c..9bad4bd3 100644
--- a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
+++ b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
@@ -55,11 +55,13 @@ public class IvyMakePomTest {
     }
 
     /**
-     * Tests that a Ivy file containing a classifier extra-attribute in its dependency, when converted to a
-     * POM file through {@link IvyMakePom}, retains the classifier in the generated POM
+     * Test case for IVY-1528.
+     * An Ivy file containing a classifier extra attribute in its dependency,
+     * must retain the classifier in the generated POM when converted to
+     * a POM file through {@link IvyMakePom}.
      *
-     * @throws Exception
-     * @see IVY-1528 for more details
+     * @throws Exception if something goes wrong
+     * @see IVY-1528
      */
     @Test
     public void testClassifier() throws Exception {
diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
index cdc5d918..1f014b17 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
@@ -178,6 +178,8 @@ public class PublishEventsTest {
 
     /**
      * Test a simple artifact publish, without errors or overwrite settings.
+     *
+     * @throws IOException if something goes wrong
      */
     @Test
     public void testPublishNoOverwrite() throws IOException {
@@ -197,6 +199,8 @@ public class PublishEventsTest {
 
     /**
      * Test a simple artifact publish, with overwrite set to true.
+     *
+     * @throws IOException if something goes wrong
      */
     @Test
     public void testPublishWithOverwrite() throws IOException {
@@ -220,6 +224,8 @@ public class PublishEventsTest {
 
     /**
      * Test an attempted publish with an invalid data file path.
+     *
+     * @throws IOException if something goes wrong
      */
     @Test
     public void testPublishMissingFile() throws IOException {
diff --git a/test/java/org/apache/ivy/core/resolve/ResolveTest.java b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
index 194d3086..0ad84b18 100644
--- a/test/java/org/apache/ivy/core/resolve/ResolveTest.java
+++ b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
@@ -350,9 +350,14 @@ public class ResolveTest {
         assertTrue(report.hasError());
     }
 
+    /**
+     * Test case for IVY-258.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-258
+     */
     @Test
     public void testResolveNoRevisionNowhere() throws Exception {
-        // test case for IVY-258
         // module1 depends on latest version of module2, which contains no revision in its ivy file,
         // nor in the pattern
         Ivy ivy = new Ivy();
@@ -367,9 +372,14 @@ public class ResolveTest {
         assertFalse(report.hasError());
     }
 
+    /**
+     * Test case for IVY-448.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-448
+     */
     @Test
     public void testResolveWithConflictManagerPerModule() throws Exception {
-        // test case for IVY-448
         // all modules from myorg
         // module1
         // -> module2-1.0
@@ -391,9 +401,14 @@ public class ResolveTest {
                 .exists());
     }
 
+    /**
+     * Test case for IVY-465.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-465
+     */
     @Test
     public void testResolveWithConflictManagerDefinedInModule() throws Exception {
-        // test case for IVY-465
         // #M1;1.0 -> #M2;1.0
         // #M2;1.0 -> {org1#mod1.2;1.1 org1#mod1.2;2.0} with
         // 
@@ -410,9 +425,14 @@ public class ResolveTest {
         assertEquals("2.0", adrs[1].getArtifact().getId().getRevision());
     }
 
+    /**
+     * Test case for IVY-1404.
+     *
+     * @see IVY-1404
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testResolveWithConflictManagerDefinedAtHigherLevel() throws Exception {
-        // test case for IVY-1404
         // #M1;1.0 -> #M2;1.0
         // #M1;2.0 -> {#M2;1.0 #M3;1.0}
         // #M2;1.0 -> org1#mod1.2;1.1
@@ -457,9 +477,14 @@ public class ResolveTest {
                 .getArtifactsNumber());
     }
 
+    /**
+     * Test case for IVY-198.
+     *
+     * @see IVY-198
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testResolveWithSlashes() throws Exception {
-        // test case for IVY-198
         // module depends on mod1.2
         ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-198.xml"),
             getResolveOptions(new String[] {"*"}));
@@ -1153,10 +1178,14 @@ public class ResolveTest {
         assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-240.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-240
+     */
     @Test
     public void testResolveMultipleExtendsAndConfs() throws Exception {
-        // Test case for IVY-240
-        //
         // mod6.3 1.1 has four confs libraries, run (extends libraries), compile (extends run) and
         // test (extends libraries)
         // mod6.3 depends on mod6.2 2.0 in conf (run->default)
@@ -1189,10 +1218,14 @@ public class ResolveTest {
         assertContainsArtifact("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar", crr);
     }
 
+    /**
+     * Test case for IVY-188.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-188
+     */
     @Test
     public void testResolveMultipleConfsWithLatest() throws Exception {
-        // Test case for IVY-188
-        //
         // mod6.2 has two confs compile and run
         // depends on mod6.1 in conf (compile->default)
         // depends on mod1.2 latest (which is 2.2) in conf (run->default)
@@ -1216,10 +1249,14 @@ public class ResolveTest {
         assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-173.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-173
+     */
     @Test
     public void testResolveMultipleConfsWithConflicts() throws Exception {
-        // Test case for IVY-173
-        //
         // mod6.2 has two confs compile and run
         // depends on mod1.2 2.1 in conf (compile->default)
         // depends on mod1.1 1.0 in conf (*->default)
@@ -1305,9 +1342,14 @@ public class ResolveTest {
         assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-261.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-261
+     */
     @Test
     public void testResolveSeveralDefaultWithArtifacts() throws Exception {
-        // test case for IVY-261
         // mod1.6 depends on
         // mod1.4, which depends on mod1.3 and selects one of its artifacts
         // mod1.3 and selects two of its artifacts
@@ -1323,9 +1365,14 @@ public class ResolveTest {
                 .exists());
     }
 
+    /**
+     * Test case for IVY-537.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-537
+     */
     @Test
     public void testResolveConflictsWithArtifacts() throws Exception {
-        // test case for IVY-537
         // #mod2.6;0.12 -> {#mod1.6;1.0.4 #mod2.5;0.6.2 }
         // #mod1.6;1.0.4 -> #mod1.3;3.0 artifacts A and B
         // #mod2.5;0.6.2 -> #mod1.3;3.1 artifact C
@@ -1343,9 +1390,14 @@ public class ResolveTest {
                 .exists());
     }
 
+    /**
+     * Test case for IVY-283.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-283
+     */
     @Test
     public void testResolveSeveralDefaultWithArtifactsAndConfs() throws Exception {
-        // test case for IVY-283
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/IVY-283/ivysettings.xml"));
         ResolveReport report = ivy.resolve(new File("test/repositories/IVY-283/ivy.xml"),
@@ -1366,9 +1418,14 @@ public class ResolveTest {
                 .exists());
     }
 
+    /**
+     * Second test case for IVY-283.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-283
+     */
     @Test
     public void testResolveSeveralDefaultWithArtifactsAndConfs2() throws Exception {
-        // second test case for IVY-283
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/IVY-283/ivysettings.xml"));
         ResolveReport report = ivy.resolve(new File("test/repositories/IVY-283/ivy-d.xml"),
@@ -1583,9 +1640,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org2", "mod2.1", "0.3", "mod2.1", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-541.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-541
+     */
     @Test
     public void testResolveWithIncludeArtifactsTransitive() throws Exception {
-        // test case for IVY-541
         // mod2.6 depends on mod2.3 and mod2.1
         // mod2.3 depends on mod2.1 and selects its artifacts
         ResolveReport report = ivy.resolve(new File(
@@ -1753,7 +1815,10 @@ public class ResolveTest {
     }
 
     /**
-     * Testcase for IVY-1131.
+     * Test case for IVY-1131.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1131
      */
     @Test
     public void testResolveTransitiveDependenciesWithOverrideAndDynamicResolveMode()
@@ -2138,9 +2203,14 @@ public class ResolveTest {
         assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-264.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-264
+     */
     @Test
     public void testResolveConflict3() throws Exception {
-        // test case for IVY-264
         // a depends on x latest, y latest, z latest
         // x and z depends on commons-lang 1.0.1
         // y depends on commons-lang 2.0
@@ -2190,7 +2260,10 @@ public class ResolveTest {
     }
 
     /**
-     * Test IVY-618.
+     * Test case for IVY-618.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-618
      */
     @Test
     public void testResolveConflictFromPoms() throws Exception {
@@ -2230,9 +2303,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-199.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-199
+     */
     @Test
     public void testTransitiveEviction2() throws Exception {
-        // IVY-199
         // mod4.1 v 4.13 depends on
         // - mod3.2 v 1.2.1 which depends on
         // - mod3.1 v 1.0 which depends on mod1.2 v 2.0
@@ -2249,9 +2327,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-590.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-590
+     */
     @Test
     public void testTransitiveEvictionWithExtendingConf() throws Exception {
-        // IVY-590
         ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-590.xml"),
             getResolveOptions(new String[] {"*"}));
         assertNotNull(report);
@@ -2385,11 +2468,16 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51B", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-681.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-681
+     */
     @Test
     public void testEvictWithConf3() throws Exception {
         // same as first one but the conf requested in evicted module is no longer present in
         // selected revision
-        // test case for IVY-681
 
         // mod6.1 r1.4 depends on
         // mod5.1 r4.3 conf A
@@ -2413,10 +2501,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51B", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-861.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-861
+     */
     @Test
     public void testFailWithMissingConf() throws Exception {
-        // test case for IVY-861
-
         // mod6.1 r1.5 depends on
         // mod5.1 [1.0,4.3] conf unknown which doesn't exist in mod5.1;4.3
         ResolveReport report = ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.5.xml"),
@@ -2530,6 +2622,12 @@ public class ResolveTest {
             crr.getDownloadReports(ModuleRevisionId.newInstance("org5", "mod5.1", "4.2")).length);
     }
 
+    /**
+     * Test case for IVY-644.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-644
+     */
     @Test
     public void testMultipleEviction() throws Exception {
 
@@ -2568,9 +2666,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-193.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-193
+     */
     @Test
     public void testResolveForceAfterConflictSolved() throws Exception {
-        // IVY-193
         // mod4.1 v 4.9 depends on
         // - mod3.2 v 1.1 which depends on mod1.2 v 2.0
         // - mod3.1 v 1.1 which depends on mod1.2 v 2.1
@@ -2593,9 +2696,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-193.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-193
+     */
     @Test
     public void testResolveForceAfterDependencyExist() throws Exception {
-        // IVY-193
         // mod4.1 v 4.10 depends on
         // - mod3.1 v 1.0.1 which depends on mod1.2 v 2.0 and forces it
         // - mod3.2 v 1.2 which depends on mod1.2 v 2.1 and on mod3.1 v1.0.1
@@ -2611,9 +2719,14 @@ public class ResolveTest {
         assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-193.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-193
+     */
     @Test
     public void testResolveForceInDepOnly() throws Exception {
-        // IVY-193
         // mod4.1 v 4.11 depends on
         // - mod1.2 v 2.0
         // - mod3.2 v 1.3 which depends on
@@ -2633,9 +2746,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org1", "mod1.2", "1.0", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-193.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-193
+     */
     @Test
     public void testResolveForceInDepOnly2() throws Exception {
-        // IVY-193
         // mod4.1 v 4.12 depends on
         // - mod3.1 v1.0 which depends on
         // - mod1.2 v 2.0
@@ -2770,9 +2888,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-182.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-182
+     */
     @Test
     public void testResolveForceWithDynamicRevisionsAndCyclicDependencies() throws Exception {
-        // IVY-182
         // * has no revision
         // * declares conf compile, test extends compile,
         // * depends on
@@ -2831,9 +2954,15 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-130.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-130
+     */
     @Test
     public void testResolveContradictoryConflictResolution2() throws Exception {
-        // BUG IVY-130 : only mod1.2 v2.0 should be resolved and not v2.1 (because of force)
+        // Only mod1.2 v2.0 should be resolved and not v2.1 (because of force)
         // mod10.1 v 1.1 depends on
         // - mod1.2 v 2.0 and forces it
         // - mod4.1 v 4.3
@@ -3060,12 +3189,16 @@ public class ResolveTest {
                 .exists());
     }
 
+    /**
+     * Test case for IVY-602.
+     * Verify that latest.integration dependencies can be resolved when using a resolver with
+     * multiple patterns, when only the first pattern finds something
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-602
+     */
     @Test
     public void testLatestWithMultiplePatterns() throws Exception {
-        // The test verify that latest.integration dependencies can be resolved
-        // when using a resolver with multiple patterns, when only the first pattern
-        // finds something - test case for IVY-602
-
         // mod9.2 depends on latest.integration of mod6.2
         Ivy ivy = Ivy.newInstance();
         ivy.configure(new File("test/repositories/ivysettings-IVY602.xml"));
@@ -3220,10 +3353,15 @@ public class ResolveTest {
         assertTrue(getIvyFileInCache(depId).exists());
     }
 
+    /**
+     * Test case for IVY-318.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-318
+     */
     @Test
     public void testLatestMilestone2() throws Exception {
         // mod9.2 depends on latest.milestone of mod6.2, but there is no milestone
-        // test case for IVY-318
         ResolveReport report = ivy.resolve(new File(
                 "test/repositories/1/org9/mod9.2/ivys/ivy-1.2.xml"),
             getResolveOptions(new String[] {"default"}));
@@ -3237,6 +3375,12 @@ public class ResolveTest {
         assertEquals(0, crr.getArtifactsNumber());
     }
 
+    /**
+     * Test case for IVY-56.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-56
+     */
     @Test
     public void testIVY56() throws Exception {
         Ivy ivy = new Ivy();
@@ -3251,6 +3395,12 @@ public class ResolveTest {
         }
     }
 
+    /**
+     * Test case for IVY-214.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-214
+     */
     @Test
     public void testIVY214() throws Exception {
         ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-214.xml"),
@@ -3263,6 +3413,12 @@ public class ResolveTest {
                 .getArtifactsNumber());
     }
 
+    /**
+     * Test case for IVY-218.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-218
+     */
     @Test
     public void testIVY218() throws Exception {
         ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-218.xml"),
@@ -3275,6 +3431,12 @@ public class ResolveTest {
                 .getArtifactsNumber());
     }
 
+    /**
+     * Test case for IVY-729.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-729
+     */
     @Test
     public void testIVY729() throws Exception {
         Ivy ivy = new Ivy();
@@ -3289,7 +3451,7 @@ public class ResolveTest {
      * Circular dependency: mod6.3 depends on mod6.2, which itself depends on mod6.3;
      * circular dependency strategy set to error.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testCircular() throws Exception {
@@ -3322,7 +3484,7 @@ public class ResolveTest {
      * Circular dependency: mod 9.1 (no revision) depends on mod9.2, which depends on mod9.1 2.+;
      * circular dependency strategy set to error.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testCircular2() throws Exception {
@@ -3344,7 +3506,8 @@ public class ResolveTest {
      * Circular dependency: mod6.3 depends on mod6.2, which itself depends on mod6.3,
      * in both configuration default and test; circular dependency strategy set to error.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
+     * @see IVY-400
      */
     @Test
     public void testCircular3() throws Exception {
@@ -3465,6 +3628,12 @@ public class ResolveTest {
                 .exists());
     }
 
+    /**
+     * Test case for IVY-1178.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1178
+     */
     @Test
     public void testIVY1178() throws Exception {
         Ivy ivy = new Ivy();
@@ -3492,6 +3661,12 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("myorg", "modE", "1.1", "modE", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-1236.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1236
+     */
     @Test
     public void testIVY1236() throws Exception {
         Ivy ivy = new Ivy();
@@ -3510,6 +3685,12 @@ public class ResolveTest {
         assertTrue(getArchiveFileInCache("myorg", "modB", "1.0", "modB-A", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-1233.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1233
+     */
     @Test
     public void testIVY1233() throws Exception {
         Ivy ivy = new Ivy();
@@ -3526,6 +3707,12 @@ public class ResolveTest {
         assertTrue(modRevIds.contains(ModuleRevisionId.newInstance("test", "c", "3.0")));
     }
 
+    /**
+     * Test case for IVY-1333.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1333
+     */
     @Test
     public void testIVY1333() throws Exception {
         Ivy ivy = new Ivy();
@@ -3546,6 +3733,12 @@ public class ResolveTest {
             "1.0.0.m4", extra)));
     }
 
+    /**
+     * Test case for IVY-1347.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1347
+     */
     @Test
     public void testIVY1347() throws Exception {
         Ivy ivy = new Ivy();
@@ -3566,6 +3759,12 @@ public class ResolveTest {
         assertEquals(ModuleRevisionId.newInstance("foo", "parent", "1.0"), parent);
     }
 
+    /**
+     * Test case for IVY-999.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-999
+     */
     @Test
     public void testIVY999() throws Exception {
         Ivy ivy = new Ivy();
@@ -3581,6 +3780,12 @@ public class ResolveTest {
         assertFalse(modRevIds.contains(ModuleRevisionId.newInstance("junit", "junit", "3.8")));
     }
 
+    /**
+     * Test case for IVY-1366.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1366
+     */
     @Test
     public void testIVY1366() throws Exception {
         Ivy ivy = new Ivy();
@@ -3654,9 +3859,14 @@ public class ResolveTest {
         assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-105.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-105
+     */
     @Test
     public void testTransitiveSetting2() throws Exception {
-        // test case for IVY-105
         // mod2.7 depends on mod1.1 and mod2.4
         // mod2.4 depends on mod1.1 with transitive set to false
         // mod1.1 depends on mod1.2
@@ -3747,6 +3957,12 @@ public class ResolveTest {
     // about configuration mapping and eviction
     // /////////////////////////////////////////////////////////
 
+    /**
+     * Test case for IVY-84.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-84
+     */
     @Test
     public void testConfigurationMapping1() throws Exception {
         Ivy ivy = new Ivy();
@@ -3764,6 +3980,12 @@ public class ResolveTest {
         assertDoesntContainArtifact("test", "c", "1.0.2", "c-bt", "txt", "txt", conf);
     }
 
+    /**
+     * Test case for IVY-84.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-84
+     */
     @Test
     public void testConfigurationMapping2() throws Exception {
         Ivy ivy = new Ivy();
@@ -3781,6 +4003,12 @@ public class ResolveTest {
         assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf);
     }
 
+    /**
+     * Test case for IVY-84.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-84
+     */
     @Test
     public void testConfigurationMapping3() throws Exception {
         Ivy ivy = new Ivy();
@@ -3798,6 +4026,12 @@ public class ResolveTest {
         assertDoesntContainArtifact("test", "c", "1.0.1", "c", "txt", "txt", conf);
     }
 
+    /**
+     * Test case for IVY-84.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-84
+     */
     @Test
     public void testConfigurationMapping4() throws Exception {
         Ivy ivy = new Ivy();
@@ -3815,6 +4049,12 @@ public class ResolveTest {
         assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf);
     }
 
+    /**
+     * Test case for IVY-84.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-84
+     */
     @Test
     public void testConfigurationMapping5() throws Exception {
         Ivy ivy = new Ivy();
@@ -3832,6 +4072,12 @@ public class ResolveTest {
         assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf);
     }
 
+    /**
+     * Test case for IVY-84.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-84
+     */
     @Test
     public void testConfigurationMapping6() throws Exception {
         Ivy ivy = new Ivy();
@@ -3849,6 +4095,12 @@ public class ResolveTest {
         assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf);
     }
 
+    /**
+     * Test case for IVY-84.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-84
+     */
     @Test
     public void testConfigurationMapping7() throws Exception {
         Ivy ivy = new Ivy();
@@ -3866,6 +4118,12 @@ public class ResolveTest {
         assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf);
     }
 
+    /**
+     * Test case for IVY-97.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-97
+     */
     @Test
     public void testIVY97() throws Exception {
         // mod9.2 depends on mod9.1 and mod1.2
@@ -4454,9 +4712,14 @@ public class ResolveTest {
         }
     }
 
+    /**
+     * Test case for IVY-418.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-418
+     */
     @Test
     public void testResolveMaven2Classifiers() throws Exception {
-        // test case for IVY-418
         // test-classifier depends on test-classified with classifier asl
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/m2/ivysettings.xml"));
@@ -4482,9 +4745,14 @@ public class ResolveTest {
             "1.0", "test-classified", "jar", "jar", cmap).exists());
     }
 
+    /**
+     * Test case for IVY-1041.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1041
+     */
     @Test
     public void testResolveMaven2ClassifiersWithoutPOM() throws Exception {
-        // test case for IVY-1041
         // test-classifier depends on test-classified with classifier asl
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/m2/ivysettings.xml"));
@@ -4532,9 +4800,14 @@ public class ResolveTest {
         assertTrue(jarFileInCache.length() != sourceFileInCache.length());
     }
 
+    /**
+     * Test case for IVY-1138.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1138
+     */
     @Test
     public void testResolveMaven2GetSourcesWithSrcClassifier() throws Exception {
-        // IVY-1138
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/m2/ivysettings.xml"));
         ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-m2-with-src.xml"),
@@ -4663,9 +4936,14 @@ public class ResolveTest {
             "jar").exists());
     }
 
+    /**
+     * Test case for IVY-1186.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1186
+     */
     @Test
     public void testResolveMaven2ParentPomWithNamespace() throws Exception {
-        // Cfr IVY-1186
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/parentPom/ivysettings-namespace.xml"));
 
@@ -4820,9 +5098,14 @@ public class ResolveTest {
             "jar").exists());
     }
 
+    /**
+     * Test case for IVY-1376.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1376
+     */
     @Test
     public void testResolveMaven2ParentPomDependencyManagementWithImport() throws Exception {
-        // IVY-1376
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/parentPom/ivysettings.xml"));
         ivy.getSettings().setDefaultResolver("parentChain");
@@ -4848,9 +5131,14 @@ public class ResolveTest {
             "jar").exists());
     }
 
+    /**
+     * Test case for IVY-501.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-501
+     */
     @Test
     public void testResolveMaven2Snapshot1() throws Exception {
-        // test case for IVY-501
         // here we test maven SNAPSHOT versions handling,
         // with m2 snapshotRepository/uniqueVersion set to true
         Ivy ivy = new Ivy();
@@ -4869,9 +5157,14 @@ public class ResolveTest {
             "test-SNAPSHOT1", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-1036.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1036
+     */
     @Test
     public void testResolveMaven2Snapshot1AsLatestIntegration() throws Exception {
-        // test case for IVY-1036
         // here we test maven SNAPSHOT versions handling,
         // with m2 snapshotRepository/uniqueVersion set to true
         // but retrieving by latest.integration
@@ -4891,9 +5184,14 @@ public class ResolveTest {
             "test-SNAPSHOT1", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-501.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-501
+     */
     @Test
     public void testResolveMaven2Snapshot2() throws Exception {
-        // test case for IVY-501
         // here we test maven SNAPSHOT versions handling,
         // without m2 snapshotRepository/uniqueVersion set to true
         Ivy ivy = new Ivy();
@@ -4912,9 +5210,14 @@ public class ResolveTest {
             "test-SNAPSHOT2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-1036.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1036
+     */
     @Test
     public void testResolveMaven2Snapshot2AsLatestIntegration() throws Exception {
-        // test case for IVY-1036
         // here we test maven SNAPSHOT versions handling,
         // with m2 snapshotRepository/uniqueVersion set to true
         // but retrieving by latest.integration
@@ -5047,6 +5350,12 @@ public class ResolveTest {
         assertTrue(getIvyFileInCache(mrid).exists());
     }
 
+    /**
+     * Test case for IVY-1151.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1151
+     */
     @Test
     public void testIVY151() throws Exception {
         Ivy ivy = new Ivy();
@@ -5101,9 +5410,14 @@ public class ResolveTest {
         assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-168.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-168
+     */
     @Test
     public void testTransitiveConfMapping() throws Exception {
-        // IVY-168
         // mod13.3 depends on mod13.2 which depends on mod13.1
         // each module has two confs: j2ee and compile
         // each module only publishes one artifact in conf compile
@@ -5148,9 +5462,14 @@ public class ResolveTest {
         assertEquals("another", resolveModRevId.getExtraAttribute("eatt2"));
     }
 
+    /**
+     * Test case for IVY-773.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-773
+     */
     @Test
     public void testExtraAttributes2() throws Exception {
-        // test case for IVY-773
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/extra-attributes/ivysettings.xml"));
         ivy.getSettings().setDefaultCache(cache);
@@ -5170,9 +5489,14 @@ public class ResolveTest {
         assertTrue(new File(cache, "apache/module2/task2/1976/module2-linux.jar").exists());
     }
 
+    /**
+     * Test case for IVY-745.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-745
+     */
     @Test
     public void testExtraAttributes3() throws Exception {
-        // test case for IVY-745
         MockMessageLogger mockLogger = new MockMessageLogger();
         Ivy ivy = new Ivy();
         ivy.getLoggerEngine().setDefaultLogger(mockLogger);
@@ -5188,10 +5512,15 @@ public class ResolveTest {
         mockLogger.assertLogContains("expected='task2' found='null'");
     }
 
+    /**
+     * Second test case for IVY-745.ยจ
+     * Now we disable consistency checking, everything must work fine.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-745
+     */
     @Test
     public void testExtraAttributes4() throws Exception {
-        // second test case for IVY-745: now we disable consistency checking, everything should work
-        // fine
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/extra-attributes/ivysettings.xml"));
         ivy.getSettings().setDefaultCache(cache);
@@ -5291,10 +5620,14 @@ public class ResolveTest {
         assertTrue(getArchiveFileInCache(ivy, "bar#bar2#trunk;2", "bar2", "jar", "jar").exists());
     }
 
+    /**
+     * Test case for IVY-717.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-717
+     */
     @Test
     public void testBranches6() throws Exception {
-        // test case for IVY-717
-
         // bar1;4 -> foo#foo1#${ivy.branch};5
         // foo#foo1#branch1;5 -> foo#foo2#${ivy.branch};1
         // foo#foo1#trunk;5 -> {}
@@ -5597,6 +5930,12 @@ public class ResolveTest {
         assertFalse(report.hasError());
     }
 
+    /**
+     * Test case for IVY-956.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-956
+     */
     @Test(expected = StrictConflictException.class)
     public void testIVY956() throws Exception {
         ivy.getSettings().setDefaultConflictManager(
@@ -5605,6 +5944,12 @@ public class ResolveTest {
                 getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false));
     }
 
+    /**
+     * Test case for IVY-1159.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1159
+     */
     @Test
     public void testIVY1159_orderIsModAModB() throws Exception {
         testIVY1159("ivy-depsorder_modA_then_modB.xml", false);
@@ -5621,6 +5966,12 @@ public class ResolveTest {
             dds[1].getDependencyRevisionId());
     }
 
+    /**
+     * Test case for IVY-1159.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1159
+     */
     @Test
     public void testIVY1159_orderIsModAModBReplaceForced() throws Exception {
         testIVY1159("ivy-depsorder_modA_then_modB.xml", true);
@@ -5637,6 +5988,12 @@ public class ResolveTest {
             dds[1].getDependencyRevisionId());
     }
 
+    /**
+     * Test case for IVY-1159.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1159
+     */
     @Test
     public void testIVY1159_orderIsModBModA() throws Exception {
         testIVY1159("ivy-depsorder_modB_then_modA.xml", false);
@@ -5653,6 +6010,12 @@ public class ResolveTest {
             dds[1].getDependencyRevisionId());
     }
 
+    /**
+     * Test case for IVY-1159.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1159
+     */
     @Test
     public void testIVY1159_orderIsModBModAReplaceForced() throws Exception {
         testIVY1159("ivy-depsorder_modB_then_modA.xml", true);
@@ -5702,6 +6065,12 @@ public class ResolveTest {
         ivy.deliver(pubrev, deliveryPattern, dopts);
     }
 
+    /**
+     * Test case for IVY-1300.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1300
+     */
     @Test
     public void testIVY1300() throws Exception {
         ivy = Ivy.newInstance();
diff --git a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
index 48d0fd40..d09c58ec 100644
--- a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
+++ b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
@@ -261,7 +261,7 @@ public class RetrieveTest {
      * This test is here to just test the deprecated {@code symlinkmass} option for retrieve task.
      * A version or two down the line, after 2.5 release, we can remove this test and the option altogether
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @SuppressWarnings("deprecation")
     @Test
@@ -293,7 +293,7 @@ public class RetrieveTest {
      * {@link Files#exists(Path, LinkOption...) exists}
      *
      * @param filePath
-     * @throws IOException
+     * @throws IOException if something goes wrong
      */
     private void assertLinkOrExists(final String filePath) throws IOException {
         if (systemHasSymlinkAbility) {
@@ -416,9 +416,11 @@ public class RetrieveTest {
     }
 
     /**
-     * Tests that the {@link RetrieveEngine} retrieves artifacts with the correct extension if the artifact is unpacked
+     * Test case for IVY-1478.
+     * {@link RetrieveEngine} must retrieve artifacts with the correct extension if the artifact
+     * is unpacked.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      * @see IVY-1478
      */
     @Test
@@ -445,31 +447,35 @@ public class RetrieveTest {
     }
 
     /**
-     * Tests that more than one retrieve, with one having symlink enabled and the other not, doesn't lead to repository
-     * cache corruption as reported in https://issues.apache.org/jira/browse/IVY-1498
+     * Test case for IVY-1498.
+     * More than one retrieve, one having symlink enabled and the other not,
+     * must not lead to repository cache corruption.
      * 

      * The test does the following:
      * - Resolves a module, let's call it "irrelevant-A" which has a dependency on "org:foo-bar:1.2.3"
      * 

      * - Invokes a retrieve RT1, with {@link RetrieveOptions#setMakeSymlinks(boolean) symlinks true}
-     * on that resolved module with a pattern that translates to a path "a/b/c/foo-bar.jar". When the RT1 retrieve is
-     * done, the path "a/b/c/foo-bar.jar" will be a symlink to a path "repo/cache/org/foo-bar/foo-bar-1.2.3.jar" in the
-     * Ivy cache.
+     * on that resolved module with a pattern that translates to a path "a/b/c/foo-bar.jar". When the
+     * RT1 retrieve is done, the path "a/b/c/foo-bar.jar" will be a symlink to a path
+     * "repo/cache/org/foo-bar/foo-bar-1.2.3.jar" in the Ivy cache.
      * All fine so far.
      * 

-     * - We then resolve another module, let's call it "irrelevant-B" which has a dependency on "org:foo-bar:2.3.4"
+     * - We then resolve another module, let's call it "irrelevant-B" which has a dependency on
+     * "org:foo-bar:2.3.4"
      * 

      * - Next, do a new retrieve RT2, on this newly resolved module with
-     * {@link RetrieveOptions#setMakeSymlinks(boolean) symlinks false} and {@link RetrieveOptions#getOverwriteMode()
-     * overwrite semantics enabled} and with the same pattern as before), that translates to a path "a/b/c/foo-bar.jar".
+     * {@link RetrieveOptions#setMakeSymlinks(boolean) symlinks false} and
+     * {@link RetrieveOptions#getOverwriteMode() overwrite semantics enabled}
+     * and with the same pattern as before), that translates to a path "a/b/c/foo-bar.jar".
      * 

-     * When RT2 retrieve is done, we expect the path "a/b/c/foo-bar.jar" will *not* be a symlink and instead be an actual file that represents
-     * the org:foo-bar:2.3.4 artifact jar.
+     * When RT2 retrieve is done, we expect the path "a/b/c/foo-bar.jar" will *not* be a symlink and
+     * instead be an actual file that represents the org:foo-bar:2.3.4 artifact jar.
      * 

-     * We also expect that this RT2 retrieve will not update/overwrite the file at path "repo/cache/org/foo-bar/foo-bar-1.2.3.jar"
-     * in the Ivy cache - the file that was the end target of the symlink generated by the previous RT1.
+     * We also expect that this RT2 retrieve will not update/overwrite the file at path
+     * "repo/cache/org/foo-bar/foo-bar-1.2.3.jar" in the Ivy cache - the file that was the end
+     * target of the symlink generated by the previous RT1.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      * @see IVY-1498
      */
     @Test
diff --git a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
index 6a271a43..71c935de 100644
--- a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
+++ b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
@@ -261,7 +261,7 @@ public class XmlSettingsParserTest {
     /**
      * Test of resolver referencing a non existent cache.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testInvalidCache() throws Exception {
@@ -400,9 +400,14 @@ public class XmlSettingsParserTest {
                 ivyPatterns.get(0));
     }
 
+    /**
+     * Test case for IVY-319.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-319
+     */
     @Test
     public void testMacroAndRef() throws Exception {
-        // test case for IVY-319
         IvySettings settings = new IvySettings();
         XmlSettingsParser parser = new XmlSettingsParser(settings);
         parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-macro+ref.xml"));
@@ -423,9 +428,14 @@ public class XmlSettingsParserTest {
         assertTrue(shared instanceof FileSystemResolver);
     }
 
+    /**
+     * Test case for IVY-860.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-860
+     */
     @Test
     public void testMacroAndRef2() throws Exception {
-        // test case for IVY-860
         IvySettings settings = new IvySettings();
         XmlSettingsParser parser = new XmlSettingsParser(settings);
         parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-macro+ref2.xml"));
@@ -646,10 +656,11 @@ public class XmlSettingsParserTest {
     }
 
     /**
-     * Tests that a <ttl> containing the matcher attribute, in a ivy settings file,
-     * works as expected.
+     * Test case for IVY-1495.
+     * <ttl> containing the matcher attribute,
+     * in an ivy settings file, must work as expected.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      * @see IVY-1495
      */
     @Test
@@ -673,7 +684,7 @@ public class XmlSettingsParserTest {
     /**
      * Tests that the timeout-constraint elements in a Ivy settings file are parsed correctly
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testTimeoutConstraints() throws Exception {
@@ -707,10 +718,10 @@ public class XmlSettingsParserTest {
     }
 
     /**
-     * Tests that timeout constraints referenced by resolvers, in an ivy settings file, are processed correctly and the
-     * corresponding resolvers use the right timeout constraints
+     * Tests that timeout constraints referenced by resolvers, in an ivy settings file, are
+     * processed correctly and the corresponding resolvers use the right timeout constraints
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testResolverTimeoutConstraintRefs() throws Exception {
diff --git a/test/java/org/apache/ivy/core/sort/SortTest.java b/test/java/org/apache/ivy/core/sort/SortTest.java
index 33031b86..00597755 100644
--- a/test/java/org/apache/ivy/core/sort/SortTest.java
+++ b/test/java/org/apache/ivy/core/sort/SortTest.java
@@ -90,8 +90,10 @@ public class SortTest {
 
     /**
      * Sorter does not throw circular dependency, circular dependencies are handled at resolve time
-     * only. However the sort respect the transitive order when it is unambiguous. (if A depends
-     * transitively of B, but B doesn't depends transitively on A then B always comes before A).
+     * only. However the sort respect the transitive order when it is unambiguous. (If A depends
+     * transitively of B, but B doesn't depends transitively on A, then B always comes before A.)
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testCircularDependency() throws Exception {
@@ -127,7 +129,12 @@ public class SortTest {
         }
     }
 
-    // Test IVY-624
+    /**
+     * Test case for IVY-624
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-624
+     */
     @Test
     public void testCircularDependencyInfiniteLoop() throws Exception {
         addDependency(md1, "md2", "rev2");
@@ -213,8 +220,8 @@ public class SortTest {
 
     /**
      * When the version asked by a dependency is not compatible with the version declared in the
-     * module to order, the two modules should be considered as independent NB: I'm sure of what
-     * 'compatible' means !
+     * module to order, the two modules should be considered as independent.
+     * NB: I'm sure of what 'compatible' means !
      */
     @Test
     public void testDifferentVersionNotConsidered() {
@@ -339,7 +346,9 @@ public class SortTest {
         fail(errorMessage.toString());
     }
 
-    /** Returns a collection of lists that contains the elements a,b,c and d */
+    /**
+     * Returns a collection of lists that contains the elements a, b, c and d
+     */
     private Collection> getAllLists(ModuleDescriptor a, ModuleDescriptor b,
             ModuleDescriptor c, ModuleDescriptor d) {
         final int nbOfList = 24;
diff --git a/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java b/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java
index 60971a43..bddb05ec 100644
--- a/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java
+++ b/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java
@@ -72,10 +72,10 @@ public class OSGiManifestParserTest extends AbstractModuleDescriptorParserTester
     }
 
     /**
-     * Tests that the {@link OSGiManifestParser#parseDescriptor(ParserSettings, URL, Resource, boolean)} works fine for descriptors
-     * that are backed by {@link FileResource}
+     * Tests that the {@link OSGiManifestParser#parseDescriptor(ParserSettings, URL, Resource, boolean)}
+     * works fine for descriptors that are backed by {@link FileResource}
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testFileResource() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
index 104c63b0..37f476cc 100644
--- a/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
+++ b/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
@@ -139,7 +139,7 @@ public class LatestCompatibleConflictManagerTest {
     /**
      * Resolve must fail with a conflict.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = StrictConflictException.class)
     public void testConflict() throws Exception {
@@ -152,7 +152,7 @@ public class LatestCompatibleConflictManagerTest {
     /**
      * Resolve must fail with a conflict.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = StrictConflictException.class)
     public void testDynamicRootConflict() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
index 03a99421..3fd6d3f7 100644
--- a/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
+++ b/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
@@ -54,7 +54,12 @@ public class LatestConflictManagerTest {
         FileUtil.forceDelete(_cache);
     }
 
-    // Test case for issue IVY-388
+    /**
+     * Test case for IVY-388.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-388
+     */
     @Test
     public void testIvy388() throws Exception {
         ResolveReport report = ivy.resolve(
@@ -78,7 +83,12 @@ public class LatestConflictManagerTest {
         }
     }
 
-    // Test case for issue IVY-383
+    /**
+     * Test case for IVY-383.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-383
+     */
     @Test
     public void testIvy383() throws Exception {
         ResolveReport report = ivy.resolve(
@@ -93,7 +103,12 @@ public class LatestConflictManagerTest {
         }
     }
 
-    // Test case for issue IVY-407
+    /**
+     * Test case for IVY-407.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-407
+     */
     @Test
     public void testLatestTime1() throws Exception {
         ivy = new Ivy();
@@ -146,12 +161,19 @@ public class LatestConflictManagerTest {
         }
     }
 
-    /*
-     * Test case for issue IVY-407 (with transitivity) There are 5 modules A, B, C, D and E. 1)
-     * publish C-1.0.0, C-1.0.1 and C-1.0.2 2) B needs C-1.0.0 : retrieve ok and publish B-1.0.0 3)
-     * A needs B-1.0.0 and C-1.0.2 : retrieve ok and publish A-1.0.0 4) D needs C-1.0.1 : retrieve
-     * ok and publish D-1.0.0 5) E needs D-1.0.0 and A-1.0.0 (D before A in ivy file) retrieve
-     * failed to get C-1.0.2 from A (get apparently C-1.0.1 from D)
+    /**
+     * Test case for IVY-407 (with transitivity). There are 5 modules A, B, C, D and E.
+     * 
    
+     * 
  1. publish C-1.0.0, C-1.0.1 and C-1.0.2
    2. 
+     * 
  2. B needs C-1.0.0 : retrieve ok and publish B-1.0.0
    3. 
+     * 
  3. A needs B-1.0.0 and C-1.0.2 : retrieve ok and publish A-1.0.0
    4. 
+     * 
  4. D needs C-1.0.1 : retrieve ok and publish D-1.0.0
    5. 
+     * 
  5. E needs D-1.0.0 and A-1.0.0 (D before A in ivy file) :
+     * retrieve failed to get C-1.0.2 from A (get apparently C-1.0.1 from D)
    6. 
+     * 

+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-407
      */
     @Test
     public void testLatestTimeTransitivity() throws Exception {
@@ -187,9 +209,10 @@ public class LatestConflictManagerTest {
         }
     }
 
-    /*
-     * Test case for issue IVY-1399:
+    /**
+     * Test case for IVY-1399.
      * Dependency tree:
+     * 
      * Mycompany#target;1
      *     MyCompany#A;1
      *         conflicting-dependency#dep;1
@@ -202,6 +225,10 @@ public class LatestConflictManagerTest {
      *             ...
      *         MyCompany#C;1
      *             conflicting-dependency#dep;1
+     * 

+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1399
      */
     @Test
     public void testEvictedModules() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
index 0851a87c..5f14e9c2 100644
--- a/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
+++ b/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
@@ -67,7 +67,7 @@ public class StrictConflictManagerTest {
     /**
      * Resolve must fail with a conflict.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = StrictConflictException.class)
     public void testConflictResolve() throws Exception {
@@ -78,7 +78,7 @@ public class StrictConflictManagerTest {
     /**
      * Resolve must fail with a conflict.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = StrictConflictException.class)
     public void testConflictWithDynamicRevisionResolve() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
index 3ed867b9..f51376da 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
@@ -376,7 +376,12 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
             dds[1].getDependencyRevisionId());
     }
 
-    // IVY-392
+    /**
+     * Test case for IVY-392.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-392
+     */
     @Test
     public void testDependenciesWithInactiveProfile() throws Exception {
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings,
@@ -451,9 +456,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
             md.getModuleRevisionId());
     }
 
+    /**
+     * Test case for IVY-425.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-425
+     */
     @Test
     public void testVariables() throws Exception {
-        // test case for IVY-425
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings,
             getClass().getResource("spring-hibernate3-2.0.2.pom"), false);
         assertNotNull(md);
@@ -469,9 +479,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
             dds[10].getDependencyRevisionId());
     }
 
+    /**
+     * Test case for IVY-423.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-423
+     */
     @Test
     public void testDependenciesInProfile() throws Exception {
-        // test case for IVY-423
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings,
             getClass().getResource("mule-module-builders-1.3.3.pom"), false);
         assertNotNull(md);
@@ -481,9 +496,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
             md.getModuleRevisionId());
     }
 
+    /**
+     * Test case for IVY-424.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-424
+     */
     @Test
     public void testIVY424() throws Exception {
-        // test case for IVY-424
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings,
             getClass().getResource("shale-tiger-1.1.0-SNAPSHOT.pom"), false);
         assertNotNull(md);
@@ -634,9 +654,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
             excludeAllTransitiveDepsDescriptor.isTransitive());
     }
 
+    /**
+     * Test case for IVY-417.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-417
+     */
     @Test
     public void testWithPlugins() throws Exception {
-        // test case for IVY-417
         ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings,
             getClass().getResource("mule-1.3.3.pom"), false);
         assertNotNull(md);
@@ -683,7 +708,7 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
      * Tests that if a module doesn't have a license specified, then parent pom's license (if any)
      * is used for the child module
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testLicenseFromParent() throws Exception {
@@ -704,7 +729,7 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
      * Tests that if a project explicitly specifies the licenses, then the licenses (if any) from
      * its parent pom aren't applied to the child project
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testOverriddenLicense() throws Exception {
@@ -1059,10 +1084,11 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
     }
 
     /**
-     * Tests that a pom.xml which has references to properties that are either set via environment variables or system
-     * properties, has its properties evaluated correctly.
+     * Test case for IVY-1561.
+     * A pom.xml which has references to properties that are either set via environment variables
+     * or system properties, must have its properties evaluated correctly.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      * @see IVY-1561
      */
     @Test
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
index af2a6cd0..0694f531 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
@@ -200,8 +200,8 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
     /**
      * Test must fail because of bad version.
      *
-     * @throws IOException
-     * @throws ParseException
+     * @throws IOException if something goes wrong
+     * @throws ParseException if something goes wrong
      */
     @Test(expected = ParseException.class)
     public void testBadVersion() throws IOException, ParseException {
@@ -1090,9 +1090,10 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
     }
 
     /**
-     * IVY-442: test for parser failure.
+     * Test case for IVY-442: expect parser failure.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
+     * @see IVY-442
      */
     @Test(expected = ParseException.class)
     public void testWithNonExistingConfigInDependency() throws Exception {
@@ -1103,7 +1104,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
     /**
      * Test for parser failure.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = ParseException.class)
     public void testWithNonExistingConfigInPublications() throws Exception {
@@ -1112,9 +1113,10 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
     }
 
     /**
-     * IVY-441: test for parser failure.
+     * Test case for IVY-441: expect parser failure.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
+     * @see IVY-441
      */
     @Test(expected = ParseException.class)
     public void testWithExistingConfigsInPublicationsSeparatedBySemiColon() throws Exception {
@@ -1459,8 +1461,8 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
      * as encoded characters (for example %2F) then the module descriptor and the location of
      * the parent descriptor, are resolved and parsed correctly.
      *
-     * @throws Exception
-     * @see IVY-1562 for more details
+     * @throws Exception if something goes wrong
+     * @see IVY-1562
      */
     @Test
     public void testExtendsAbsoluteLocation() throws Exception {
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 14edef1f..341b569e 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
@@ -189,10 +189,10 @@ public class XmlModuleDescriptorWriterTest {
     /**
      * Test that the transitive attribute is written for non-transitive configurations.
      *
-     * 
+     * <conf ... transitive="false" ... />
      *
+     * @throws Exception if something goes wrong
      * @see IVY-1207
-     * @throws Exception
      */
     @Test
     public void testTransitiveAttributeForNonTransitiveConfs() throws Exception {
@@ -219,8 +219,8 @@ public class XmlModuleDescriptorWriterTest {
      * This is the default and writing it will only add noise and cause a deviation from the known
      * behavior (before fixing IVY-1207).
      *
+     * @throws Exception if something goes wrong
      * @see IVY-1207
-     * @throws Exception
      */
     @Test
     public void testTransitiveAttributeNotWrittenForTransitiveConfs() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
index bb582d0f..233b4e6a 100644
--- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
@@ -337,7 +337,12 @@ public class XmlModuleUpdaterTest {
         }
     }
 
-    // IVY-1356
+    /**
+     * Test case for IVY-1356.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-1356
+     */
     @Test
     public void testMergedUpdateWithExtendsAndExcludes() throws Exception {
         URL url = XmlModuleUpdaterTest.class.getResource("test-extends-dependencies-exclude.xml");
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 fe2fae47..e5cd9b8e 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java
@@ -29,19 +29,29 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 /**
- * Testing Testing was the single biggest hurdle I faced. I have tried to provide a complete test
+ * Testing was the single biggest hurdle I faced. I have tried to provide a complete test
  * suite that covers all protocols and which can be easily extended. It does differ - somewhat - in
  * structure from the resolver/repository test suites. Setting up smb, ftp, sftp will undoubtedly be
- * your biggest headache (it was mine). Here are a few notes about the setup: - the VFS test suite
- * uses the build/test/repositories area - when setting samba, sftp, etc. the corresponding user
- * needs both read and write privileges. - the tests assume that the user and password is the same
- * for all services. - a limited amount of configuration is available by setting the following
- * properties in the ivy.properties file: * vfs.host * vfs.username * vfs.password * vfs.samba_share
- * Running the test requires that commons-io and ant.jar are on the classpath. Also, I would
- * recommend that at some time the tests be converted from straight junit to something which betters
- * supports functional testing. Although somewhat crude I am using jsystem
+ * your biggest headache (it was mine). Here are a few notes about the setup:
+ * 
    
+ * 
  • the VFS test suite uses the build/test/repositories area;
+ * when setting samba, sftp, etc. the corresponding user needs both read and write privileges.
    • 
+ * 
  • the tests assume that the user and password is the same for all services.
    • 
+ * 
  • a limited amount of configuration is available by setting the following properties in the
+ * ivy.properties file:
    • 
+ * 

+ * 
+ *   vfs.host
+ *   vfs.username
+ *   vfs.password
+ *   vfs.samba_share
+ * 

+ * Running the test requires that commons-io and ant jars are on the classpath. Also, I would
+ * recommend that at some time the tests be converted from straight junit to something which better
+ * supports functional testing. Although somewhat crude, I am using jsystem
  * (http://jsystemtest.sourceforge.net/) in other projects and am finding it a much better solution
- * than straight junit. Stephen Nesbitt
+ * than straight junit.
+ * 
Stephen Nesbitt

  */
 public class VfsRepositoryTest {
     private VfsRepository repo = null;
@@ -70,7 +80,7 @@ public class VfsRepositoryTest {
     /**
      * Basic validation of happy path put - valid VFS URI and no conflict with existing file
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testPutValid() throws Exception {
@@ -98,7 +108,7 @@ public class VfsRepositoryTest {
     /**
      * Validate that we can overwrite an existing file
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testPutOverwriteTrue() throws Exception {
@@ -133,7 +143,7 @@ public class VfsRepositoryTest {
     /**
      * Validate that we put will respect a request not to overwrite an existing file
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test(expected = IOException.class)
     public void testPutOverwriteFalse() throws Exception {
@@ -152,7 +162,7 @@ public class VfsRepositoryTest {
     /**
      * Test the retrieval of an artifact from the repository creating a new artifact
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testGetNoExisting() throws Exception {
@@ -178,7 +188,7 @@ public class VfsRepositoryTest {
     /**
      * Test the retrieval of an artifact from the repository overwriting an existing artifact
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testGetOverwriteExisting() throws Exception {
@@ -209,6 +219,8 @@ public class VfsRepositoryTest {
     /**
      * Validate that we get a non null Resource instance when passed a well-formed VfsURI pointing
      * to an existing file
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testGetResourceValidExist() throws Exception {
@@ -227,6 +239,8 @@ public class VfsRepositoryTest {
     /**
      * Validate that we get a non null Resource instance when passed a well-formed VfsURI pointing
      * to a non-existent file.
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testGetResourceValidNoExist() throws Exception {
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 5e9cd74d..99b9201c 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
@@ -48,6 +48,8 @@ public class VfsResourceTest {
 
     /**
      * Validate VFSResource creation for a valid VFS URI pointing to an physically existing file
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testCreateResourceThatExists() throws Exception {
@@ -87,6 +89,8 @@ public class VfsResourceTest {
     /**
      * Validating that resource can be created for files which don't physically exists - e.g.
      * resources that are going to created.
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testCreateResourceThatDoesntExist() throws Exception {
@@ -112,6 +116,8 @@ public class VfsResourceTest {
 
     /**
      * Validate VFSResource creation when given a poorly formed VFS identifier
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testBadURI() throws Exception {
@@ -132,6 +138,8 @@ public class VfsResourceTest {
 
     /**
      * Validate getChildren when given a VFS URI for a directory
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testListFolderChildren() throws Exception {
@@ -165,6 +173,8 @@ public class VfsResourceTest {
     /**
      * Validate that we don't get any results when we query a VFSResource file object for its
      * children
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testListFileChildren() throws Exception {
@@ -179,6 +189,8 @@ public class VfsResourceTest {
     /**
      * Validate that we don't get any results if we ask an IMAGINARY VFSResource - a nonexistent
      * file - for a list of its children
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testListImaginary() throws Exception {
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 394dfba2..a8314e41 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
@@ -73,7 +73,7 @@ public class VfsTestHelper {
      *
      * @param resource
      *            name of the resource
-     * @return List of well-formed VFS resource identifiers
+     * @return {@link List} of well-formed VFS resource identifiers
      */
     public List createVFSUriSet(String resource) {
         List set = new ArrayList<>();
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 3b890020..1a5ced95 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
@@ -128,7 +128,7 @@ public class VfsURI {
     /**
      * Return a well-formed VFS Resource identifier
      *
-     * @return String representing a well formed VFS resource identifier
+     * @return String representing a well formed VFS resource identifier
      */
     public String getVfsURI() {
         StringBuilder uri = new StringBuilder();
diff --git a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
index c04894c2..e9f0dd19 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
@@ -326,9 +326,14 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
         }
     }
 
+    /**
+     * Test case for IVY-206.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-206
+     */
     @Test
     public void testFixedWithDefaultAndRealResolver() throws Exception {
-        // test case for IVY-206
         ChainResolver chain = new ChainResolver();
         chain.setName("chain");
         chain.setSettings(settings);
@@ -416,9 +421,14 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
         }
     }
 
+    /**
+     * Test case for IVY-389.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-389
+     */
     @Test
     public void testReturnFirstWithDefaultAndCacheAndRealResolver() throws Exception {
-        // test case for IVY-389
         DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(
                 ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), false);
 
@@ -437,10 +447,14 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
         assertEquals(true, rmr.getDescriptor().isDefault());
     }
 
+    /**
+     * Test case for IVY-207.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-207
+     */
     public void testReturnFirstWithCheckModifiedAndDefaultAndCacheAndRealResolver()
             throws Exception {
-        // test case for IVY-207
-
         DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(
                 ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), false);
 
diff --git a/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java
index 8a7b5b2d..6ed58538 100644
--- a/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java
@@ -87,8 +87,8 @@ public class DualResolverTest extends AbstractDependencyResolverTest {
     /**
      * Test fails due to bad resolver configuration.
      *
-     * @throws IOException
-     * @throws ParseException
+     * @throws IOException if something goes wrong
+     * @throws ParseException if something goes wrong
      */
     @Test(expected = ParseException.class)
     public void testFromBadConf() throws IOException, ParseException {
@@ -99,7 +99,7 @@ public class DualResolverTest extends AbstractDependencyResolverTest {
     /**
      * Test fails due to bad resolver configuration
      *
-     * @throws ParseException
+     * @throws ParseException if something goes wrong
      */
     @Test(expected = IllegalStateException.class)
     public void testBad() throws ParseException {
diff --git a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
index a0cbd711..6446d9c8 100644
--- a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
@@ -165,9 +165,14 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest {
         assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
     }
 
+    /**
+     * Test case for IVY-676.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-676
+     */
     @Test
     public void testFindIvyFileRefWithMultipleIvyPatterns() throws Exception {
-        // cfr IVY-676
         FileSystemResolver resolver = new FileSystemResolver();
         resolver.setName("test");
         resolver.setSettings(settings);
@@ -263,7 +268,8 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest {
 
     /**
      * Tests that SHA-256 algorithm can be used for checksums on resolvers
-     * @throws Exception
+     *
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testSHA256Checksum() throws Exception {
@@ -294,7 +300,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest {
     /**
      * Tests that SHA-512 algorithm can be used for checksums on resolvers
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testSHA512Checksum() throws Exception {
@@ -887,7 +893,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest {
     /**
      * Publishing with transaction=true and an unsupported pattern must fail.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testUnsupportedTransaction() throws Exception {
@@ -916,7 +922,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest {
     /**
      * Publishing with transaction=true and an unsupported combination of patterns must fail.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testUnsupportedTransaction2() throws Exception {
@@ -948,7 +954,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest {
     /**
      * Publishing with transaction=true and overwrite mode must fail.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testUnsupportedTransaction3() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
index 6091f5eb..bce5415f 100644
--- a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
@@ -95,9 +95,10 @@ public class IvyRepResolverTest extends AbstractDependencyResolverTest {
     }
 
     /**
-     * IVY-625: should fail if no ivyroot specified.
+     * Test case for IVY-625. Must fail if no ivyroot specified.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
+     * @see IVY-625
      */
     @Test
     public void testMandatoryRoot() throws Exception {
diff --git a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
index f8945989..7b11e4e1 100644
--- a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
@@ -383,7 +383,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest {
     /**
      * Tests that the timeout constraint set on the URL resolver is used correctly by the resolver
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testTimeoutConstraint() throws Exception {
diff --git a/test/java/org/apache/ivy/util/TestXmlHelper.java b/test/java/org/apache/ivy/util/TestXmlHelper.java
index cea9e0bc..440e35a0 100644
--- a/test/java/org/apache/ivy/util/TestXmlHelper.java
+++ b/test/java/org/apache/ivy/util/TestXmlHelper.java
@@ -40,7 +40,7 @@ public class TestXmlHelper {
      * @param xPathExpression The XPath expression to evaluate
      * @param returnType      The expected return type of the {@link XPathExpression#evaluate(Object, QName) evaluation}
      * @return                The result
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     public static Object evaluateXPathExpr(final File xmlFile, final XPathExpression xPathExpression, final QName returnType)
             throws Exception {
@@ -67,7 +67,7 @@ public class TestXmlHelper {
      * @param xpathExpression The XPath expression to evaluate
      * @param returnType      The expected return type of the {@link XPathExpression#evaluate(Object, QName) evaluation}
      * @return                The result
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     public static Object evaluateXPathExpr(final File xmlFile, final String xpathExpression, final QName returnType) throws Exception {
         return evaluateXPathExpr(xmlFile, XPathFactory.newInstance().newXPath().compile(xpathExpression), returnType);
diff --git a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
index d30f1dd0..e792c046 100644
--- a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
+++ b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
@@ -32,7 +32,10 @@ import static org.junit.Assert.assertEquals;
 public class AbstractURLHandlerTest {
 
     /**
-     * JUnit test for IVY-923.
+     * Test case for IVY-923.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-923
      */
     @Test
     public void testNormalizeToStringWithSpaceURL() throws Exception {
@@ -43,7 +46,10 @@ public class AbstractURLHandlerTest {
     }
 
     /**
-     * JUnit test for IVY-923.
+     * Test case for IVY-923.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-923
      */
     @Test
     public void testNormalizeToStringWithPlusCharacter() throws Exception {
diff --git a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java
index 6ab2543d..226a9202 100644
--- a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java
+++ b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java
@@ -33,7 +33,7 @@ public class ApacheURLListerTest {
     /**
      * Tests {@link ApacheURLLister#retrieveListing(URL, boolean, boolean)}.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testRetrieveListing() throws Exception {
@@ -62,7 +62,7 @@ public class ApacheURLListerTest {
     /**
      * Tests {@link ApacheURLLister#retrieveListing(URL, boolean, boolean)}.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testRetrieveListingWithSpaces() throws Exception {
diff --git a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
index de82269b..d63cf6d3 100644
--- a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
+++ b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
@@ -80,10 +80,15 @@ public class HttpclientURLHandlerTest {
         assertFalse("URL resource was expected to be unreachable", handler.isReachable(new URL("http://www.google.fr/unknownpage.html"), defaultTimeoutConstraint));
     }
 
+    /**
+     * Test case for IVY-390.
+     *
+     * @throws Exception if something goes wrong
+     * @see IVY-390
+     */
     @SuppressWarnings("resource")
     @Test
     public void testGetURLInfo() throws Exception {
-        // IVY-390
         URLHandler handler = new HttpClientHandler();
         URLInfo info = handler
                 .getURLInfo(new URL(
@@ -115,7 +120,7 @@ public class HttpclientURLHandlerTest {
      * Tests that the {@link HttpClientHandler}, backed by {@link CredentialsStore Ivy credentials store}
      * works as expected when it interacts with a HTTP server which requires authentication for accessing resources.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      * @see IVY-1336
      */
     @Test
diff --git a/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java b/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java
index 9817576b..002e68de 100644
--- a/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java
+++ b/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java
@@ -67,7 +67,7 @@ public class IvyAuthenticatorTest {
      * relevant requesting information, including the {@link Authenticator#getRequestingURL() requesting URL} and
      * {@link Authenticator#getRequestorType() request type}
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      * @see IVY-1557
      */
     @Test