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/12/05 10:12:41 UTC
[1/2] ant-ivy git commit: chop extraneous throws,
fix imports and javadoc
Repository: ant-ivy
Updated Branches:
refs/heads/master d86ae886e -> 4e2846d5f
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
index 6299190..1aae1f3 100644
--- a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
+++ b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
@@ -658,7 +658,7 @@ public class XmlSettingsParserTest {
}
@Test
- public void testBaseDirVariables() throws Exception {
+ public void testBaseDirVariables() {
IvySettings settings = new IvySettings();
settings.setBaseDir(new File("test/base/dir"));
assertEquals(new File("test/base/dir").getAbsolutePath(), settings.getVariable("basedir"));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/sort/SortTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/sort/SortTest.java b/test/java/org/apache/ivy/core/sort/SortTest.java
index be3654a..0660884 100644
--- a/test/java/org/apache/ivy/core/sort/SortTest.java
+++ b/test/java/org/apache/ivy/core/sort/SortTest.java
@@ -74,7 +74,7 @@ public class SortTest {
}
@Test
- public void testSort() throws Exception {
+ public void testSort() {
addDependency(md2, "md1", "rev1");
addDependency(md3, "md2", "rev2");
addDependency(md4, "md3", "rev3");
@@ -95,7 +95,7 @@ public class SortTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testCircularDependency() throws Exception {
+ public void testCircularDependency() {
addDependency(md1, "md4", "rev4");
addDependency(md2, "md1", "rev1");
addDependency(md3, "md2", "rev2");
@@ -111,7 +111,7 @@ public class SortTest {
}
@Test
- public void testCircularDependency2() throws Exception {
+ public void testCircularDependency2() {
addDependency(md2, "md3", "rev3");
addDependency(md2, "md1", "rev1");
addDependency(md3, "md2", "rev2");
@@ -133,7 +133,7 @@ public class SortTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-624">IVY-624</a>
*/
@Test
- public void testCircularDependencyInfiniteLoop() throws Exception {
+ public void testCircularDependencyInfiniteLoop() {
addDependency(md1, "md2", "rev2");
addDependency(md1, "md3", "rev3");
addDependency(md2, "md3", "rev3");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java b/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
index 21bfb83..a6db458 100644
--- a/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
+++ b/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
@@ -104,7 +104,7 @@ public class ManifestParserTest {
}
@Test
- public void testFormatLines() throws Exception {
+ public void testFormatLines() {
assertEquals("foo bar\n", ManifestParser.formatLines("foo bar"));
assertEquals(
"123456789012345678901234567890123456789012345678901234567890123456789012\n",
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java b/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
index 0e4bdb7..55a2515 100644
--- a/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
+++ b/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
@@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.text.ParseException;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.sax.SAXTransformerFactory;
@@ -95,7 +94,7 @@ public class BundleRepoTest {
}
@Test
- public void testXMLSerialisation() throws SAXException, ParseException, IOException {
+ public void testXMLSerialisation() throws SAXException, IOException {
FSManifestIterable it = new FSManifestIterable(bundlerepo);
BundleRepoDescriptor repo = new BundleRepoDescriptor(bundlerepo.toURI(),
ExecutionEnvironmentProfileProvider.getInstance());
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java
index 6e47044..0d2d868 100644
--- a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java
+++ b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java
@@ -86,7 +86,7 @@ public class UpdateSiteResolverTest {
}
@Test
- public void testListOrganization() throws Exception {
+ public void testListOrganization() {
OrganisationEntry[] orgs = resolver.listOrganisations();
assertEquals(2, orgs.length);
assertTrue((orgs[0].getOrganisation().equals(BundleInfo.BUNDLE_TYPE) && orgs[1]
@@ -96,7 +96,7 @@ public class UpdateSiteResolverTest {
}
@Test
- public void testListModules() throws Exception {
+ public void testListModules() {
ModuleEntry[] modules = resolver.listModules(new OrganisationEntry(resolver,
BundleInfo.BUNDLE_TYPE));
assertEquals(3, modules.length);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/osgi/util/VersionTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/util/VersionTest.java b/test/java/org/apache/ivy/osgi/util/VersionTest.java
index 0cd2243..ae4420a 100644
--- a/test/java/org/apache/ivy/osgi/util/VersionTest.java
+++ b/test/java/org/apache/ivy/osgi/util/VersionTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
public class VersionTest {
@Test
- public void testParsing() throws Exception {
+ public void testParsing() {
Version v;
v = new Version("1");
@@ -46,7 +46,7 @@ public class VersionTest {
}
@Test
- public void testCompareTo() throws Exception {
+ public void testCompareTo() {
assertTrue(new Version("1.2.3").compareTo(new Version("1.2.3")) == 0);
assertTrue(new Version("1.2.3").compareTo(new Version("1.2.2")) > 0);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java b/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
index 10707f4..9c371dc 100644
--- a/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
+++ b/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
@@ -43,19 +43,19 @@ public class IgnoreCircularDependencyStrategyTest {
}
@After
- public void tearDown() throws Exception {
+ public void tearDown() {
resetMockLogger(messageLoggerEngine);
}
@Test
- public void testLog() throws Exception {
+ public void testLog() {
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.0, #B;1.0"));
mockMessageImpl.assertLogVerboseContains("circular dependency found: #A;1.0->#B;1.0");
}
@Test
- public void testRemoveDuplicates() throws Exception {
+ public void testRemoveDuplicates() {
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java b/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
index f643864..6722aab 100644
--- a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
+++ b/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
@@ -56,13 +56,13 @@ public class WarnCircularDependencyStrategyTest {
}
@Test
- public void testLog() throws Exception {
+ public void testLog() {
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.0, #B;1.0"));
mockMessageLogger.assertLogWarningContains("circular dependency found: #A;1.0->#B;1.0");
}
@Test
- public void testRemoveDuplicates() throws Exception {
+ public void testRemoveDuplicates() {
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
@@ -71,7 +71,7 @@ public class WarnCircularDependencyStrategyTest {
}
@Test
- public void testRemoveDuplicates2() throws Exception {
+ public void testRemoveDuplicates2() {
setResolveContext("1");
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
index 5f14e9c..07eb201 100644
--- a/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
+++ b/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
@@ -47,7 +47,7 @@ public class StrictConflictManagerTest {
}
@Test
- public void testInitFromConf() throws Exception {
+ public void testInitFromConf() {
ConflictManager cm = ivy.getSettings().getDefaultConflictManager();
assertTrue(cm instanceof StrictConflictManager);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java b/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java
index bd880a5..68756aa 100644
--- a/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java
+++ b/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
public class NameSpaceHelperTest {
@Test
- public void testTransformArtifactWithExtraAttributes() throws Exception {
+ public void testTransformArtifactWithExtraAttributes() {
Artifact artifact = new DefaultArtifact(ArtifactRevisionId.newInstance(
ModuleRevisionId.parse("org.apache#test;1.0"), "test", "jar", "jar",
Collections.singletonMap("m:qualifier", "sources")), new Date(), null, false);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
----------------------------------------------------------------------
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 82b42ae..f215e7c 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
+++ b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
@@ -109,7 +109,7 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
}
@Test
- public void testAccept() throws Exception {
+ public void testAccept() {
assertTrue(PomModuleDescriptorParser.getInstance().accept(
new URLResource(getClass().getResource("test-simple.pom"))));
assertFalse(PomModuleDescriptorParser.getInstance().accept(
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
index 99b9201..c33d8c4 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
@@ -120,7 +120,7 @@ public class VfsResourceTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testBadURI() throws Exception {
+ public void testBadURI() {
String vfsURI = "smb1:/goobeldygook";
VfsResource res = new VfsResource(vfsURI, helper.fsManager);
@@ -142,7 +142,7 @@ public class VfsResourceTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testListFolderChildren() throws Exception {
+ public void testListFolderChildren() {
final String testFolder = "2/mod10.1";
final List<String> expectedFiles =
Arrays.asList("ivy-1.0.xml", "ivy-1.1.xml", "ivy-1.2.xml", "ivy-1.3.xml");
@@ -177,7 +177,7 @@ public class VfsResourceTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testListFileChildren() throws Exception {
+ public void testListFileChildren() {
for (VfsURI vfsURI : helper.createVFSUriSet(VfsTestHelper.TEST_IVY_XML)) {
VfsResource res = new VfsResource(vfsURI.toString(), helper.fsManager);
List<String> results = res.getChildren();
@@ -193,7 +193,7 @@ public class VfsResourceTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testListImaginary() throws Exception {
+ public void testListImaginary() {
for (VfsURI vfsURI : helper.createVFSUriSet("idontexistzzxx")) {
VfsResource res = new VfsResource(vfsURI.toString(), helper.fsManager);
List<String> results = res.getChildren();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
index e318df7..2ff8c1f 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
@@ -97,7 +97,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
}
@Test
- public void testName() throws Exception {
+ public void testName() {
ChainResolver chain = new ChainResolver();
chain.setSettings(settings);
chain.setName("chain");
@@ -539,7 +539,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
}
@Test
- public void testDownloadWithDual() throws Exception {
+ public void testDownloadWithDual() {
ChainResolver chain = new ChainResolver();
chain.setName("chain");
chain.setSettings(settings);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
index 07c75e7..dea435e 100644
--- a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
@@ -1020,7 +1020,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest {
}
@Test
- public void testListing() throws Exception {
+ public void testListing() {
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("test");
resolver.setSettings(settings);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
index 88e5da0..5549344 100644
--- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
@@ -155,7 +155,7 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest {
@SuppressWarnings({"rawtypes", "unchecked"})
@Test
- public void testMaven2Listing() throws Exception {
+ public void testMaven2Listing() {
IBiblioResolver resolver = new IBiblioResolver();
resolver.setName("test");
resolver.setSettings(settings);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
index 1cd1aa2..413d6ec 100644
--- a/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
@@ -90,7 +90,7 @@ public class PackagerResolverTest extends AbstractDependencyResolverTest {
}
@After
- public void tearDown() throws Exception {
+ public void tearDown() {
FileUtil.forceDelete(cache);
cleanupTempDirs();
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java b/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
index 4956a95..e8b9f70 100644
--- a/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
+++ b/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
@@ -58,7 +58,7 @@ public class LogTriggerTest {
}
@Test
- public void testMessage() throws Exception {
+ public void testMessage() {
trigger.setMessage("msg: ${organisation} ${module} ${revision}");
MockMessageLogger mockLogger = new MockMessageLogger();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
index 0b027dd..4f45dc9 100644
--- a/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
+++ b/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
@@ -42,14 +42,14 @@ public class LatestVersionMatcherTest {
}
@Test
- public void testNeedModuleDescriptorStandardStatus() throws Exception {
+ public void testNeedModuleDescriptorStandardStatus() {
assertNeed("latest.release", true);
assertNeed("latest.milestone", true);
assertNeed("latest.integration", false);
}
@Test
- public void testNeedModuleDescriptorCustomStatus() throws Exception {
+ public void testNeedModuleDescriptorCustomStatus() {
StatusManager.getCurrent().addStatus(new Status("release", false));
StatusManager.getCurrent().addStatus(new Status("snapshot", true));
@@ -58,21 +58,21 @@ public class LatestVersionMatcherTest {
}
@Test
- public void testAcceptForStandardStatus() throws Exception {
+ public void testAcceptForStandardStatus() {
assertAccept("latest.release", "release", true);
assertAccept("latest.release", "milestone", false);
assertAccept("latest.release", "integration", false);
}
@Test
- public void testAcceptForSameBranches() throws Exception {
+ public void testAcceptForSameBranches() {
assertAccept("latest.release", "trunk", "release", "trunk", true);
assertAccept("latest.release", "trunk", "milestone", "trunk", false);
assertAccept("latest.release", "trunk", "integration", "trunk", false);
}
@Test
- public void testAcceptForDifferentBranches() throws Exception {
+ public void testAcceptForDifferentBranches() {
assertAccept("latest.release", "trunk", "release", "feature", false);
assertAccept("latest.release", "trunk", "milestone", "feature", false);
assertAccept("latest.release", "trunk", "integration", "feature", false);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
index f984a62..29f42a1 100644
--- a/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
+++ b/test/java/org/apache/ivy/plugins/version/MavenTimedSnapshotVersionMatcherTest.java
@@ -29,11 +29,9 @@ public class MavenTimedSnapshotVersionMatcherTest {
/**
* Tests the {@link MavenTimedSnapshotVersionMatcher#isDynamic(ModuleRevisionId)} method
- *
- * @throws Exception
*/
@Test
- public void testIsDynamic() throws Exception {
+ public void testIsDynamic() {
final MavenTimedSnapshotVersionMatcher versionMatcher = new MavenTimedSnapshotVersionMatcher();
final ModuleRevisionId regularSnapshot = ModuleRevisionId.newInstance("org.apache", "ant-ivy", "1.0.2-SNAPSHOT");
Assert.assertFalse(regularSnapshot + " wasn't expected to be a dynamic revision", versionMatcher.isDynamic(regularSnapshot));
@@ -46,11 +44,9 @@ public class MavenTimedSnapshotVersionMatcherTest {
/**
* Tests the {@link MavenTimedSnapshotVersionMatcher#computeIfSnapshot(String)} method
- *
- * @throws Exception
*/
@Test
- public void testSnapshotParsing() throws Exception {
+ public void testSnapshotParsing() {
Assert.assertNull("Revision wasn't expected to be a snapshot",
MavenTimedSnapshotVersionMatcher.computeIfSnapshot("1.9.9"));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
index 1abfe1a..3167ddb 100644
--- a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
+++ b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
@@ -27,7 +27,7 @@ public class VersionRangeMatcherTest {
final VersionMatcher vm = new VersionRangeMatcher("range", new LatestRevisionStrategy());
@Test
- public void testMavenExcludeParenthesis() throws Exception {
+ public void testMavenExcludeParenthesis() {
assertAccept("[3.8,4.0)", "3.7", false);
assertAccept("[3.8,4.0)", "3.8", true);
assertAccept("[3.8,4.0)", "3.9", true);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/util/StringUtilsTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/util/StringUtilsTest.java b/test/java/org/apache/ivy/util/StringUtilsTest.java
index 3d48fb2..0e9aeae 100644
--- a/test/java/org/apache/ivy/util/StringUtilsTest.java
+++ b/test/java/org/apache/ivy/util/StringUtilsTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue;
public class StringUtilsTest {
@Test
- public void testGetStackTrace() throws Exception {
+ public void testGetStackTrace() {
String trace = StringUtils.getStackTrace(new Exception());
assertTrue(trace.contains("java.lang.Exception"));
assertTrue(trace.contains("at org.apache.ivy.util.StringUtilsTest.testGetStackTrace(StringUtilsTest.java"));
[2/2] ant-ivy git commit: chop extraneous throws,
fix imports and javadoc
Posted by gi...@apache.org.
chop extraneous throws, fix imports and javadoc
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/4e2846d5
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/4e2846d5
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/4e2846d5
Branch: refs/heads/master
Commit: 4e2846d5f453b1190b1a6fe73e804ec726d072cb
Parents: d86ae88
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Tue Dec 5 11:12:21 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Tue Dec 5 11:12:21 2017 +0100
----------------------------------------------------------------------
.../ivy/plugins/resolver/IvyRepResolver.java | 3 +-
.../apache/ivy/ant/AntBuildResolverTest.java | 6 +-
.../org/apache/ivy/ant/AntCallTriggerTest.java | 2 +-
test/java/org/apache/ivy/ant/FileUtilTest.java | 8 +--
.../apache/ivy/ant/IvyArtifactPropertyTest.java | 4 +-
.../apache/ivy/ant/IvyArtifactReportTest.java | 2 +-
.../org/apache/ivy/ant/IvyBuildNumberTest.java | 24 ++++----
.../org/apache/ivy/ant/IvyCacheFilesetTest.java | 12 ++--
.../org/apache/ivy/ant/IvyCachePathTest.java | 26 ++++----
.../org/apache/ivy/ant/IvyCleanCacheTest.java | 10 ++--
.../org/apache/ivy/ant/IvyConfigureTest.java | 14 ++---
.../java/org/apache/ivy/ant/IvyDeliverTest.java | 3 +-
.../apache/ivy/ant/IvyDependencyTreeTest.java | 14 ++---
.../ivy/ant/IvyDependencyUpdateCheckerTest.java | 24 ++++----
.../org/apache/ivy/ant/IvyFindRevisionTest.java | 6 +-
.../apache/ivy/ant/IvyInfoRepositoryTest.java | 6 +-
test/java/org/apache/ivy/ant/IvyInfoTest.java | 8 +--
.../java/org/apache/ivy/ant/IvyInstallTest.java | 4 +-
.../org/apache/ivy/ant/IvyListModulesTest.java | 2 +-
.../apache/ivy/ant/IvyPostResolveTaskTest.java | 26 ++++----
.../java/org/apache/ivy/ant/IvyPublishTest.java | 44 +++++++-------
test/java/org/apache/ivy/ant/IvyReportTest.java | 8 +--
.../java/org/apache/ivy/ant/IvyResolveTest.java | 62 ++++++++++----------
.../org/apache/ivy/ant/IvyResourcesTest.java | 16 ++---
.../org/apache/ivy/ant/IvyRetrieveTest.java | 30 +++++-----
.../org/apache/ivy/core/TestPerformance.java | 2 +-
.../ivy/core/event/IvyEventFilterTest.java | 2 +-
.../core/module/descriptor/IvyMakePomTest.java | 2 +-
.../core/module/id/ModuleRevisionIdTest.java | 10 ++--
.../ivy/core/module/id/ModuleRulesTest.java | 4 +-
.../ivy/core/resolve/ResolveEngineTest.java | 2 +-
.../apache/ivy/core/resolve/ResolveTest.java | 19 +++---
.../apache/ivy/core/retrieve/RetrieveTest.java | 2 +-
.../core/settings/XmlSettingsParserTest.java | 2 +-
.../java/org/apache/ivy/core/sort/SortTest.java | 8 +--
.../ivy/osgi/core/ManifestParserTest.java | 2 +-
.../apache/ivy/osgi/repo/BundleRepoTest.java | 3 +-
.../osgi/updatesite/UpdateSiteResolverTest.java | 4 +-
.../org/apache/ivy/osgi/util/VersionTest.java | 4 +-
.../IgnoreCircularDependencyStrategyTest.java | 6 +-
.../WarnCircularDependencyStrategyTest.java | 6 +-
.../conflict/StrictConflictManagerTest.java | 2 +-
.../plugins/namespace/NameSpaceHelperTest.java | 2 +-
.../m2/PomModuleDescriptorParserTest.java | 2 +-
.../plugins/repository/vfs/VfsResourceTest.java | 8 +--
.../ivy/plugins/resolver/ChainResolverTest.java | 4 +-
.../resolver/FileSystemResolverTest.java | 2 +-
.../plugins/resolver/IBiblioResolverTest.java | 2 +-
.../plugins/resolver/PackagerResolverTest.java | 2 +-
.../ivy/plugins/trigger/LogTriggerTest.java | 2 +-
.../version/LatestVersionMatcherTest.java | 10 ++--
.../MavenTimedSnapshotVersionMatcherTest.java | 8 +--
.../version/VersionRangeMatcherTest.java | 2 +-
.../org/apache/ivy/util/StringUtilsTest.java | 2 +-
54 files changed, 239 insertions(+), 251 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java b/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java
index bf527a0..79bc831 100644
--- a/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java
@@ -43,6 +43,7 @@ import org.apache.ivy.core.search.RevisionEntry;
import org.apache.ivy.plugins.resolver.util.ResolvedResource;
import org.apache.ivy.util.Message;
import org.apache.ivy.util.XMLHelper;
+import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -228,7 +229,7 @@ public class IvyRepResolver extends URLResolver {
XMLHelper.parse(content, null, new DefaultHandler() {
@Override
public void startElement(String uri, String localName, String qName,
- org.xml.sax.Attributes attributes) throws SAXException {
+ Attributes attributes) throws SAXException {
if ("organisation".equals(qName)) {
String org = attributes.getValue("name");
if (org != null) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/AntBuildResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/AntBuildResolverTest.java b/test/java/org/apache/ivy/ant/AntBuildResolverTest.java
index 0bf8bd8..9889db9 100644
--- a/test/java/org/apache/ivy/ant/AntBuildResolverTest.java
+++ b/test/java/org/apache/ivy/ant/AntBuildResolverTest.java
@@ -78,7 +78,7 @@ public class AntBuildResolverTest {
}
@Test
- public void testNoProject() throws Exception {
+ public void testNoProject() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/workspace/project1/ivy.xml"));
@@ -158,7 +158,7 @@ public class AntBuildResolverTest {
}
@Test
- public void testCachePath() throws Exception {
+ public void testCachePath() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/workspace/project2/ivy.xml"));
@@ -180,7 +180,7 @@ public class AntBuildResolverTest {
}
@Test
- public void testCachePathFolder() throws Exception {
+ public void testCachePathFolder() {
wa.setPath("target/classes");
IvyResolve resolve = new IvyResolve();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
index 91f8351..cb1ec59 100644
--- a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
+++ b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
public class AntCallTriggerTest {
@Test
- public void test() throws Exception {
+ public void test() {
assertFalse(new File("test/triggers/ant-call/A/out/foo.txt").exists());
runAnt(new File("test/triggers/ant-call/A/build.xml"), "resolve");
// should have unzipped foo.zip
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 4056e86..7eb28d6 100644
--- a/test/java/org/apache/ivy/ant/FileUtilTest.java
+++ b/test/java/org/apache/ivy/ant/FileUtilTest.java
@@ -35,11 +35,9 @@ public class FileUtilTest {
/**
* Tests that {@link FileUtil#normalize(String)} works as expected for some basic file paths
- *
- * @throws Exception if something goes wrong
*/
@Test
- public void testSimpleNormalize() throws Exception {
+ public void testSimpleNormalize() {
final File ivySettingsFile = new File("test/repositories/ivysettings.xml");
final File normalizedIvySettingsFile = FileUtil.normalize(ivySettingsFile.getAbsolutePath());
assertEquals("Unexpected normalization of file path " + ivySettingsFile.getAbsolutePath(), ivySettingsFile.getAbsolutePath(), normalizedIvySettingsFile.getAbsolutePath());
@@ -49,11 +47,9 @@ 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 if something goes wrong
*/
@Test
- public void testNormalizeOfFileSystemRootPath() throws Exception {
+ public void testNormalizeOfFileSystemRootPath() {
for (final File fileSystemRoot : File.listRoots()) {
final File normalized = FileUtil.normalize(fileSystemRoot.getPath());
assertNotNull("Normalized path was null for " + fileSystemRoot, normalized);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 60e8459..847eb8f 100644
--- a/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
+++ b/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
@@ -90,11 +90,9 @@ public class IvyArtifactPropertyTest {
/**
* Test must fail because no resolve was performed
- *
- * @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testWithResolveIdWithoutResolve() throws Exception {
+ public void testWithResolveIdWithoutResolve() {
prop.setName("[module].[artifact]-[revision]");
prop.setValue("${cache.dir}/[module]/[artifact]-[revision].[type]");
prop.setResolveId("abc");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java b/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
index c254cc6..52a3d64 100644
--- a/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
+++ b/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
@@ -52,7 +52,7 @@ public class IvyArtifactReportTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
prop.setTofile(new File("build/test-artifact-report.xml"));
prop.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
prop.execute();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 9633326..f688684 100644
--- a/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
+++ b/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
@@ -47,7 +47,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testDefault() throws Exception {
+ public void testDefault() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("newmod");
buildNumber.execute();
@@ -58,7 +58,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testDefault2() throws Exception {
+ public void testDefault2() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("newmod");
buildNumber.setDefault("1.0-dev-1");
@@ -70,7 +70,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testDefault3() throws Exception {
+ public void testDefault3() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("newmod");
buildNumber.setDefault("mydefault");
@@ -82,7 +82,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testLatest() throws Exception {
+ public void testLatest() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("mod1.1");
buildNumber.execute();
@@ -93,7 +93,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testLatest2() throws Exception {
+ public void testLatest2() {
buildNumber.setOrganisation("orgbn");
buildNumber.setModule("buildnumber");
buildNumber.execute();
@@ -104,7 +104,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testPrefix() throws Exception {
+ public void testPrefix() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("mod1.1");
buildNumber.setPrefix("test");
@@ -116,7 +116,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testBuildNumber() throws Exception {
+ public void testBuildNumber() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("mod1.1");
buildNumber.setRevision("1.");
@@ -128,7 +128,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testBuildNumber2() throws Exception {
+ public void testBuildNumber2() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("mod1.5");
buildNumber.setRevision("1.");
@@ -140,7 +140,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testBuildNumber3() throws Exception {
+ public void testBuildNumber3() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("mod1.1");
buildNumber.setRevision("1.1");
@@ -152,7 +152,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testBuildNumber4() throws Exception {
+ public void testBuildNumber4() {
buildNumber.setOrganisation("org1");
buildNumber.setModule("mod1.1");
buildNumber.setRevision("3.");
@@ -164,7 +164,7 @@ public class IvyBuildNumberTest {
}
@Test
- public void testWithBadChecksum() throws Exception {
+ public void testWithBadChecksum() {
Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings-checksums.xml");
@@ -187,7 +187,7 @@ public class IvyBuildNumberTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-1037">IVY-1037</a>
*/
@Test
- public void testChainResolver() throws Exception {
+ public void testChainResolver() {
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/4e2846d5/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 eab8032..63ee091 100644
--- a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
@@ -66,7 +66,7 @@ public class IvyCacheFilesetTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
fileset.setSetid("simple-setid");
fileset.execute();
@@ -95,7 +95,7 @@ public class IvyCacheFilesetTest {
}
@Test
- public void testEmptyConf() throws Exception {
+ public void testEmptyConf() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-108.xml");
fileset.setSetid("emptyconf-setid");
fileset.setConf("empty");
@@ -115,7 +115,7 @@ public class IvyCacheFilesetTest {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testFailure() throws Exception {
+ public void testFailure() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
fileset.setSetid("failure-setid");
fileset.execute();
@@ -127,7 +127,7 @@ public class IvyCacheFilesetTest {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testInvalidPattern() throws Exception {
+ public void testInvalidPattern() {
project.setProperty("ivy.settings.file", "test/repositories/ivysettings-invalidcachepattern.xml");
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
fileset.setSetid("simple-setid");
@@ -140,7 +140,7 @@ public class IvyCacheFilesetTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testHaltOnFailure() throws Exception {
+ public void testHaltOnFailure() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
fileset.setSetid("haltfailure-setid");
fileset.setHaltonfailure(false);
@@ -148,7 +148,7 @@ public class IvyCacheFilesetTest {
}
@Test
- public void testWithoutPreviousResolveAndNonDefaultCache() throws Exception {
+ public void testWithoutPreviousResolveAndNonDefaultCache() {
File cache2 = new File("build/cache2");
cache2.mkdirs();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 36f9c5a..81519f6 100644
--- a/test/java/org/apache/ivy/ant/IvyCachePathTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCachePathTest.java
@@ -56,7 +56,7 @@ public class IvyCachePathTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
path.setPathid("simple-pathid");
path.execute();
@@ -70,7 +70,7 @@ public class IvyCachePathTest {
}
@Test
- public void testInline1() throws Exception {
+ public void testInline1() {
// we first resolve another ivy file
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
@@ -96,7 +96,7 @@ public class IvyCachePathTest {
}
@Test
- public void testInline2() throws Exception {
+ public void testInline2() {
// we first resolve a dependency directly
path.setOrganisation("org1");
path.setModule("mod1.2");
@@ -122,7 +122,7 @@ public class IvyCachePathTest {
}
@Test
- public void testEmptyConf() throws Exception {
+ public void testEmptyConf() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-108.xml");
path.setPathid("emptyconf-pathid");
path.setConf("empty");
@@ -140,14 +140,14 @@ public class IvyCachePathTest {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testFailure() throws Exception {
+ public void testFailure() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
path.setPathid("failure-pathid");
path.execute();
}
@Test
- public void testHaltOnFailure() throws Exception {
+ public void testHaltOnFailure() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
path.setPathid("haltfailure-pathid");
path.setHaltonfailure(false);
@@ -155,7 +155,7 @@ public class IvyCachePathTest {
}
@Test
- public void testWithResolveId() throws Exception {
+ public void testWithResolveId() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
@@ -182,7 +182,7 @@ public class IvyCachePathTest {
}
@Test
- public void testWithResolveIdWithoutResolve() throws Exception {
+ public void testWithResolveIdWithoutResolve() {
Project otherProject = TestHelper.newProject();
otherProject.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
@@ -213,7 +213,7 @@ public class IvyCachePathTest {
}
@Test
- public void testWithResolveIdAndMissingConfs() throws Exception {
+ public void testWithResolveIdAndMissingConfs() {
Project otherProject = TestHelper.newProject();
otherProject.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
@@ -240,7 +240,7 @@ public class IvyCachePathTest {
}
@Test
- public void testUnpack() throws Exception {
+ public void testUnpack() {
project.setProperty("ivy.dep.file",
"test/repositories/1/packaging/module1/ivys/ivy-1.0.xml");
path.setPathid("testUnpack");
@@ -254,7 +254,7 @@ public class IvyCachePathTest {
}
@Test
- public void testOSGi() throws Exception {
+ public void testOSGi() {
project.setProperty("ivy.dep.file",
"test/repositories/1/packaging/module5/ivys/ivy-1.0.xml");
path.setPathid("testOSGi");
@@ -274,7 +274,7 @@ public class IvyCachePathTest {
}
@Test
- public void testOSGi2() throws Exception {
+ public void testOSGi2() {
project.setProperty("ivy.dep.file",
"test/repositories/1/packaging/module6/ivys/ivy-1.0.xml");
path.setPathid("testOSGi");
@@ -291,7 +291,7 @@ public class IvyCachePathTest {
}
@Test
- public void testPackedOSGi() throws Exception {
+ public void testPackedOSGi() {
project.setProperty("ivy.dep.file",
"test/repositories/1/packaging/module8/ivys/ivy-1.0.xml");
path.setPathid("testOSGi");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 87dc6a9..8a38237 100644
--- a/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCleanCacheTest.java
@@ -66,7 +66,7 @@ public class IvyCleanCacheTest {
}
@Test
- public void testCleanAll() throws Exception {
+ public void testCleanAll() {
cleanCache.perform();
assertFalse(resolutionCache.exists());
assertFalse(repoCache.exists());
@@ -74,7 +74,7 @@ public class IvyCleanCacheTest {
}
@Test
- public void testResolutionOnly() throws Exception {
+ public void testResolutionOnly() {
cleanCache.setCache(IvyCleanCache.NONE);
cleanCache.perform();
assertFalse(resolutionCache.exists());
@@ -83,7 +83,7 @@ public class IvyCleanCacheTest {
}
@Test
- public void testRepositoryOnly() throws Exception {
+ public void testRepositoryOnly() {
cleanCache.setResolution(false);
cleanCache.perform();
assertTrue(resolutionCache.exists());
@@ -92,7 +92,7 @@ public class IvyCleanCacheTest {
}
@Test
- public void testOneRepositoryOnly() throws Exception {
+ public void testOneRepositoryOnly() {
cleanCache.setResolution(false);
cleanCache.setCache("mycache");
cleanCache.perform();
@@ -107,7 +107,7 @@ public class IvyCleanCacheTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testUnknownCache() throws Exception {
+ public void testUnknownCache() {
expExc.expect(BuildException.class);
expExc.expectMessage("unknown cache 'yourcache'");
cleanCache.setResolution(false);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 c729f1b..02e4a5d 100644
--- a/test/java/org/apache/ivy/ant/IvyConfigureTest.java
+++ b/test/java/org/apache/ivy/ant/IvyConfigureTest.java
@@ -104,7 +104,7 @@ public class IvyConfigureTest {
}
@Test
- public void testDefault() throws Exception {
+ public void testDefault() {
// by default settings look in the current directory for an ivysettings.xml file...
// but Ivy itself has one, and we don't want to use it
configure.getProject().setProperty("ivy.settings.file", "no/settings/will/use/default.xml");
@@ -121,7 +121,7 @@ public class IvyConfigureTest {
}
@Test
- public void testDefault14() throws Exception {
+ public void testDefault14() {
// by default settings look in the current directory for an ivysettings.xml file...
// but Ivy itself has one, and we don't want to use it
configure.getProject().setProperty("ivy.settings.file", "no/settings/will/use/default.xml");
@@ -229,7 +229,7 @@ public class IvyConfigureTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-601">IVY-601</a>
*/
@Test
- public void testIncludeTwice() throws Exception {
+ public void testIncludeTwice() {
configure.setFile(new File("test/java/org/apache/ivy/ant/ivysettings-include-twice.xml"));
configure.execute();
@@ -238,7 +238,7 @@ public class IvyConfigureTest {
}
@Test
- public void testOverrideTrue() throws Exception {
+ public void testOverrideTrue() {
configure.setFile(new File("test/repositories/ivysettings.xml"));
configure.execute();
@@ -256,7 +256,7 @@ public class IvyConfigureTest {
}
@Test
- public void testOverrideFalse() throws Exception {
+ public void testOverrideFalse() {
configure.setFile(new File("test/repositories/ivysettings.xml"));
configure.execute();
@@ -278,7 +278,7 @@ public class IvyConfigureTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testOverrideNotAllowed() throws Exception {
+ public void testOverrideNotAllowed() {
expExc.expect(BuildException.class);
expExc.expectMessage("Overriding a previous definition of ivy:settings with the id '"
+ configure.getSettingsId() + "' is not allowed when using override='notallowed'.");
@@ -303,7 +303,7 @@ public class IvyConfigureTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testInvalidOverride() throws Exception {
+ public void testInvalidOverride() {
expExc.expect(IllegalArgumentException.class);
expExc.expectMessage("invalid override value 'unknown'. Valid values are "
+ "[true, false, notallowed]");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 056e9e7..5b00b3d 100644
--- a/test/java/org/apache/ivy/ant/IvyDeliverTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDeliverTest.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.text.ParseException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -98,7 +97,7 @@ public class IvyDeliverTest {
}
@Test
- public void testMergeParent() throws IOException, ParseException {
+ public void testMergeParent() throws IOException {
// publish the parent descriptor first, so that it can be found while
// we are reading the child descriptor.
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 633f0a3..8485973 100644
--- a/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java
@@ -50,7 +50,7 @@ public class IvyDependencyTreeTest extends AntTaskTestCase {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
dependencyTree.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
dependencyTree.execute();
assertLogContaining("Dependency tree for apache-resolve-simple");
@@ -58,7 +58,7 @@ public class IvyDependencyTreeTest extends AntTaskTestCase {
}
@Test
- public void testEmpty() throws Exception {
+ public void testEmpty() {
dependencyTree.setFile(new File("test/java/org/apache/ivy/ant/ivy-empty.xml"));
dependencyTree.execute();
assertLogContaining("Dependency tree for apache-resolve-empty");
@@ -66,7 +66,7 @@ public class IvyDependencyTreeTest extends AntTaskTestCase {
}
@Test
- public void testWithResolveId() throws Exception {
+ public void testWithResolveId() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
@@ -90,12 +90,12 @@ public class IvyDependencyTreeTest extends AntTaskTestCase {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testWithResolveIdWithoutResolve() throws Exception {
+ public void testWithResolveIdWithoutResolve() {
dependencyTree.execute();
}
@Test
- public void testWithEvictedModule() throws Exception {
+ public void testWithEvictedModule() {
dependencyTree.setFile(new File("test/java/org/apache/ivy/ant/ivy-dyn-evicted.xml"));
dependencyTree.execute();
assertLogContaining("Dependency tree for apache-resolve-latest");
@@ -106,7 +106,7 @@ public class IvyDependencyTreeTest extends AntTaskTestCase {
}
@Test
- public void testShowEvictedModule() throws Exception {
+ public void testShowEvictedModule() {
dependencyTree.setFile(new File("test/java/org/apache/ivy/ant/ivy-dyn-evicted.xml"));
dependencyTree.setShowEvicted(true);
dependencyTree.execute();
@@ -125,7 +125,7 @@ public class IvyDependencyTreeTest extends AntTaskTestCase {
* @see <a href="https://issues.apache.org/jira/browse/IVY-1540">IVY-1540</a>
*/
@Test
- public void testCircularDep() throws Exception {
+ public void testCircularDep() {
final String resolveId = "circular-dep-tree";
// resolve
final IvyResolve ivyResolve = new IvyResolve();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 dad5e13..5e9a0d6 100644
--- a/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDependencyUpdateCheckerTest.java
@@ -63,7 +63,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
// depends on org="org1" name="mod1.1" rev="1.0"
// has transitive dependency on org="org1" name="mod1.2" rev="2.0"
dependencyUpdateChecker.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple3.xml"));
@@ -78,7 +78,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
}
@Test
- public void testSimpleAndShowTransitiveDependencies() throws Exception {
+ public void testSimpleAndShowTransitiveDependencies() {
// depends on org="org1" name="mod1.1" rev="1.0"
// has transitive dependency on org="org1" name="mod1.2" rev="2.0"
dependencyUpdateChecker.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple3.xml"));
@@ -94,7 +94,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
}
@Test
- public void testResolveWithoutIvyFile() throws Exception {
+ public void testResolveWithoutIvyFile() {
// depends on org="org1" name="mod1.2" rev="2.0"
dependencyUpdateChecker.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
dependencyUpdateChecker.setConf("default");
@@ -106,7 +106,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
}
@Test
- public void testInline() throws Exception {
+ public void testInline() {
// same as before, but expressing dependency directly without ivy file
dependencyUpdateChecker.setOrganisation("org1");
dependencyUpdateChecker.setModule("mod1.2");
@@ -124,7 +124,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testInlineForNonExistingModule() throws Exception {
+ public void testInlineForNonExistingModule() {
dependencyUpdateChecker.setOrganisation("org1XXYZ");
dependencyUpdateChecker.setModule("mod1.2");
dependencyUpdateChecker.setRevision("2.0");
@@ -139,7 +139,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testFailure() throws Exception {
+ public void testFailure() {
dependencyUpdateChecker
.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
dependencyUpdateChecker.execute();
@@ -151,7 +151,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
* @throws Exception if something goes wrong
*/
@Test
- public void testFailureWithMissingConfigurations() throws Exception {
+ public void testFailureWithMissingConfigurations() {
expExc.expect(BuildException.class);
expExc.expectMessage("unknown");
@@ -167,7 +167,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testFailureOnBadDependencyIvyFile() throws Exception {
+ public void testFailureOnBadDependencyIvyFile() {
dependencyUpdateChecker.setFile(new File(
"test/java/org/apache/ivy/ant/ivy-failure2.xml"));
dependencyUpdateChecker.execute();
@@ -179,14 +179,14 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testFailureOnBadStatusInDependencyIvyFile() throws Exception {
+ public void testFailureOnBadStatusInDependencyIvyFile() {
dependencyUpdateChecker.setFile(new File(
"test/java/org/apache/ivy/ant/ivy-failure3.xml"));
dependencyUpdateChecker.execute();
}
@Test
- public void testHaltOnFailure() throws Exception {
+ public void testHaltOnFailure() {
dependencyUpdateChecker
.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
dependencyUpdateChecker.setHaltonfailure(false);
@@ -194,7 +194,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
}
@Test
- public void testExcludedConf() throws Exception {
+ public void testExcludedConf() {
dependencyUpdateChecker.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
dependencyUpdateChecker.setConf("*,!default");
dependencyUpdateChecker.execute();
@@ -245,7 +245,7 @@ public class IvyDependencyUpdateCheckerTest extends AntTaskTestCase {
}
@Test
- public void testSimpleExtends() throws Exception {
+ public void testSimpleExtends() {
dependencyUpdateChecker.setFile(new File(
"test/java/org/apache/ivy/ant/ivy-extends-multiconf.xml"));
dependencyUpdateChecker.execute();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java b/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
index 4439dc6..b0b4670 100644
--- a/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
+++ b/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
@@ -47,7 +47,7 @@ public class IvyFindRevisionTest {
}
@Test
- public void testProperty() throws Exception {
+ public void testProperty() {
findRevision.setOrganisation("org1");
findRevision.setModule("mod1.1");
findRevision.setRevision("1.0");
@@ -57,7 +57,7 @@ public class IvyFindRevisionTest {
}
@Test
- public void testLatest() throws Exception {
+ public void testLatest() {
findRevision.setOrganisation("org1");
findRevision.setModule("mod1.1");
findRevision.setRevision("latest.integration");
@@ -66,7 +66,7 @@ public class IvyFindRevisionTest {
}
@Test
- public void testLatestSubversion() throws Exception {
+ public void testLatestSubversion() {
findRevision.setOrganisation("org1");
findRevision.setModule("mod1.1");
findRevision.setRevision("1.0+");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java b/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java
index 218f850..20c3f0c 100644
--- a/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java
+++ b/test/java/org/apache/ivy/ant/IvyInfoRepositoryTest.java
@@ -47,7 +47,7 @@ public class IvyInfoRepositoryTest {
}
@Test
- public void testProperty() throws Exception {
+ public void testProperty() {
info.setOrganisation("org1");
info.setModule("mod1.1");
info.setRevision("1.0");
@@ -61,7 +61,7 @@ public class IvyInfoRepositoryTest {
}
@Test
- public void testLatest() throws Exception {
+ public void testLatest() {
info.setOrganisation("org1");
info.setModule("mod1.1");
info.setRevision("latest.integration");
@@ -74,7 +74,7 @@ public class IvyInfoRepositoryTest {
}
@Test
- public void testLatestSubversion() throws Exception {
+ public void testLatestSubversion() {
info.setOrganisation("org1");
info.setModule("mod1.1");
info.setRevision("1.0+");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 0d6b225..6c9ae94 100644
--- a/test/java/org/apache/ivy/ant/IvyInfoTest.java
+++ b/test/java/org/apache/ivy/ant/IvyInfoTest.java
@@ -41,7 +41,7 @@ public class IvyInfoTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
info.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
info.execute();
@@ -53,7 +53,7 @@ public class IvyInfoTest {
}
@Test
- public void testAll() throws Exception {
+ public void testAll() {
info.setFile(new File("test/java/org/apache/ivy/ant/ivy-info-all.xml"));
info.execute();
@@ -81,7 +81,7 @@ public class IvyInfoTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-726">IVY-726</a>
*/
@Test
- public void testIVY726() throws Exception {
+ public void testIVY726() {
info.setFile(new File("test/java/org/apache/ivy/ant/ivy-info-all.xml"));
info.execute();
@@ -95,7 +95,7 @@ public class IvyInfoTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-395">IVY-395</a>
*/
@Test
- public void testIVY395() throws Exception {
+ public void testIVY395() {
info.setFile(new File("test/java/org/apache/ivy/ant/ivy-artifact-info.xml"));
info.execute();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 b1edbc0..749b500 100644
--- a/test/java/org/apache/ivy/ant/IvyInstallTest.java
+++ b/test/java/org/apache/ivy/ant/IvyInstallTest.java
@@ -295,7 +295,7 @@ public class IvyInstallTest {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testInstallWithNamespace2() throws Exception {
+ public void testInstallWithNamespace2() {
project.setProperty("ivy.settings.file", "test/repositories/namespace/ivysettings.xml");
install.setOrganisation("A");
install.setModule("B");
@@ -328,7 +328,7 @@ public class IvyInstallTest {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testDependencyNotFoundFailure() throws Exception {
+ public void testDependencyNotFoundFailure() {
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
install.setOrganisation("xxx");
install.setModule("yyy");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/IvyListModulesTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyListModulesTest.java b/test/java/org/apache/ivy/ant/IvyListModulesTest.java
index fbb1d0e..19dff06 100644
--- a/test/java/org/apache/ivy/ant/IvyListModulesTest.java
+++ b/test/java/org/apache/ivy/ant/IvyListModulesTest.java
@@ -47,7 +47,7 @@ public class IvyListModulesTest {
}
@Test
- public void testExact() throws Exception {
+ public void testExact() {
findModules.setOrganisation("org1");
findModules.setModule("mod1.1");
findModules.setRevision("1.0");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java b/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
index 5c7be0d..3d5e545 100644
--- a/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
+++ b/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
@@ -70,7 +70,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithPreviousResolveInSameBuildAndLessConfs() throws Exception {
+ public void testWithPreviousResolveInSameBuildAndLessConfs() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -89,7 +89,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithPreviousResolveInSameBuildAndSameConfs() throws Exception {
+ public void testWithPreviousResolveInSameBuildAndSameConfs() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -108,7 +108,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithPreviousResolveInSameBuildAndWildcard() throws Exception {
+ public void testWithPreviousResolveInSameBuildAndWildcard() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -127,7 +127,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithPreviousResolveInSameBuildAndBothWildcard() throws Exception {
+ public void testWithPreviousResolveInSameBuildAndBothWildcard() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -146,7 +146,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithPreviousResolveInSameBuildAndMoreConfs() throws Exception {
+ public void testWithPreviousResolveInSameBuildAndMoreConfs() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -168,7 +168,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithoutKeep() throws Exception {
+ public void testWithoutKeep() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -191,7 +191,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testInlineWithoutKeep() throws Exception {
+ public void testInlineWithoutKeep() {
task.setOrganisation("org1");
task.setModule("mod1.1");
task.setRevision("2.0");
@@ -207,7 +207,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testInlineWithKeep() throws Exception {
+ public void testInlineWithKeep() {
task.setOrganisation("org1");
task.setModule("mod1.1");
task.setRevision("2.0");
@@ -224,7 +224,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithResolveIdAndPreviousResolveInSameBuildAndLessConfs() throws Exception {
+ public void testWithResolveIdAndPreviousResolveInSameBuildAndLessConfs() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -258,7 +258,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithResolveIdAndPreviousResolveInSameBuildAndSameConfs() throws Exception {
+ public void testWithResolveIdAndPreviousResolveInSameBuildAndSameConfs() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -293,7 +293,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithResolveIdAndPreviousResolveInSameBuildAndWildcard() throws Exception {
+ public void testWithResolveIdAndPreviousResolveInSameBuildAndWildcard() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -328,7 +328,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithResolveIdAndPreviousResolveInSameBuildAndBothWildcard() throws Exception {
+ public void testWithResolveIdAndPreviousResolveInSameBuildAndBothWildcard() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
@@ -363,7 +363,7 @@ public class IvyPostResolveTaskTest {
}
@Test
- public void testWithResolveIdAndPreviousResolveInSameBuildAndMoreConfs() throws Exception {
+ public void testWithResolveIdAndPreviousResolveInSameBuildAndMoreConfs() {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 4529a0f..b7696e9 100644
--- a/test/java/org/apache/ivy/ant/IvyPublishTest.java
+++ b/test/java/org/apache/ivy/ant/IvyPublishTest.java
@@ -99,7 +99,7 @@ public class IvyPublishTest {
}
@Test
- public void testMergeParent() throws IOException, ParseException {
+ public void testMergeParent() throws IOException {
// publish the parent descriptor first, so that it can be found while
// we are reading the child descriptor.
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
@@ -171,7 +171,7 @@ public class IvyPublishTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-1248">IVY-1248</a>
*/
@Test
- public void testMergeParentWithoutPublishingParent() throws IOException, ParseException {
+ public void testMergeParentWithoutPublishingParent() throws IOException {
// here we directly publish a module extending ivy-multiconf.xml,
// the module parent is not published not yet in cache
// update=true implies merge=true
@@ -204,7 +204,7 @@ public class IvyPublishTest {
*/
@Test
public void testMergeParentWithoutPublishingParentForceDeliver()
- throws IOException, ParseException {
+ throws IOException {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-extends-multiconf.xml"));
@@ -230,7 +230,7 @@ public class IvyPublishTest {
}
@Test
- public void testMergeParentWithoutLocationAttribute() throws IOException, ParseException {
+ public void testMergeParentWithoutLocationAttribute() throws IOException {
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/extends/child1/ivy-child1.xml"));
@@ -253,7 +253,7 @@ public class IvyPublishTest {
}
@Test
- public void testMinimalMerge() throws IOException, ParseException {
+ public void testMinimalMerge() throws IOException {
// publish the parent descriptor first, so that it can be found while
// we are reading the child descriptor.
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
@@ -288,7 +288,7 @@ public class IvyPublishTest {
}
@Test
- public void testMergeExtraAttributes() throws IOException, ParseException {
+ public void testMergeExtraAttributes() throws IOException {
// publish the parent descriptor first, so that it can be found while
// we are reading the child descriptor.
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
@@ -329,7 +329,7 @@ public class IvyPublishTest {
}
@Test
- public void testMergeExtraAttributesFromParent() throws IOException, ParseException {
+ public void testMergeExtraAttributesFromParent() throws IOException {
// publish the parent descriptor first, so that it can be found while
// we are reading the child descriptor.
project.setProperty("ivy.dep.file",
@@ -371,7 +371,7 @@ public class IvyPublishTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() throws IOException, ParseException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -400,7 +400,7 @@ public class IvyPublishTest {
}
@Test
- public void testHaltOnMissing() throws Exception {
+ public void testHaltOnMissing() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -428,7 +428,7 @@ public class IvyPublishTest {
}
@Test
- public void testHaltOnMissing2() throws Exception {
+ public void testHaltOnMissing2() throws IOException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-publish-multi.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -457,7 +457,7 @@ public class IvyPublishTest {
}
@Test
- public void testHaltOnMissing3() throws Exception {
+ public void testHaltOnMissing3() throws IOException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-publish-multi.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -486,7 +486,7 @@ public class IvyPublishTest {
}
@Test
- public void testPublishNotAllConfigs() throws Exception {
+ public void testPublishNotAllConfigs() throws IOException, ParseException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -522,7 +522,7 @@ public class IvyPublishTest {
}
@Test
- public void testMultiPatterns() throws Exception {
+ public void testMultiPatterns() throws IOException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-publish-multi.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -548,7 +548,7 @@ public class IvyPublishTest {
}
@Test
- public void testPublishPublicConfigsByWildcard() throws Exception {
+ public void testPublishPublicConfigsByWildcard() throws IOException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-publish-public.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -572,7 +572,7 @@ public class IvyPublishTest {
}
@Test
- public void testCustom() throws Exception {
+ public void testCustom() throws IOException, ParseException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-custom.xml");
IvyResolve res = new IvyResolve();
res.setValidate(false);
@@ -615,7 +615,7 @@ public class IvyPublishTest {
}
@Test
- public void testNoDeliver() throws Exception {
+ public void testNoDeliver() throws IOException, ParseException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -650,7 +650,7 @@ public class IvyPublishTest {
}
@Test
- public void testNoDeliverWithBranch() throws Exception {
+ public void testNoDeliverWithBranch() throws IOException, ParseException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -688,7 +688,7 @@ public class IvyPublishTest {
}
@Test
- public void testForceDeliver() throws Exception {
+ public void testForceDeliver() throws IOException, ParseException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -722,10 +722,10 @@ public class IvyPublishTest {
/**
* Test must not publish ivy file with bad revision.
*
- * @throws Exception if something goes wrong
+ * @throws IOException when copy fails
*/
@Test(expected = BuildException.class)
- public void testBadNoDeliver() throws Exception {
+ public void testBadNoDeliver() throws IOException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -786,7 +786,7 @@ public class IvyPublishTest {
}
@Test
- public void testOverwrite() throws Exception {
+ public void testOverwrite() throws IOException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
@@ -822,7 +822,7 @@ public class IvyPublishTest {
}
@Test
- public void testOverwriteReadOnly() throws Exception {
+ public void testOverwriteReadOnly() throws IOException {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve res = new IvyResolve();
res.setProject(project);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/IvyReportTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyReportTest.java b/test/java/org/apache/ivy/ant/IvyReportTest.java
index 77c69eb..f8bb471 100644
--- a/test/java/org/apache/ivy/ant/IvyReportTest.java
+++ b/test/java/org/apache/ivy/ant/IvyReportTest.java
@@ -55,7 +55,7 @@ public class IvyReportTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
Locale oldLocale = Locale.getDefault();
try {
@@ -134,7 +134,7 @@ public class IvyReportTest {
}
@Test
- public void testNoRevisionInOutputPattern() throws Exception {
+ public void testNoRevisionInOutputPattern() {
Locale oldLocale = Locale.getDefault();
try {
@@ -159,7 +159,7 @@ public class IvyReportTest {
}
@Test
- public void testMultipleConfigurations() throws Exception {
+ public void testMultipleConfigurations() {
Locale oldLocale = Locale.getDefault();
try {
@@ -184,7 +184,7 @@ public class IvyReportTest {
}
@Test
- public void testRegularCircular() throws Exception {
+ public void testRegularCircular() {
Locale oldLocale = Locale.getDefault();
try {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 f100a71..d12d3c5 100644
--- a/test/java/org/apache/ivy/ant/IvyResolveTest.java
+++ b/test/java/org/apache/ivy/ant/IvyResolveTest.java
@@ -73,7 +73,7 @@ public class IvyResolveTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-1455">IVY-1455</a>
*/
@Test
- public void testIVY1455() throws Exception {
+ public void testIVY1455() {
project.setProperty("ivy.settings.file", "test/repositories/IVY-1455/ivysettings.xml");
resolve.setFile(new File("test/repositories/IVY-1455/ivy.xml"));
resolve.execute();
@@ -104,7 +104,7 @@ public class IvyResolveTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-779">IVY-779</a>
*/
@Test
- public void testIVY779() throws Exception {
+ public void testIVY779() {
Project project = TestHelper.newProject();
project.setProperty("ivy.local.default.root",
new File("test/repositories/norev").getAbsolutePath());
@@ -124,7 +124,7 @@ public class IvyResolveTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
// depends on org="org1" name="mod1.2" rev="2.0"
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.execute();
@@ -145,7 +145,7 @@ public class IvyResolveTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-630">IVY-630</a>
*/
@Test
- public void testResolveWithoutIvyFile() throws Exception {
+ public void testResolveWithoutIvyFile() {
resolve.getProject().setProperty("ivy.settings.file",
"test/repositories/IVY-630/ivysettings.xml");
@@ -174,7 +174,7 @@ public class IvyResolveTest {
}
@Test
- public void testInline() throws Exception {
+ public void testInline() {
// same as before, but expressing dependency directly without ivy file
resolve.setOrganisation("org1");
resolve.setModule("mod1.2");
@@ -189,7 +189,7 @@ public class IvyResolveTest {
}
@Test
- public void testInlineWithResolveId() throws Exception {
+ public void testInlineWithResolveId() {
// same as before, but expressing dependency directly without ivy file
resolve.setOrganisation("org1");
resolve.setModule("mod1.2");
@@ -206,7 +206,7 @@ public class IvyResolveTest {
}
@Test
- public void testInlineForNonExistingModule() throws Exception {
+ public void testInlineForNonExistingModule() {
resolve.setOrganisation("org1XX");
resolve.setModule("mod1.2");
resolve.setRevision("2.0");
@@ -221,7 +221,7 @@ public class IvyResolveTest {
}
@Test
- public void testWithSlashes() throws Exception {
+ public void testWithSlashes() {
resolve.setFile(new File("test/java/org/apache/ivy/core/resolve/ivy-198.xml"));
resolve.execute();
@@ -241,7 +241,7 @@ public class IvyResolveTest {
}
@Test
- public void testDepsChanged() throws Exception {
+ public void testDepsChanged() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.execute();
@@ -253,7 +253,7 @@ public class IvyResolveTest {
}
@Test
- public void testDontCheckIfChanged() throws Exception {
+ public void testDontCheckIfChanged() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setCheckIfChanged(false);
resolve.execute();
@@ -265,7 +265,7 @@ public class IvyResolveTest {
}
@Test
- public void testConflictingDepsChanged() throws Exception {
+ public void testConflictingDepsChanged() {
resolve.setFile(new File("test/repositories/2/mod4.1/ivy-4.1.xml"));
resolve.execute();
@@ -277,7 +277,7 @@ public class IvyResolveTest {
}
@Test
- public void testDouble() throws Exception {
+ public void testDouble() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.execute();
@@ -292,13 +292,13 @@ public class IvyResolveTest {
}
@Test(expected = BuildException.class)
- public void testFailure() throws Exception {
+ public void testFailure() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
resolve.execute();
}
@Test
- public void testIvyLogModulesInUseWithFailure() throws Exception {
+ public void testIvyLogModulesInUseWithFailure() {
resolve.getProject().setProperty("ivy.log.modules.in.use", "true");
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
resolve.setHaltonfailure(false);
@@ -308,7 +308,7 @@ public class IvyResolveTest {
}
@Test
- public void testFailureWithMissingConfigurations() throws Exception {
+ public void testFailureWithMissingConfigurations() {
expExc.expect(BuildException.class);
expExc.expectMessage("unknown");
@@ -318,26 +318,26 @@ public class IvyResolveTest {
}
@Test(expected = BuildException.class)
- public void testFailureOnBadDependencyIvyFile() throws Exception {
+ public void testFailureOnBadDependencyIvyFile() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure2.xml"));
resolve.execute();
}
@Test(expected = BuildException.class)
- public void testFailureOnBadStatusInDependencyIvyFile() throws Exception {
+ public void testFailureOnBadStatusInDependencyIvyFile() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure3.xml"));
resolve.execute();
}
@Test
- public void testHaltOnFailure() throws Exception {
+ public void testHaltOnFailure() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
resolve.setHaltonfailure(false);
resolve.execute();
}
@Test
- public void testWithResolveId() throws Exception {
+ public void testWithResolveId() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setResolveId("testWithResolveId");
resolve.execute();
@@ -376,7 +376,7 @@ public class IvyResolveTest {
}
@Test
- public void testDoubleResolveWithResolveId() throws Exception {
+ public void testDoubleResolveWithResolveId() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setResolveId("testWithResolveId");
resolve.execute();
@@ -410,7 +410,7 @@ public class IvyResolveTest {
}
@Test
- public void testDifferentResolveWithSameResolveId() throws Exception {
+ public void testDifferentResolveWithSameResolveId() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setResolveId("testWithResolveId");
resolve.execute();
@@ -445,7 +445,7 @@ public class IvyResolveTest {
}
@Test
- public void testExcludedConf() throws Exception {
+ public void testExcludedConf() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("*,!default");
resolve.execute();
@@ -495,7 +495,7 @@ public class IvyResolveTest {
}
@Test
- public void testChildsSimple() throws Exception {
+ public void testChildsSimple() {
IvyDependency dependency = resolve.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -507,7 +507,7 @@ public class IvyResolveTest {
}
@Test
- public void testChildsMultiple() throws Exception {
+ public void testChildsMultiple() {
IvyDependency dependency = resolve.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -528,7 +528,7 @@ public class IvyResolveTest {
}
@Test
- public void testChildsMultipleWithConf() throws Exception {
+ public void testChildsMultipleWithConf() {
IvyDependency dependency = resolve.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -548,7 +548,7 @@ public class IvyResolveTest {
}
@Test
- public void testChildsMultipleWithConf2() throws Exception {
+ public void testChildsMultipleWithConf2() {
IvyDependency dependency = resolve.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -569,7 +569,7 @@ public class IvyResolveTest {
}
@Test
- public void testChildsExclude() throws Exception {
+ public void testChildsExclude() {
IvyDependency dependency = resolve.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -593,7 +593,7 @@ public class IvyResolveTest {
}
@Test
- public void testChildsDependencyExclude() throws Exception {
+ public void testChildsDependencyExclude() {
IvyDependency dependency = resolve.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -616,7 +616,7 @@ public class IvyResolveTest {
}
@Test
- public void testChildsDependencyInclude() throws Exception {
+ public void testChildsDependencyInclude() {
IvyDependency dependency = resolve.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -642,7 +642,7 @@ public class IvyResolveTest {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testChildsFail() throws Exception {
+ public void testChildsFail() {
IvyDependency dependency = resolve.createDependency();
dependency.setOrg("org1");
dependency.setName("noexisting");
@@ -651,7 +651,7 @@ public class IvyResolveTest {
}
@Test
- public void testSimpleExtends() throws Exception {
+ public void testSimpleExtends() {
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-extends-multiconf.xml"));
resolve.execute();
assertEquals("1", resolve.getProject().getProperty("ivy.parents.count"));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/ant/IvyResourcesTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyResourcesTest.java b/test/java/org/apache/ivy/ant/IvyResourcesTest.java
index 2639087..fb3da4d 100644
--- a/test/java/org/apache/ivy/ant/IvyResourcesTest.java
+++ b/test/java/org/apache/ivy/ant/IvyResourcesTest.java
@@ -73,7 +73,7 @@ public class IvyResourcesTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
IvyDependency dependency = resources.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -86,7 +86,7 @@ public class IvyResourcesTest {
}
@Test
- public void testMultiple() throws Exception {
+ public void testMultiple() {
IvyDependency dependency = resources.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -112,7 +112,7 @@ public class IvyResourcesTest {
}
@Test
- public void testMultipleWithConf() throws Exception {
+ public void testMultipleWithConf() {
IvyDependency dependency = resources.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -135,7 +135,7 @@ public class IvyResourcesTest {
}
@Test
- public void testMultipleWithConf2() throws Exception {
+ public void testMultipleWithConf2() {
IvyDependency dependency = resources.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -160,7 +160,7 @@ public class IvyResourcesTest {
}
@Test
- public void testExclude() throws Exception {
+ public void testExclude() {
IvyDependency dependency = resources.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -187,7 +187,7 @@ public class IvyResourcesTest {
}
@Test
- public void testDependencyExclude() throws Exception {
+ public void testDependencyExclude() {
IvyDependency dependency = resources.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -213,7 +213,7 @@ public class IvyResourcesTest {
}
@Test
- public void testDependencyInclude() throws Exception {
+ public void testDependencyInclude() {
IvyDependency dependency = resources.createDependency();
dependency.setOrg("org1");
dependency.setName("mod1.2");
@@ -236,7 +236,7 @@ public class IvyResourcesTest {
}
@Test(expected = BuildException.class)
- public void testFail() throws Exception {
+ public void testFail() {
IvyDependency dependency = resources.createDependency();
dependency.setOrg("org1");
dependency.setName("noexisting");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 ea88fa6..de9ec7c 100644
--- a/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
+++ b/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
@@ -70,7 +70,7 @@ public class IvyRetrieveTest {
}
@Test
- public void testSimple() throws Exception {
+ public void testSimple() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
retrieve.execute();
assertTrue(new File(IvyPatternHelper.substitute(RETRIEVE_PATTERN, "org1", "mod1.2", "2.0",
@@ -78,7 +78,7 @@ public class IvyRetrieveTest {
}
@Test
- public void testRetrievePrivateWithWildcard() throws Exception {
+ public void testRetrievePrivateWithWildcard() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-381.xml");
retrieve.setConf("*");
retrieve.execute();
@@ -95,7 +95,7 @@ public class IvyRetrieveTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-992">IVY-992</a>
*/
@Test
- public void testValidateInIvySettings() throws Exception {
+ public void testValidateInIvySettings() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest-extra.xml");
retrieve.getSettings().setValidate(false);
retrieve.execute();
@@ -105,7 +105,7 @@ public class IvyRetrieveTest {
}
@Test
- public void testInline() throws Exception {
+ public void testInline() {
// we first resolve another ivy file
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
@@ -125,7 +125,7 @@ public class IvyRetrieveTest {
}
@Test
- public void testWithConf() throws Exception {
+ public void testWithConf() {
project.setProperty("ivy.dep.file", "test/repositories/1/org6/mod6.2/ivys/ivy-0.4.xml");
retrieve.execute();
@@ -185,7 +185,7 @@ public class IvyRetrieveTest {
}
@Test
- public void testWithAPreviousResolve() throws Exception {
+ public void testWithAPreviousResolve() {
// first we do a resolve in another project
Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
@@ -205,7 +205,7 @@ public class IvyRetrieveTest {
}
@Test
- public void testWithAPreviousResolveAndResolveId() throws Exception {
+ public void testWithAPreviousResolveAndResolveId() {
// first we do a resolve in another project
Project project = TestHelper.newProject();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
@@ -233,7 +233,7 @@ public class IvyRetrieveTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-304">IVY-304</a>
*/
@Test
- public void testUseOrigin() throws Exception {
+ public void testUseOrigin() {
// first we do a resolve with useOrigin=true in another project
Project project = TestHelper.newProject();
project.init();
@@ -256,7 +256,7 @@ public class IvyRetrieveTest {
}
@Test
- public void testUseOriginWithIvyPattern() throws Exception {
+ public void testUseOriginWithIvyPattern() {
// mod2.5 depends on virtual mod2.3 which depends on mod2.1 which depends on mod1.1 which
// depends on mod1.2
project.setProperty("ivy.dep.file", "test/repositories/1/org2/mod2.5/ivys/ivy-0.6.1.xml");
@@ -284,7 +284,7 @@ public class IvyRetrieveTest {
* @see <a href="https://issues.apache.org/jira/browse/IVY-631">IVY-631</a>
*/
@Test
- public void testRetrieveWithOriginalNamePattern() throws Exception {
+ public void testRetrieveWithOriginalNamePattern() {
retrieve.setFile(new File("test/java/org/apache/ivy/ant/ivy-631.xml"));
retrieve.setConf("default");
retrieve.setPattern("build/test/lib/[conf]/[originalname].[ext]");
@@ -300,7 +300,7 @@ public class IvyRetrieveTest {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testFailureWithoutAPreviousResolve() throws Exception {
+ public void testFailureWithoutAPreviousResolve() {
retrieve.setOrganisation("apache");
retrieve.setModule("resolve-simple");
retrieve.setConf("default");
@@ -313,20 +313,20 @@ public class IvyRetrieveTest {
* @throws Exception if something goes wrong
*/
@Test(expected = BuildException.class)
- public void testFailure() throws Exception {
+ public void testFailure() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
retrieve.execute();
}
@Test
- public void testHaltOnFailure() throws Exception {
+ public void testHaltOnFailure() {
project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
retrieve.setHaltonfailure(false);
retrieve.execute();
}
@Test
- public void testCustomIvyPattern() throws Exception {
+ public void testCustomIvyPattern() {
// mod2.5 depends on virtual mod2.3 which depends on mod2.1 which depends on mod1.1 which
// depends on mod1.2
project.setProperty("ivy.dep.file", "test/repositories/1/org2/mod2.5/ivys/ivy-0.6.1.xml");
@@ -347,7 +347,7 @@ public class IvyRetrieveTest {
}
@Test
- public void testCustomIvyPatternWithConf() throws Exception {
+ public void testCustomIvyPatternWithConf() {
project.setProperty("ivy.dep.file", "test/repositories/1/org6/mod6.2/ivys/ivy-0.4.xml");
String ivyPattern = "build/test/lib/[conf]/[organisation]/[module]/ivy-[revision].xml";
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/TestPerformance.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/TestPerformance.java b/test/java/org/apache/ivy/core/TestPerformance.java
index 64ea1df..11b19bd 100644
--- a/test/java/org/apache/ivy/core/TestPerformance.java
+++ b/test/java/org/apache/ivy/core/TestPerformance.java
@@ -46,7 +46,7 @@ public class TestPerformance {
private final Ivy ivy;
- public TestPerformance() throws Exception {
+ public TestPerformance() {
ivy = new Ivy();
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("def");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java b/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
index 688b6af..4f25e43 100644
--- a/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
+++ b/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
@@ -42,7 +42,7 @@ public class IvyEventFilterTest {
private ModuleDescriptor md4 = null;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
md = new DefaultModuleDescriptor(ModuleRevisionId.newInstance("foo", "bar", "1.0"),
"integration", new Date());
md2 = new DefaultModuleDescriptor(ModuleRevisionId.newInstance("foo2", "bar", "1.0"),
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/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 3fdf22b..fdb869e 100644
--- a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
+++ b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
@@ -51,7 +51,7 @@ public class IvyMakePomTest {
public TemporaryFolder workdir = new TemporaryFolder();
@Before
- public void beforeTest() throws Exception {
+ public void beforeTest() {
this.project = TestHelper.newProject();
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java b/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
index 7d0b8b3..cd8fb86 100644
--- a/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
+++ b/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
@@ -32,7 +32,7 @@ public class ModuleRevisionIdTest {
public ExpectedException expExc = ExpectedException.none();
@Test
- public void testParse() throws Exception {
+ public void testParse() {
testParse("#A;1.0");
testParse("org#module;2.0");
testParse("org#module#branch;myversion");
@@ -47,22 +47,22 @@ public class ModuleRevisionIdTest {
}
@Test
- public void testParseFailure1() throws Exception {
+ public void testParseFailure1() {
testParseFailure("bad");
}
@Test
- public void testParseFailure2() throws Exception {
+ public void testParseFailure2() {
testParseFailure("org#mod");
}
@Test
- public void testParseFailure3() throws Exception {
+ public void testParseFailure3() {
testParseFailure("#;1");
}
@Test
- public void testParseFailure4() throws Exception {
+ public void testParseFailure4() {
testParseFailure("#A%;1.0");
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java b/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
index 610cb58..675486e 100644
--- a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
+++ b/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
@@ -46,7 +46,7 @@ public class ModuleRulesTest {
}
@Test
- public void testGetRule() throws Exception {
+ public void testGetRule() {
// fixture
rules.defineRule(mapMatcher().organization("apache").build(), rule[0]);
rules.defineRule(mapMatcher().organization("other").build(), rule[1]);
@@ -59,7 +59,7 @@ public class ModuleRulesTest {
}
@Test
- public void testGetRuleWithFilter() throws Exception {
+ public void testGetRuleWithFilter() {
// fixture
rules.defineRule(mapMatcher().organization("apache").build(), rule[0]);
rules.defineRule(mapMatcher().module("module1").build(), rule[1]);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java b/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
index 6ed2c5f..1533758 100644
--- a/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
+++ b/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
@@ -75,7 +75,7 @@ public class ResolveEngineTest {
}
@Test
- public void testLocateThenDownload() throws Exception {
+ public void testLocateThenDownload() {
ResolveEngine engine = new ResolveEngine(ivy.getSettings(), ivy.getEventManager(),
ivy.getSortEngine());
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/resolve/ResolveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/resolve/ResolveTest.java b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
index 53ae7cf..eff5454 100644
--- a/test/java/org/apache/ivy/core/resolve/ResolveTest.java
+++ b/test/java/org/apache/ivy/core/resolve/ResolveTest.java
@@ -55,13 +55,12 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.xml.sax.SAXException;
+import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.File;
-import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -303,7 +302,7 @@ public class ResolveTest {
}
@Test
- public void testResolveWithXmlEntities() throws Exception {
+ public void testResolveWithXmlEntities() {
Ivy ivy = new Ivy();
Throwable th = null;
try {
@@ -2117,7 +2116,7 @@ public class ResolveTest {
saxParser.parse(r, new DefaultHandler() {
@Override
public void startElement(String uri, String localName, String qName,
- org.xml.sax.Attributes attributes) throws SAXException {
+ Attributes attributes) {
if ("revision".equals(qName) && "2.0".equals(attributes.getValue("name"))) {
found[0] = true;
}
@@ -2166,7 +2165,7 @@ public class ResolveTest {
saxParser.parse(r, new DefaultHandler() {
@Override
public void startElement(String uri, String localName, String qName,
- org.xml.sax.Attributes attributes) throws SAXException {
+ Attributes attributes) {
if ("revision".equals(qName) && "2.0".equals(attributes.getValue("name"))) {
found[0] = true;
}
@@ -3039,7 +3038,7 @@ public class ResolveTest {
saxParser.parse(r, new DefaultHandler() {
@Override
public void startElement(String uri, String localName, String qName,
- org.xml.sax.Attributes attributes) throws SAXException {
+ Attributes attributes) {
if ("artifact".equals(qName) && "art51B".equals(attributes.getValue("name"))) {
found[0] = true;
}
@@ -3131,7 +3130,7 @@ public class ResolveTest {
saxParser.parse(r, new DefaultHandler() {
@Override
public void startElement(String uri, String localName, String qName,
- org.xml.sax.Attributes attributes) throws SAXException {
+ Attributes attributes) {
if ("artifact".equals(qName) && "mod1.2".equals(attributes.getValue("name"))) {
found[0] = true;
}
@@ -6160,15 +6159,15 @@ public class ResolveTest {
// ensure that we hit only the cache and never try to hit in the repository
FileSystemResolver resolver = (FileSystemResolver) ivy.getSettings().getResolver("1");
resolver.setRepository(new AbstractRepository() {
- public List<String> list(String parent) throws IOException {
+ public List<String> list(String parent) {
throw new UnsupportedOperationException();
}
- public Resource getResource(String source) throws IOException {
+ public Resource getResource(String source) {
throw new UnsupportedOperationException();
}
- public void get(String source, File destination) throws IOException {
+ public void get(String source, File destination) {
throw new UnsupportedOperationException();
}
});
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4e2846d5/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
index 05c7b91..237f10d 100644
--- a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
+++ b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
@@ -293,7 +293,7 @@ public class RetrieveTest {
* passed {@code filePath} is a {@link Files#isSymbolicLink(Path) symbolic link}. Else asserts
* that the {@code filePath} {@link Files#exists(Path, LinkOption...) exists}.
*
- * @param filePath
+ * @param filePath String
*/
private void assertLinkOrExists(final String filePath) {
if (systemHasSymlinkAbility) {