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 [1/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/
Author: gscokart
Date: Sat Jun 23 14:59:40 2007
New Revision: 550119
URL: http://svn.apache.org/viewvc?view=rev&rev=550119
Log:
clean code
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java?view=diff&rev=550119&r1=550118&r2=550119
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java Sat Jun 23 14:59:40 2007
@@ -97,6 +97,7 @@
try {
defaultIvy.configureDefault();
} catch (Exception e) {
+ //???
}
}
return defaultIvy;
@@ -143,11 +144,13 @@
public Object peek(String key) {
synchronized (contextMap) {
Object o = contextMap.get(key);
- if (o == null)
+ if (o == null) {
return null;
+ }
if (o instanceof List) {
- if (((List) o).size() == 0)
+ if (((List) o).size() == 0) {
return null;
+ }
Object ret = ((List) o).get(0);
return ret;
} else {
@@ -167,11 +170,13 @@
public Object pop(String key) {
synchronized (contextMap) {
Object o = contextMap.get(key);
- if (o == null)
+ if (o == null) {
return null;
+ }
if (o instanceof List) {
- if (((List) o).size() == 0)
+ if (((List) o).size() == 0) {
return null;
+ }
Object ret = ((List) o).remove(0);
return ret;
} else {
@@ -192,14 +197,17 @@
public boolean pop(String key, Object expectedValue) {
synchronized (contextMap) {
Object o = contextMap.get(key);
- if (o == null)
+ if (o == null) {
return false;
+ }
if (o instanceof List) {
- if (((List) o).size() == 0)
+ if (((List) o).size() == 0) {
return false;
+ }
Object top = ((List) o).get(0);
- if (!top.equals(expectedValue))
+ if (!top.equals(expectedValue)) {
return false;
+ }
((List) o).remove(0);
return true;
} else {
@@ -221,8 +229,9 @@
*/
public void push(String key, Object value) {
synchronized (contextMap) {
- if (!contextMap.containsKey(key))
+ if (!contextMap.containsKey(key)) {
contextMap.put(key, new LinkedList());
+ }
Object o = contextMap.get(key);
if (o instanceof List) {
((List) o).add(0, value);
@@ -280,7 +289,7 @@
// public IvyNode getRoot() {
// return (IvyNode) _root.get();
// }
- //
+ //
// public void setRoot(IvyNode root) {
// _root = new WeakReference(root);
// }
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java?view=diff&rev=550119&r1=550118&r2=550119
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java Sat Jun 23 14:59:40 2007
@@ -35,7 +35,12 @@
/**
*/
-public class IvyPatternHelper {
+public final class IvyPatternHelper {
+
+ private IvyPatternHelper() {
+ //Helper class
+ }
+
public static final String CONF_KEY = "conf";
public static final String TYPE_KEY = "type";
@@ -62,7 +67,8 @@
public static String substitute(String pattern, ModuleRevisionId moduleRevision) {
return substitute(pattern, moduleRevision.getOrganisation(), moduleRevision.getName(),
- moduleRevision.getRevision(), "ivy", "ivy", "xml", null, moduleRevision.getAttributes());
+ moduleRevision.getRevision(), "ivy", "ivy", "xml", null,
+ moduleRevision.getAttributes());
}
public static String substitute(String pattern, ModuleRevisionId moduleRevision,
@@ -165,8 +171,8 @@
String var = m.group(1);
String val = (String) variables.get(var);
if (val != null) {
- int index;
- if ((index = substituting.indexOf(var)) != -1) {
+ int index = substituting.indexOf(var);
+ if (index != -1) {
List cycle = new ArrayList(substituting.subList(index, substituting.size()));
cycle.add(var);
throw new IllegalArgumentException("cyclic variable definition: cycle = "
@@ -335,8 +341,8 @@
String var = m.group(1);
String val = (String) params.get(var);
if (val != null) {
- int index;
- if ((index = substituting.indexOf(var)) != -1) {
+ int index = substituting.indexOf(var);
+ if (index != -1) {
List cycle = new ArrayList(substituting.subList(index, substituting.size()));
cycle.add(var);
throw new IllegalArgumentException("cyclic param definition: cycle = " + cycle);
@@ -357,7 +363,8 @@
}
public static void main(String[] args) {
- String pattern = "[organisation]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]";
+ String pattern = "[organisation]/[module]/build/archives/[type]s/"
+ + "[artifact]-[revision].[ext]";
System.out.println("pattern= " + pattern);
System.out.println("resolved= "
+ substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntCallTriggerTest.java?view=diff&rev=550119&r1=550118&r2=550119
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntCallTriggerTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/AntCallTriggerTest.java Sat Jun 23 14:59:40 2007
@@ -70,10 +70,10 @@
// Project project = new Project();
// project.setBaseDir(buildFile.getParentFile());
// project.init();
- //
+ //
// ant.setProject(project);
// ant.setTaskName("ant");
- //
+ //
// ant.setAntfile(buildFile.getAbsolutePath());
// ant.setInheritAll(false);
// if (target != null) {
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java?view=diff&rev=550119&r1=550118&r2=550119
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactPropertyTest.java Sat Jun 23 14:59:40 2007
@@ -26,25 +26,25 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyArtifactPropertyTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyArtifactProperty _prop;
+ private IvyArtifactProperty prop;
- 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");
- _prop = new IvyArtifactProperty();
- _prop.setProject(_project);
- _prop.setCache(_cache);
+ prop = new IvyArtifactProperty();
+ prop.setProject(project);
+ prop.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,51 +54,51 @@
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");
- _prop.setName("[module].[artifact]-[revision]");
- _prop.setValue("${cache.dir}/[module]/[artifact]-[revision].[type]");
- _prop.execute();
- String val = _project.getProperty("mod1.2.mod1.2-2.0");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
+ prop.setName("[module].[artifact]-[revision]");
+ prop.setValue("${cache.dir}/[module]/[artifact]-[revision].[type]");
+ prop.execute();
+ String val = project.getProperty("mod1.2.mod1.2-2.0");
assertNotNull(val);
assertEquals("build/cache/mod1.2/mod1.2-2.0.jar", val);
}
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("abc");
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();
- _prop.setName("[module].[artifact]-[revision]");
- _prop.setValue("${cache.dir}/[module]/[artifact]-[revision].[type]");
- _prop.setResolveId("abc");
- _prop.execute();
+ prop.setName("[module].[artifact]-[revision]");
+ prop.setValue("${cache.dir}/[module]/[artifact]-[revision].[type]");
+ prop.setResolveId("abc");
+ prop.execute();
- String val = _project.getProperty("mod1.2.mod1.2-2.0");
+ String val = project.getProperty("mod1.2.mod1.2-2.0");
assertNotNull(val);
assertEquals("build/cache/mod1.2/mod1.2-2.0.jar", val);
}
public void testWithResolveIdWithoutResolve() throws Exception {
try {
- _prop.setName("[module].[artifact]-[revision]");
- _prop.setValue("${cache.dir}/[module]/[artifact]-[revision].[type]");
- _prop.setResolveId("abc");
- _prop.execute();
+ prop.setName("[module].[artifact]-[revision]");
+ prop.setValue("${cache.dir}/[module]/[artifact]-[revision].[type]");
+ prop.setResolveId("abc");
+ prop.execute();
fail("Task should have failed because no resolve was performed!");
} catch (BuildException e) {
// this is expected!
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java?view=diff&rev=550119&r1=550118&r2=550119
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyArtifactReportTest.java Sat Jun 23 14:59:40 2007
@@ -25,25 +25,25 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyArtifactReportTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyArtifactReport _prop;
+ private IvyArtifactReport prop;
- 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");
- _prop = new IvyArtifactReport();
- _prop.setProject(_project);
- _prop.setCache(_cache);
+ prop = new IvyArtifactReport();
+ prop.setProject(project);
+ prop.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -53,14 +53,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 {
- _prop.setTofile(new File("build/test-artifact-report.xml"));
- _prop.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
- _prop.execute();
+ prop.setTofile(new File("build/test-artifact-report.xml"));
+ prop.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
+ prop.execute();
assertTrue(new File("build/test-artifact-report.xml").exists());
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java?view=diff&rev=550119&r1=550118&r2=550119
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildNumberTest.java Sat Jun 23 14:59:40 2007
@@ -25,22 +25,22 @@
import org.apache.tools.ant.taskdefs.Delete;
public class IvyBuildNumberTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyBuildNumber _buildNumber;
+ private IvyBuildNumber buildNumber;
protected void setUp() throws Exception {
createCache();
Project project = new Project();
project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
- _buildNumber = new IvyBuildNumber();
- _buildNumber.setProject(project);
+ buildNumber = new IvyBuildNumber();
+ buildNumber.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,115 +50,115 @@
private void cleanCache() {
Delete del = new Delete();
del.setProject(new Project());
- del.setDir(_cache);
+ del.setDir(cache);
del.execute();
}
public void testDefault() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("newmod");
- _buildNumber.execute();
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("0", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals("0", _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("newmod");
+ buildNumber.execute();
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("0", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals("0", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
public void testDefault2() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("newmod");
- _buildNumber.setDefault("1.0-dev-1");
- _buildNumber.execute();
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("1.0-dev-1", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals("1", _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("newmod");
+ buildNumber.setDefault("1.0-dev-1");
+ buildNumber.execute();
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("1.0-dev-1", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
public void testDefault3() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("newmod");
- _buildNumber.setDefault("mydefault");
- _buildNumber.execute();
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("mydefault", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("newmod");
+ buildNumber.setDefault("mydefault");
+ buildNumber.execute();
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("mydefault", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.new.build.number"));
}
public void testLatest() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("mod1.1");
- _buildNumber.execute();
- assertEquals("2.0", _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("2.1", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals("0", _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals("1", _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("mod1.1");
+ buildNumber.execute();
+ assertEquals("2.0", buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("2.1", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals("0", buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
public void testLatest2() throws Exception {
- _buildNumber.setOrganisation("orgbn");
- _buildNumber.setModule("buildnumber");
- _buildNumber.execute();
- assertEquals("test", _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("test.1", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals("1", _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("orgbn");
+ buildNumber.setModule("buildnumber");
+ buildNumber.execute();
+ assertEquals("test", buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("test.1", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
public void testPrefix() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("mod1.1");
- _buildNumber.setPrefix("test");
- _buildNumber.execute();
- assertEquals("2.0", _buildNumber.getProject().getProperty("test.revision"));
- assertEquals("2.1", _buildNumber.getProject().getProperty("test.new.revision"));
- assertEquals("0", _buildNumber.getProject().getProperty("test.build.number"));
- assertEquals("1", _buildNumber.getProject().getProperty("test.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("mod1.1");
+ buildNumber.setPrefix("test");
+ buildNumber.execute();
+ assertEquals("2.0", buildNumber.getProject().getProperty("test.revision"));
+ assertEquals("2.1", buildNumber.getProject().getProperty("test.new.revision"));
+ assertEquals("0", buildNumber.getProject().getProperty("test.build.number"));
+ assertEquals("1", buildNumber.getProject().getProperty("test.new.build.number"));
}
public void testBuildNumber() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("mod1.1");
- _buildNumber.setRevision("1.");
- _buildNumber.execute();
- assertEquals("1.1", _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("1.2", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals("1", _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals("2", _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("mod1.1");
+ buildNumber.setRevision("1.");
+ buildNumber.execute();
+ assertEquals("1.1", buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("1.2", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals("1", buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals("2", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
public void testBuildNumber2() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("mod1.5");
- _buildNumber.setRevision("1.");
- _buildNumber.execute();
- assertEquals("1.0.2", _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("1.1", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals("0", _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals("1", _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("mod1.5");
+ buildNumber.setRevision("1.");
+ buildNumber.execute();
+ assertEquals("1.0.2", buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("1.1", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals("0", buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
public void testBuildNumber3() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("mod1.1");
- _buildNumber.setRevision("1.1");
- _buildNumber.execute();
- assertEquals("1.1", _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("1.1.1", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals("1", _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("mod1.1");
+ buildNumber.setRevision("1.1");
+ buildNumber.execute();
+ assertEquals("1.1", buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("1.1.1", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals("1", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
public void testBuildNumber4() throws Exception {
- _buildNumber.setOrganisation("org1");
- _buildNumber.setModule("mod1.1");
- _buildNumber.setRevision("3.");
- _buildNumber.execute();
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.revision"));
- assertEquals("3.0", _buildNumber.getProject().getProperty("ivy.new.revision"));
- assertEquals(null, _buildNumber.getProject().getProperty("ivy.build.number"));
- assertEquals("0", _buildNumber.getProject().getProperty("ivy.new.build.number"));
+ buildNumber.setOrganisation("org1");
+ buildNumber.setModule("mod1.1");
+ buildNumber.setRevision("3.");
+ buildNumber.execute();
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.revision"));
+ assertEquals("3.0", buildNumber.getProject().getProperty("ivy.new.revision"));
+ assertEquals(null, buildNumber.getProject().getProperty("ivy.build.number"));
+ assertEquals("0", buildNumber.getProject().getProperty("ivy.new.build.number"));
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java?view=diff&rev=550119&r1=550118&r2=550119
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java Sat Jun 23 14:59:40 2007
@@ -29,25 +29,25 @@
import org.apache.tools.ant.types.FileSet;
public class IvyCacheFilesetTest extends TestCase {
- private File _cache;
+ private File cache;
- private IvyCacheFileset _fileset;
+ private IvyCacheFileset fileset;
- 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");
- _fileset = new IvyCacheFileset();
- _fileset.setProject(_project);
- _fileset.setCache(_cache);
+ fileset = new IvyCacheFileset();
+ fileset.setProject(project);
+ fileset.setCache(cache);
}
private void createCache() {
- _cache = new File("build/cache");
- _cache.mkdirs();
+ cache = new File("build/cache");
+ cache.mkdirs();
}
protected void tearDown() throws Exception {
@@ -57,19 +57,19 @@
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");
- _fileset.setSetid("simple-setid");
- _fileset.execute();
- Object ref = _project.getReference("simple-setid");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
+ fileset.setSetid("simple-setid");
+ fileset.execute();
+ Object ref = project.getReference("simple-setid");
assertNotNull(ref);
assertTrue(ref instanceof FileSet);
FileSet fs = (FileSet) ref;
- DirectoryScanner directoryScanner = fs.getDirectoryScanner(_project);
+ DirectoryScanner directoryScanner = fs.getDirectoryScanner(project);
assertEquals(1, directoryScanner.getIncludedFiles().length);
assertEquals(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar")
.getAbsolutePath(), new File("build/cache/"
@@ -78,34 +78,34 @@
private File getArchiveFileInCache(String organisation, String module, String revision,
String artifact, String type, String ext) {
- return TestHelper.getArchiveFileInCache(_fileset.getIvyInstance(), _cache, organisation,
+ return TestHelper.getArchiveFileInCache(fileset.getIvyInstance(), cache, organisation,
module, revision, artifact, type, ext);
}
private File getArchiveFileInCache(String organisation, String module, String revision,
String artifact, String type, String ext, File cache) {
- return TestHelper.getArchiveFileInCache(_fileset.getIvyInstance(), cache, organisation,
+ return TestHelper.getArchiveFileInCache(fileset.getIvyInstance(), cache, organisation,
module, revision, artifact, type, ext);
}
public void testEmptyConf() throws Exception {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-108.xml");
- _fileset.setSetid("emptyconf-setid");
- _fileset.setConf("empty");
- _fileset.execute();
- Object ref = _project.getReference("emptyconf-setid");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-108.xml");
+ fileset.setSetid("emptyconf-setid");
+ fileset.setConf("empty");
+ fileset.execute();
+ Object ref = project.getReference("emptyconf-setid");
assertNotNull(ref);
assertTrue(ref instanceof FileSet);
FileSet fs = (FileSet) ref;
- DirectoryScanner directoryScanner = fs.getDirectoryScanner(_project);
+ DirectoryScanner directoryScanner = fs.getDirectoryScanner(project);
assertEquals(0, directoryScanner.getIncludedFiles().length);
}
public void testFailure() throws Exception {
try {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
- _fileset.setSetid("failure-setid");
- _fileset.execute();
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
+ fileset.setSetid("failure-setid");
+ fileset.execute();
fail("failure didn't raised an exception with default haltonfailure setting");
} catch (BuildException ex) {
// ok => should raised an exception
@@ -114,10 +114,10 @@
public void testHaltOnFailure() throws Exception {
try {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
- _fileset.setSetid("haltfailure-setid");
- _fileset.setHaltonfailure(false);
- _fileset.execute();
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-failure.xml");
+ fileset.setSetid("haltfailure-setid");
+ fileset.setHaltonfailure(false);
+ fileset.execute();
} catch (BuildException ex) {
fail("failure raised an exception with haltonfailure set to false");
}
@@ -128,15 +128,15 @@
cache2.mkdirs();
try {
- _project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
- _fileset.setSetid("simple-setid");
- _fileset.setCache(cache2);
- _fileset.execute();
- Object ref = _project.getReference("simple-setid");
+ project.setProperty("ivy.dep.file", "test/java/org/apache/ivy/ant/ivy-simple.xml");
+ fileset.setSetid("simple-setid");
+ fileset.setCache(cache2);
+ fileset.execute();
+ Object ref = project.getReference("simple-setid");
assertNotNull(ref);
assertTrue(ref instanceof FileSet);
FileSet fs = (FileSet) ref;
- DirectoryScanner directoryScanner = fs.getDirectoryScanner(_project);
+ DirectoryScanner directoryScanner = fs.getDirectoryScanner(project);
assertEquals(1, directoryScanner.getIncludedFiles().length);
assertEquals(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar",
cache2).getAbsolutePath(), new File("build/cache2/"