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 ma...@apache.org on 2007/08/30 20:08:05 UTC
svn commit: r571290 -
/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
Author: maartenc
Date: Thu Aug 30 13:08:05 2007
New Revision: 571290
URL: http://svn.apache.org/viewvc?rev=571290&view=rev
Log:
Fixed incorrect code cleanup.
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.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?rev=571290&r1=571289&r2=571290&view=diff
==============================================================================
--- 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 Thu Aug 30 13:08:05 2007
@@ -186,11 +186,11 @@
}
public void testWithResolveIdWithoutResolve() throws Exception {
- Project project = new Project();
- project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+ Project otherProject = new Project();
+ otherProject.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
IvyResolve resolve = new IvyResolve();
- resolve.setProject(project);
+ resolve.setProject(otherProject);
resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
resolve.setResolveId("withResolveId");
@@ -218,11 +218,11 @@
}
public void testWithResolveIdAndMissingConfs() throws Exception {
- Project project = new Project();
- project.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
+ Project otherProject = new Project();
+ otherProject.setProperty("ivy.settings.file", "test/repositories/ivysettings.xml");
IvyResolve resolve = new IvyResolve();
- resolve.setProject(project);
+ resolve.setProject(otherProject);
resolve.setCache(cache);
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-multiconf.xml"));
resolve.setResolveId("testWithResolveIdAndMissingConfs");
RE: svn commit: r571290 - /incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.java
Posted by Gilles Scokart <gs...@gmail.com>.
Oups, sorry.
Gilles
> -----Original Message-----
> From: maartenc@apache.org [mailto:maartenc@apache.org]
> Sent: jeudi 30 août 2007 22:08
> To: ivy-commits@incubator.apache.org
> Subject: svn commit: r571290 -
> /incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.ja
> va
>
> Author: maartenc
> Date: Thu Aug 30 13:08:05 2007
> New Revision: 571290
>
> URL: http://svn.apache.org/viewvc?rev=571290&view=rev
> Log:
> Fixed incorrect code cleanup.
>
> Modified:
>
> incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.jav
> a
>
> Modified:
> incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.jav
> a
> URL:
> http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache
> /ivy/ant/IvyCachePathTest.java?rev=571290&r1=571289&r2=571290&view=diff
> ==========================================================================
> ====
> ---
> incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.jav
> a (original)
> +++
> incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyCachePathTest.jav
> a Thu Aug 30 13:08:05 2007
> @@ -186,11 +186,11 @@
> }
>
> public void testWithResolveIdWithoutResolve() throws Exception {
> - Project project = new Project();
> - project.setProperty("ivy.settings.file",
> "test/repositories/ivysettings.xml");
> + Project otherProject = new Project();
> + otherProject.setProperty("ivy.settings.file",
> "test/repositories/ivysettings.xml");
>
> IvyResolve resolve = new IvyResolve();
> - resolve.setProject(project);
> + resolve.setProject(otherProject);
> resolve.setCache(cache);
> resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-
> simple.xml"));
> resolve.setResolveId("withResolveId");
> @@ -218,11 +218,11 @@
> }
>
> public void testWithResolveIdAndMissingConfs() throws Exception {
> - Project project = new Project();
> - project.setProperty("ivy.settings.file",
> "test/repositories/ivysettings.xml");
> + Project otherProject = new Project();
> + otherProject.setProperty("ivy.settings.file",
> "test/repositories/ivysettings.xml");
>
> IvyResolve resolve = new IvyResolve();
> - resolve.setProject(project);
> + resolve.setProject(otherProject);
> resolve.setCache(cache);
> resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-
> multiconf.xml"));
> resolve.setResolveId("testWithResolveIdAndMissingConfs");