You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by gs...@apache.org on 2007/06/23 21:59:40 UTC
svn commit: r550119 [2/2] - in /incubator/ivy/core/trunk:
src/java/org/apache/ivy/core/ test/java/org/apache/ivy/ant/
test/java/org/apache/ivy/core/resolve/
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?view=diff&rev=550119&r1=550118&r2=550119
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Sat Jun 23 14:59:40 2007
@@ -22,9 +22,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -60,34 +58,32 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-import sun.security.action.GetIntegerAction;
-
/**
*
*/
public class ResolveTest extends TestCase {
- private Ivy _ivy;
+ private Ivy ivy;
- private IvySettings _settings;
+ private IvySettings settings;
- private File _cache;
+ private File cache;
- private CacheManager _cacheManager;
+ private CacheManager cacheManager;
public ResolveTest() {
}
protected void setUp() throws Exception {
- _ivy = Ivy.newInstance();
- _ivy.configure(new File("test/repositories/ivysettings.xml"));
- _settings = _ivy.getSettings();
- _cache = new File("build/cache");
- _cacheManager = _ivy.getCacheManager(_cache);
+ ivy = Ivy.newInstance();
+ ivy.configure(new File("test/repositories/ivysettings.xml"));
+ settings = ivy.getSettings();
+ cache = new File("build/cache");
+ cacheManager = ivy.getCacheManager(cache);
createCache();
}
private void createCache() {
- _cache.mkdirs();
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -97,13 +93,13 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
public void testResolveWithRetainingArtifactName() throws Exception {
- _settings.setCacheArtifactPattern(_ivy.substitute("[module]/[originalname].[ext]"));
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod15.2/ivy-1.1.xml")
+ settings.setCacheArtifactPattern(ivy.substitute("[module]/[originalname].[ext]"));
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod15.2/ivy-1.1.xml")
.toURL(), getResolveOptions(new String[] {"default"}));
assertNotNull(report);
@@ -115,7 +111,7 @@
Artifact artifact = dReports[0].getArtifact();
assertNotNull(artifact);
- String cachePath = _cacheManager.getArchivePathInCache(artifact);
+ String cachePath = cacheManager.getArchivePathInCache(artifact);
assertTrue("artifact name has not been retained: " + cachePath, cachePath
.endsWith("library.jar"));
@@ -127,13 +123,13 @@
artifact = dReports[0].getArtifact();
assertNotNull(artifact);
- cachePath = _cacheManager.getArchivePathInCache(artifact);
+ cachePath = cacheManager.getArchivePathInCache(artifact);
assertTrue("artifact name has not been retained: " + cachePath, cachePath
.endsWith("mod14.1-1.1.jar"));
}
public void testArtifactOrigin() throws Exception {
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
getResolveOptions(new String[] {"default"}));
assertNotNull(report);
@@ -157,14 +153,14 @@
.getLocation());
// verify the saved origin on disk
- ArtifactOrigin ivyOrigin = _cacheManager.getSavedArtifactOrigin(artifact);
+ ArtifactOrigin ivyOrigin = cacheManager.getSavedArtifactOrigin(artifact);
assertNotNull(ivyOrigin);
assertEquals("isLocal for artifact not correct", true, ivyOrigin.isLocal());
assertEquals("location for artifact not correct", expectedLocation, ivyOrigin.getLocation());
// now resolve the same artifact again and verify the origin of the (not-downloaded)
// artifact
- report = _ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
+ report = ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
getResolveOptions(new String[] {"default"}));
assertNotNull(report);
@@ -182,7 +178,7 @@
}
public void testUseOrigin() throws Exception {
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(), getResolveOptions(
new String[] {"default"}).setUseOrigin(true));
assertNotNull(report);
@@ -201,16 +197,16 @@
String expectedLocation = new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar")
.getAbsolutePath();
- ArtifactOrigin origin = _cacheManager.getSavedArtifactOrigin(artifact);
- File artInCache = new File(_cache, _cacheManager.getArchivePathInCache(artifact, origin));
+ ArtifactOrigin origin = cacheManager.getSavedArtifactOrigin(artifact);
+ File artInCache = new File(cache, cacheManager.getArchivePathInCache(artifact, origin));
assertFalse("should not download artifact in useOrigin mode.", artInCache.exists());
- assertEquals("location for artifact not correct.", expectedLocation, _cacheManager
+ assertEquals("location for artifact not correct.", expectedLocation, cacheManager
.getArchiveFileInCache(artifact).getAbsolutePath());
}
public void testResolveSimple() throws Exception {
// mod1.1 depends on mod1.2
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -219,17 +215,17 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testResolveBadStatus() throws Exception {
// mod1.4 depends on modfailure, modfailure has a bad status
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.4/ivys/ivy-1.1.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -249,7 +245,7 @@
public void testResolveNoRevisionInDep() throws Exception {
// mod1.4 depends on mod1.6, in which the ivy file has no revision
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.4/ivys/ivy-1.2.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -308,7 +304,7 @@
}
public void testResolveOtherConfiguration() throws Exception {
- ResolveReport report = _ivy.resolve(ResolveTest.class.getResource("ivy-other.xml"),
+ ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-other.xml"),
getResolveOptions(new String[] {"test"}));
assertNotNull(report);
@@ -321,7 +317,7 @@
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"),
+ ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-198.xml"),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -329,14 +325,14 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg/mydep", "system/module", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("yourorg/yourdep", "yoursys/yourmod", "1.0")).exists());
assertTrue(getArchiveFileInCache("yourorg/yourdep", "yoursys/yourmod", "1.0", "yourmod",
"jar", "jar").exists());
@@ -346,7 +342,7 @@
// mod1.1 depends on mod1.2
// we first do a simple resolve so that module is in cache
- _ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
+ ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
getResolveOptions(new String[] {"*"}));
// we now use a badly configured ivy, so that it can't find module in repository
@@ -363,10 +359,10 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
@@ -415,10 +411,10 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
@@ -434,9 +430,9 @@
// assertTrue(report.hasError());
// put necessary stuff in cache, and it should now be ok
- File ivyfile = ivy.getCacheManager(_cache).getIvyFileInCache(
+ File ivyfile = ivy.getCacheManager(cache).getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"));
- File art = TestHelper.getArchiveFileInCache(ivy, _cache, "org1", "mod1.2", "2.0", "mod1.2",
+ File art = TestHelper.getArchiveFileInCache(ivy, cache, "org1", "mod1.2", "2.0", "mod1.2",
"jar", "jar");
FileUtil.copy(ResolveTest.class.getResource("ivy-mod1.2.xml"), ivyfile, null);
FileUtil.copy(new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar"), art, null);
@@ -463,20 +459,20 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(ivy.getCacheManager(_cache).getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(ivy.getCacheManager(cache).getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(ivy.getCacheManager(_cache).getIvyFileInCache(
+ assertTrue(ivy.getCacheManager(cache).getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
- assertTrue(new File(_cache, "mod1.2/ivy.xml").exists());
- assertTrue(TestHelper.getArchiveFileInCache(ivy, _cache, "org1", "mod1.2", "2.0", "mod1.2",
+ assertTrue(new File(cache, "mod1.2/ivy.xml").exists());
+ assertTrue(TestHelper.getArchiveFileInCache(ivy, cache, "org1", "mod1.2", "2.0", "mod1.2",
"jar", "jar").exists());
- assertTrue(new File(_cache, "mod1.2.jar").exists());
+ assertTrue(new File(cache, "mod1.2.jar").exists());
}
public void testResolveExtends() throws Exception {
// mod6.1 depends on mod1.2 2.0 in conf default, and conf extension extends default
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org6/mod6.1/ivys/ivy-0.3.xml").toURL(),
getResolveOptions(new String[] {"extension"}));
assertNotNull(report);
@@ -485,17 +481,17 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org6", "mod6.1", "0.3");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies from default
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testResolveExtended() throws Exception {
// mod6.1 depends on mod1.2 2.0 in conf default, and conf extension extends default
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org6/mod6.1/ivys/ivy-0.3.xml").toURL(),
getResolveOptions(new String[] {"default"}));
assertNotNull(report);
@@ -504,17 +500,17 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org6", "mod6.1", "0.3");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies from default
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testResolveExtendedAndExtends() throws Exception {
// mod6.1 depends on mod1.2 2.0 in conf default, and conf extension extends default
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org6/mod6.1/ivys/ivy-0.3.xml").toURL(),
getResolveOptions(new String[] {"default", "extension"}));
assertNotNull(report);
@@ -529,9 +525,9 @@
assertNotNull(crr);
assertEquals(1, crr.getArtifactsNumber());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
@@ -543,7 +539,7 @@
// mod6.1 has two confs default and extension
// mod6.1 depends on mod1.2 2.0 in conf (default->default)
// conf extension extends default
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org6/mod6.2/ivys/ivy-0.3.xml").toURL(),
getResolveOptions(new String[] {"default", "extension"}));
assertNotNull(report);
@@ -559,13 +555,13 @@
assertNotNull(crr);
assertEquals(2, crr.getArtifactsNumber());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org6", "mod6.1", "0.4")).exists());
assertTrue(getArchiveFileInCache("org6", "mod6.1", "0.4", "mod6.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
@@ -580,7 +576,7 @@
// mod6.2 2.0 depends on mod6.1 2.0 in conf (default->standalone)
// mod6.1 2.0 has two confs default and standalone
// mod6.1 2.0 depends on mod1.2 2.2 in conf (default->default)
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod6.3/ivy-1.1.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod6.3/ivy-1.1.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
assertFalse(report.hasError());
@@ -613,7 +609,7 @@
// depends on mod1.2 latest (which is 2.2) in conf (run->default)
// mod6.1
// depends on mod1.2 2.2
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org6/mod6.2/ivys/ivy-0.6.xml").toURL(),
getResolveOptions(new String[] {"compile", "run"}));
assertNotNull(report);
@@ -626,7 +622,7 @@
assertNotNull(crr);
assertEquals(1, crr.getArtifactsNumber());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.2")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
}
@@ -642,7 +638,7 @@
// depends on mod1.2 2.1
// mod1.1
// depends on mod1.2 2.0
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org6/mod6.2/ivys/ivy-0.5.xml").toURL(),
getResolveOptions(new String[] {"compile", "run"}));
assertNotNull(report);
@@ -658,21 +654,21 @@
assertNotNull(crr);
assertEquals(3, crr.getArtifactsNumber());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org6", "mod6.1", "0.5")).exists());
assertTrue(getArchiveFileInCache("org6", "mod6.1", "0.5", "mod6.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
@@ -680,7 +676,7 @@
public void testResolveMultipleExtends2() throws Exception {
// same as before, except that mod6.2 depends on mod1.2 2.1 extension->default
// so mod1.2 2.0 should be evicted in conf extension
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org6/mod6.2/ivys/ivy-0.4.xml").toURL(),
getResolveOptions(new String[] {"default", "extension"}));
assertNotNull(report);
@@ -705,17 +701,17 @@
assertNotNull(node);
assertFalse(node.isEvicted("extension"));
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org6", "mod6.1", "0.4")).exists());
assertTrue(getArchiveFileInCache("org6", "mod6.1", "0.4", "mod6.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
@@ -725,7 +721,7 @@
// 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
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.6/ivys/ivy-1.0.3.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertFalse(report.hasError());
@@ -792,7 +788,7 @@
public void testResolveDefaultWithArtifactsConf1() throws Exception {
// mod2.2 depends on mod1.3 and selects its artifacts
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.2/ivys/ivy-0.5.xml").toURL(),
getResolveOptions(new String[] {"myconf1"}));
assertNotNull(report);
@@ -801,10 +797,10 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.2", "0.5");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.3", "3.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.3", "3.0", "mod1.3-A", "jar", "jar")
.exists());
@@ -815,7 +811,7 @@
public void testResolveDefaultWithArtifactsConf2() throws Exception {
// mod2.2 depends on mod1.3 and selects its artifacts
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.2/ivys/ivy-0.5.xml").toURL(),
getResolveOptions(new String[] {"myconf2"}));
assertNotNull(report);
@@ -824,9 +820,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.2", "0.5");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.3", "3.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.3", "3.0", "mod1.3-A", "jar", "jar")
.exists());
@@ -837,7 +833,7 @@
public void testResolveDefaultWithArtifactsAndConfMapping() throws Exception {
// mod2.2 depends on mod1.3 and specify its artifacts and a conf mapping
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.2/ivys/ivy-0.5.1.xml").toURL(),
getResolveOptions(new String[] {"myconf1"}));
assertNotNull(report);
@@ -847,9 +843,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.2", "0.5.1");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.3", "3.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.3", "3.0", "mod1.3-A", "jar", "jar")
.exists());
@@ -860,7 +856,7 @@
public void testResolveWithIncludeArtifactsConf1() throws Exception {
// mod2.3 depends on mod2.1 and selects its artifacts in myconf1
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.3/ivys/ivy-0.4.xml").toURL(),
getResolveOptions(new String[] {"myconf1"}));
assertNotNull(report);
@@ -869,9 +865,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.3", "0.4");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3")).exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21A", "jar", "jar").exists());
assertTrue(!getArchiveFileInCache("org2", "mod2.1", "0.3", "art21B", "jar", "jar").exists());
@@ -880,7 +876,7 @@
public void testResolveWithIncludeArtifactsConf2() throws Exception {
// mod2.3 depends on mod2.1 and selects its artifacts in myconf1
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.3/ivys/ivy-0.4.xml").toURL(),
getResolveOptions(new String[] {"myconf2"}));
assertNotNull(report);
@@ -889,9 +885,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.3", "0.4");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3")).exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21A", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21B", "jar", "jar").exists());
@@ -900,7 +896,7 @@
public void testResolveWithIncludeArtifactsWithoutConf() throws Exception {
// mod2.3 depends on mod2.1 and selects its artifacts
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.3/ivys/ivy-0.5.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -909,9 +905,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.3", "0.5");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3")).exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21A", "jar", "jar").exists());
assertTrue(!getArchiveFileInCache("org2", "mod2.1", "0.3", "art21B", "jar", "jar").exists());
@@ -920,7 +916,7 @@
public void testResolveWithExcludesArtifacts() throws Exception {
// mod2.3 depends on mod2.1 and selects its artifacts
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.3/ivys/ivy-0.6.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -929,9 +925,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.3", "0.6");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3")).exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21A", "jar", "jar").exists());
assertTrue(!getArchiveFileInCache("org2", "mod2.1", "0.3", "art21B", "jar", "jar").exists());
@@ -940,7 +936,7 @@
public void testResolveWithExcludesArtifacts2() throws Exception {
// mod2.3 depends on mod2.1 and badly excludes artifacts with incorrect matcher
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.3/ivys/ivy-0.6.2.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -949,9 +945,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.3", "0.6.2");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3")).exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21A", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21B", "jar", "jar").exists());
@@ -960,7 +956,7 @@
public void testResolveWithExcludesArtifacts3() throws Exception {
// mod2.3 depends on mod2.1 and excludes artifacts with exact matcher
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.3/ivys/ivy-0.6.3.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -969,9 +965,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.3", "0.6.3");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3")).exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21A", "jar", "jar").exists());
assertTrue(!getArchiveFileInCache("org2", "mod2.1", "0.3", "art21B", "jar", "jar").exists());
@@ -980,7 +976,7 @@
public void testResolveWithExcludesArtifacts4() throws Exception {
// mod2.3 depends on mod2.1 and excludes artifacts with regexp matcher
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.3/ivys/ivy-0.6.4.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -989,9 +985,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.3", "0.6.4");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3")).exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21A", "jar", "jar").exists());
assertTrue(!getArchiveFileInCache("org2", "mod2.1", "0.3", "art21B", "jar", "jar").exists());
@@ -1000,7 +996,7 @@
public void testResolveWithExcludesArtifacts5() throws Exception {
// mod2.3 depends on mod2.1 and excludes artifacts with glob matcher
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.3/ivys/ivy-0.6.5.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -1009,9 +1005,9 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.3", "0.6.5");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3")).exists());
assertTrue(getArchiveFileInCache("org2", "mod2.1", "0.3", "art21A", "jar", "jar").exists());
assertTrue(!getArchiveFileInCache("org2", "mod2.1", "0.3", "art21B", "jar", "jar").exists());
@@ -1020,7 +1016,7 @@
public void testResolveTransitiveDependencies() throws Exception {
// mod2.1 depends on mod1.1 which depends on mod1.2
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.1/ivys/ivy-0.3.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -1029,21 +1025,21 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.1", "0.3");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testResolveTransitiveDisabled() throws Exception {
// mod2.1 depends on mod1.1 which depends on mod1.2
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.1/ivys/ivy-0.3.xml").toURL(), getResolveOptions(
new String[] {"*"}).setTransitive(false));
assertNotNull(report);
@@ -1052,20 +1048,20 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.1", "0.3");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testDependenciesOrder() throws Exception {
- ResolveReport report = _ivy.resolve(ResolveTest.class.getResource("ivy-225.xml"),
+ ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-225.xml"),
getResolveOptions(new String[] {"default"}));
List revisions = new ArrayList(report.getConfigurationReport("default").getModuleRevisionIds());
@@ -1086,29 +1082,29 @@
// compile conf is not transitive
// first we resolve compile conf only
- _ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.1.xml").toURL(),
+ ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.1.xml").toURL(),
getResolveOptions(new String[] {"compile"}));
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
// then we resolve runtime conf
- _ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.1.xml").toURL(),
+ ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.1.xml").toURL(),
getResolveOptions(new String[] {"runtime"}));
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
// same as before, but resolve both confs in one call
- ResolveReport r = _ivy.resolve(new File(
+ ResolveReport r = ivy.resolve(new File(
"test/repositories/1/org2/mod2.1/ivys/ivy-0.3.1.xml").toURL(),
getResolveOptions(new String[] {"runtime", "compile"}));
assertFalse(r.hasError());
@@ -1122,29 +1118,29 @@
// compile extends runtime
// first we resolve compile conf only
- _ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.2.xml").toURL(),
+ ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.2.xml").toURL(),
getResolveOptions(new String[] {"compile"}));
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
// then we resolve runtime conf
- _ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.2.xml").toURL(),
+ ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.2.xml").toURL(),
getResolveOptions(new String[] {"runtime"}));
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
// same as before, but resolve both confs in one call
- ResolveReport r = _ivy.resolve(new File(
+ ResolveReport r = ivy.resolve(new File(
"test/repositories/1/org2/mod2.1/ivys/ivy-0.3.2.xml").toURL(),
getResolveOptions(new String[] {"runtime", "compile"}));
assertFalse(r.hasError());
@@ -1158,29 +1154,29 @@
// runtime extends compile
// first we resolve compile conf only
- _ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.3.xml").toURL(),
+ ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.3.xml").toURL(),
getResolveOptions(new String[] {"compile"}));
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
// then we resolve runtime conf
- _ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.3.xml").toURL(),
+ ivy.resolve(new File("test/repositories/1/org2/mod2.1/ivys/ivy-0.3.3.xml").toURL(),
getResolveOptions(new String[] {"runtime"}));
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
// same as before, but resolve both confs in one call
- ResolveReport r = _ivy.resolve(new File(
+ ResolveReport r = ivy.resolve(new File(
"test/repositories/1/org2/mod2.1/ivys/ivy-0.3.3.xml").toURL(),
getResolveOptions(new String[] {"runtime", "compile"}));
assertFalse(r.hasError());
@@ -1195,7 +1191,7 @@
// mod2.1 (compile, runtime) depends on mod1.1 which depends on mod1.2
// compile conf is not transitive and extends runtime
- ResolveReport r = _ivy.resolve(new File("test/repositories/1/org2/mod2.2/ivys/ivy-0.6.xml")
+ ResolveReport r = ivy.resolve(new File("test/repositories/1/org2/mod2.2/ivys/ivy-0.6.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertFalse(r.hasError());
@@ -1203,18 +1199,18 @@
assertEquals(new HashSet(Arrays.asList(new ModuleRevisionId[] {
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"),
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),
- ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"),})), r
- .getConfigurationReport("A").getModuleRevisionIds());
+ ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")})),
+ r.getConfigurationReport("A").getModuleRevisionIds());
// here we should get only mod2.1 and mod1.1 cause compile is not transitive in mod2.1
assertEquals(new HashSet(Arrays.asList(new ModuleRevisionId[] {
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"),
- ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),})), r
- .getConfigurationReport("B").getModuleRevisionIds());
+ ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")})),
+ r.getConfigurationReport("B").getModuleRevisionIds());
// here we should get only mod2.1 cause compile is not transitive
assertEquals(new HashSet(Arrays.asList(new ModuleRevisionId[] {ModuleRevisionId
- .newInstance("org2", "mod2.1", "0.3.2"),})), r.getConfigurationReport("compile")
+ .newInstance("org2", "mod2.1", "0.3.2")})), r.getConfigurationReport("compile")
.getModuleRevisionIds());
}
@@ -1227,7 +1223,7 @@
// mod2.1 (compile, runtime) depends on mod1.1 1.0 which depends on mod1.2 2.0
// compile conf is not transitive and extends runtime
- ResolveReport r = _ivy.resolve(new File("test/repositories/1/org2/mod2.2/ivys/ivy-0.7.xml")
+ ResolveReport r = ivy.resolve(new File("test/repositories/1/org2/mod2.2/ivys/ivy-0.7.xml")
.toURL(), getResolveOptions(new String[] {"A", "B", "compile"}));
assertFalse(r.hasError());
@@ -1235,19 +1231,19 @@
assertEquals(new HashSet(Arrays.asList(new ModuleRevisionId[] {
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"),
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),
- ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"),})), r
+ ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")})), r
.getConfigurationReport("A").getModuleRevisionIds());
// here we should get only mod2.1 and mod1.1 cause compile is not transitive in mod2.1
assertEquals(new HashSet(Arrays.asList(new ModuleRevisionId[] {
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"),
- ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),})), r
+ ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")})), r
.getConfigurationReport("B").getModuleRevisionIds());
// here we should get only mod2.1 cause compile is not transitive
assertEquals(new HashSet(Arrays.asList(new ModuleRevisionId[] {
ModuleRevisionId.newInstance("org2", "mod2.1", "0.3.2"),
- ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),})), r
+ ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")})), r
.getConfigurationReport("compile").getModuleRevisionIds());
}
@@ -1255,7 +1251,7 @@
// mod4.1 depends on
// - mod1.1 which depends on mod1.2
// - mod3.1 which depends on mod1.2
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.0.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.0.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1263,18 +1259,18 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1", "4.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org3", "mod3.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.0", "mod3.1", "jar", "jar").exists());
}
@@ -1283,7 +1279,7 @@
// mod4.1 v 4.1 depends on
// - mod1.1 v 1.0 which depends on mod1.2 v 2.0
// - mod3.1 v 1.1 which depends on mod1.2 v 2.1
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.1.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.1.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1291,7 +1287,7 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1", "4.1");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
ConfigurationResolveReport crr = report.getConfigurationReport("default");
@@ -1301,7 +1297,7 @@
assertEquals(1, crr.getDownloadReports(ModuleRevisionId
.newInstance("org1", "mod1.2", "2.1")).length);
- File r = _cacheManager.getConfigurationResolveReportInCache(ResolveOptions
+ File r = cacheManager.getConfigurationResolveReportInCache(ResolveOptions
.getDefaultResolveId(md), "default");
assertTrue(r.exists());
final boolean[] found = new boolean[] {false};
@@ -1316,17 +1312,17 @@
});
assertTrue(found[0]); // the report should contain the evicted revision
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org3", "mod3.1", "1.1")).exists());
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.1", "mod3.1", "jar", "jar").exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
@@ -1336,7 +1332,7 @@
// - mod1.1 v 1.0 which depends on mod1.2 v 2.0
// - mod3.1 v 1.1 which depends on mod1.2 v 2.1
// - mod6.1 v 0.3 which depends on mod1.2 v 2.0
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.14.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.14.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
// dependencies
@@ -1348,7 +1344,7 @@
.newInstance("org1", "mod1.2", "2.1")).length);
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1", "4.14");
- File r = _cacheManager.getConfigurationResolveReportInCache(ResolveOptions
+ File r = cacheManager.getConfigurationResolveReportInCache(ResolveOptions
.getDefaultResolveId(mrid.getModuleId()), "default");
assertTrue(r.exists());
final boolean[] found = new boolean[] {false};
@@ -1363,17 +1359,17 @@
});
assertTrue(found[0]); // the report should contain the evicted revision
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org3", "mod3.1", "1.1")).exists());
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.1", "mod3.1", "jar", "jar").exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
@@ -1409,7 +1405,7 @@
// mod7.2 v1.0 depends on mod7.1 v1.0 (which then should be evicted)
// mod7.1 v1.0 depends on mod 1.2 v1.0 (which should be evicted by transitivity)
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod7.3/ivy-1.0.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod7.3/ivy-1.0.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1417,14 +1413,14 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org7", "mod7.3", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org7", "mod7.2", "1.0")).exists());
assertTrue(getArchiveFileInCache("org7", "mod7.2", "1.0", "mod7.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org7", "mod7.1", "2.0")).exists());
assertTrue(getArchiveFileInCache("org7", "mod7.1", "2.0", "mod7.1", "jar", "jar").exists());
@@ -1439,12 +1435,12 @@
// - mod3.2 v 1.2.1 which depends on
// - mod3.1 v 1.0 which depends on mod1.2 v 2.0
// - mod1.2 v 2.1
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.13.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.13.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
@@ -1456,7 +1452,7 @@
// mod2.1 conf A depends on mod1.1 which depends on mod1.2 2.0
// mod2.1 conf B depends on mod1.2 2.1
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org2/mod2.1/ivys/ivy-0.4.xml").toURL(),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
@@ -1465,18 +1461,18 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.1", "0.4");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.1", "1.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.1", "1.0", "mod1.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
@@ -1489,7 +1485,7 @@
// mod5.2 r1.0 which depends on mod5.1 r4.0 conf B
//
// mod5.1 r4.2 conf B depends on mod1.2 r2.0
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.0.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.0.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1497,24 +1493,24 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org6", "mod6.1", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.1", "4.2")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.2", "art51A", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.2", "art51B", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.2", "1.0")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.2", "1.0", "mod5.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
// should have been evicted before download
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.1", "4.0")).exists());
assertFalse(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51A", "jar", "jar").exists());
assertFalse(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51B", "jar", "jar").exists());
@@ -1530,7 +1526,7 @@
// mod5.1 r4.2 conf A
//
// mod5.1 r4.2 conf B depends on mod1.2 r2.0
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.1.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.1.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1538,19 +1534,19 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org6", "mod6.1", "1.1");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.1", "4.2")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.2", "art51A", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.2", "art51B", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.2", "1.0")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.2", "1.0", "mod5.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
@@ -1568,7 +1564,7 @@
// mod5.1 r4.2 conf A
//
// mod5.1 r4.2 conf B depends on mod1.2 r2.0
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.2.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.2.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1576,19 +1572,19 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org6", "mod6.1", "1.2");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.1", "4.2")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.2", "art51A", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.2", "art51B", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.2", "1.0")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.2", "1.0", "mod5.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
@@ -1621,7 +1617,7 @@
// mod5.1 r4.2 conf A
//
// mod5.1 r4.2 conf B depends on mod1.2 r2.0
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.3.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod6.1/ivy-1.3.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1629,24 +1625,24 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org6", "mod6.1", "1.3");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.1", "4.2")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.2", "art51A", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.2", "art51B", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.1", "4.0")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51A", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51B", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.2", "1.0")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.2", "1.0", "mod5.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
@@ -1666,7 +1662,7 @@
// mod4.1 v 4.2 depends on
// - mod1.2 v 2.0 and forces it
// - mod3.1 v 1.1 which depends on mod1.2 v 2.1
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.2.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.2.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1674,18 +1670,18 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1", "4.2");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org3", "mod3.1", "1.1")).exists());
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.1", "mod3.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
@@ -1696,7 +1692,7 @@
// - 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
// - mod1.2 v 2.0 and forces it
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.9.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.9.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1704,10 +1700,10 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1", "4.9");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
@@ -1719,14 +1715,14 @@
// 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
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.10.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.10.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
// dependencies
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
@@ -1739,12 +1735,12 @@
// - mod3.1 v1.1 which depends on
// - mod1.2 v 2.1
// - mod1.2 v 1.0 and forces it
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.11.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.11.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
@@ -1761,12 +1757,12 @@
// - mod1.2 v 2.0 and forces it
// - mod3.1 v1.1 which depends on
// - mod1.2 v 2.1
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.12.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.12.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
@@ -1777,7 +1773,7 @@
// mod4.1 v 4.5 depends on
// - mod1.2 v 1+ and forces it
// - mod3.1 v 1.2 which depends on mod1.2 v 2+
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.5.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.5.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1785,18 +1781,18 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1", "4.5");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org3", "mod3.1", "1.2")).exists());
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.2", "mod3.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "1.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "1.1", "mod1.2", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.2")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
}
@@ -1805,7 +1801,7 @@
// mod4.1 v 4.6 (conf compile, test extends compile) depends on
// - mod1.2 v 1+ and forces it in conf compile
// - mod3.1 v 1.2 in conf test which depends on mod1.2 v 2+
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.6.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.6.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1813,18 +1809,18 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1", "4.6");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org3", "mod3.1", "1.2")).exists());
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.2", "mod3.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "1.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "1.1", "mod1.2", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.2")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
}
@@ -1835,7 +1831,7 @@
// - mod3.1 v 1.3 in conf test->runtime
// which defines confs compile, runtime extends compile
// which depends on mod1.2 v 2+ in conf compile->default
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.7.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod4.1/ivy-4.7.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1843,18 +1839,18 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org4", "mod4.1", "4.7");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org3", "mod3.1", "1.3")).exists());
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.3", "mod3.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "1.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "1.1", "mod1.2", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.2")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
}
@@ -1869,7 +1865,7 @@
// which defines confs compile, runtime extends compile
// which depends on mod1.2 v 2+ in conf compile->default
// which depends on mod4.1 v 4+ in conf compile->compile
- ResolveReport report = _ivy.resolve(ResolveTest.class.getResource("ivy-182.xml"),
+ ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-182.xml"),
getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1878,15 +1874,15 @@
assertEquals(mid, md.getModuleRevisionId().getModuleId());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org3", "mod3.1", "1.4")).exists());
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.4", "mod3.1", "jar", "jar").exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "1.1")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "1.1", "mod1.2", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.2")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
}
@@ -1898,7 +1894,7 @@
// mod4.1 v 4.1 depends on
// - mod1.1 v 1.0 which depends on mod1.2 v 2.0
// - mod3.1 v 1.1 which depends on mod1.2 v 2.1
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod10.1/ivy-1.0.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod10.1/ivy-1.0.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1906,14 +1902,14 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org10", "mod10.1", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// conflicting dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
@@ -1926,15 +1922,15 @@
// mod4.1 v 4.3 depends on
// - mod1.2 v 2.1
// - mod3.1 v 1.1 which depends on mod1.2 v 2.1
- _ivy.resolve(new File("test/repositories/2/mod10.1/ivy-1.1.xml").toURL(),
+ ivy.resolve(new File("test/repositories/2/mod10.1/ivy-1.1.xml").toURL(),
getResolveOptions(new String[] {"*"}));
// conflicting dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertFalse(_cacheManager.getIvyFileInCache(
+ assertFalse(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org1", "mod1.2", "2.1")).exists());
assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.1", "mod1.2", "jar", "jar").exists());
}
@@ -1948,7 +1944,7 @@
// mod4.1 v 4.4 depends on
// - mod1.2 v 2.0 but selects mod1.2 v 2.1
// - mod3.1 v 1.1 which depends on mod1.2 v 2.1
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod10.1/ivy-1.3.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod10.1/ivy-1.3.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
IvyNode[] evicted = report.getConfigurationReport("default").getEvictedNodes();
@@ -1962,7 +1958,7 @@
// mod5.1 conf B publishes art51B
// mod5.1 conf B extends conf A
// mod5.1 conf A publishes art51A
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod5.2/ivy-1.0.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod5.2/ivy-1.0.xml")
.toURL(), getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1970,10 +1966,10 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org5", "mod5.2", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org5", "mod5.1", "4.0")).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51B", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.0", "art51A", "jar", "jar").exists());
@@ -1983,7 +1979,7 @@
// mod 5.2 depends on mod5.1 conf B in its conf B and conf A in its conf A
// mod5.1 conf B publishes art51B
// mod5.1 conf A publishes art51A
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod5.2/ivy-2.0.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod5.2/ivy-2.0.xml")
.toURL(), getResolveOptions(new String[] {"B", "A"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -1991,7 +1987,7 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org5", "mod5.2", "2.0");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
ModuleRevisionId depId = ModuleRevisionId.newInstance("org5", "mod5.1", "4.1");
@@ -2000,7 +1996,7 @@
assertNotNull(crr);
assertEquals(1, crr.getDownloadReports(depId).length);
- File r = new File(_cache, ResolveOptions.getDefaultResolveId(mrid.getModuleId()) + "-A.xml");
+ File r = new File(cache, ResolveOptions.getDefaultResolveId(mrid.getModuleId()) + "-A.xml");
assertTrue(r.exists());
final boolean[] found = new boolean[] {false};
SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
@@ -2014,13 +2010,13 @@
});
assertFalse(found[0]);
- assertTrue(_cacheManager.getIvyFileInCache(depId).exists());
+ assertTrue(cacheManager.getIvyFileInCache(depId).exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.1", "art51A", "jar", "jar").exists());
assertTrue(getArchiveFileInCache("org5", "mod5.1", "4.1", "art51B", "jar", "jar").exists());
}
public void testThisConfiguration() throws Exception {
- ResolveReport report = _ivy.resolve(new File("test/repositories/2/mod14.4/ivy-1.1.xml")
+ ResolveReport report = ivy.resolve(new File("test/repositories/2/mod14.4/ivy-1.1.xml")
.toURL(), getResolveOptions(new String[] {"compile"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
@@ -2031,46 +2027,46 @@
ConfigurationResolveReport crr = report.getConfigurationReport("compile");
assertNotNull(crr);
assertEquals(4, crr.getArtifactsNumber());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org14", "mod14.3", "1.1")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org14", "mod14.2", "1.1")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org14", "mod14.1", "1.1")).exists());
- assertTrue(!_cacheManager.getIvyFileInCache(
+ assertTrue(!cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org8", "mod8.3", "1.0")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org8", "mod8.1", "1.0")).exists());
cleanCache();
createCache();
- report = _ivy.resolve(new File("test/repositories/2/mod14.4/ivy-1.1.xml").toURL(),
+ report = ivy.resolve(new File("test/repositories/2/mod14.4/ivy-1.1.xml").toURL(),
getResolveOptions(new String[] {"standalone"}));
crr = report.getConfigurationReport("standalone");
assertNotNull(crr);
assertEquals(7, crr.getArtifactsNumber());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org14", "mod14.3", "1.1")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org14", "mod14.1", "1.1")).exists());
- assertTrue(!_cacheManager.getIvyFileInCache(
+ assertTrue(!cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org14", "mod14.2", "1.1")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org14", "mod14.3", "1.1")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org8", "mod8.3", "1.0")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org8", "mod8.1", "1.0")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org8", "mod8.4", "1.1")).exists());
- assertTrue(_cacheManager.getIvyFileInCache(
+ assertTrue(cacheManager.getIvyFileInCache(
ModuleRevisionId.newInstance("org8", "mod8.2", "1.1")).exists());
}
public void testLatest() throws Exception {
// mod1.4 depends on latest mod1.2
- ResolveReport report = _ivy.resolve(new File(
+ ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.4/ivys/ivy-1.0.1.xml").toURL(),
getResolveOptions(new String[] {"default"}));
assertNotNull(report);
@@ -2079,7 +2075,7 @@
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.4", "1.0.1");
assertEquals(mrid, md.getModuleRevisionId());
- assertTrue(_cacheManager.getResolvedIvyFileInCache(mrid).exists());
+ assertTrue(cacheManager.getResolvedIvyFileInCache(mrid).exists());
// dependencies
ModuleRevisionId depId = ModuleRevisionId.newInstance("org1", "mod1.2", "2.2");
@@ -2088,7 +2084,7 @@
assertNotNull(crr);
assertEquals(1, crr.getDownloadReports(depId).length);
- File r = _cacheManager.getConfigurationResolveReportInCache(ResolveOptions
+ File r = cacheManager.getConfigurationResolveReportInCache(ResolveOptions
.getDefaultResolveId(mrid.getModuleId()), "default");
assertTrue(r.exists());
final boolean[] found = new boolean[] {false};
@@ -2103,7 +2099,7 @@
});
assertTrue(found[0]);
- assertTrue(_cacheManager.getIvyFileInCache(depId).exists());
+ assertTrue(cacheManager.getIvyFileInCache(depId).exists());
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
}
@@ -2111,16 +2107,16 @@
// mod1.5 depends on
// latest mod1.4, which depends on mod1.2 2.2
// latest mod1.2 (which is 2.2)
- ResolveReport report = _ivy.resolve(new File(
[... 702 lines stripped ...]