You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2017/08/19 04:50:58 UTC
[3/3] ant-ivy git commit: add a target to generate javadoc for test
cases; fix javadoc for doclint
add a target to generate javadoc for test cases; fix javadoc for doclint
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/c1f910cc
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/c1f910cc
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/c1f910cc
Branch: refs/heads/master
Commit: c1f910cc5380e3a2440f63d03d4cb4fda4e627c0
Parents: 186fd10
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat Aug 19 06:44:37 2017 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat Aug 19 06:44:37 2017 +0200
----------------------------------------------------------------------
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 +-
test/java/org/apache/ivy/ant/FileUtilTest.java | 4 +-
.../ivy/ant/IvyAntSettingsBuildFileTest.java | 12 +-
.../apache/ivy/ant/IvyArtifactPropertyTest.java | 2 +-
.../org/apache/ivy/ant/IvyBuildNumberTest.java | 7 +-
.../org/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 +-
.../java/org/apache/ivy/ant/IvyDeliverTest.java | 21 +-
.../apache/ivy/ant/IvyDependencyTreeTest.java | 9 +-
.../ivy/ant/IvyDependencyUpdateCheckerTest.java | 22 +-
test/java/org/apache/ivy/ant/IvyInfoTest.java | 12 +
.../java/org/apache/ivy/ant/IvyInstallTest.java | 25 +-
.../java/org/apache/ivy/ant/IvyPublishTest.java | 26 +-
.../java/org/apache/ivy/ant/IvyResolveTest.java | 33 +-
.../org/apache/ivy/ant/IvyRetrieveTest.java | 30 +-
.../apache/ivy/core/deliver/DeliverTest.java | 6 +
.../core/module/descriptor/IvyMakePomTest.java | 10 +-
.../ivy/core/publish/PublishEventsTest.java | 6 +
.../apache/ivy/core/resolve/ResolveTest.java | 479 ++++++++++++++++---
.../apache/ivy/core/retrieve/RetrieveTest.java | 40 +-
.../core/settings/XmlSettingsParserTest.java | 31 +-
.../java/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 | 15 +-
.../xml/XmlModuleDescriptorWriterTest.java | 6 +-
.../parser/xml/XmlModuleUpdaterTest.java | 7 +-
.../repository/vfs/VfsRepositoryTest.java | 44 +-
.../plugins/repository/vfs/VfsResourceTest.java | 12 +
.../plugins/repository/vfs/VfsTestHelper.java | 2 +-
.../ivy/plugins/repository/vfs/VfsURI.java | 2 +-
.../ivy/plugins/resolver/ChainResolverTest.java | 22 +-
.../ivy/plugins/resolver/DualResolverTest.java | 6 +-
.../resolver/FileSystemResolverTest.java | 18 +-
.../plugins/resolver/IvyRepResolverTest.java | 5 +-
.../ivy/plugins/resolver/URLResolverTest.java | 2 +-
.../java/org/apache/ivy/util/TestXmlHelper.java | 4 +-
.../ivy/util/url/AbstractURLHandlerTest.java | 10 +-
.../ivy/util/url/ApacheURLListerTest.java | 4 +-
.../ivy/util/url/HttpclientURLHandlerTest.java | 9 +-
.../ivy/util/url/IvyAuthenticatorTest.java | 2 +-
55 files changed, 944 insertions(+), 276 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index b291a81..60606d9 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
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 834123f..660cc8b 100644
--- a/build.xml
+++ b/build.xml
@@ -90,7 +90,6 @@
<path refid="lib.classpath"/>
</path>
<path id="test.classpath">
- <pathelement location="${coverage.classes.dir}"/>
<fileset dir="${lib.dir}">
<include name="*.jar"/>
<exclude name="ant.jar"/>
@@ -101,6 +100,10 @@
<pathelement location="${optional.classes.build.dir}"/>
<pathelement path="${test.build.dir}"/>
</path>
+ <path id="javadoc.test.classpath">
+ <path refid="run.classpath"/>
+ <pathelement path="${test.build.dir}"/>
+ </path>
</target>
<target name="prepare" depends="init">
@@ -518,6 +521,22 @@
</javadoc>
</target>
+ <target name="javadoc-test" depends="init" unless="skip.javadoc">
+ <tstamp>
+ <format pattern="2007-yyyy" property="years"/>
+ </tstamp>
+ <property name="copyright" value="Copyright &copy;${years} The Apache Software Foundation, Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a>."/>
+ <property name="title" value="Apache Ivy&trade; dependency manager ${target.ivy.version} API"/>
+ <javadoc destdir="${test.javadoc.build.dir}"
+ useexternalfile="true"
+ windowtitle="Apache Ivy&trade;"
+ doctitle="${title}"
+ bottom="${copyright}"
+ classpathref="javadoc.test.classpath">
+ <fileset dir="${test.dir}" includes="**/*.java"/>
+ </javadoc>
+ </target>
+
<target name="sources" depends="default-version" description="Create source archive files">
<mkdir dir="${artifacts.build.dir}/sources/"/>
<jar destfile="${artifacts.build.dir}/sources/${final.name}">
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java b/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java
index 304a351..c74e13e 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
*/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java b/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java
index 8ab90cb..fbcb21d 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
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java
----------------------------------------------------------------------
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 04ac8b5..004b390 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;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/src/java/org/apache/ivy/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/FileUtil.java b/src/java/org/apache/ivy/util/FileUtil.java
index 138a9ce..957e8de 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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/src/java/org/apache/ivy/util/url/URLHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/URLHandler.java b/src/java/org/apache/ivy/util/url/URLHandler.java
index 0b31c5e..5f75479 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 {
* <p>
* Please use {@link #getURLInfo(URL, TimeoutConstraint)} if more one information about the <code>url</code>
* is needed
+ * </p>
*
* @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 {
* <p>
* Please use {@link #getURLInfo(URL, TimeoutConstraint)} if more one information about the <code>url</code>
* is needed
+ * </p>
*
* @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;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/MainTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/MainTest.java b/test/java/org/apache/ivy/MainTest.java
index 427f97c..256906b 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 <a href="https://issues.apache.org/jira/browse/IVY-1355">IVY-1355</a>
*/
@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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/TestFixture.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/TestFixture.java b/test/java/org/apache/ivy/TestFixture.java
index 7886ead..374711e 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. <br/>
+ * modules, using micro ivy format to describe the repository.
+ * <p>
* Example of use:
- *
+ * </p>
* <pre>
* 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")
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/TestHelper.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java
index e206d3b..57303bd 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.
* <p>
* Examples:
- *
+ * </p>
* <pre>
* #A;1
* </pre>
- *
- * <hr/>
- *
+ * <hr>
* <pre>
- * #A;2-> #B;[1.0,1.5]
+ * #A;2-> #B;[1.0,1.5]
* </pre>
- *
- * <hr/>
- *
+ * <hr>
* <pre>
- * #A;3-> { #B;[1.0,1.5] #C;[2.0,2.5] }
+ * #A;3-> { #B;[1.0,1.5] #C;[2.0,2.5] }
* </pre>
*
- * </p>
- *
* @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,
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/FileUtilTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/FileUtilTest.java b/test/java/org/apache/ivy/ant/FileUtilTest.java
index 902d1a1..4056e86 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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java b/test/java/org/apache/ivy/ant/IvyAntSettingsBuildFileTest.java
index 13d0cd8..22b3257 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 <a href="https://issues.apache.org/jira/browse/IVY-925">IVY-925</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-924">IVY-924</a>
+ */
@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");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java b/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
index 44365c6..60e8459 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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java b/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
index 73d4bff..9633326 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 <a href="https://issues.apache.org/jira/browse/IVY-1037">IVY-1037</a>
+ */
@Test
public void testChainResolver() throws Exception {
- // IVY-1037
Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/IVY-1037/ivysettings.xml");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
index cc52a66..3d8a489 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 <a href="https://issues.apache.org/jira/browse/IVY-1475">IVY-1475</a> for more details
+ * @see <a href="https://issues.apache.org/jira/browse/IVY-1475">IVY-1475</a>
*/
@Test
public void getBaseDirNoCommonBaseDir() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyCachePathTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyCachePathTest.java b/test/java/org/apache/ivy/ant/IvyCachePathTest.java
index 00b1d4c..536022b 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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java b/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
index e8b6932..87dc6a9 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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyConfigureTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyConfigureTest.java b/test/java/org/apache/ivy/ant/IvyConfigureTest.java
index 11fdd69..49f62a9 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 <a href="https://issues.apache.org/jira/browse/IVY-601">IVY-601</a>
+ */
@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 <code>include</code>s another file as <code>optional</code>,
* 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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyDeliverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyDeliverTest.java b/test/java/org/apache/ivy/ant/IvyDeliverTest.java
index 5bcc689..056e9e7 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 <a href="https://issues.apache.org/jira/browse/IVY-404">IVY-404</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-415">IVY-415</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-707">IVY-707</a>
+ */
@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);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java b/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
index bf41b27..633f0a3 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 <a href="https://issues.apache.org/jira/browse/IVY-1540">IVY-1540</a> for more details
+ * @throws Exception if something goes wrong
+ * @see <a href="https://issues.apache.org/jira/browse/IVY-1540">IVY-1540</a>
*/
@Test
public void testCircularDep() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java b/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
index ed8c4ab..9501a1b 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 <a href="https://issues.apache.org/jira/browse/IVY-396">IVY-396</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-396">IVY-396</a>
+ */
@Test
public void testResolveWithRelativeFile() {
- // IVY-396
dependencyUpdateChecker.getProject().setProperty("ivy.dep.file",
"test/java/org/apache/ivy/ant/ivy-simple.xml");
dependencyUpdateChecker.execute();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyInfoTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyInfoTest.java b/test/java/org/apache/ivy/ant/IvyInfoTest.java
index 3930a9d..5d52a22 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 <a href="https://issues.apache.org/jira/browse/IVY-726">IVY-726</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-395">IVY-395</a>
+ */
@Test
public void testIVY395() throws Exception {
info.setFile(new File("test/java/org/apache/ivy/ant/ivy-artifact-info.xml"));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyInstallTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyInstallTest.java b/test/java/org/apache/ivy/ant/IvyInstallTest.java
index 1f24f7a..69c7873 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 <a href="https://issues.apache.org/jira/browse/IVY-1313">IVY-1313</a>
*/
@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 <a href="https://issues.apache.org/jira/browse/IVY-1324">IVY-1324</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-843">IVY-843</a>
+ */
@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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyPublishTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyPublishTest.java b/test/java/org/apache/ivy/ant/IvyPublishTest.java
index e20c0ad..4109c2c 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 <a href="https://issues.apache.org/jira/browse/IVY-1248">IVY-1248</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-1248">IVY-1248</a>
+ */
@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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyResolveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyResolveTest.java b/test/java/org/apache/ivy/ant/IvyResolveTest.java
index ee220e9..3e2ebb2 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 <a href="https://issues.apache.org/jira/browse/IVY-1455">IVY-1455</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-779">IVY-779</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-630">IVY-630</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-396">IVY-396</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-396">IVY-396</a>
+ */
@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 {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyRetrieveTest.java b/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
index 422513d..692360a 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 <a href="https://issues.apache.org/jira/browse/IVY-992">IVY-992</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-304">IVY-304</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-631">IVY-631</a>
+ */
@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 <a href="https://issues.apache.org/jira/browse/IVY-315">IVY-315</a>
+ */
@Test
public void testDoubleRetrieveWithDifferentConfigurations() {
- // IVY-315
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-doubleretrieve.xml");
retrieve.setConf("compile");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/core/deliver/DeliverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/deliver/DeliverTest.java b/test/java/org/apache/ivy/core/deliver/DeliverTest.java
index 70dcd58..2b52e1f 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 <a href="https://issues.apache.org/jira/browse/IVY-1111">IVY-1111</a>
+ */
@Test
public void testIVY1111() throws Exception {
Project project = ivyDeliver.getProject();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
----------------------------------------------------------------------
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 04c06e4..9bad4bd 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 <code>classifier</code> extra-attribute in its dependency, when converted to a
- * POM file through {@link IvyMakePom}, retains the <code>classifier</code> in the generated POM
+ * Test case for IVY-1528.
+ * An Ivy file containing a <code>classifier</code> extra attribute in its dependency,
+ * must retain the <code>classifier</code> in the generated POM when converted to
+ * a POM file through {@link IvyMakePom}.
*
- * @throws Exception
- * @see <a href="https://issues.apache.org/jira/browse/IVY-1528">IVY-1528</a> for more details
+ * @throws Exception if something goes wrong
+ * @see <a href="https://issues.apache.org/jira/browse/IVY-1528">IVY-1528</a>
*/
@Test
public void testClassifier() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
index cdc5d91..1f014b1 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 {