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/08/06 14:25:12 UTC
svn commit: r563149 [1/2] - in
/incubator/ivy/core/trunk/test/java/org/apache/ivy: ant/ core/
Author: gscokart
Date: Mon Aug 6 07:25:11 2007
New Revision: 563149
URL: http://svn.apache.org/viewvc?view=rev&rev=563149
Log:
clean formating
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyTaskTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/TestPerformance.java
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java Mon Aug 6 07:25:11 2007
@@ -28,25 +28,25 @@
import org.apache.tools.ant.types.Path;
public class IvyCachePathTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyCachePath _path;
+ private IvyCachePath path;
- private Project _project;
+ private Project project;
protected void setUp() throws Exception {
createCache();
- _project = new Project();
- _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+ project = new Project();
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _path = new IvyCachePath();
- _path.setProject(_project);
- _path.setCache(_cache);
+ path = new IvyCachePath();
+ path.setProject(project);
+ path.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -56,15 +56,15 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
public void testSimple() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
- _path.setPathid("simple-pathid");
- _path.execute();
- Object ref = _project.getReference("simple-pathid");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
+ path.setPathid("simple-pathid");
+ path.execute();
+ Object ref = project.getReference("simple-pathid");
assertNotNull(ref);
assertTrue(ref instanceof Path);
Path p = (Path) ref;
@@ -76,20 +76,20 @@
public void testInline1() throws Exception {
// we first resolve another ivy file
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
+ resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
resolve.execute();
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
// then we resolve a dependency directly
- _path.setOrganisation("org1");
- _path.setModule("mod1.2");
- _path.setRevision("2.0");
- _path.setInline(true);
- _path.setPathid("simple-pathid");
- _path.execute();
- Object ref = _project.getReference("simple-pathid");
+ path.setOrganisation("org1");
+ path.setModule("mod1.2");
+ path.setRevision("2.0");
+ path.setInline(true);
+ path.setPathid("simple-pathid");
+ path.execute();
+ Object ref = project.getReference("simple-pathid");
assertNotNull(ref);
assertTrue(ref instanceof Path);
Path p = (Path) ref;
@@ -100,13 +100,13 @@
public void testInline2() throws Exception {
// we first resolve a dependency directly
- _path.setOrganisation("org1");
- _path.setModule("mod1.2");
- _path.setRevision("2.0");
- _path.setInline(true);
- _path.setPathid("simple-pathid");
- _path.execute();
- Object ref = _project.getReference("simple-pathid");
+ path.setOrganisation("org1");
+ path.setModule("mod1.2");
+ path.setRevision("2.0");
+ path.setInline(true);
+ path.setPathid("simple-pathid");
+ path.execute();
+ Object ref = project.getReference("simple-pathid");
assertNotNull(ref);
assertTrue(ref instanceof Path);
Path p = (Path) ref;
@@ -116,7 +116,7 @@
// we then resolve another ivy file
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
+ resolve.setProject(project);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
resolve.execute();
@@ -124,11 +124,11 @@
}
public void testEmptyConf() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-108.xml");
- _path.setPathid("emptyconf-pathid");
- _path.setConf("empty");
- _path.execute();
- Object ref = _project.getReference("emptyconf-pathid");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-108.xml");
+ path.setPathid("emptyconf-pathid");
+ path.setConf("empty");
+ path.execute();
+ Object ref = project.getReference("emptyconf-pathid");
assertNotNull(ref);
assertTrue(ref instanceof Path);
Path p = (Path) ref;
@@ -137,9 +137,9 @@
public void testFailure() throws Exception {
try {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
- _path.setPathid("failure-pathid");
- _path.execute();
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
+ path.setPathid("failure-pathid");
+ path.execute();
fail("failure didn't raised an exception with default haltonfailure setting");
} catch (BuildException ex) {
// ok => should raised an exception
@@ -148,10 +148,10 @@
public void testHaltOnFailure() throws Exception {
try {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
- _path.setPathid("haltfailure-pathid");
- _path.setHaltonfailure(false);
- _path.execute();
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
+ path.setPathid("haltfailure-pathid");
+ path.setHaltonfailure(false);
+ path.execute();
} catch (BuildException ex) {
fail("failure raised an exception with haltonfailure set to false");
}
@@ -159,24 +159,24 @@
public void testWithResolveId() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setResolveId("withResolveId");
resolve.execute();
// resolve another ivy file
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
resolve.execute();
- _path.setResolveId("withResolveId");
- _path.setPathid("withresolveid-pathid");
- _path.execute();
+ path.setResolveId("withResolveId");
+ path.setPathid("withresolveid-pathid");
+ path.execute();
- Object ref = _project.getReference("withresolveid-pathid");
+ Object ref = project.getReference("withresolveid-pathid");
assertNotNull(ref);
assertTrue(ref instanceof Path);
Path p = (Path) ref;
@@ -191,24 +191,24 @@
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
- resolve.setCache(_cache);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setResolveId("withResolveId");
resolve.execute();
// resolve another ivy file
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
resolve.execute();
- _path.setResolveId("withResolveId");
- _path.setPathid("withresolveid-pathid");
- _path.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _path.execute();
+ path.setResolveId("withResolveId");
+ path.setPathid("withresolveid-pathid");
+ path.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ path.execute();
- Object ref = _project.getReference("withresolveid-pathid");
+ Object ref = project.getReference("withresolveid-pathid");
assertNotNull(ref);
assertTrue(ref instanceof Path);
Path p = (Path) ref;
@@ -223,7 +223,7 @@
IvyResolve resolve = new IvyResolve();
resolve.setProject(project);
- resolve.setCache(_cache);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setResolveId("testWithResolveIdAndMissingConfs");
resolve.setConf("default");
@@ -231,23 +231,23 @@
// resolve another ivy file
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
resolve.execute();
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
- _path.setResolveId("testWithResolveIdAndMissingConfs");
- _path.setPathid("withresolveid-pathid");
- _path.setConf("default,compile");
- _path.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
- _path.execute();
+ path.setResolveId("testWithResolveIdAndMissingConfs");
+ path.setPathid("withresolveid-pathid");
+ path.setConf("default,compile");
+ path.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
+ path.execute();
}
private File getArchiveFileInCache(String organisation, String module, String revision,
String artifact, String type, String ext) {
- return TestHelper.getArchiveFileInCache(_path.getIvyInstance(), _cache, organisation,
+ return TestHelper.getArchiveFileInCache(path.getIvyInstance(), cache, organisation,
module, revision, artifact, type, ext);
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyDeliverTest.java Mon Aug 6 07:25:11 2007
@@ -35,28 +35,28 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyDeliverTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyDeliver _deliver;
+ private IvyDeliver deliver;
- private Project _project;
+ private Project project;
protected void setUp() throws Exception {
cleanTestDir();
cleanRep();
createCache();
- _project = new Project();
- _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _project.setProperty("build", "build/test/deliver");
-
- _deliver = new IvyDeliver();
- _deliver.setProject(_project);
- _deliver.setCache(_cache);
+ project = new Project();
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+ project.setProperty("build", "build/test/deliver");
+
+ deliver = new IvyDeliver();
+ deliver.setProject(project);
+ deliver.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -68,7 +68,7 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
@@ -87,14 +87,14 @@
}
public void testSimple() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.execute();
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
@@ -111,23 +111,23 @@
public void testWithResolveId() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setResolveId("withResolveId");
resolve.execute();
// resolve another ivy file
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
resolve.execute();
- _deliver.setResolveId("withResolveId");
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.execute();
+ deliver.setResolveId("withResolveId");
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
@@ -151,22 +151,22 @@
// do a resolve in the new build
IvyResolve resolve = new IvyResolve();
resolve.setProject(other);
- resolve.setCache(_cache);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setResolveId("withResolveId");
resolve.execute();
// resolve another ivy file
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
resolve.execute();
- _deliver.setResolveId("withResolveId");
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.execute();
+ deliver.setResolveId("withResolveId");
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
@@ -183,14 +183,14 @@
public void testWithBranch() throws Exception {
// test case for IVY-404
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest-branch.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest-branch.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.execute();
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
@@ -207,16 +207,16 @@
public void testWithExtraAttributes() throws Exception {
// test case for IVY-415
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest-extra.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest-extra.xml");
IvyResolve res = new IvyResolve();
res.setValidate(false);
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.setValidate(false);
- _deliver.execute();
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.setValidate(false);
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
@@ -234,14 +234,14 @@
}
public void testReplaceImportedConfigurations() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-import-confs.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-import-confs.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.execute();
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
@@ -255,16 +255,16 @@
}
public void testReplaceVariables() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-with-variables.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-with-variables.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
res.getIvyInstance().getSettings().setVariable("myvar", "myvalue");
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.execute();
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
@@ -278,15 +278,15 @@
}
public void testNoReplaceDynamicRev() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.setReplacedynamicrev(false);
- _deliver.execute();
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.setReplacedynamicrev(false);
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
@@ -302,15 +302,15 @@
}
public void testDifferentRevisionsForSameModule() throws Exception {
- _project.setProperty("ivy.dep.file",
+ project.setProperty("ivy.dep.file",
"test/java/org/apache/ivy/ant/ivy-different-revisions.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _deliver.setPubrevision("1.2");
- _deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
- _deliver.execute();
+ deliver.setPubrevision("1.2");
+ deliver.setDeliverpattern("build/test/deliver/ivy-[revision].xml");
+ deliver.execute();
// should have done the ivy delivering
File deliveredIvyFile = new File("build/test/deliver/ivy-1.2.xml");
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyFindRevisionTest.java Mon Aug 6 07:25:11 2007
@@ -25,22 +25,22 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyFindRevisionTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyFindRevision _findRevision;
+ private IvyFindRevision findRevision;
protected void setUp() throws Exception {
createCache();
Project project = new Project();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _findRevision = new IvyFindRevision();
- _findRevision.setProject(project);
+ findRevision = new IvyFindRevision();
+ findRevision.setProject(project);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -50,33 +50,33 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
public void testProperty() throws Exception {
- _findRevision.setOrganisation("org1");
- _findRevision.setModule("mod1.1");
- _findRevision.setRevision("1.0");
- _findRevision.setProperty("test.revision");
- _findRevision.execute();
- assertEquals("1.0", _findRevision.getProject().getProperty("test.revision"));
+ findRevision.setOrganisation("org1");
+ findRevision.setModule("mod1.1");
+ findRevision.setRevision("1.0");
+ findRevision.setProperty("test.revision");
+ findRevision.execute();
+ assertEquals("1.0", findRevision.getProject().getProperty("test.revision"));
}
public void testLatest() throws Exception {
- _findRevision.setOrganisation("org1");
- _findRevision.setModule("mod1.1");
- _findRevision.setRevision("latest.integration");
- _findRevision.execute();
- assertEquals("2.0", _findRevision.getProject().getProperty("ivy.revision"));
+ findRevision.setOrganisation("org1");
+ findRevision.setModule("mod1.1");
+ findRevision.setRevision("latest.integration");
+ findRevision.execute();
+ assertEquals("2.0", findRevision.getProject().getProperty("ivy.revision"));
}
public void testLatestSubversion() throws Exception {
- _findRevision.setOrganisation("org1");
- _findRevision.setModule("mod1.1");
- _findRevision.setRevision("1.0+");
- _findRevision.execute();
- assertEquals("1.0.1", _findRevision.getProject().getProperty("ivy.revision"));
+ findRevision.setOrganisation("org1");
+ findRevision.setModule("mod1.1");
+ findRevision.setRevision("1.0+");
+ findRevision.execute();
+ assertEquals("1.0.1", findRevision.getProject().getProperty("ivy.revision"));
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java Mon Aug 6 07:25:11 2007
@@ -26,26 +26,26 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyInstallTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyInstall _install;
+ private IvyInstall install;
- private Project _project;
+ private Project project;
protected void setUp() throws Exception {
createCache();
cleanTestLib();
- _project = new Project();
- _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+ project = new Project();
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _install = new IvyInstall();
- _install.setProject(_project);
- _install.setCache(_cache);
+ install = new IvyInstall();
+ install.setProject(project);
+ install.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -56,7 +56,7 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
@@ -68,14 +68,14 @@
}
public void testDependencyNotFoundFailure() {
- _install.setOrganisation("xxx");
- _install.setModule("yyy");
- _install.setRevision("zzz");
- _install.setFrom("test");
- _install.setTo("1");
+ install.setOrganisation("xxx");
+ install.setModule("yyy");
+ install.setRevision("zzz");
+ install.setFrom("test");
+ install.setTo("1");
try {
- _install.execute();
+ install.execute();
fail("unknown dependency, failure expected (haltunresolved=true)");
} catch (BuildException be) {
// success
@@ -83,15 +83,15 @@
}
public void testDependencyNotFoundSuccess() {
- _install.setOrganisation("xxx");
- _install.setModule("yyy");
- _install.setRevision("zzz");
- _install.setFrom("test");
- _install.setTo("1");
- _install.setHaltonfailure(false);
+ install.setOrganisation("xxx");
+ install.setModule("yyy");
+ install.setRevision("zzz");
+ install.setFrom("test");
+ install.setTo("1");
+ install.setHaltonfailure(false);
try {
- _install.execute();
+ install.execute();
} catch (BuildException be) {
fail("unknown dependency, failure unexepected (haltunresolved=false)");
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyListModulesTest.java Mon Aug 6 07:25:11 2007
@@ -25,22 +25,22 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyListModulesTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyListModules _findModules;
+ private IvyListModules findModules;
protected void setUp() throws Exception {
createCache();
Project project = new Project();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _findModules = new IvyListModules();
- _findModules.setProject(project);
+ findModules = new IvyListModules();
+ findModules.setProject(project);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -50,30 +50,30 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
public void testExact() throws Exception {
- _findModules.setOrganisation("org1");
- _findModules.setModule("mod1.1");
- _findModules.setRevision("1.0");
- _findModules.setProperty("found");
- _findModules.setValue("[organisation]/[module]/[revision]");
- _findModules.execute();
- assertEquals("org1/mod1.1/1.0", _findModules.getProject().getProperty("found"));
+ findModules.setOrganisation("org1");
+ findModules.setModule("mod1.1");
+ findModules.setRevision("1.0");
+ findModules.setProperty("found");
+ findModules.setValue("[organisation]/[module]/[revision]");
+ findModules.execute();
+ assertEquals("org1/mod1.1/1.0", findModules.getProject().getProperty("found"));
}
public void testAllRevs() throws Exception {
- _findModules.setOrganisation("org1");
- _findModules.setModule("mod1.1");
- _findModules.setRevision("*");
- _findModules.setProperty("found.[revision]");
- _findModules.setValue("true");
- _findModules.execute();
- assertEquals("true", _findModules.getProject().getProperty("found.1.0"));
- assertEquals("true", _findModules.getProject().getProperty("found.1.1"));
- assertEquals("true", _findModules.getProject().getProperty("found.2.0"));
+ findModules.setOrganisation("org1");
+ findModules.setModule("mod1.1");
+ findModules.setRevision("*");
+ findModules.setProperty("found.[revision]");
+ findModules.setValue("true");
+ findModules.execute();
+ assertEquals("true", findModules.getProject().getProperty("found.1.0"));
+ assertEquals("true", findModules.getProject().getProperty("found.1.1"));
+ assertEquals("true", findModules.getProject().getProperty("found.2.0"));
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPostResolveTaskTest.java Mon Aug 6 07:25:11 2007
@@ -30,31 +30,31 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyPostResolveTaskTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyPostResolveTask _task;
+ private IvyPostResolveTask task;
- private Project _project;
+ private Project project;
protected void setUp() throws Exception {
Message.init(new DefaultMessageImpl(10));
createCache();
- _project = new Project();
- _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+ project = new Project();
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _task = new IvyPostResolveTask() {
+ task = new IvyPostResolveTask() {
public void doExecute() throws BuildException {
prepareAndCheck();
}
};
- _task.setProject(_project);
- _task.setCache(_cache);
+ task.setProject(project);
+ task.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -64,24 +64,24 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
public void testWithPreviousResolveInSameBuildAndLessConfs() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("default,compile");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("default");
- _task.execute();
+ task.setConf("default");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
reportAfter);
@@ -89,18 +89,18 @@
public void testWithPreviousResolveInSameBuildAndSameConfs() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("default");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("default");
- _task.execute();
+ task.setConf("default");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
reportAfter);
@@ -108,18 +108,18 @@
public void testWithPreviousResolveInSameBuildAndWildcard() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("*");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("default");
- _task.execute();
+ task.setConf("default");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
reportAfter);
@@ -127,18 +127,18 @@
public void testWithPreviousResolveInSameBuildAndBothWildcard() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("*");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("*");
- _task.execute();
+ task.setConf("*");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
reportAfter);
@@ -146,20 +146,22 @@
public void testWithPreviousResolveInSameBuildAndMoreConfs() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("compile");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
- assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
- assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
+ assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar")
+ .exists());
+ assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar")
+ .exists());
- _task.setConf("*");
- _task.execute();
+ task.setConf("*");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
assertNotSame("IvyPostResolveTask hasn't performed a resolve where it should have",
reportBefore, reportAfter);
@@ -168,21 +170,23 @@
public void testWithoutKeep() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("compile");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
- assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
- assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
-
- _task.setConf("*"); // will trigger a resolve
- _task.setKeep(false); // don't keep the resolve results
- _task.execute();
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
+ assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar")
+ .exists());
+ assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar")
+ .exists());
+
+ task.setConf("*"); // will trigger a resolve
+ task.setKeep(false); // don't keep the resolve results
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
assertSame("IvyPostResolveTask has kept the resolve report where it should have",
reportBefore, reportAfter);
@@ -190,14 +194,14 @@
}
public void testInlineWithoutKeep() throws Exception {
- _task.setOrganisation("org1");
- _task.setModule("mod1.1");
- _task.setRevision("2.0");
- _task.setInline(true);
- _task.setConf("*"); // will trigger a resolve
- _task.execute();
+ task.setOrganisation("org1");
+ task.setModule("mod1.1");
+ task.setRevision("2.0");
+ task.setInline(true);
+ task.setConf("*"); // will trigger a resolve
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
assertNull("IvyPostResolveTask has kept the resolve report where it should have",
reportAfter);
@@ -205,15 +209,15 @@
}
public void testInlineWithKeep() throws Exception {
- _task.setOrganisation("org1");
- _task.setModule("mod1.1");
- _task.setRevision("2.0");
- _task.setInline(true);
- _task.setKeep(true);
- _task.setConf("*"); // will trigger a resolve
- _task.execute();
+ task.setOrganisation("org1");
+ task.setModule("mod1.1");
+ task.setRevision("2.0");
+ task.setInline(true);
+ task.setKeep(true);
+ task.setConf("*"); // will trigger a resolve
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
assertNotNull("IvyPostResolveTask has kept the resolve report where it should have",
reportAfter);
@@ -222,32 +226,32 @@
public void testWithResolveIdAndPreviousResolveInSameBuildAndLessConfs() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("default,compile");
resolve.setResolveId("testResolveId");
resolve.execute();
- ResolveReport report1 = (ResolveReport) _project
+ ResolveReport report1 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
// perform another resolve
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setConf("*");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("default");
- _task.setResolveId("testResolveId");
- _task.execute();
+ task.setConf("default");
+ task.setResolveId("testResolveId");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
@@ -258,32 +262,32 @@
public void testWithResolveIdAndPreviousResolveInSameBuildAndSameConfs() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("default");
resolve.setResolveId("testResolveId");
resolve.execute();
- ResolveReport report1 = (ResolveReport) _project
+ ResolveReport report1 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
// perform another resolve
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setConf("*");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("default");
- _task.setResolveId("testResolveId");
- _task.execute();
+ task.setConf("default");
+ task.setResolveId("testResolveId");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
@@ -294,32 +298,32 @@
public void testWithResolveIdAndPreviousResolveInSameBuildAndWildcard() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("*");
resolve.setResolveId("testResolveId");
resolve.execute();
- ResolveReport report1 = (ResolveReport) _project
+ ResolveReport report1 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
// perform another resolve
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setConf("*");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("default");
- _task.setResolveId("testResolveId");
- _task.execute();
+ task.setConf("default");
+ task.setResolveId("testResolveId");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
@@ -330,32 +334,32 @@
public void testWithResolveIdAndPreviousResolveInSameBuildAndBothWildcard() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("*");
resolve.setResolveId("testResolveId");
resolve.execute();
- ResolveReport report1 = (ResolveReport) _project
+ ResolveReport report1 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
// perform another resolve
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setConf("*");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("*");
- _task.setResolveId("testResolveId");
- _task.execute();
+ task.setConf("*");
+ task.setResolveId("testResolveId");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
assertSame("IvyPostResolveTask has performed a resolve where it shouldn't", reportBefore,
@@ -366,34 +370,36 @@
public void testWithResolveIdAndPreviousResolveInSameBuildAndMoreConfs() throws Exception {
IvyResolve resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setConf("compile");
resolve.setResolveId("testResolveId");
resolve.execute();
- ResolveReport report1 = (ResolveReport) _project
+ ResolveReport report1 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
- assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar").exists());
- assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+ assertTrue(getArchiveFileInCache("org1", "mod1.1", "2.0", "mod1.1", "jar", "jar")
+ .exists());
+ assertFalse(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar")
+ .exists());
// perform another resolve
resolve = new IvyResolve();
- resolve.setProject(_project);
- resolve.setCache(_cache);
+ resolve.setProject(project);
+ resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setConf("*");
resolve.execute();
- ResolveReport reportBefore = (ResolveReport) _project.getReference("ivy.resolved.report");
+ ResolveReport reportBefore = (ResolveReport) project.getReference("ivy.resolved.report");
- _task.setConf("*");
- _task.setResolveId("testResolveId");
- _task.execute();
+ task.setConf("*");
+ task.setResolveId("testResolveId");
+ task.execute();
- ResolveReport reportAfter = (ResolveReport) _project.getReference("ivy.resolved.report");
- ResolveReport report2 = (ResolveReport) _project
+ ResolveReport reportAfter = (ResolveReport) project.getReference("ivy.resolved.report");
+ ResolveReport report2 = (ResolveReport) project
.getReference("ivy.resolved.report.testResolveId");
assertNotSame("IvyPostResolveTask hasn't performed a resolve where it should have",
@@ -405,7 +411,7 @@
private File getArchiveFileInCache(String organisation, String module, String revision,
String artifact, String type, String ext) {
- return TestHelper.getArchiveFileInCache(_task.getIvyInstance(), _cache, organisation,
+ return TestHelper.getArchiveFileInCache(task.getIvyInstance(), cache, organisation,
module, revision, artifact, type, ext);
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyPublishTest.java Mon Aug 6 07:25:11 2007
@@ -36,30 +36,30 @@
import org.apache.tools.ant.taskdefs.Echo;
public class IvyPublishTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyPublish _publish;
+ private IvyPublish publish;
- private Project _project;
+ private Project project;
protected void setUp() throws Exception {
cleanTestDir();
cleanRep();
createCache();
- _project = new Project();
- _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _project.setProperty("build", "build/test/publish");
-
- _publish = new IvyPublish();
- _publish.setProject(_project);
- _publish.setCache(_cache);
+ project = new Project();
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+ project.setProperty("build", "build/test/publish");
+
+ publish = new IvyPublish();
+ publish.setProject(project);
+ publish.setCache(cache);
Message.init(new DefaultMessageImpl(10));
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -71,7 +71,7 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
@@ -90,16 +90,16 @@
}
public void testSimple() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.2");
- _publish.setResolver("1");
+ publish.setPubrevision("1.2");
+ publish.setResolver("1");
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
- _publish.execute();
+ publish.execute();
// should have do the ivy delivering
assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
@@ -117,18 +117,18 @@
}
public void testPublishNotAllConfigs() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-multiconf.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.2");
- _publish.setResolver("1");
- _publish.setConf("compile");
- _publish.setUpdate(true);
+ publish.setPubrevision("1.2");
+ publish.setResolver("1");
+ publish.setConf("compile");
+ publish.setUpdate(true);
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
- _publish.execute();
+ publish.execute();
// should have do the ivy delivering
assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
@@ -151,20 +151,20 @@
}
public void testMultiPatterns() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-publish-multi.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-publish-multi.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.2");
- _publish.setResolver("1");
+ publish.setPubrevision("1.2");
+ publish.setResolver("1");
File art = new File("build/test/publish/1/multi1-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
art = new File("build/test/publish/2/multi2-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
- _publish.addArtifactspattern("build/test/publish/1/[artifact]-[revision].[ext]");
- _publish.addArtifactspattern("build/test/publish/2/[artifact]-[revision].[ext]");
- _publish.execute();
+ publish.addArtifactspattern("build/test/publish/1/[artifact]-[revision].[ext]");
+ publish.addArtifactspattern("build/test/publish/2/[artifact]-[revision].[ext]");
+ publish.execute();
// should have do the ivy delivering
assertTrue(new File("build/test/publish/1/ivy-1.2.xml").exists());
@@ -176,19 +176,19 @@
}
public void testCustom() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-custom.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-custom.xml");
IvyResolve res = new IvyResolve();
res.setValidate(false);
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.2");
- _publish.setPubdate("20060906141243");
- _publish.setResolver("1");
- _publish.setValidate(false);
+ publish.setPubrevision("1.2");
+ publish.setPubdate("20060906141243");
+ publish.setResolver("1");
+ publish.setValidate(false);
File art = new File("build/test/publish/resolve-custom-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
- _publish.execute();
+ publish.execute();
// should have do the ivy delivering
assertTrue(new File("build/test/publish/ivy-1.2.xml").exists());
@@ -218,21 +218,21 @@
}
public void testNoDeliver() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.3");
- _publish.setResolver("1");
- _publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
+ publish.setPubrevision("1.3");
+ publish.setResolver("1");
+ publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-publish.xml"), new File(
"build/test/publish/ivy-1.3.xml"), null);
File art = new File("build/test/publish/resolve-latest-1.3.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
- _publish.execute();
+ publish.execute();
// should have published the files with "1" resolver
assertTrue(new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").exists());
@@ -251,22 +251,22 @@
}
public void testForceDeliver() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.3");
- _publish.setResolver("1");
- _publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
- _publish.setForcedeliver(true);
+ publish.setPubrevision("1.3");
+ publish.setResolver("1");
+ publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
+ publish.setForcedeliver(true);
FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"), new File(
"build/test/publish/ivy-1.3.xml"), null);
File art = new File("build/test/publish/resolve-latest-1.3.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
- _publish.execute();
+ publish.execute();
// should have published the files with "1" resolver
assertTrue(new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").exists());
@@ -281,14 +281,14 @@
}
public void testBadNoDeliver() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-latest.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.3");
- _publish.setResolver("1");
- _publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
+ publish.setPubrevision("1.3");
+ publish.setResolver("1");
+ publish.setSrcivypattern("build/test/publish/ivy-1.3.xml");
FileUtil.copy(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"), new File(
"build/test/publish/ivy-1.3.xml"), null);
@@ -296,26 +296,26 @@
File art = new File("build/test/publish/resolve-latest-1.3.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
try {
- _publish.execute();
+ publish.execute();
fail("shouldn't publish ivy file with bad revision");
} catch (BuildException ex) {
-
+ //normal
}
}
public void testReadonly() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.2");
- _publish.setResolver("1");
+ publish.setPubrevision("1.2");
+ publish.setResolver("1");
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
Echo echo = new Echo();
- echo.setProject(_project);
+ echo.setProject(project);
echo.setMessage("new version");
echo.setFile(art);
echo.execute();
@@ -325,7 +325,7 @@
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), dest, null);
echo = new Echo();
- echo.setProject(_project);
+ echo.setProject(project);
echo.setMessage("old version");
echo.setFile(dest);
echo.execute();
@@ -333,7 +333,7 @@
dest.setReadOnly();
try {
- _publish.execute();
+ publish.execute();
fail("by default, publish should fail when a readonly artifact already exist");
} catch (Exception ex) {
assertTrue(dest.exists());
@@ -344,18 +344,18 @@
}
public void testOverwrite() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.2");
- _publish.setResolver("1");
+ publish.setPubrevision("1.2");
+ publish.setResolver("1");
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
Echo echo = new Echo();
- echo.setProject(_project);
+ echo.setProject(project);
echo.setMessage("new version");
echo.setFile(art);
echo.execute();
@@ -365,13 +365,13 @@
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), dest, null);
echo = new Echo();
- echo.setProject(_project);
+ echo.setProject(project);
echo.setMessage("old version");
echo.setFile(dest);
echo.execute();
- _publish.setOverwrite(true);
- _publish.execute();
+ publish.setOverwrite(true);
+ publish.execute();
assertTrue(dest.exists());
BufferedReader reader = new BufferedReader(new FileReader(dest));
assertEquals("new version", reader.readLine());
@@ -379,18 +379,18 @@
}
public void testOverwriteReadOnly() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _publish.setPubrevision("1.2");
- _publish.setResolver("1");
+ publish.setPubrevision("1.2");
+ publish.setResolver("1");
File art = new File("build/test/publish/resolve-simple-1.2.jar");
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), art, null);
Echo echo = new Echo();
- echo.setProject(_project);
+ echo.setProject(project);
echo.setMessage("new version");
echo.setFile(art);
echo.execute();
@@ -400,15 +400,15 @@
FileUtil.copy(new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), dest, null);
echo = new Echo();
- echo.setProject(_project);
+ echo.setProject(project);
echo.setMessage("old version");
echo.setFile(dest);
echo.execute();
dest.setReadOnly();
- _publish.setOverwrite(true);
- _publish.execute();
+ publish.setOverwrite(true);
+ publish.execute();
assertTrue(dest.exists());
BufferedReader reader = new BufferedReader(new FileReader(dest));
assertEquals("new version", reader.readLine());
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyReportTest.java Mon Aug 6 07:25:11 2007
@@ -25,26 +25,26 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyReportTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyReport _report;
+ private IvyReport report;
- private Project _project;
+ private Project project;
protected void setUp() throws Exception {
createCache();
- _project = new Project();
- _project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+ project = new Project();
+ project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _report = new IvyReport();
- _report.setTaskName("report");
- _report.setProject(_project);
- _report.setCache(_cache);
+ report = new IvyReport();
+ report.setTaskName("report");
+ report.setProject(project);
+ report.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -54,26 +54,26 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
public void testRegularCircular() throws Exception {
- _project.setProperty("ivy.dep.file", "test/repositories/2/mod11.1/ivy-1.0.xml");
+ project.setProperty("ivy.dep.file", "test/repositories/2/mod11.1/ivy-1.0.xml");
IvyResolve res = new IvyResolve();
- res.setProject(_project);
+ res.setProject(project);
res.execute();
- _report.setTodir(new File(_cache, "report"));
- _report.setXml(true);
+ report.setTodir(new File(cache, "report"));
+ report.setXml(true);
// do not test any xsl transformation here, because of problems of build in our continuous
// integration server
- _report.setXsl(false);
- _report.setGraph(false);
+ report.setXsl(false);
+ report.setGraph(false);
- _report.execute();
+ report.execute();
- assertTrue(new File(_cache, "report/org11-mod11.1-compile.xml").exists());
+ assertTrue(new File(cache, "report/org11-mod11.1-compile.xml").exists());
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRepositoryReportTest.java Mon Aug 6 07:25:11 2007
@@ -25,23 +25,23 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyRepositoryReportTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyRepositoryReport _report;
+ private IvyRepositoryReport report;
protected void setUp() throws Exception {
createCache();
Project project = new Project();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings-1.xml");
- _report = new IvyRepositoryReport();
- _report.setProject(project);
- _report.setCache(_cache);
+ report = new IvyRepositoryReport();
+ report.setProject(project);
+ report.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -51,7 +51,7 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java?view=diff&rev=563149&r1=563148&r2=563149
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyResolveTest.java Mon Aug 6 07:25:11 2007
@@ -29,23 +29,23 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyResolveTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyResolve _resolve;
+ private IvyResolve resolve;
protected void setUp() throws Exception {
createCache();
Project project = new Project();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _resolve = new IvyResolve();
- _resolve.setProject(project);
- _resolve.setCache(_cache);
+ resolve = new IvyResolve();
+ resolve.setProject(project);
+ resolve.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -55,14 +55,14 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
public void testSimple() throws Exception {
// depends on org="org1" name="mod1.2" rev="2.0"
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.execute();
assertTrue(getResolvedIvyFileInCache(
ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
@@ -75,25 +75,25 @@
private File getArchiveFileInCache(String organisation, String module, String revision,
String artifact, String type, String ext) {
- return TestHelper.getArchiveFileInCache(getIvy(), _cache, organisation, module, revision,
+ return TestHelper.getArchiveFileInCache(getIvy(), cache, organisation, module, revision,
artifact, type, ext);
}
private File getIvyFileInCache(ModuleRevisionId id) {
- return getIvy().getCacheManager(_cache).getIvyFileInCache(id);
+ return getIvy().getCacheManager(cache).getIvyFileInCache(id);
}
private File getResolvedIvyFileInCache(ModuleRevisionId id) {
- return getIvy().getCacheManager(_cache).getResolvedIvyFileInCache(id);
+ return getIvy().getCacheManager(cache).getResolvedIvyFileInCache(id);
}
public void testInline() throws Exception {
// same as before, but expressing dependency directly without ivy file
- _resolve.setOrganisation("org1");
- _resolve.setModule("mod1.2");
- _resolve.setRevision("2.0");
- _resolve.setInline(true);
- _resolve.execute();
+ resolve.setOrganisation("org1");
+ resolve.setModule("mod1.2");
+ resolve.setRevision("2.0");
+ resolve.setInline(true);
+ resolve.execute();
// dependencies
assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"))
@@ -102,8 +102,8 @@
}
public void testWithSlashes() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/core/resolve/ivy-198.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/core/resolve/ivy-198.xml"));
+ resolve.execute();
File resolvedIvyFileInCache = getResolvedIvyFileInCache(ModuleRevisionId.newInstance(
"myorg/mydep", "system/module", "1.0"));
@@ -121,36 +121,36 @@
}
public void testDepsChanged() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.execute();
assertEquals("true", getIvy().getVariable("ivy.deps.changed"));
- _resolve.execute();
+ resolve.execute();
assertEquals("false", getIvy().getVariable("ivy.deps.changed"));
}
public void testConflictingDepsChanged() throws Exception {
- _resolve.setFile(new File("test/repositories/2/mod4.1/ivy-4.1.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/repositories/2/mod4.1/ivy-4.1.xml"));
+ resolve.execute();
assertEquals("true", getIvy().getVariable("ivy.deps.changed"));
- _resolve.execute();
+ resolve.execute();
assertEquals("false", getIvy().getVariable("ivy.deps.changed"));
}
public void testDouble() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.execute();
assertEquals("resolve-simple", getIvy().getVariable("ivy.module"));
assertEquals("1.0", getIvy().getVariable("ivy.revision"));
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-double.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-double.xml"));
+ resolve.execute();
assertEquals("resolve-double", getIvy().getVariable("ivy.module"));
assertEquals("1.1", getIvy().getVariable("ivy.revision"));
@@ -158,8 +158,8 @@
public void testFailure() throws Exception {
try {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
+ resolve.execute();
fail("failure didn't raised an exception with default haltonfailure setting");
} catch (BuildException ex) {
// ok => should raise an exception
@@ -168,8 +168,8 @@
public void testFailureOnBadDependencyIvyFile() throws Exception {
try {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure2.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure2.xml"));
+ resolve.execute();
fail("failure didn't raised an exception with default haltonfailure setting");
} catch (BuildException ex) {
// ok => should raise an exception
@@ -178,8 +178,8 @@
public void testFailureOnBadStatusInDependencyIvyFile() throws Exception {
try {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure3.xml"));
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure3.xml"));
+ resolve.execute();
fail("failure didn't raised an exception with default haltonfailure setting");
} catch (BuildException ex) {
// ok => should raise an exception
@@ -188,9 +188,9 @@
public void testHaltOnFailure() throws Exception {
try {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
- _resolve.setHaltonfailure(false);
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-failure.xml"));
+ resolve.setHaltonfailure(false);
+ resolve.execute();
} catch (BuildException ex) {
ex.printStackTrace();
fail("failure raised an exception with haltonfailure set to false");
@@ -198,13 +198,13 @@
}
public void testWithResolveId() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.setResolveId("testWithResolveId");
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setResolveId("testWithResolveId");
+ resolve.execute();
assertTrue(getResolvedIvyFileInCache(
ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
- assertTrue(getIvy().getCacheManager(_cache).getConfigurationResolveReportInCache(
+ assertTrue(getIvy().getCacheManager(cache).getConfigurationResolveReportInCache(
"testWithResolveId", "default").exists());
// dependencies
@@ -213,7 +213,7 @@
assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
// test the properties
- Project project = _resolve.getProject();
+ Project project = resolve.getProject();
assertEquals("apache", project.getProperty("ivy.organisation"));
assertEquals("apache", project.getProperty("ivy.organisation.testWithResolveId"));
assertEquals("resolve-simple", project.getProperty("ivy.module"));
@@ -236,17 +236,17 @@
}
public void testDoubleResolveWithResolveId() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.setResolveId("testWithResolveId");
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setResolveId("testWithResolveId");
+ resolve.execute();
IvyResolve newResolve = new IvyResolve();
- newResolve.setProject(_resolve.getProject());
+ newResolve.setProject(resolve.getProject());
newResolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple2.xml"));
newResolve.execute();
// test the properties
- Project project = _resolve.getProject();
+ Project project = resolve.getProject();
assertEquals("apache2", project.getProperty("ivy.organisation"));
assertEquals("apache", project.getProperty("ivy.organisation.testWithResolveId"));
assertEquals("resolve-simple2", project.getProperty("ivy.module"));
@@ -269,18 +269,18 @@
}
public void testDifferentResolveWithSameResolveId() throws Exception {
- _resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _resolve.setResolveId("testWithResolveId");
- _resolve.execute();
+ resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ resolve.setResolveId("testWithResolveId");
+ resolve.execute();
IvyResolve newResolve = new IvyResolve();
- newResolve.setProject(_resolve.getProject());
+ newResolve.setProject(resolve.getProject());
newResolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple2.xml"));
newResolve.setResolveId("testWithResolveId");
newResolve.execute();
// test the properties
- Project project = _resolve.getProject();
+ Project project = resolve.getProject();
assertEquals("apache2", project.getProperty("ivy.organisation"));
assertEquals("apache2", project.getProperty("ivy.organisation.testWithResolveId"));
assertEquals("resolve-simple2", project.getProperty("ivy.module"));
@@ -305,8 +305,8 @@
public void testResolveWithAbsoluteFile() {
// IVY-396
File ivyFile = new File("test/java/org/apache/ivy/ant/ivy-simple.xml");
- _resolve.getProject().setProperty("ivy.dep.file", ivyFile.getAbsolutePath());
- _resolve.execute();
+ resolve.getProject().setProperty("ivy.dep.file", ivyFile.getAbsolutePath());
+ resolve.execute();
assertTrue(getResolvedIvyFileInCache(
ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
@@ -314,16 +314,16 @@
public void testResolveWithRelativeFile() {
// IVY-396
- _resolve.getProject().setProperty("ivy.dep.file",
+ resolve.getProject().setProperty("ivy.dep.file",
"test/java/org/apache/ivy/ant/ivy-simple.xml");
- _resolve.execute();
+ resolve.execute();
assertTrue(getResolvedIvyFileInCache(
ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
}
private Ivy getIvy() {
- return _resolve.getIvyInstance();
+ return resolve.getIvyInstance();
}
}