http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 194d308..0ad84b1 100644 --- a/test/java/org/apache/ivy/core/resolve/ResolveTest.java +++ b/test/java/org/apache/ivy/core/resolve/ResolveTest.java @@ -350,9 +350,14 @@ public class ResolveTest { assertTrue(report.hasError()); } + /** + * Test case for IVY-258. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-258";>IVY-258</a> + */ @Test public void testResolveNoRevisionNowhere() throws Exception { - // test case for IVY-258 // module1 depends on latest version of module2, which contains no revision in its ivy file, // nor in the pattern Ivy ivy = new Ivy(); @@ -367,9 +372,14 @@ public class ResolveTest { assertFalse(report.hasError()); } + /** + * Test case for IVY-448. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-448";>IVY-448</a> + */ @Test public void testResolveWithConflictManagerPerModule() throws Exception { - // test case for IVY-448 // all modules from myorg // module1 // -> module2-1.0 @@ -391,9 +401,14 @@ public class ResolveTest { .exists()); } + /** + * Test case for IVY-465. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-465";>IVY-465</a> + */ @Test public void testResolveWithConflictManagerDefinedInModule() throws Exception { - // test case for IVY-465 // #M1;1.0 -> #M2;1.0 // #M2;1.0 -> {org1#mod1.2;1.1 org1#mod1.2;2.0} with // <conflict org="org1" module="mod1.2" rev="1.1,2.0" /> @@ -410,9 +425,14 @@ public class ResolveTest { assertEquals("2.0", adrs[1].getArtifact().getId().getRevision()); } + /** + * Test case for IVY-1404. + * + * @see <a href="https://issues.apache.org/jira/browse/IVY-1404";>IVY-1404</a> + * @throws Exception if something goes wrong + */ @Test public void testResolveWithConflictManagerDefinedAtHigherLevel() throws Exception { - // test case for IVY-1404 // #M1;1.0 -> #M2;1.0 // #M1;2.0 -> {#M2;1.0 #M3;1.0} // #M2;1.0 -> org1#mod1.2;1.1 @@ -457,9 +477,14 @@ public class ResolveTest { .getArtifactsNumber()); } + /** + * Test case for IVY-198. + * + * @see <a href="https://issues.apache.org/jira/browse/IVY-198";>IVY-198</a> + * @throws Exception if something goes wrong + */ @Test public void testResolveWithSlashes() throws Exception { - // test case for IVY-198 // module depends on mod1.2 ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-198.xml"), getResolveOptions(new String[] {"*"})); @@ -1153,10 +1178,14 @@ public class ResolveTest { assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-240. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-240";>IVY-240</a> + */ @Test public void testResolveMultipleExtendsAndConfs() throws Exception { - // Test case for IVY-240 - // // mod6.3 1.1 has four confs libraries, run (extends libraries), compile (extends run) and // test (extends libraries) // mod6.3 depends on mod6.2 2.0 in conf (run->default) @@ -1189,10 +1218,14 @@ public class ResolveTest { assertContainsArtifact("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar", crr); } + /** + * Test case for IVY-188. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-188";>IVY-188</a> + */ @Test public void testResolveMultipleConfsWithLatest() throws Exception { - // Test case for IVY-188 - // // mod6.2 has two confs compile and run // depends on mod6.1 in conf (compile->default) // depends on mod1.2 latest (which is 2.2) in conf (run->default) @@ -1216,10 +1249,14 @@ public class ResolveTest { assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-173. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-173";>IVY-173</a> + */ @Test public void testResolveMultipleConfsWithConflicts() throws Exception { - // Test case for IVY-173 - // // mod6.2 has two confs compile and run // depends on mod1.2 2.1 in conf (compile->default) // depends on mod1.1 1.0 in conf (*->default) @@ -1305,9 +1342,14 @@ public class ResolveTest { assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-261. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-261";>IVY-261</a> + */ @Test public void testResolveSeveralDefaultWithArtifacts() throws Exception { - // test case for IVY-261 // mod1.6 depends on // mod1.4, which depends on mod1.3 and selects one of its artifacts // mod1.3 and selects two of its artifacts @@ -1323,9 +1365,14 @@ public class ResolveTest { .exists()); } + /** + * Test case for IVY-537. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-537";>IVY-537</a> + */ @Test public void testResolveConflictsWithArtifacts() throws Exception { - // test case for IVY-537 // #mod2.6;0.12 -> {#mod1.6;1.0.4 #mod2.5;0.6.2 } // #mod1.6;1.0.4 -> #mod1.3;3.0 artifacts A and B // #mod2.5;0.6.2 -> #mod1.3;3.1 artifact C @@ -1343,9 +1390,14 @@ public class ResolveTest { .exists()); } + /** + * Test case for IVY-283. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-283";>IVY-283</a> + */ @Test public void testResolveSeveralDefaultWithArtifactsAndConfs() throws Exception { - // test case for IVY-283 Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/IVY-283/ivysettings.xml")); ResolveReport report = ivy.resolve(new File("test/repositories/IVY-283/ivy.xml"), @@ -1366,9 +1418,14 @@ public class ResolveTest { .exists()); } + /** + * Second test case for IVY-283. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-283";>IVY-283</a> + */ @Test public void testResolveSeveralDefaultWithArtifactsAndConfs2() throws Exception { - // second test case for IVY-283 Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/IVY-283/ivysettings.xml")); ResolveReport report = ivy.resolve(new File("test/repositories/IVY-283/ivy-d.xml"), @@ -1583,9 +1640,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org2", "mod2.1", "0.3", "mod2.1", "jar", "jar").exists()); } + /** + * Test case for IVY-541. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-541";>IVY-541</a> + */ @Test public void testResolveWithIncludeArtifactsTransitive() throws Exception { - // test case for IVY-541 // mod2.6 depends on mod2.3 and mod2.1 // mod2.3 depends on mod2.1 and selects its artifacts ResolveReport report = ivy.resolve(new File( @@ -1753,7 +1815,10 @@ public class ResolveTest { } /** - * Testcase for IVY-1131. + * Test case for IVY-1131. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1131";>IVY-1131</a> */ @Test public void testResolveTransitiveDependenciesWithOverrideAndDynamicResolveMode() @@ -2138,9 +2203,14 @@ public class ResolveTest { assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-264. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-264";>IVY-264</a> + */ @Test public void testResolveConflict3() throws Exception { - // test case for IVY-264 // a depends on x latest, y latest, z latest // x and z depends on commons-lang 1.0.1 // y depends on commons-lang 2.0 @@ -2190,7 +2260,10 @@ public class ResolveTest { } /** - * Test IVY-618. + * Test case for IVY-618. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-618";>IVY-618</a> */ @Test public void testResolveConflictFromPoms() throws Exception { @@ -2230,9 +2303,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-199. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-199";>IVY-199</a> + */ @Test public void testTransitiveEviction2() throws Exception { - // IVY-199 // mod4.1 v 4.13 depends on // - mod3.2 v 1.2.1 which depends on // - mod3.1 v 1.0 which depends on mod1.2 v 2.0 @@ -2249,9 +2327,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-590. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-590";>IVY-590</a> + */ @Test public void testTransitiveEvictionWithExtendingConf() throws Exception { - // IVY-590 ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-590.xml"), getResolveOptions(new String[] {"*"})); assertNotNull(report); @@ -2385,11 +2468,16 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51B", "jar", "jar").exists()); } + /** + * Test case for IVY-681. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-681";>IVY-681</a> + */ @Test public void testEvictWithConf3() throws Exception { // same as first one but the conf requested in evicted module is no longer present in // selected revision - // test case for IVY-681 // mod6.1 r1.4 depends on // mod5.1 r4.3 conf A @@ -2413,10 +2501,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51B", "jar", "jar").exists()); } + /** + * Test case for IVY-861. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-861";>IVY-861</a> + */ @Test public void testFailWithMissingConf() throws Exception { - // test case for IVY-861 - // mod6.1 r1.5 depends on // mod5.1 [1.0,4.3] conf unknown which doesn't exist in mod5.1;4.3 ResolveReport report = ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.5.xml"), @@ -2530,6 +2622,12 @@ public class ResolveTest { crr.getDownloadReports(ModuleRevisionId.newInstance("org5", "mod5.1", "4.2")).length); } + /** + * Test case for IVY-644. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-644";>IVY-644</a> + */ @Test public void testMultipleEviction() throws Exception { @@ -2568,9 +2666,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-193. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-193";>IVY-193</a> + */ @Test public void testResolveForceAfterConflictSolved() throws Exception { - // IVY-193 // mod4.1 v 4.9 depends on // - mod3.2 v 1.1 which depends on mod1.2 v 2.0 // - mod3.1 v 1.1 which depends on mod1.2 v 2.1 @@ -2593,9 +2696,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-193. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-193";>IVY-193</a> + */ @Test public void testResolveForceAfterDependencyExist() throws Exception { - // IVY-193 // mod4.1 v 4.10 depends on // - mod3.1 v 1.0.1 which depends on mod1.2 v 2.0 and forces it // - mod3.2 v 1.2 which depends on mod1.2 v 2.1 and on mod3.1 v1.0.1 @@ -2611,9 +2719,14 @@ public class ResolveTest { assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-193. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-193";>IVY-193</a> + */ @Test public void testResolveForceInDepOnly() throws Exception { - // IVY-193 // mod4.1 v 4.11 depends on // - mod1.2 v 2.0 // - mod3.2 v 1.3 which depends on @@ -2633,9 +2746,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org1", "mod1.2", "1.0", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-193. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-193";>IVY-193</a> + */ @Test public void testResolveForceInDepOnly2() throws Exception { - // IVY-193 // mod4.1 v 4.12 depends on // - mod3.1 v1.0 which depends on // - mod1.2 v 2.0 @@ -2770,9 +2888,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-182. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-182";>IVY-182</a> + */ @Test public void testResolveForceWithDynamicRevisionsAndCyclicDependencies() throws Exception { - // IVY-182 // * has no revision // * declares conf compile, test extends compile, // * depends on @@ -2831,9 +2954,15 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-130. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-130";>IVY-130</a> + */ @Test public void testResolveContradictoryConflictResolution2() throws Exception { - // BUG IVY-130 : only mod1.2 v2.0 should be resolved and not v2.1 (because of force) + // Only mod1.2 v2.0 should be resolved and not v2.1 (because of force) // mod10.1 v 1.1 depends on // - mod1.2 v 2.0 and forces it // - mod4.1 v 4.3 @@ -3060,12 +3189,16 @@ public class ResolveTest { .exists()); } + /** + * Test case for IVY-602. + * Verify that latest.integration dependencies can be resolved when using a resolver with + * multiple patterns, when only the first pattern finds something + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-602";>IVY-602</a> + */ @Test public void testLatestWithMultiplePatterns() throws Exception { - // The test verify that latest.integration dependencies can be resolved - // when using a resolver with multiple patterns, when only the first pattern - // finds something - test case for IVY-602 - // mod9.2 depends on latest.integration of mod6.2 Ivy ivy = Ivy.newInstance(); ivy.configure(new File("test/repositories/ivysettings-IVY602.xml")); @@ -3220,10 +3353,15 @@ public class ResolveTest { assertTrue(getIvyFileInCache(depId).exists()); } + /** + * Test case for IVY-318. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-318";>IVY-318</a> + */ @Test public void testLatestMilestone2() throws Exception { // mod9.2 depends on latest.milestone of mod6.2, but there is no milestone - // test case for IVY-318 ResolveReport report = ivy.resolve(new File( "test/repositories/1/org9/mod9.2/ivys/ivy-1.2.xml"), getResolveOptions(new String[] {"default"})); @@ -3237,6 +3375,12 @@ public class ResolveTest { assertEquals(0, crr.getArtifactsNumber()); } + /** + * Test case for IVY-56. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-56";>IVY-56</a> + */ @Test public void testIVY56() throws Exception { Ivy ivy = new Ivy(); @@ -3251,6 +3395,12 @@ public class ResolveTest { } } + /** + * Test case for IVY-214. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-214";>IVY-214</a> + */ @Test public void testIVY214() throws Exception { ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-214.xml"), @@ -3263,6 +3413,12 @@ public class ResolveTest { .getArtifactsNumber()); } + /** + * Test case for IVY-218. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-218";>IVY-218</a> + */ @Test public void testIVY218() throws Exception { ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-218.xml"), @@ -3275,6 +3431,12 @@ public class ResolveTest { .getArtifactsNumber()); } + /** + * Test case for IVY-729. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-729";>IVY-729</a> + */ @Test public void testIVY729() throws Exception { Ivy ivy = new Ivy(); @@ -3289,7 +3451,7 @@ public class ResolveTest { * Circular dependency: mod6.3 depends on mod6.2, which itself depends on mod6.3; * circular dependency strategy set to error. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testCircular() throws Exception { @@ -3322,7 +3484,7 @@ public class ResolveTest { * Circular dependency: mod 9.1 (no revision) depends on mod9.2, which depends on mod9.1 2.+; * circular dependency strategy set to error. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testCircular2() throws Exception { @@ -3344,7 +3506,8 @@ public class ResolveTest { * Circular dependency: mod6.3 depends on mod6.2, which itself depends on mod6.3, * in both configuration default and test; circular dependency strategy set to error. * - * @throws Exception + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-400";>IVY-400</a> */ @Test public void testCircular3() throws Exception { @@ -3465,6 +3628,12 @@ public class ResolveTest { .exists()); } + /** + * Test case for IVY-1178. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1178";>IVY-1178</a> + */ @Test public void testIVY1178() throws Exception { Ivy ivy = new Ivy(); @@ -3492,6 +3661,12 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("myorg", "modE", "1.1", "modE", "jar", "jar").exists()); } + /** + * Test case for IVY-1236. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1236";>IVY-1236</a> + */ @Test public void testIVY1236() throws Exception { Ivy ivy = new Ivy(); @@ -3510,6 +3685,12 @@ public class ResolveTest { assertTrue(getArchiveFileInCache("myorg", "modB", "1.0", "modB-A", "jar", "jar").exists()); } + /** + * Test case for IVY-1233. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1233";>IVY-1233</a> + */ @Test public void testIVY1233() throws Exception { Ivy ivy = new Ivy(); @@ -3526,6 +3707,12 @@ public class ResolveTest { assertTrue(modRevIds.contains(ModuleRevisionId.newInstance("test", "c", "3.0"))); } + /** + * Test case for IVY-1333. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1333";>IVY-1333</a> + */ @Test public void testIVY1333() throws Exception { Ivy ivy = new Ivy(); @@ -3546,6 +3733,12 @@ public class ResolveTest { "1.0.0.m4", extra))); } + /** + * Test case for IVY-1347. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1347";>IVY-1347</a> + */ @Test public void testIVY1347() throws Exception { Ivy ivy = new Ivy(); @@ -3566,6 +3759,12 @@ public class ResolveTest { assertEquals(ModuleRevisionId.newInstance("foo", "parent", "1.0"), parent); } + /** + * Test case for IVY-999. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-999";>IVY-999</a> + */ @Test public void testIVY999() throws Exception { Ivy ivy = new Ivy(); @@ -3581,6 +3780,12 @@ public class ResolveTest { assertFalse(modRevIds.contains(ModuleRevisionId.newInstance("junit", "junit", "3.8"))); } + /** + * Test case for IVY-1366. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1366";>IVY-1366</a> + */ @Test public void testIVY1366() throws Exception { Ivy ivy = new Ivy(); @@ -3654,9 +3859,14 @@ public class ResolveTest { assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-105. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-105";>IVY-105</a> + */ @Test public void testTransitiveSetting2() throws Exception { - // test case for IVY-105 // mod2.7 depends on mod1.1 and mod2.4 // mod2.4 depends on mod1.1 with transitive set to false // mod1.1 depends on mod1.2 @@ -3747,6 +3957,12 @@ public class ResolveTest { // about configuration mapping and eviction // ///////////////////////////////////////////////////////// + /** + * Test case for IVY-84. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-84";>IVY-84</a> + */ @Test public void testConfigurationMapping1() throws Exception { Ivy ivy = new Ivy(); @@ -3764,6 +3980,12 @@ public class ResolveTest { assertDoesntContainArtifact("test", "c", "1.0.2", "c-bt", "txt", "txt", conf); } + /** + * Test case for IVY-84. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-84";>IVY-84</a> + */ @Test public void testConfigurationMapping2() throws Exception { Ivy ivy = new Ivy(); @@ -3781,6 +4003,12 @@ public class ResolveTest { assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf); } + /** + * Test case for IVY-84. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-84";>IVY-84</a> + */ @Test public void testConfigurationMapping3() throws Exception { Ivy ivy = new Ivy(); @@ -3798,6 +4026,12 @@ public class ResolveTest { assertDoesntContainArtifact("test", "c", "1.0.1", "c", "txt", "txt", conf); } + /** + * Test case for IVY-84. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-84";>IVY-84</a> + */ @Test public void testConfigurationMapping4() throws Exception { Ivy ivy = new Ivy(); @@ -3815,6 +4049,12 @@ public class ResolveTest { assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf); } + /** + * Test case for IVY-84. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-84";>IVY-84</a> + */ @Test public void testConfigurationMapping5() throws Exception { Ivy ivy = new Ivy(); @@ -3832,6 +4072,12 @@ public class ResolveTest { assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf); } + /** + * Test case for IVY-84. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-84";>IVY-84</a> + */ @Test public void testConfigurationMapping6() throws Exception { Ivy ivy = new Ivy(); @@ -3849,6 +4095,12 @@ public class ResolveTest { assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf); } + /** + * Test case for IVY-84. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-84";>IVY-84</a> + */ @Test public void testConfigurationMapping7() throws Exception { Ivy ivy = new Ivy(); @@ -3866,6 +4118,12 @@ public class ResolveTest { assertDoesntContainArtifact("test", "c", "1.0.1", "c-bt", "txt", "txt", conf); } + /** + * Test case for IVY-97. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-97";>IVY-97</a> + */ @Test public void testIVY97() throws Exception { // mod9.2 depends on mod9.1 and mod1.2 @@ -4454,9 +4712,14 @@ public class ResolveTest { } } + /** + * Test case for IVY-418. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-418";>IVY-418</a> + */ @Test public void testResolveMaven2Classifiers() throws Exception { - // test case for IVY-418 // test-classifier depends on test-classified with classifier asl Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/m2/ivysettings.xml")); @@ -4482,9 +4745,14 @@ public class ResolveTest { "1.0", "test-classified", "jar", "jar", cmap).exists()); } + /** + * Test case for IVY-1041. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1041";>IVY-1041</a> + */ @Test public void testResolveMaven2ClassifiersWithoutPOM() throws Exception { - // test case for IVY-1041 // test-classifier depends on test-classified with classifier asl Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/m2/ivysettings.xml")); @@ -4532,9 +4800,14 @@ public class ResolveTest { assertTrue(jarFileInCache.length() != sourceFileInCache.length()); } + /** + * Test case for IVY-1138. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1138";>IVY-1138</a> + */ @Test public void testResolveMaven2GetSourcesWithSrcClassifier() throws Exception { - // IVY-1138 Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/m2/ivysettings.xml")); ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-m2-with-src.xml"), @@ -4663,9 +4936,14 @@ public class ResolveTest { "jar").exists()); } + /** + * Test case for IVY-1186. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1186";>IVY-1186</a> + */ @Test public void testResolveMaven2ParentPomWithNamespace() throws Exception { - // Cfr IVY-1186 Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/parentPom/ivysettings-namespace.xml")); @@ -4820,9 +5098,14 @@ public class ResolveTest { "jar").exists()); } + /** + * Test case for IVY-1376. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1376";>IVY-1376</a> + */ @Test public void testResolveMaven2ParentPomDependencyManagementWithImport() throws Exception { - // IVY-1376 Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/parentPom/ivysettings.xml")); ivy.getSettings().setDefaultResolver("parentChain"); @@ -4848,9 +5131,14 @@ public class ResolveTest { "jar").exists()); } + /** + * Test case for IVY-501. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-501";>IVY-501</a> + */ @Test public void testResolveMaven2Snapshot1() throws Exception { - // test case for IVY-501 // here we test maven SNAPSHOT versions handling, // with m2 snapshotRepository/uniqueVersion set to true Ivy ivy = new Ivy(); @@ -4869,9 +5157,14 @@ public class ResolveTest { "test-SNAPSHOT1", "jar", "jar").exists()); } + /** + * Test case for IVY-1036. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1036";>IVY-1036</a> + */ @Test public void testResolveMaven2Snapshot1AsLatestIntegration() throws Exception { - // test case for IVY-1036 // here we test maven SNAPSHOT versions handling, // with m2 snapshotRepository/uniqueVersion set to true // but retrieving by latest.integration @@ -4891,9 +5184,14 @@ public class ResolveTest { "test-SNAPSHOT1", "jar", "jar").exists()); } + /** + * Test case for IVY-501. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-501";>IVY-501</a> + */ @Test public void testResolveMaven2Snapshot2() throws Exception { - // test case for IVY-501 // here we test maven SNAPSHOT versions handling, // without m2 snapshotRepository/uniqueVersion set to true Ivy ivy = new Ivy(); @@ -4912,9 +5210,14 @@ public class ResolveTest { "test-SNAPSHOT2", "jar", "jar").exists()); } + /** + * Test case for IVY-1036. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1036";>IVY-1036</a> + */ @Test public void testResolveMaven2Snapshot2AsLatestIntegration() throws Exception { - // test case for IVY-1036 // here we test maven SNAPSHOT versions handling, // with m2 snapshotRepository/uniqueVersion set to true // but retrieving by latest.integration @@ -5047,6 +5350,12 @@ public class ResolveTest { assertTrue(getIvyFileInCache(mrid).exists()); } + /** + * Test case for IVY-1151. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1151";>IVY-1151</a> + */ @Test public void testIVY151() throws Exception { Ivy ivy = new Ivy(); @@ -5101,9 +5410,14 @@ public class ResolveTest { assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists()); } + /** + * Test case for IVY-168. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-168";>IVY-168</a> + */ @Test public void testTransitiveConfMapping() throws Exception { - // IVY-168 // mod13.3 depends on mod13.2 which depends on mod13.1 // each module has two confs: j2ee and compile // each module only publishes one artifact in conf compile @@ -5148,9 +5462,14 @@ public class ResolveTest { assertEquals("another", resolveModRevId.getExtraAttribute("eatt2")); } + /** + * Test case for IVY-773. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-773";>IVY-773</a> + */ @Test public void testExtraAttributes2() throws Exception { - // test case for IVY-773 Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/extra-attributes/ivysettings.xml")); ivy.getSettings().setDefaultCache(cache); @@ -5170,9 +5489,14 @@ public class ResolveTest { assertTrue(new File(cache, "apache/module2/task2/1976/module2-linux.jar").exists()); } + /** + * Test case for IVY-745. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-745";>IVY-745</a> + */ @Test public void testExtraAttributes3() throws Exception { - // test case for IVY-745 MockMessageLogger mockLogger = new MockMessageLogger(); Ivy ivy = new Ivy(); ivy.getLoggerEngine().setDefaultLogger(mockLogger); @@ -5188,10 +5512,15 @@ public class ResolveTest { mockLogger.assertLogContains("expected='task2' found='null'"); } + /** + * Second test case for IVY-745.¨ + * Now we disable consistency checking, everything must work fine. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-745";>IVY-745</a> + */ @Test public void testExtraAttributes4() throws Exception { - // second test case for IVY-745: now we disable consistency checking, everything should work - // fine Ivy ivy = new Ivy(); ivy.configure(new File("test/repositories/extra-attributes/ivysettings.xml")); ivy.getSettings().setDefaultCache(cache); @@ -5291,10 +5620,14 @@ public class ResolveTest { assertTrue(getArchiveFileInCache(ivy, "bar#bar2#trunk;2", "bar2", "jar", "jar").exists()); } + /** + * Test case for IVY-717. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-717";>IVY-717</a> + */ @Test public void testBranches6() throws Exception { - // test case for IVY-717 - // bar1;4 -> foo#foo1#${ivy.branch};5 // foo#foo1#branch1;5 -> foo#foo2#${ivy.branch};1 // foo#foo1#trunk;5 -> {} @@ -5597,6 +5930,12 @@ public class ResolveTest { assertFalse(report.hasError()); } + /** + * Test case for IVY-956. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-956";>IVY-956</a> + */ @Test(expected = StrictConflictException.class) public void testIVY956() throws Exception { ivy.getSettings().setDefaultConflictManager( @@ -5605,6 +5944,12 @@ public class ResolveTest { getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false)); } + /** + * Test case for IVY-1159. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1159";>IVY-1159</a> + */ @Test public void testIVY1159_orderIsModAModB() throws Exception { testIVY1159("ivy-depsorder_modA_then_modB.xml", false); @@ -5621,6 +5966,12 @@ public class ResolveTest { dds[1].getDependencyRevisionId()); } + /** + * Test case for IVY-1159. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1159";>IVY-1159</a> + */ @Test public void testIVY1159_orderIsModAModBReplaceForced() throws Exception { testIVY1159("ivy-depsorder_modA_then_modB.xml", true); @@ -5637,6 +5988,12 @@ public class ResolveTest { dds[1].getDependencyRevisionId()); } + /** + * Test case for IVY-1159. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1159";>IVY-1159</a> + */ @Test public void testIVY1159_orderIsModBModA() throws Exception { testIVY1159("ivy-depsorder_modB_then_modA.xml", false); @@ -5653,6 +6010,12 @@ public class ResolveTest { dds[1].getDependencyRevisionId()); } + /** + * Test case for IVY-1159. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1159";>IVY-1159</a> + */ @Test public void testIVY1159_orderIsModBModAReplaceForced() throws Exception { testIVY1159("ivy-depsorder_modB_then_modA.xml", true); @@ -5702,6 +6065,12 @@ public class ResolveTest { ivy.deliver(pubrev, deliveryPattern, dopts); } + /** + * Test case for IVY-1300. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1300";>IVY-1300</a> + */ @Test public void testIVY1300() throws Exception { ivy = Ivy.newInstance();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 48d0fd4..d09c58e 100644 --- a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java +++ b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java @@ -261,7 +261,7 @@ public class RetrieveTest { * This test is here to just test the deprecated {@code symlinkmass} option for retrieve task. * A version or two down the line, after 2.5 release, we can remove this test and the option altogether * - * @throws Exception + * @throws Exception if something goes wrong */ @SuppressWarnings("deprecation") @Test @@ -293,7 +293,7 @@ public class RetrieveTest { * {@link Files#exists(Path, LinkOption...) exists} * * @param filePath - * @throws IOException + * @throws IOException if something goes wrong */ private void assertLinkOrExists(final String filePath) throws IOException { if (systemHasSymlinkAbility) { @@ -416,9 +416,11 @@ public class RetrieveTest { } /** - * Tests that the {@link RetrieveEngine} retrieves artifacts with the correct extension if the artifact is unpacked + * Test case for IVY-1478. + * {@link RetrieveEngine} must retrieve artifacts with the correct extension if the artifact + * is unpacked. * - * @throws Exception + * @throws Exception if something goes wrong * @see <a href="https://issues.apache.org/jira/browse/IVY-1478";>IVY-1478</a> */ @Test @@ -445,31 +447,35 @@ public class RetrieveTest { } /** - * Tests that more than one retrieve, with one having symlink enabled and the other not, doesn't lead to repository - * cache corruption as reported in https://issues.apache.org/jira/browse/IVY-1498 + * Test case for IVY-1498. + * More than one retrieve, one having symlink enabled and the other not, + * must not lead to repository cache corruption. * <p> * The test does the following: * - Resolves a module, let's call it "irrelevant-A" which has a dependency on "org:foo-bar:1.2.3" * <p> * - Invokes a retrieve RT1, with {@link RetrieveOptions#setMakeSymlinks(boolean) symlinks true} - * on that resolved module with a pattern that translates to a path "a/b/c/foo-bar.jar". When the RT1 retrieve is - * done, the path "a/b/c/foo-bar.jar" will be a symlink to a path "repo/cache/org/foo-bar/foo-bar-1.2.3.jar" in the - * Ivy cache. + * on that resolved module with a pattern that translates to a path "a/b/c/foo-bar.jar". When the + * RT1 retrieve is done, the path "a/b/c/foo-bar.jar" will be a symlink to a path + * "repo/cache/org/foo-bar/foo-bar-1.2.3.jar" in the Ivy cache. * All fine so far. * <p> - * - We then resolve another module, let's call it "irrelevant-B" which has a dependency on "org:foo-bar:2.3.4" + * - We then resolve another module, let's call it "irrelevant-B" which has a dependency on + * "org:foo-bar:2.3.4" * <p> * - Next, do a new retrieve RT2, on this newly resolved module with - * {@link RetrieveOptions#setMakeSymlinks(boolean) symlinks false} and {@link RetrieveOptions#getOverwriteMode() - * overwrite semantics enabled} and with the same pattern as before), that translates to a path "a/b/c/foo-bar.jar". + * {@link RetrieveOptions#setMakeSymlinks(boolean) symlinks false} and + * {@link RetrieveOptions#getOverwriteMode() overwrite semantics enabled} + * and with the same pattern as before), that translates to a path "a/b/c/foo-bar.jar". * <p> - * When RT2 retrieve is done, we expect the path "a/b/c/foo-bar.jar" will *not* be a symlink and instead be an actual file that represents - * the org:foo-bar:2.3.4 artifact jar. + * When RT2 retrieve is done, we expect the path "a/b/c/foo-bar.jar" will *not* be a symlink and + * instead be an actual file that represents the org:foo-bar:2.3.4 artifact jar. * <p> - * We also expect that this RT2 retrieve will not update/overwrite the file at path "repo/cache/org/foo-bar/foo-bar-1.2.3.jar" - * in the Ivy cache - the file that was the end target of the symlink generated by the previous RT1. + * We also expect that this RT2 retrieve will not update/overwrite the file at path + * "repo/cache/org/foo-bar/foo-bar-1.2.3.jar" in the Ivy cache - the file that was the end + * target of the symlink generated by the previous RT1. * - * @throws Exception + * @throws Exception if something goes wrong * @see <a href="https://issues.apache.org/jira/browse/IVY-1498";>IVY-1498</a> */ @Test http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 6a271a4..71c935d 100644 --- a/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java +++ b/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java @@ -261,7 +261,7 @@ public class XmlSettingsParserTest { /** * Test of resolver referencing a non existent cache. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testInvalidCache() throws Exception { @@ -400,9 +400,14 @@ public class XmlSettingsParserTest { ivyPatterns.get(0)); } + /** + * Test case for IVY-319. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-319";>IVY-319</a> + */ @Test public void testMacroAndRef() throws Exception { - // test case for IVY-319 IvySettings settings = new IvySettings(); XmlSettingsParser parser = new XmlSettingsParser(settings); parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-macro+ref.xml")); @@ -423,9 +428,14 @@ public class XmlSettingsParserTest { assertTrue(shared instanceof FileSystemResolver); } + /** + * Test case for IVY-860. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-860";>IVY-860</a> + */ @Test public void testMacroAndRef2() throws Exception { - // test case for IVY-860 IvySettings settings = new IvySettings(); XmlSettingsParser parser = new XmlSettingsParser(settings); parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-macro+ref2.xml")); @@ -646,10 +656,11 @@ public class XmlSettingsParserTest { } /** - * Tests that a <code><ttl></code> containing the <code>matcher</code> attribute, in a ivy settings file, - * works as expected. + * Test case for IVY-1495. + * <code><ttl></code> containing the <code>matcher</code> attribute, + * in an ivy settings file, must work as expected. * - * @throws Exception + * @throws Exception if something goes wrong * @see <a href="https://issues.apache.org/jira/browse/IVY-1495";>IVY-1495</a> */ @Test @@ -673,7 +684,7 @@ public class XmlSettingsParserTest { /** * Tests that the <code>timeout-constraint</code> elements in a Ivy settings file are parsed correctly * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testTimeoutConstraints() throws Exception { @@ -707,10 +718,10 @@ public class XmlSettingsParserTest { } /** - * Tests that timeout constraints referenced by resolvers, in an ivy settings file, are processed correctly and the - * corresponding resolvers use the right timeout constraints + * Tests that timeout constraints referenced by resolvers, in an ivy settings file, are + * processed correctly and the corresponding resolvers use the right timeout constraints * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testResolverTimeoutConstraintRefs() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 33031b8..0059775 100644 --- a/test/java/org/apache/ivy/core/sort/SortTest.java +++ b/test/java/org/apache/ivy/core/sort/SortTest.java @@ -90,8 +90,10 @@ public class SortTest { /** * Sorter does not throw circular dependency, circular dependencies are handled at resolve time - * only. However the sort respect the transitive order when it is unambiguous. (if A depends - * transitively of B, but B doesn't depends transitively on A then B always comes before A). + * only. However the sort respect the transitive order when it is unambiguous. (If A depends + * transitively of B, but B doesn't depends transitively on A, then B always comes before A.) + * + * @throws Exception if something goes wrong */ @Test public void testCircularDependency() throws Exception { @@ -127,7 +129,12 @@ public class SortTest { } } - // Test IVY-624 + /** + * Test case for IVY-624 + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-624";>IVY-624</a> + */ @Test public void testCircularDependencyInfiniteLoop() throws Exception { addDependency(md1, "md2", "rev2"); @@ -213,8 +220,8 @@ public class SortTest { /** * When the version asked by a dependency is not compatible with the version declared in the - * module to order, the two modules should be considered as independent NB: I'm sure of what - * 'compatible' means ! + * module to order, the two modules should be considered as independent. + * NB: I'm sure of what 'compatible' means ! */ @Test public void testDifferentVersionNotConsidered() { @@ -339,7 +346,9 @@ public class SortTest { fail(errorMessage.toString()); } - /** Returns a collection of lists that contains the elements a,b,c and d */ + /** + * Returns a collection of lists that contains the elements a, b, c and d + */ private Collection<List<ModuleDescriptor>> getAllLists(ModuleDescriptor a, ModuleDescriptor b, ModuleDescriptor c, ModuleDescriptor d) { final int nbOfList = 24; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java b/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java index 60971a4..bddb05e 100644 --- a/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java +++ b/test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java @@ -72,10 +72,10 @@ public class OSGiManifestParserTest extends AbstractModuleDescriptorParserTester } /** - * Tests that the {@link OSGiManifestParser#parseDescriptor(ParserSettings, URL, Resource, boolean)} works fine for descriptors - * that are backed by {@link FileResource} + * Tests that the {@link OSGiManifestParser#parseDescriptor(ParserSettings, URL, Resource, boolean)} + * works fine for descriptors that are backed by {@link FileResource} * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testFileResource() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java index 104c63b..37f476c 100644 --- a/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java +++ b/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java @@ -139,7 +139,7 @@ public class LatestCompatibleConflictManagerTest { /** * Resolve must fail with a conflict. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test(expected = StrictConflictException.class) public void testConflict() throws Exception { @@ -152,7 +152,7 @@ public class LatestCompatibleConflictManagerTest { /** * Resolve must fail with a conflict. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test(expected = StrictConflictException.class) public void testDynamicRootConflict() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java b/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java index 03a9942..3fd6d3f 100644 --- a/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java +++ b/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java @@ -54,7 +54,12 @@ public class LatestConflictManagerTest { FileUtil.forceDelete(_cache); } - // Test case for issue IVY-388 + /** + * Test case for IVY-388. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-388";>IVY-388</a> + */ @Test public void testIvy388() throws Exception { ResolveReport report = ivy.resolve( @@ -78,7 +83,12 @@ public class LatestConflictManagerTest { } } - // Test case for issue IVY-383 + /** + * Test case for IVY-383. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-383";>IVY-383</a> + */ @Test public void testIvy383() throws Exception { ResolveReport report = ivy.resolve( @@ -93,7 +103,12 @@ public class LatestConflictManagerTest { } } - // Test case for issue IVY-407 + /** + * Test case for IVY-407. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-407";>IVY-407</a> + */ @Test public void testLatestTime1() throws Exception { ivy = new Ivy(); @@ -146,12 +161,19 @@ public class LatestConflictManagerTest { } } - /* - * Test case for issue IVY-407 (with transitivity) There are 5 modules A, B, C, D and E. 1) - * publish C-1.0.0, C-1.0.1 and C-1.0.2 2) B needs C-1.0.0 : retrieve ok and publish B-1.0.0 3) - * A needs B-1.0.0 and C-1.0.2 : retrieve ok and publish A-1.0.0 4) D needs C-1.0.1 : retrieve - * ok and publish D-1.0.0 5) E needs D-1.0.0 and A-1.0.0 (D before A in ivy file) retrieve - * failed to get C-1.0.2 from A (get apparently C-1.0.1 from D) + /** + * Test case for IVY-407 (with transitivity). There are 5 modules A, B, C, D and E. + * <ol> + * <li>publish C-1.0.0, C-1.0.1 and C-1.0.2</li> + * <li>B needs C-1.0.0 : retrieve ok and publish B-1.0.0</li> + * <li>A needs B-1.0.0 and C-1.0.2 : retrieve ok and publish A-1.0.0</li> + * <li>D needs C-1.0.1 : retrieve ok and publish D-1.0.0</li> + * <li>E needs D-1.0.0 and A-1.0.0 (D before A in ivy file) : + * retrieve failed to get C-1.0.2 from A (get apparently C-1.0.1 from D)</li> + * </ol> + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-407";>IVY-407</a> */ @Test public void testLatestTimeTransitivity() throws Exception { @@ -187,9 +209,10 @@ public class LatestConflictManagerTest { } } - /* - * Test case for issue IVY-1399: + /** + * Test case for IVY-1399. * Dependency tree: + * <pre> * Mycompany#target;1 * MyCompany#A;1 * conflicting-dependency#dep;1 @@ -202,6 +225,10 @@ public class LatestConflictManagerTest { * ... * MyCompany#C;1 * conflicting-dependency#dep;1 + * </pre> + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1399";>IVY-1399</a> */ @Test public void testEvictedModules() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 0851a87..5f14e9c 100644 --- a/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java +++ b/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java @@ -67,7 +67,7 @@ public class StrictConflictManagerTest { /** * Resolve must fail with a conflict. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test(expected = StrictConflictException.class) public void testConflictResolve() throws Exception { @@ -78,7 +78,7 @@ public class StrictConflictManagerTest { /** * Resolve must fail with a conflict. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test(expected = StrictConflictException.class) public void testConflictWithDynamicRevisionResolve() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 3ed867b..f51376d 100644 --- a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java +++ b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java @@ -376,7 +376,12 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse dds[1].getDependencyRevisionId()); } - // IVY-392 + /** + * Test case for IVY-392. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-392";>IVY-392</a> + */ @Test public void testDependenciesWithInactiveProfile() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings, @@ -451,9 +456,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse md.getModuleRevisionId()); } + /** + * Test case for IVY-425. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-425";>IVY-425</a> + */ @Test public void testVariables() throws Exception { - // test case for IVY-425 ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings, getClass().getResource("spring-hibernate3-2.0.2.pom"), false); assertNotNull(md); @@ -469,9 +479,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse dds[10].getDependencyRevisionId()); } + /** + * Test case for IVY-423. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-423";>IVY-423</a> + */ @Test public void testDependenciesInProfile() throws Exception { - // test case for IVY-423 ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings, getClass().getResource("mule-module-builders-1.3.3.pom"), false); assertNotNull(md); @@ -481,9 +496,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse md.getModuleRevisionId()); } + /** + * Test case for IVY-424. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-424";>IVY-424</a> + */ @Test public void testIVY424() throws Exception { - // test case for IVY-424 ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings, getClass().getResource("shale-tiger-1.1.0-SNAPSHOT.pom"), false); assertNotNull(md); @@ -634,9 +654,14 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse excludeAllTransitiveDepsDescriptor.isTransitive()); } + /** + * Test case for IVY-417. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-417";>IVY-417</a> + */ @Test public void testWithPlugins() throws Exception { - // test case for IVY-417 ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(settings, getClass().getResource("mule-1.3.3.pom"), false); assertNotNull(md); @@ -683,7 +708,7 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse * Tests that if a module doesn't have a license specified, then parent pom's license (if any) * is used for the child module * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testLicenseFromParent() throws Exception { @@ -704,7 +729,7 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse * Tests that if a project explicitly specifies the licenses, then the licenses (if any) from * its parent pom aren't applied to the child project * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testOverriddenLicense() throws Exception { @@ -1059,10 +1084,11 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse } /** - * Tests that a pom.xml which has references to properties that are either set via environment variables or system - * properties, has its properties evaluated correctly. + * Test case for IVY-1561. + * A pom.xml which has references to properties that are either set via environment variables + * or system properties, must have its properties evaluated correctly. * - * @throws Exception + * @throws Exception if something goes wrong * @see <a href="https://issues.apache.org/jira/browse/IVY-1561";>IVY-1561</a> */ @Test http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java index af2a6cd..7588edb 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java +++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java @@ -200,8 +200,8 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse /** * Test must fail because of bad version. * - * @throws IOException - * @throws ParseException + * @throws IOException if something goes wrong + * @throws ParseException if something goes wrong */ @Test(expected = ParseException.class) public void testBadVersion() throws IOException, ParseException { @@ -1103,7 +1103,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse /** * Test for parser failure. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test(expected = ParseException.class) public void testWithNonExistingConfigInPublications() throws Exception { @@ -1112,9 +1112,10 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse } /** - * IVY-441: test for parser failure. + * Test case for IVY-441: expect parser failure. * - * @throws Exception + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-441";>IVY-441</a> */ @Test(expected = ParseException.class) public void testWithExistingConfigsInPublicationsSeparatedBySemiColon() throws Exception { @@ -1459,8 +1460,8 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse * as encoded characters (for example <code>%2F</code>) then the module descriptor and the location of * the parent descriptor, are resolved and parsed correctly. * - * @throws Exception - * @see <a href="https://issues.apache.org/jira/browse/IVY-1562";>IVY-1562</a> for more details + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1562";>IVY-1562</a> */ @Test public void testExtendsAbsoluteLocation() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java index 14edef1..341b569 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java +++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java @@ -189,10 +189,10 @@ public class XmlModuleDescriptorWriterTest { /** * Test that the transitive attribute is written for non-transitive configurations. * - * <code><conf ... transitive="false" ... /></code> + * <code><conf ... transitive="false" ... /></code> * + * @throws Exception if something goes wrong * @see <a href="https://issues.apache.org/jira/browse/IVY-1207";>IVY-1207</a> - * @throws Exception */ @Test public void testTransitiveAttributeForNonTransitiveConfs() throws Exception { @@ -219,8 +219,8 @@ public class XmlModuleDescriptorWriterTest { * This is the default and writing it will only add noise and cause a deviation from the known * behavior (before fixing IVY-1207). * + * @throws Exception if something goes wrong * @see <a href="https://issues.apache.org/jira/browse/IVY-1207";>IVY-1207</a> - * @throws Exception */ @Test public void testTransitiveAttributeNotWrittenForTransitiveConfs() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java index bb582d0..233b4e6 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java +++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java @@ -337,7 +337,12 @@ public class XmlModuleUpdaterTest { } } - // IVY-1356 + /** + * Test case for IVY-1356. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-1356";>IVY-1356</a> + */ @Test public void testMergedUpdateWithExtendsAndExcludes() throws Exception { URL url = XmlModuleUpdaterTest.class.getResource("test-extends-dependencies-exclude.xml"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java index fe2fae4..e5cd9b8 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java @@ -29,19 +29,29 @@ import org.junit.Test; import static org.junit.Assert.*; /** - * Testing Testing was the single biggest hurdle I faced. I have tried to provide a complete test + * Testing was the single biggest hurdle I faced. I have tried to provide a complete test * suite that covers all protocols and which can be easily extended. It does differ - somewhat - in * structure from the resolver/repository test suites. Setting up smb, ftp, sftp will undoubtedly be - * your biggest headache (it was mine). Here are a few notes about the setup: - the VFS test suite - * uses the build/test/repositories area - when setting samba, sftp, etc. the corresponding user - * needs both read and write privileges. - the tests assume that the user and password is the same - * for all services. - a limited amount of configuration is available by setting the following - * properties in the ivy.properties file: * vfs.host * vfs.username * vfs.password * vfs.samba_share - * Running the test requires that commons-io and ant.jar are on the classpath. Also, I would - * recommend that at some time the tests be converted from straight junit to something which betters - * supports functional testing. Although somewhat crude I am using jsystem + * your biggest headache (it was mine). Here are a few notes about the setup: + * <ul> + * <li>the VFS test suite uses the build/test/repositories area; + * when setting samba, sftp, etc. the corresponding user needs both read and write privileges.</li> + * <li>the tests assume that the user and password is the same for all services.</li> + * <li>a limited amount of configuration is available by setting the following properties in the + * <code>ivy.properties</code> file:</li> + * </ul> + * <pre> + * vfs.host + * vfs.username + * vfs.password + * vfs.samba_share + * </pre> + * Running the test requires that commons-io and ant jars are on the classpath. Also, I would + * recommend that at some time the tests be converted from straight junit to something which better + * supports functional testing. Although somewhat crude, I am using jsystem * (http://jsystemtest.sourceforge.net/) in other projects and am finding it a much better solution - * than straight junit. Stephen Nesbitt + * than straight junit. + * <p>Stephen Nesbitt</p> */ public class VfsRepositoryTest { private VfsRepository repo = null; @@ -70,7 +80,7 @@ public class VfsRepositoryTest { /** * Basic validation of happy path put - valid VFS URI and no conflict with existing file * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testPutValid() throws Exception { @@ -98,7 +108,7 @@ public class VfsRepositoryTest { /** * Validate that we can overwrite an existing file * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testPutOverwriteTrue() throws Exception { @@ -133,7 +143,7 @@ public class VfsRepositoryTest { /** * Validate that we put will respect a request not to overwrite an existing file * - * @throws Exception + * @throws Exception if something goes wrong */ @Test(expected = IOException.class) public void testPutOverwriteFalse() throws Exception { @@ -152,7 +162,7 @@ public class VfsRepositoryTest { /** * Test the retrieval of an artifact from the repository creating a new artifact * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testGetNoExisting() throws Exception { @@ -178,7 +188,7 @@ public class VfsRepositoryTest { /** * Test the retrieval of an artifact from the repository overwriting an existing artifact * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testGetOverwriteExisting() throws Exception { @@ -209,6 +219,8 @@ public class VfsRepositoryTest { /** * Validate that we get a non null Resource instance when passed a well-formed VfsURI pointing * to an existing file + * + * @throws Exception if something goes wrong */ @Test public void testGetResourceValidExist() throws Exception { @@ -227,6 +239,8 @@ public class VfsRepositoryTest { /** * Validate that we get a non null Resource instance when passed a well-formed VfsURI pointing * to a non-existent file. + * + * @throws Exception if something goes wrong */ @Test public void testGetResourceValidNoExist() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 5e9cd74..99b9201 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java @@ -48,6 +48,8 @@ public class VfsResourceTest { /** * Validate VFSResource creation for a valid VFS URI pointing to an physically existing file + * + * @throws Exception if something goes wrong */ @Test public void testCreateResourceThatExists() throws Exception { @@ -87,6 +89,8 @@ public class VfsResourceTest { /** * Validating that resource can be created for files which don't physically exists - e.g. * resources that are going to created. + * + * @throws Exception if something goes wrong */ @Test public void testCreateResourceThatDoesntExist() throws Exception { @@ -112,6 +116,8 @@ public class VfsResourceTest { /** * Validate VFSResource creation when given a poorly formed VFS identifier + * + * @throws Exception if something goes wrong */ @Test public void testBadURI() throws Exception { @@ -132,6 +138,8 @@ public class VfsResourceTest { /** * Validate getChildren when given a VFS URI for a directory + * + * @throws Exception if something goes wrong */ @Test public void testListFolderChildren() throws Exception { @@ -165,6 +173,8 @@ public class VfsResourceTest { /** * Validate that we don't get any results when we query a VFSResource file object for its * children + * + * @throws Exception if something goes wrong */ @Test public void testListFileChildren() throws Exception { @@ -179,6 +189,8 @@ public class VfsResourceTest { /** * Validate that we don't get any results if we ask an IMAGINARY VFSResource - a nonexistent * file - for a list of its children + * + * @throws Exception if something goes wrong */ @Test public void testListImaginary() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java index 394dfba..a8314e4 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java @@ -73,7 +73,7 @@ public class VfsTestHelper { * * @param resource * name of the resource - * @return <class>List</class> of well-formed VFS resource identifiers + * @return {@link List} of well-formed VFS resource identifiers */ public List<VfsURI> createVFSUriSet(String resource) { List<VfsURI> set = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java index 3b89002..1a5ced9 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java @@ -128,7 +128,7 @@ public class VfsURI { /** * Return a well-formed VFS Resource identifier * - * @return <code>String<code> representing a well formed VFS resource identifier + * @return <code>String</code> representing a well formed VFS resource identifier */ public String getVfsURI() { StringBuilder uri = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 c04894c..e9f0dd1 100644 --- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java @@ -326,9 +326,14 @@ public class ChainResolverTest extends AbstractDependencyResolverTest { } } + /** + * Test case for IVY-206. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-206";>IVY-206</a> + */ @Test public void testFixedWithDefaultAndRealResolver() throws Exception { - // test case for IVY-206 ChainResolver chain = new ChainResolver(); chain.setName("chain"); chain.setSettings(settings); @@ -416,9 +421,14 @@ public class ChainResolverTest extends AbstractDependencyResolverTest { } } + /** + * Test case for IVY-389. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-389";>IVY-389</a> + */ @Test public void testReturnFirstWithDefaultAndCacheAndRealResolver() throws Exception { - // test case for IVY-389 DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), false); @@ -437,10 +447,14 @@ public class ChainResolverTest extends AbstractDependencyResolverTest { assertEquals(true, rmr.getDescriptor().isDefault()); } + /** + * Test case for IVY-207. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-207";>IVY-207</a> + */ public void testReturnFirstWithCheckModifiedAndDefaultAndCacheAndRealResolver() throws Exception { - // test case for IVY-207 - DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), false); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java index 8a7b5b2..6ed5853 100644 --- a/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java @@ -87,8 +87,8 @@ public class DualResolverTest extends AbstractDependencyResolverTest { /** * Test fails due to bad resolver configuration. * - * @throws IOException - * @throws ParseException + * @throws IOException if something goes wrong + * @throws ParseException if something goes wrong */ @Test(expected = ParseException.class) public void testFromBadConf() throws IOException, ParseException { @@ -99,7 +99,7 @@ public class DualResolverTest extends AbstractDependencyResolverTest { /** * Test fails due to bad resolver configuration * - * @throws ParseException + * @throws ParseException if something goes wrong */ @Test(expected = IllegalStateException.class) public void testBad() throws ParseException { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/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 a0cbd71..6446d9c 100644 --- a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java @@ -165,9 +165,14 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest { assertEquals(DownloadStatus.NO, ar.getDownloadStatus()); } + /** + * Test case for IVY-676. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-676";>IVY-676</a> + */ @Test public void testFindIvyFileRefWithMultipleIvyPatterns() throws Exception { - // cfr IVY-676 FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); resolver.setSettings(settings); @@ -263,7 +268,8 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest { /** * Tests that <code>SHA-256</code> algorithm can be used for checksums on resolvers - * @throws Exception + * + * @throws Exception if something goes wrong */ @Test public void testSHA256Checksum() throws Exception { @@ -294,7 +300,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest { /** * Tests that <code>SHA-512</code> algorithm can be used for checksums on resolvers * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testSHA512Checksum() throws Exception { @@ -887,7 +893,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest { /** * Publishing with transaction=true and an unsupported pattern must fail. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testUnsupportedTransaction() throws Exception { @@ -916,7 +922,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest { /** * Publishing with transaction=true and an unsupported combination of patterns must fail. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testUnsupportedTransaction2() throws Exception { @@ -948,7 +954,7 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest { /** * Publishing with transaction=true and overwrite mode must fail. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testUnsupportedTransaction3() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java index 6091f5e..bce5415 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java @@ -95,9 +95,10 @@ public class IvyRepResolverTest extends AbstractDependencyResolverTest { } /** - * IVY-625: should fail if no ivyroot specified. + * Test case for IVY-625. Must fail if no ivyroot specified. * - * @throws Exception + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-625";>IVY-625</a> */ @Test public void testMandatoryRoot() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java index f894598..7b11e4e 100644 --- a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java @@ -383,7 +383,7 @@ public class URLResolverTest extends AbstractDependencyResolverTest { /** * Tests that the timeout constraint set on the URL resolver is used correctly by the resolver * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testTimeoutConstraint() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/util/TestXmlHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/TestXmlHelper.java b/test/java/org/apache/ivy/util/TestXmlHelper.java index cea9e0b..440e35a 100644 --- a/test/java/org/apache/ivy/util/TestXmlHelper.java +++ b/test/java/org/apache/ivy/util/TestXmlHelper.java @@ -40,7 +40,7 @@ public class TestXmlHelper { * @param xPathExpression The XPath expression to evaluate * @param returnType The expected return type of the {@link XPathExpression#evaluate(Object, QName) evaluation} * @return The result - * @throws Exception + * @throws Exception if something goes wrong */ public static Object evaluateXPathExpr(final File xmlFile, final XPathExpression xPathExpression, final QName returnType) throws Exception { @@ -67,7 +67,7 @@ public class TestXmlHelper { * @param xpathExpression The XPath expression to evaluate * @param returnType The expected return type of the {@link XPathExpression#evaluate(Object, QName) evaluation} * @return The result - * @throws Exception + * @throws Exception if something goes wrong */ public static Object evaluateXPathExpr(final File xmlFile, final String xpathExpression, final QName returnType) throws Exception { return evaluateXPathExpr(xmlFile, XPathFactory.newInstance().newXPath().compile(xpathExpression), returnType); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java index d30f1dd..e792c04 100644 --- a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java @@ -32,7 +32,10 @@ import static org.junit.Assert.assertEquals; public class AbstractURLHandlerTest { /** - * JUnit test for IVY-923. + * Test case for IVY-923. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-923";>IVY-923</a> */ @Test public void testNormalizeToStringWithSpaceURL() throws Exception { @@ -43,7 +46,10 @@ public class AbstractURLHandlerTest { } /** - * JUnit test for IVY-923. + * Test case for IVY-923. + * + * @throws Exception if something goes wrong + * @see <a href="https://issues.apache.org/jira/browse/IVY-923";>IVY-923</a> */ @Test public void testNormalizeToStringWithPlusCharacter() throws Exception { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c1f910cc/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java index 6ab2543..226a920 100644 --- a/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java +++ b/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java @@ -33,7 +33,7 @@ public class ApacheURLListerTest { /** * Tests {@link ApacheURLLister#retrieveListing(URL, boolean, boolean)}. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testRetrieveListing() throws Exception { @@ -62,7 +62,7 @@ public class ApacheURLListerTest { /** * Tests {@link ApacheURLLister#retrieveListing(URL, boolean, boolean)}. * - * @throws Exception + * @throws Exception if something goes wrong */ @Test public void testRetrieveListingWithSpaces() throws Exception {
