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 xa...@apache.org on 2007/01/31 11:00:37 UTC
svn commit: r501796 [7/10] - in /incubator/ivy/core/trunk:
src/java/org/apache/ivy/ src/java/org/apache/ivy/ant/
src/java/org/apache/ivy/core/ src/java/org/apache/ivy/core/cache/
src/java/org/apache/ivy/core/event/ src/java/org/apache/ivy/core/event/do...
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=501796&r1=501795&r2=501796
==============================================================================
--- 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 Wed Jan 31 03:00:29 2007
@@ -24,10 +24,8 @@
import junit.framework.TestCase;
-import org.apache.ivy.Ivy;
-import org.apache.ivy.ant.IvyPublish;
-import org.apache.ivy.ant.IvyResolve;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
import org.apache.ivy.util.FileUtil;
import org.apache.tools.ant.BuildException;
@@ -106,7 +104,7 @@
assertTrue(new File("test/repositories/1/apache/resolve-simple/jars/resolve-simple-1.2.jar").exists());
// should have updated published ivy version
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new Ivy(), new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), new File("test/repositories/1/apache/resolve-simple/ivys/ivy-1.2.xml").toURL(), false);
assertEquals("1.2", md.getModuleRevisionId().getRevision());
}
@@ -159,7 +157,7 @@
assertTrue(new File("test/repositories/1/apache/resolve-custom/jars/resolve-custom-1.2.jar").exists());
// should have updated published ivy version
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new Ivy(), dest.toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), dest.toURL(), false);
assertEquals("1.2", md.getModuleRevisionId().getRevision());
// should have kept custom attributes
@@ -196,7 +194,7 @@
assertTrue(new File("test/repositories/1/apache/resolve-latest/jars/resolve-latest-1.3.jar").exists());
// the published ivy version should be ok (ok in ivy-publish file)
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new Ivy(), new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").toURL(), false);
assertEquals("1.3", md.getModuleRevisionId().getRevision());
// should not have done delivery (replace dynamic revisions with static ones)
@@ -225,7 +223,7 @@
assertTrue(new File("test/repositories/1/apache/resolve-latest/jars/resolve-latest-1.3.jar").exists());
// should have updated published ivy version
- ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new Ivy(), new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").toURL(), false);
+ ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), new File("test/repositories/1/apache/resolve-latest/ivys/ivy-1.3.xml").toURL(), false);
assertEquals("1.3", md.getModuleRevisionId().getRevision());
}
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=501796&r1=501795&r2=501796
==============================================================================
--- 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 Wed Jan 31 03:00:29 2007
@@ -21,8 +21,6 @@
import junit.framework.TestCase;
-import org.apache.ivy.ant.IvyReport;
-import org.apache.ivy.ant.IvyResolve;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
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=501796&r1=501795&r2=501796
==============================================================================
--- 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 Wed Jan 31 03:00:29 2007
@@ -21,7 +21,6 @@
import junit.framework.TestCase;
-import org.apache.ivy.ant.IvyRepositoryReport;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
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=501796&r1=501795&r2=501796
==============================================================================
--- 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 Wed Jan 31 03:00:29 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.apache.ivy.Ivy;
-import org.apache.ivy.ant.IvyResolve;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -64,14 +64,26 @@
_resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-simple.xml"));
_resolve.execute();
- assertTrue(getIvy().getResolvedIvyFileInCache(_cache, ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
+ assertTrue(getResolvedIvyFileInCache(ModuleRevisionId.newInstance("apache", "resolve-simple", "1.0")).exists());
// dependencies
- assertTrue(getIvy().getIvyFileInCache(_cache, ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
- assertTrue(getIvy().getArchiveFileInCache(_cache, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+ assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
- public void testInline() throws Exception {
+ private File getArchiveFileInCache(String organisation, String module, String revision, String artifact, String type, String ext) {
+ return TestHelper.getArchiveFileInCache(getIvy(), _cache,
+ organisation, module, revision, artifact, type, ext);
+ }
+ private File getIvyFileInCache(ModuleRevisionId id) {
+ return getIvy().getCacheManager(_cache).getIvyFileInCache(id);
+ }
+
+ private File getResolvedIvyFileInCache(ModuleRevisionId 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");
@@ -80,23 +92,23 @@
_resolve.execute();
// dependencies
- assertTrue(getIvy().getIvyFileInCache(_cache, ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
- assertTrue(getIvy().getArchiveFileInCache(_cache, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+ assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
}
public void testWithSlashes() throws Exception {
_resolve.setFile(new File("test/java/org/apache/ivy/core/resolve/ivy-198.xml"));
_resolve.execute();
- File resolvedIvyFileInCache = getIvy().getResolvedIvyFileInCache(_cache, ModuleRevisionId.newInstance("myorg/mydep", "system/module", "1.0"));
+ File resolvedIvyFileInCache = getResolvedIvyFileInCache(ModuleRevisionId.newInstance("myorg/mydep", "system/module", "1.0"));
assertTrue(resolvedIvyFileInCache.exists());
// dependencies
- assertTrue(getIvy().getIvyFileInCache(_cache, ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
- assertTrue(getIvy().getArchiveFileInCache(_cache, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
+ assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0")).exists());
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.0", "mod1.2", "jar", "jar").exists());
- assertTrue(getIvy().getIvyFileInCache(_cache, ModuleRevisionId.newInstance("yourorg/yourdep", "yoursys/yourmod", "1.0")).exists());
- assertTrue(getIvy().getArchiveFileInCache(_cache, "yourorg/yourdep", "yoursys/yourmod", "1.0", "yourmod", "jar", "jar").exists());
+ assertTrue(getIvyFileInCache(ModuleRevisionId.newInstance("yourorg/yourdep", "yoursys/yourmod", "1.0")).exists());
+ assertTrue(getArchiveFileInCache("yourorg/yourdep", "yoursys/yourmod", "1.0", "yourmod", "jar", "jar").exists());
}
public void testDepsChanged() throws Exception {
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java?view=diff&rev=501796&r1=501795&r2=501796
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyRetrieveTest.java Wed Jan 31 03:00:29 2007
@@ -22,12 +22,8 @@
import junit.framework.TestCase;
-import org.apache.ivy.ant.IvyResolve;
-import org.apache.ivy.ant.IvyRetrieve;
+import org.apache.ivy.TestHelper;
import org.apache.ivy.core.IvyPatternHelper;
-import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
-import org.apache.ivy.core.report.ResolveReport;
-import org.apache.ivy.core.retrieve.RetrieveTest;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
@@ -100,7 +96,7 @@
resolve.setFile(new File("test/java/org/apache/ivy/ant/ivy-latest.xml"));
resolve.execute();
- assertTrue(_retrieve.getIvyInstance().getArchiveFileInCache(_cache, "org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
+ assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
// then we resolve a dependency directly
_retrieve.setOrganisation("org1");
@@ -328,6 +324,10 @@
file.getParentFile().mkdirs();
}
file.createNewFile();
+ }
+ private File getArchiveFileInCache(String organisation, String module, String revision, String artifact, String type, String ext) {
+ return TestHelper.getArchiveFileInCache(_retrieve.getIvyInstance(), _cache,
+ organisation, module, revision, artifact, type, ext);
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyVarTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyVarTest.java?view=diff&rev=501796&r1=501795&r2=501796
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyVarTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyVarTest.java Wed Jan 31 03:00:29 2007
@@ -17,12 +17,10 @@
*/
package org.apache.ivy.ant;
+import junit.framework.TestCase;
+
import org.apache.ivy.Ivy;
-import org.apache.ivy.ant.IvyVar;
import org.apache.tools.ant.Project;
-
-
-import junit.framework.TestCase;
public class IvyVarTest extends TestCase {
public void testSimple() {
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/TestPerformance.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/TestPerformance.java?view=diff&rev=501796&r1=501795&r2=501796
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/TestPerformance.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/TestPerformance.java Wed Jan 31 03:00:29 2007
@@ -47,13 +47,13 @@
_ivy = new Ivy();
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("def");
- resolver.setIvy(_ivy);
+ resolver.setSettings(_ivy.getSettings());
resolver.addIvyPattern(PATTERN);
resolver.addArtifactPattern(PATTERN);
- _ivy.addResolver(resolver);
- _ivy.setDefaultResolver("def");
+ _ivy.getSettings().addResolver(resolver);
+ _ivy.getSettings().setDefaultResolver("def");
}
protected void setUp() throws Exception {
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java?view=diff&rev=501796&r1=501795&r2=501796
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/event/IvyEventFilterTest.java Wed Jan 31 03:00:29 2007
@@ -19,8 +19,9 @@
import java.util.Date;
+import junit.framework.TestCase;
+
import org.apache.ivy.Ivy;
-import org.apache.ivy.core.event.IvyEventFilter;
import org.apache.ivy.core.event.resolve.EndResolveEvent;
import org.apache.ivy.core.event.resolve.StartResolveEvent;
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
@@ -28,8 +29,6 @@
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.report.ResolveReport;
-import junit.framework.TestCase;
-
public class IvyEventFilterTest extends TestCase {
Ivy ivy = new Ivy();
ModuleDescriptor md = new DefaultModuleDescriptor(ModuleRevisionId.newInstance("foo", "bar", "1.0"), "integration", new Date());
@@ -40,62 +39,62 @@
public void testSimple() {
IvyEventFilter f = new IvyEventFilter("pre-resolve", null, null);
- assertTrue(f.accept(new StartResolveEvent(ivy, md, new String[] {"default"})));
- assertFalse(f.accept(new EndResolveEvent(ivy, md, new String[] {"default"}, new ResolveReport(md))));
+ assertTrue(f.accept(new StartResolveEvent(md, new String[] {"default"})));
+ assertFalse(f.accept(new EndResolveEvent(md, new String[] {"default"}, new ResolveReport(md))));
}
public void testSimpleExpression() {
IvyEventFilter f = new IvyEventFilter("pre-resolve", "organisation = foo", null);
- assertTrue(f.accept(new StartResolveEvent(ivy, md, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md2, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md4, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md2, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md4, new String[] {"default"})));
f = new IvyEventFilter("pre-resolve", "module = bar", null);
- assertTrue(f.accept(new StartResolveEvent(ivy, md, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md2, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md3, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md4, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md2, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md3, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md4, new String[] {"default"})));
f = new IvyEventFilter("pre-resolve", "organisation = foo, foo2", null);
- assertTrue(f.accept(new StartResolveEvent(ivy, md, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md2, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md3, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md4, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md2, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md3, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md4, new String[] {"default"})));
}
public void testAndExpression() {
IvyEventFilter f = new IvyEventFilter("pre-resolve", "organisation = foo AND module = bar", null);
- assertTrue(f.accept(new StartResolveEvent(ivy, md, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md2, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md4, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md2, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md4, new String[] {"default"})));
f = new IvyEventFilter("pre-resolve", "organisation = foo,foo2 AND module = bar", null);
- assertTrue(f.accept(new StartResolveEvent(ivy, md, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md2, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md3, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md4, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md2, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md3, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md4, new String[] {"default"})));
}
public void testOrExpression() {
IvyEventFilter f = new IvyEventFilter("pre-resolve", "organisation = foo3 OR module = bar", null);
- assertTrue(f.accept(new StartResolveEvent(ivy, md, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md2, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md3, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md4, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md2, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md3, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md4, new String[] {"default"})));
}
public void testNotExpression() {
IvyEventFilter f = new IvyEventFilter("pre-resolve", "NOT organisation = foo", null);
- assertFalse(f.accept(new StartResolveEvent(ivy, md, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md2, new String[] {"default"})));
- assertTrue(f.accept(new StartResolveEvent(ivy, md3, new String[] {"default"})));
- assertFalse(f.accept(new StartResolveEvent(ivy, md4, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md2, new String[] {"default"})));
+ assertTrue(f.accept(new StartResolveEvent(md3, new String[] {"default"})));
+ assertFalse(f.accept(new StartResolveEvent(md4, new String[] {"default"})));
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java?view=diff&rev=501796&r1=501795&r2=501796
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/install/InstallTest.java Wed Jan 31 03:00:29 2007
@@ -19,23 +19,22 @@
import java.io.File;
+import junit.framework.TestCase;
+
import org.apache.ivy.Ivy;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.plugins.matcher.PatternMatcher;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-
-import junit.framework.TestCase;
-
public class InstallTest extends TestCase {
public void testSimple() throws Exception {
- Ivy ivy = new Ivy();
+ Ivy ivy = Ivy.newInstance();
ivy.configure(new File("test/repositories/ivyconf.xml"));
ivy.install(ModuleRevisionId.newInstance("org1", "mod1.2", "2.0"),
- ivy.getDefaultResolver().getName(),
+ ivy.getSettings().getDefaultResolver().getName(),
"install", true, true, true, null, _cache, PatternMatcher.EXACT);
assertTrue(new File("build/test/install/org1/mod1.2/ivy-2.0.xml").exists());
@@ -43,11 +42,11 @@
}
public void testDependencies() throws Exception {
- Ivy ivy = new Ivy();
+ Ivy ivy = Ivy.newInstance();
ivy.configure(new File("test/repositories/ivyconf.xml"));
ivy.install(ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),
- ivy.getDefaultResolver().getName(),
+ ivy.getSettings().getDefaultResolver().getName(),
"install", true, true, true, null, _cache, PatternMatcher.EXACT);
assertTrue(new File("build/test/install/org1/mod1.1/ivy-1.0.xml").exists());
@@ -58,11 +57,11 @@
}
public void testNotTransitive() throws Exception {
- Ivy ivy = new Ivy();
+ Ivy ivy = Ivy.newInstance();
ivy.configure(new File("test/repositories/ivyconf.xml"));
ivy.install(ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"),
- ivy.getDefaultResolver().getName(),
+ ivy.getSettings().getDefaultResolver().getName(),
"install", false, true, true, null, _cache, PatternMatcher.EXACT);
assertTrue(new File("build/test/install/org1/mod1.1/ivy-1.0.xml").exists());
@@ -73,7 +72,7 @@
}
public void testRegexpMatcher() throws Exception {
- Ivy ivy = new Ivy();
+ Ivy ivy = Ivy.newInstance();
ivy.configure(new File("test/repositories/ivyconf.xml"));
ivy.install(ModuleRevisionId.newInstance("org1", ".*", ".*"),
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java?view=diff&rev=501796&r1=501795&r2=501796
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java Wed Jan 31 03:00:29 2007
@@ -18,8 +18,6 @@
package org.apache.ivy.core.module.descriptor;
-import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
-
import junit.framework.TestCase;
public class DefaultDependencyDescriptorTest extends TestCase {
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java?view=diff&rev=501796&r1=501795&r2=501796
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java Wed Jan 31 03:00:29 2007
@@ -20,8 +20,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-
import junit.framework.TestCase;
public class ModuleRevisionIdTest extends TestCase {