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/06/05 12:02:43 UTC
svn commit: r544459 [35/36] - 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/check/ src/java/org/apache/ivy/core/deliver...
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java Tue Jun 5 05:02:27 2007
@@ -41,26 +41,31 @@
*/
public class DualResolverTest extends TestCase {
private IvySettings _settings;
+
private ResolveEngine _engine;
+
private ResolveData _data;
+
private File _cache;
-
+
protected void setUp() throws Exception {
_settings = new IvySettings();
_engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings));
_cache = new File("build/cache");
- _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(_settings, _cache)));
+ _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(
+ _settings, _cache)));
_cache.mkdirs();
_settings.setDefaultCache(_cache);
}
public void testFromConf() throws Exception {
- new XmlSettingsParser(_settings).parse(DualResolverTest.class.getResource("dualresolverconf.xml"));
-
+ new XmlSettingsParser(_settings).parse(DualResolverTest.class
+ .getResource("dualresolverconf.xml"));
+
DependencyResolver resolver = _settings.getResolver("dualok");
assertNotNull(resolver);
assertTrue(resolver instanceof DualResolver);
- DualResolver dual = (DualResolver)resolver;
+ DualResolver dual = (DualResolver) resolver;
assertNotNull(dual.getIvyResolver());
assertEquals("ivy", dual.getIvyResolver().getName());
assertNotNull(dual.getArtifactResolver());
@@ -69,14 +74,15 @@
resolver = _settings.getResolver("dualnotenough");
assertNotNull(resolver);
assertTrue(resolver instanceof DualResolver);
- dual = (DualResolver)resolver;
+ dual = (DualResolver) resolver;
assertNotNull(dual.getIvyResolver());
assertNull(dual.getArtifactResolver());
}
public void testFromBadConf() throws Exception {
try {
- new XmlSettingsParser(_settings).parse(DualResolverTest.class.getResource("dualresolverconf-bad.xml"));
+ new XmlSettingsParser(_settings).parse(DualResolverTest.class
+ .getResource("dualresolverconf-bad.xml"));
fail("bad dual resolver configuration should raise exception");
} catch (Exception ex) {
// ok -> bad conf has raised an exception
@@ -86,7 +92,8 @@
public void testBad() throws Exception {
DualResolver dual = new DualResolver();
dual.setIvyResolver(new IBiblioResolver());
- DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org","mod", "rev"), false);
+ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId
+ .newInstance("org", "mod", "rev"), false);
try {
dual.getDependency(dd, _data);
fail("bad dual resolver configuration should raise exception");
@@ -97,13 +104,16 @@
public void testResolve() throws Exception {
DualResolver dual = new DualResolver();
- MockResolver ivyResolver = MockResolver.buildMockResolver("ivy", true, new GregorianCalendar(2005, 1, 20).getTime());
- MockResolver artifactResolver = MockResolver.buildMockResolver("artifact", false, new GregorianCalendar(2005, 1, 20).getTime());
+ MockResolver ivyResolver = MockResolver.buildMockResolver("ivy", true,
+ new GregorianCalendar(2005, 1, 20).getTime());
+ MockResolver artifactResolver = MockResolver.buildMockResolver("artifact", false,
+ new GregorianCalendar(2005, 1, 20).getTime());
dual.setIvyResolver(ivyResolver);
dual.setArtifactResolver(artifactResolver);
- DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org","mod", "rev"), false);
+ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId
+ .newInstance("org", "mod", "rev"), false);
ResolvedModuleRevision rmr = dual.getDependency(dd, _data);
-
+
assertNotNull(rmr);
assertEquals(dual, rmr.getArtifactResolver());
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), ivyResolver.askedDeps);
@@ -112,13 +122,16 @@
public void testResolveFromArtifact() throws Exception {
DualResolver dual = new DualResolver();
- MockResolver ivyResolver = MockResolver.buildMockResolver("ivy", false, new GregorianCalendar(2005, 1, 20).getTime());
- MockResolver artifactResolver = MockResolver.buildMockResolver("artifact", true, new GregorianCalendar(2005, 1, 20).getTime());
+ MockResolver ivyResolver = MockResolver.buildMockResolver("ivy", false,
+ new GregorianCalendar(2005, 1, 20).getTime());
+ MockResolver artifactResolver = MockResolver.buildMockResolver("artifact", true,
+ new GregorianCalendar(2005, 1, 20).getTime());
dual.setIvyResolver(ivyResolver);
dual.setArtifactResolver(artifactResolver);
- DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org","mod", "rev"), false);
+ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId
+ .newInstance("org", "mod", "rev"), false);
ResolvedModuleRevision rmr = dual.getDependency(dd, _data);
-
+
assertNotNull(rmr);
assertEquals(artifactResolver, rmr.getResolver());
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), ivyResolver.askedDeps);
@@ -127,13 +140,16 @@
public void testResolveFail() throws Exception {
DualResolver dual = new DualResolver();
- MockResolver ivyResolver = MockResolver.buildMockResolver("ivy", false, new GregorianCalendar(2005, 1, 20).getTime());
- MockResolver artifactResolver = MockResolver.buildMockResolver("artifact", false, new GregorianCalendar(2005, 1, 20).getTime());
+ MockResolver ivyResolver = MockResolver.buildMockResolver("ivy", false,
+ new GregorianCalendar(2005, 1, 20).getTime());
+ MockResolver artifactResolver = MockResolver.buildMockResolver("artifact", false,
+ new GregorianCalendar(2005, 1, 20).getTime());
dual.setIvyResolver(ivyResolver);
dual.setArtifactResolver(artifactResolver);
- DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org","mod", "rev"), false);
+ DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ModuleRevisionId
+ .newInstance("org", "mod", "rev"), false);
ResolvedModuleRevision rmr = dual.getDependency(dd, _data);
-
+
assertNull(rmr);
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), ivyResolver.askedDeps);
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), artifactResolver.askedDeps);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java Tue Jun 5 05:02:27 2007
@@ -50,35 +50,41 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-
/**
*
*/
public class FileSystemResolverTest extends TestCase {
private static final String FS = System.getProperty("file.separator");
- private static final String IVY_PATTERN = "test"+FS+"repositories"+FS+"1"+FS+"[organisation]"+FS+"[module]"+FS+"ivys"+FS+"ivy-[revision].xml";
+
+ private static final String IVY_PATTERN = "test" + FS + "repositories" + FS + "1" + FS
+ + "[organisation]" + FS + "[module]" + FS + "ivys" + FS + "ivy-[revision].xml";
+
private IvySettings _settings;
+
private ResolveEngine _engine;
+
private ResolveData _data;
+
private File _cache;
- private CacheManager _cacheManager;
-
-
+
+ private CacheManager _cacheManager;
+
public FileSystemResolverTest() {
setupLastModified();
}
-
+
protected void setUp() throws Exception {
- _settings = new IvySettings();
+ _settings = new IvySettings();
_engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings));
_cache = new File("build/cache");
- _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(_settings, _cache)));
+ _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(
+ _settings, _cache)));
_cache.mkdirs();
_cacheManager = new CacheManager(_settings, _cache);
_settings.setDefaultCache(_cache);
}
-
+
private void setupLastModified() {
// change important last modified dates cause svn doesn't keep them
long minute = 60 * 1000;
@@ -104,61 +110,66 @@
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
resolver.addIvyPattern(IVY_PATTERN);
- resolver.addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
-
+ resolver
+ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
assertEquals(pubdate, rmr.getPublicationDate());
-
-
+
// test to ask to download
DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar");
- DownloadReport report = resolver.download(new Artifact[] {artifact}, getDownloadOptions(false));
+ DownloadReport report = resolver.download(new Artifact[] {artifact},
+ getDownloadOptions(false));
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ArtifactDownloadReport ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
// test to ask to download again, should use cache
report = resolver.download(new Artifact[] {artifact}, getDownloadOptions(false));
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
}
private DownloadOptions getDownloadOptions(boolean useOrigin) {
- return new DownloadOptions(_settings, _cacheManager, null, useOrigin);
- }
+ return new DownloadOptions(_settings, _cacheManager, null, useOrigin);
+ }
- public void testMaven2() throws Exception {
+ public void testMaven2() throws Exception {
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("test");
resolver.setSettings(_settings);
resolver.setM2compatible(true);
assertEquals("test", resolver.getName());
-
- resolver.addIvyPattern("test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
- resolver.addArtifactPattern("test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
-
+
+ resolver
+ .addIvyPattern("test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver
+ .addArtifactPattern("test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "test", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
mrid = ModuleRevisionId.newInstance("org.apache.unknown", "test", "1.0");
@@ -171,15 +182,18 @@
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("test");
resolver.setSettings(_settings);
-
+
resolver.addIvyPattern("test/repositories/checksums/[module]/[artifact]-[revision].[ext]");
- resolver.addArtifactPattern("test/repositories/checksums/[module]/[artifact]-[revision].[ext]");
-
+ resolver
+ .addArtifactPattern("test/repositories/checksums/[module]/[artifact]-[revision].[ext]");
+
resolver.setChecksums("sha1, md5");
ModuleRevisionId mrid = ModuleRevisionId.newInstance("test", "allright", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
- DownloadReport dr = resolver.download(rmr.getDescriptor().getAllArtifacts(), getDownloadOptions(false));
+ DownloadReport dr = resolver.download(rmr.getDescriptor().getAllArtifacts(),
+ getDownloadOptions(false));
assertEquals(2, dr.getArtifactsReports(DownloadStatus.SUCCESSFUL).length);
resolver.setChecksums("md5");
@@ -189,20 +203,23 @@
resolver.setChecksums("none");
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNotNull(rmr);
- dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, getDownloadOptions(false));
+ dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(),
+ mrid.getName(), "jar", "jar")}, getDownloadOptions(false));
assertEquals(1, dr.getArtifactsReports(DownloadStatus.SUCCESSFUL).length);
resolver.setChecksums("md5");
mrid = ModuleRevisionId.newInstance("test", "badartcs", "1.0");
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNotNull(rmr);
- dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, getDownloadOptions(false));
+ dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(),
+ mrid.getName(), "jar", "jar")}, getDownloadOptions(false));
assertEquals(1, dr.getArtifactsReports(DownloadStatus.FAILED).length);
-
+
resolver.setChecksums("");
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNotNull(rmr);
- dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(), mrid.getName(), "jar", "jar")}, getDownloadOptions(false));
+ dr = resolver.download(new Artifact[] {new DefaultArtifact(mrid, rmr.getPublicationDate(),
+ mrid.getName(), "jar", "jar")}, getDownloadOptions(false));
assertEquals(1, dr.getArtifactsReports(DownloadStatus.SUCCESSFUL).length);
}
@@ -212,38 +229,43 @@
resolver.setSettings(_settings);
_settings.addResolver(resolver);
assertEquals("test", resolver.getName());
-
- resolver.addIvyPattern("test"+FS+"repositories"+FS+"checkmodified"+FS+"ivy-[revision].xml");
+
+ resolver.addIvyPattern("test" + FS + "repositories" + FS + "checkmodified" + FS
+ + "ivy-[revision].xml");
File modify = new File("test/repositories/checkmodified/ivy-1.0.xml");
- FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-before.xml"), modify, null, true);
+ FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-before.xml"), modify, null,
+ true);
Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
modify.setLastModified(pubdate.getTime());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
assertEquals(pubdate, rmr.getPublicationDate());
-
+
// updates ivy file in repository
- FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-after.xml"), modify, null, true);
+ FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-after.xml"), modify, null,
+ true);
pubdate = new GregorianCalendar(2005, 4, 1, 11, 0, 0).getTime();
modify.setLastModified(pubdate.getTime());
-
+
// should not get the new version
resolver.setCheckmodified(false);
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
- assertEquals(new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime(), rmr.getPublicationDate());
+ assertEquals(new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime(), rmr
+ .getPublicationDate());
// should now get the new version
resolver.setCheckmodified(true);
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
assertEquals(pubdate, rmr.getPublicationDate());
}
@@ -254,25 +276,31 @@
resolver.setSettings(_settings);
_settings.addResolver(resolver);
assertEquals("test", resolver.getName());
-
- resolver.addIvyPattern("test"+FS+"repositories"+FS+"norevision"+FS+"ivy-[module].xml");
- resolver.addArtifactPattern("test"+FS+"repositories"+FS+"norevision"+FS+"[artifact].[ext]");
+
+ resolver.addIvyPattern("test" + FS + "repositories" + FS + "norevision" + FS
+ + "ivy-[module].xml");
+ resolver.addArtifactPattern("test" + FS + "repositories" + FS + "norevision" + FS
+ + "[artifact].[ext]");
File modify = new File("test/repositories/norevision/ivy-mod1.1.xml");
File artifact = new File("test/repositories/norevision/mod1.1.jar");
-
+
// 'publish' 'before' version
- FileUtil.copy(new File("test/repositories/norevision/ivy-mod1.1-before.xml"), modify, null, true);
- FileUtil.copy(new File("test/repositories/norevision/mod1.1-before.jar"), artifact, null, true);
+ FileUtil.copy(new File("test/repositories/norevision/ivy-mod1.1-before.xml"), modify, null,
+ true);
+ FileUtil.copy(new File("test/repositories/norevision/mod1.1-before.jar"), artifact, null,
+ true);
Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
modify.setLastModified(pubdate.getTime());
-
- ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "latest.integration");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+
+ ModuleRevisionId mrid = ModuleRevisionId
+ .newInstance("org1", "mod1.1", "latest.integration");
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
-
+
assertEquals(ModuleRevisionId.newInstance("org1", "mod1.1", "1.0"), rmr.getId());
assertEquals(pubdate, rmr.getPublicationDate());
-
+
Artifact[] artifacts = rmr.getDescriptor().getArtifacts("default");
File archiveFileInCache = _cacheManager.getArchiveFileInCache(artifacts[0]);
resolver.download(artifacts, getDownloadOptions(false));
@@ -280,25 +308,28 @@
BufferedReader r = new BufferedReader(new FileReader(archiveFileInCache));
assertEquals("before", r.readLine());
r.close();
-
- // updates ivy file and artifact in repository
- FileUtil.copy(new File("test/repositories/norevision/ivy-mod1.1-after.xml"), modify, null, true);
- FileUtil.copy(new File("test/repositories/norevision/mod1.1-after.jar"), artifact, null, true);
+
+ // updates ivy file and artifact in repository
+ FileUtil.copy(new File("test/repositories/norevision/ivy-mod1.1-after.xml"), modify, null,
+ true);
+ FileUtil.copy(new File("test/repositories/norevision/mod1.1-after.jar"), artifact, null,
+ true);
pubdate = new GregorianCalendar(2005, 4, 1, 11, 0, 0).getTime();
modify.setLastModified(pubdate.getTime());
// no need to update new artifact timestamp cause it isn't used
-
- // should get the new version even if checkModified is false, beacause we ask a latest.integration
+
+ // should get the new version even if checkModified is false, beacause we ask a
+ // latest.integration
resolver.setCheckmodified(false);
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNotNull(rmr);
-
+
assertEquals(ModuleRevisionId.newInstance("org1", "mod1.1", "1.1"), rmr.getId());
assertEquals(pubdate, rmr.getPublicationDate());
artifacts = rmr.getDescriptor().getArtifacts("default");
archiveFileInCache = _cacheManager.getArchiveFileInCache(artifacts[0]);
-
+
assertFalse(archiveFileInCache.exists());
// should download the new artifact
@@ -316,25 +347,30 @@
resolver.setSettings(_settings);
_settings.addResolver(resolver);
assertEquals("test", resolver.getName());
-
- resolver.addIvyPattern("test"+FS+"repositories"+FS+"checkmodified"+FS+"ivy-[revision].xml");
- resolver.addArtifactPattern("test"+FS+"repositories"+FS+"checkmodified"+FS+"[artifact]-[revision].[ext]");
+
+ resolver.addIvyPattern("test" + FS + "repositories" + FS + "checkmodified" + FS
+ + "ivy-[revision].xml");
+ resolver.addArtifactPattern("test" + FS + "repositories" + FS + "checkmodified" + FS
+ + "[artifact]-[revision].[ext]");
File modify = new File("test/repositories/checkmodified/ivy-1.0.xml");
File artifact = new File("test/repositories/checkmodified/mod1.1-1.0.jar");
-
+
// 'publish' 'before' version
- FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-before.xml"), modify, null, true);
- FileUtil.copy(new File("test/repositories/checkmodified/mod1.1-1.0-before.jar"), artifact, null, true);
+ FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-before.xml"), modify, null,
+ true);
+ FileUtil.copy(new File("test/repositories/checkmodified/mod1.1-1.0-before.jar"), artifact,
+ null, true);
Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
modify.setLastModified(pubdate.getTime());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
assertEquals(pubdate, rmr.getPublicationDate());
-
+
Artifact[] artifacts = rmr.getDescriptor().getArtifacts("default");
resolver.download(artifacts, getDownloadOptions(false));
File archiveFileInCache = _cacheManager.getArchiveFileInCache(artifacts[0]);
@@ -342,21 +378,25 @@
BufferedReader r = new BufferedReader(new FileReader(archiveFileInCache));
assertEquals("before", r.readLine());
r.close();
-
- // updates ivy file and artifact in repository
- FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-after.xml"), modify, null, true);
- FileUtil.copy(new File("test/repositories/checkmodified/mod1.1-1.0-after.jar"), artifact, null, true);
+
+ // updates ivy file and artifact in repository
+ FileUtil.copy(new File("test/repositories/checkmodified/ivy-1.0-after.xml"), modify, null,
+ true);
+ FileUtil.copy(new File("test/repositories/checkmodified/mod1.1-1.0-after.jar"), artifact,
+ null, true);
pubdate = new GregorianCalendar(2005, 4, 1, 11, 0, 0).getTime();
modify.setLastModified(pubdate.getTime());
// no need to update new artifact timestamp cause it isn't used
-
- // should not get the new version: checkmodified is false and edpendency is not told to be a changing one
+
+ // should not get the new version: checkmodified is false and edpendency is not told to be a
+ // changing one
resolver.setCheckmodified(false);
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
- assertEquals(new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime(), rmr.getPublicationDate());
+ assertEquals(new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime(), rmr
+ .getPublicationDate());
assertTrue(archiveFileInCache.exists());
r = new BufferedReader(new FileReader(archiveFileInCache));
@@ -366,7 +406,7 @@
// should now get the new version cause we say it's a changing one
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false, true), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
assertEquals(pubdate, rmr.getPublicationDate());
@@ -385,16 +425,19 @@
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
resolver.addIvyPattern(IVY_PATTERN);
- resolver.addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
-
+ resolver
+ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+
resolver.setLatestStrategy(new LatestTimeStrategy());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "2.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1", "mod1.1", "latest.integration"), false), _data);
+ ResolvedModuleRevision rmr = resolver
+ .getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1",
+ "mod1.1", "latest.integration"), false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
Date pubdate = new GregorianCalendar(2005, 1, 15, 11, 0, 0).getTime();
assertEquals(pubdate, rmr.getPublicationDate());
@@ -405,16 +448,19 @@
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
resolver.addIvyPattern(IVY_PATTERN);
- resolver.addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
-
+ resolver
+ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+
resolver.setLatestStrategy(new LatestRevisionStrategy());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "2.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1", "mod1.1", "latest.integration"), false), _data);
+ ResolvedModuleRevision rmr = resolver
+ .getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1",
+ "mod1.1", "latest.integration"), false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
Date pubdate = new GregorianCalendar(2005, 1, 15, 11, 0, 0).getTime();
assertEquals(pubdate, rmr.getPublicationDate());
@@ -425,16 +471,19 @@
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
- resolver.addIvyPattern(new File("src/java").getAbsolutePath()+"/../../"+IVY_PATTERN);
- resolver.addArtifactPattern("src/../test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
-
+
+ resolver.addIvyPattern(new File("src/java").getAbsolutePath() + "/../../" + IVY_PATTERN);
+ resolver
+ .addArtifactPattern("src/../test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+
resolver.setLatestStrategy(new LatestRevisionStrategy());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "2.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1", "mod1.1", "latest.integration"), false), _data);
+ ResolvedModuleRevision rmr = resolver
+ .getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1",
+ "mod1.1", "latest.integration"), false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
Date pubdate = new GregorianCalendar(2005, 1, 15, 11, 0, 0).getTime();
assertEquals(pubdate, rmr.getPublicationDate());
@@ -445,16 +494,18 @@
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
resolver.addIvyPattern(IVY_PATTERN);
- resolver.addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
-
+ resolver
+ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+
resolver.setLatestStrategy(new LatestTimeStrategy());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.1");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1", "mod1.1", "1+"), false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(
+ ModuleRevisionId.newInstance("org1", "mod1.1", "1+"), false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
Date pubdate = new GregorianCalendar(2005, 0, 2, 11, 0, 0).getTime();
assertEquals(pubdate, rmr.getPublicationDate());
@@ -465,16 +516,18 @@
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
resolver.addIvyPattern(IVY_PATTERN);
- resolver.addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
-
+ resolver
+ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+
resolver.setLatestStrategy(new LatestRevisionStrategy());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.1");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("org1", "mod1.1", "1+"), false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(
+ ModuleRevisionId.newInstance("org1", "mod1.1", "1+"), false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
Date pubdate = new GregorianCalendar(2005, 0, 2, 11, 0, 0).getTime();
assertEquals(pubdate, rmr.getPublicationDate());
@@ -486,19 +539,24 @@
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
- resolver.addIvyPattern("test"+FS+"repositories"+FS+"1"+FS+"[organisation]"+FS+"[module]"+FS+"[revision]"+FS+"[artifact].[ext]");
- resolver.addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]");
-
+
+ resolver.addIvyPattern("test" + FS + "repositories" + FS + "1" + FS + "[organisation]"
+ + FS + "[module]" + FS + "[revision]" + FS + "[artifact].[ext]");
+ resolver
+ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]");
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision");
Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml");
- Artifact artifact = new DefaultArtifact(mrid, new Date(), "myartifact", "mytype", "myext");
+ Artifact artifact = new DefaultArtifact(mrid, new Date(), "myartifact", "mytype",
+ "myext");
File src = new File("test/repositories/ivysettings.xml");
resolver.publish(ivyArtifact, src, false);
resolver.publish(artifact, src, false);
-
+
assertTrue(new File("test/repositories/1/myorg/mymodule/myrevision/ivy.xml").exists());
- assertTrue(new File("test/repositories/1/myorg/mymodule/mytypes/myartifact-myrevision.myext").exists());
+ assertTrue(new File(
+ "test/repositories/1/myorg/mymodule/mytypes/myartifact-myrevision.myext")
+ .exists());
} finally {
Delete del = new Delete();
del.setProject(new Project());
@@ -506,30 +564,35 @@
del.execute();
}
}
-
+
public void testListing() throws Exception {
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
resolver.addIvyPattern(IVY_PATTERN);
- resolver.addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]");
+ resolver
+ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]");
OrganisationEntry[] orgs = resolver.listOrganisations();
- ResolverTestHelper.assertOrganisationEntries(resolver, new String[] {"org1", "org2", "org6", "org9", "orgfailure", "yourorg"}, orgs);
-
+ ResolverTestHelper.assertOrganisationEntries(resolver, new String[] {"org1", "org2",
+ "org6", "org9", "orgfailure", "yourorg"}, orgs);
+
OrganisationEntry org = ResolverTestHelper.getEntry(orgs, "org1");
ModuleEntry[] mods = resolver.listModules(org);
- ResolverTestHelper.assertModuleEntries(resolver, org, new String[] {"mod1.1", "mod1.2", "mod1.3", "mod1.4", "mod1.5", "mod1.6"}, mods);
+ ResolverTestHelper.assertModuleEntries(resolver, org, new String[] {"mod1.1", "mod1.2",
+ "mod1.3", "mod1.4", "mod1.5", "mod1.6"}, mods);
ModuleEntry mod = ResolverTestHelper.getEntry(mods, "mod1.1");
RevisionEntry[] revs = resolver.listRevisions(mod);
- ResolverTestHelper.assertRevisionEntries(resolver, mod, new String[] {"1.0", "1.0.1", "1.1", "2.0"}, revs);
+ ResolverTestHelper.assertRevisionEntries(resolver, mod, new String[] {"1.0", "1.0.1",
+ "1.1", "2.0"}, revs);
mod = ResolverTestHelper.getEntry(mods, "mod1.2");
revs = resolver.listRevisions(mod);
- ResolverTestHelper.assertRevisionEntries(resolver, mod, new String[] {"1.0", "1.1", "2.0", "2.1", "2.2"}, revs);
+ ResolverTestHelper.assertRevisionEntries(resolver, mod, new String[] {"1.0", "1.1", "2.0",
+ "2.1", "2.2"}, revs);
}
public void testDownloadWithUseOriginIsTrue() throws Exception {
@@ -537,29 +600,31 @@
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
resolver.addIvyPattern(IVY_PATTERN);
- resolver.addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
-
+ resolver
+ .addArtifactPattern("test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
-
+
assertEquals(mrid, rmr.getId());
Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
assertEquals(pubdate, rmr.getPublicationDate());
-
-
+
// test to ask to download
DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar");
- DownloadReport report = resolver.download(new Artifact[] {artifact}, getDownloadOptions(true));
+ DownloadReport report = resolver.download(new Artifact[] {artifact},
+ getDownloadOptions(true));
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ArtifactDownloadReport ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java Tue Jun 5 05:02:27 2007
@@ -22,41 +22,37 @@
import org.apache.ivy.util.url.URLHandler;
import org.apache.ivy.util.url.URLHandlerRegistry;
-
/**
* TODO write javadoc
*/
public class IBiblioHelper {
private static boolean _checked = false;
+
private static String _mirror = null;
+
private static URLHandler handler = URLHandlerRegistry.getHttp();
+
public static String getIBiblioMirror() throws Exception {
if (!_checked) {
- String[] mirrors = new String[] {
- "http://repo1.maven.org/maven/REPOSITORY-V1.txt",
- "http://mirrors.sunsite.dk/maven",
- "http://public.planetmirror.com/pub/maven",
- "http://www.ibiblio.org/maven"
- };
- String[] mirrorsRoot = new String[] {
- "http://repo1.maven.org/maven",
- "http://mirrors.sunsite.dk/maven",
- "http://public.planetmirror.com/pub/maven",
- "http://www.ibiblio.org/maven"
- };
+ String[] mirrors = new String[] {"http://repo1.maven.org/maven/REPOSITORY-V1.txt",
+ "http://mirrors.sunsite.dk/maven", "http://public.planetmirror.com/pub/maven",
+ "http://www.ibiblio.org/maven"};
+ String[] mirrorsRoot = new String[] {"http://repo1.maven.org/maven",
+ "http://mirrors.sunsite.dk/maven", "http://public.planetmirror.com/pub/maven",
+ "http://www.ibiblio.org/maven"};
long best = -1;
for (int i = 0; i < mirrors.length; i++) {
long start = System.currentTimeMillis();
if (handler.isReachable(new URL(mirrors[i]), 300)) {
long took = System.currentTimeMillis() - start;
- System.out.println("reached "+mirrors[i]+" in "+took+"ms");
+ System.out.println("reached " + mirrors[i] + " in " + took + "ms");
if (best == -1 || took < best) {
best = took;
_mirror = mirrorsRoot[i];
if (took < 400) {
- // this mirror is good enough
- break;
+ // this mirror is good enough
+ break;
}
}
}
@@ -67,11 +63,12 @@
}
return _mirror;
}
-
+
public static void main(String[] args) throws Exception {
long start = System.currentTimeMillis();
String biblioMirror = getIBiblioMirror();
- System.out.println("best mirror is "+biblioMirror+ " - found in "+(System.currentTimeMillis() - start)+"ms");
+ System.out.println("best mirror is " + biblioMirror + " - found in "
+ + (System.currentTimeMillis() - start) + "ms");
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java Tue Jun 5 05:02:27 2007
@@ -18,7 +18,6 @@
package org.apache.ivy.plugins.resolver;
import java.io.File;
-import java.text.ParseException;
import java.util.List;
import junit.framework.TestCase;
@@ -27,7 +26,6 @@
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.DefaultArtifact;
-import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor;
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
import org.apache.ivy.core.module.descriptor.DefaultIncludeRule;
import org.apache.ivy.core.module.id.ArtifactId;
@@ -48,97 +46,112 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-
/**
*
*/
public class IBiblioResolverTest extends TestCase {
- // remote.test
+ // remote.test
private IvySettings _settings;
+
private ResolveEngine _engine;
+
private ResolveData _data;
+
private File _cache;
-
-
+
protected void setUp() throws Exception {
- _settings = new IvySettings();
+ _settings = new IvySettings();
_engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings));
_cache = new File("build/cache");
- _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(_settings, _cache)));
+ _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(
+ _settings, _cache)));
_cache.mkdirs();
_settings.setDefaultCache(_cache);
}
-
+
protected void tearDown() throws Exception {
Delete del = new Delete();
del.setProject(new Project());
del.setDir(_cache);
del.execute();
}
-
+
public void testDefaults() {
IBiblioResolver resolver = new IBiblioResolver();
- _settings.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/mymaven/");
- _settings.setVariable("ivy.ibiblio.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar");
+ _settings.setVariable("ivy.ibiblio.default.artifact.root",
+ "http://www.ibiblio.org/mymaven/");
+ _settings.setVariable("ivy.ibiblio.default.artifact.pattern",
+ "[module]/jars/[artifact]-[revision].jar");
resolver.setSettings(_settings);
List l = resolver.getArtifactPatterns();
assertNotNull(l);
assertEquals(1, l.size());
- assertEquals("http://www.ibiblio.org/mymaven/[module]/jars/[artifact]-[revision].jar", l.get(0));
+ assertEquals("http://www.ibiblio.org/mymaven/[module]/jars/[artifact]-[revision].jar", l
+ .get(0));
}
public void testInitFromConf() throws Exception {
_settings.setVariable("ivy.ibiblio.default.artifact.root", "http://www.ibiblio.org/maven/");
- _settings.setVariable("ivy.ibiblio.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar");
+ _settings.setVariable("ivy.ibiblio.default.artifact.pattern",
+ "[module]/jars/[artifact]-[revision].jar");
_settings.setVariable("my.ibiblio.root", "http://www.ibiblio.org/mymaven/");
_settings.setVariable("my.ibiblio.pattern", "[module]/[artifact]-[revision].jar");
_settings.load(IBiblioResolverTest.class.getResource("ibiblioresolverconf.xml"));
- IBiblioResolver resolver = (IBiblioResolver)_settings.getResolver("ibiblioA");
+ IBiblioResolver resolver = (IBiblioResolver) _settings.getResolver("ibiblioA");
assertNotNull(resolver);
List l = resolver.getArtifactPatterns();
assertNotNull(l);
assertEquals(1, l.size());
assertEquals("http://www.ibiblio.org/mymaven/[module]/[artifact]-[revision].jar", l.get(0));
-
- resolver = (IBiblioResolver)_settings.getResolver("ibiblioB");
+
+ resolver = (IBiblioResolver) _settings.getResolver("ibiblioB");
assertNotNull(resolver);
l = resolver.getArtifactPatterns();
assertNotNull(l);
assertEquals(1, l.size());
- assertEquals("http://www.ibiblio.org/mymaven/[organisation]/jars/[artifact]-[revision].jar", l.get(0));
+ assertEquals(
+ "http://www.ibiblio.org/mymaven/[organisation]/jars/[artifact]-[revision].jar", l
+ .get(0));
- resolver = (IBiblioResolver)_settings.getResolver("ibiblioC");
+ resolver = (IBiblioResolver) _settings.getResolver("ibiblioC");
assertTrue(resolver.isM2compatible());
assertNotNull(resolver);
l = resolver.getArtifactPatterns();
assertNotNull(l);
assertEquals(1, l.size());
- assertEquals("http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]", l.get(0));
+ assertEquals(
+ "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]",
+ l.get(0));
- resolver = (IBiblioResolver)_settings.getResolver("ibiblioD");
+ resolver = (IBiblioResolver) _settings.getResolver("ibiblioD");
assertFalse(resolver.isM2compatible());
assertNotNull(resolver);
l = resolver.getArtifactPatterns();
assertNotNull(l);
assertEquals(1, l.size());
- assertEquals("http://www.ibiblio.org/maven/[module]/jars/[artifact]-[revision].jar", l.get(0));
+ assertEquals("http://www.ibiblio.org/maven/[module]/jars/[artifact]-[revision].jar", l
+ .get(0));
- resolver = (IBiblioResolver)_settings.getResolver("ibiblioE");
+ resolver = (IBiblioResolver) _settings.getResolver("ibiblioE");
assertTrue(resolver.isM2compatible());
assertNotNull(resolver);
l = resolver.getArtifactPatterns();
assertNotNull(l);
assertEquals(1, l.size());
- assertEquals("http://www.ibiblio.org/mymaven/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]", l.get(0));
+ assertEquals(
+ "http://www.ibiblio.org/mymaven/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]",
+ l.get(0));
- resolver = (IBiblioResolver)_settings.getResolver("ibiblioF");
+ resolver = (IBiblioResolver) _settings.getResolver("ibiblioF");
assertTrue(resolver.isM2compatible());
assertNotNull(resolver);
l = resolver.getArtifactPatterns();
assertNotNull(l);
assertEquals(1, l.size());
- assertEquals("http://www.ibiblio.org/mymaven/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]", l.get(0));
+ assertEquals(
+ "http://www.ibiblio.org/mymaven/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]",
+ l.get(0));
}
public void testIBiblio() throws Exception {
@@ -146,43 +159,47 @@
if (ibiblioRoot == null) {
return;
}
-
+
IBiblioResolver resolver = new IBiblioResolver();
resolver.setRoot(ibiblioRoot);
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "commons-fileupload", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
assertEquals(mrid, rmr.getId());
- DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "commons-fileupload", "jar", "jar");
- DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache));
+ DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(),
+ "commons-fileupload", "jar", "jar");
+ DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(
+ _settings, _cache));
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ArtifactDownloadReport ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
// test to ask to download again, should use cache
- report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache));
+ report = resolver.download(new Artifact[] {artifact},
+ new DownloadOptions(_settings, _cache));
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
}
-
+
public void testErrorReport() throws Exception {
IBiblioResolver resolver = new IBiblioResolver();
resolver.setRoot("http://unknown.host.comx/");
@@ -190,16 +207,20 @@
resolver.setM2compatible(true);
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
MockMessageImpl mockMessageImpl = new MockMessageImpl();
- Message.setImpl(mockMessageImpl);
-
- ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "commons-fileupload", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ Message.setImpl(mockMessageImpl);
+
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "commons-fileupload",
+ "1.0");
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNull(rmr);
-
- mockMessageImpl.assertLogContains("tried http://unknown.host.comx/org/apache/commons-fileupload/1.0/commons-fileupload-1.0.pom");
- mockMessageImpl.assertLogContains("tried http://unknown.host.comx/org/apache/commons-fileupload/1.0/commons-fileupload-1.0.jar");
+
+ mockMessageImpl
+ .assertLogContains("tried http://unknown.host.comx/org/apache/commons-fileupload/1.0/commons-fileupload-1.0.pom");
+ mockMessageImpl
+ .assertLogContains("tried http://unknown.host.comx/org/apache/commons-fileupload/1.0/commons-fileupload-1.0.jar");
}
public void testIBiblioArtifacts() throws Exception {
@@ -207,55 +228,61 @@
if (ibiblioRoot == null) {
return;
}
-
+
IBiblioResolver resolver = new IBiblioResolver();
resolver.setRoot(ibiblioRoot);
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "nanning", "0.9");
DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(mrid, false);
- dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(), "nanning-profiler", "jar", "jar"), ExactPatternMatcher.INSTANCE, null));
- dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(), "nanning-trace", "jar", "jar"), ExactPatternMatcher.INSTANCE, null));
+ dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(),
+ "nanning-profiler", "jar", "jar"), ExactPatternMatcher.INSTANCE, null));
+ dd.addIncludeRule("default", new DefaultIncludeRule(new ArtifactId(mrid.getModuleId(),
+ "nanning-trace", "jar", "jar"), ExactPatternMatcher.INSTANCE, null));
ResolvedModuleRevision rmr = resolver.getDependency(dd, _data);
assertNotNull(rmr);
assertEquals(mrid, rmr.getId());
- DefaultArtifact profiler = new DefaultArtifact(mrid, rmr.getPublicationDate(), "nanning-profiler", "jar", "jar");
- DefaultArtifact trace = new DefaultArtifact(mrid, rmr.getPublicationDate(), "nanning-trace", "jar", "jar");
- DownloadReport report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_settings, _cache));
+ DefaultArtifact profiler = new DefaultArtifact(mrid, rmr.getPublicationDate(),
+ "nanning-profiler", "jar", "jar");
+ DefaultArtifact trace = new DefaultArtifact(mrid, rmr.getPublicationDate(),
+ "nanning-trace", "jar", "jar");
+ DownloadReport report = resolver.download(new Artifact[] {profiler, trace},
+ new DownloadOptions(_settings, _cache));
assertNotNull(report);
-
+
assertEquals(2, report.getArtifactsReports().length);
-
+
ArtifactDownloadReport ar = report.getArtifactReport(profiler);
assertNotNull(ar);
-
+
assertEquals(profiler, ar.getArtifact());
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
ar = report.getArtifactReport(trace);
assertNotNull(ar);
-
+
assertEquals(trace, ar.getArtifact());
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
// test to ask to download again, should use cache
- report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_settings, _cache));
+ report = resolver.download(new Artifact[] {profiler, trace}, new DownloadOptions(_settings,
+ _cache));
assertNotNull(report);
-
+
assertEquals(2, report.getArtifactsReports().length);
-
+
ar = report.getArtifactReport(profiler);
assertNotNull(ar);
-
+
assertEquals(profiler, ar.getArtifact());
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
ar = report.getArtifactReport(trace);
assertNotNull(ar);
-
+
assertEquals(trace, ar.getArtifact());
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
}
@@ -265,13 +292,14 @@
if (ibiblioRoot == null) {
return;
}
-
+
IBiblioResolver resolver = new IBiblioResolver();
resolver.setRoot(ibiblioRoot);
resolver.setName("test");
resolver.setSettings(_settings);
- assertNull(resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId.newInstance("unknown", "unknown", "1.0"), false), _data));
+ assertNull(resolver.getDependency(new DefaultDependencyDescriptor(ModuleRevisionId
+ .newInstance("unknown", "unknown", "1.0"), false), _data));
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java Tue Jun 5 05:02:27 2007
@@ -44,28 +44,30 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-
/**
*
*/
public class IvyRepResolverTest extends TestCase {
- // remote.test
-
+ // remote.test
+
private IvySettings _settings;
+
private ResolveEngine _engine;
+
private ResolveData _data;
+
private File _cache;
-
-
+
protected void setUp() throws Exception {
- _settings = new IvySettings();
+ _settings = new IvySettings();
_engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings));
_cache = new File("build/cache");
- _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(_settings, _cache)));
+ _data = new ResolveData(_engine, new ResolveOptions().setCache(CacheManager.getInstance(
+ _settings, _cache)));
_cache.mkdirs();
_settings.setDefaultCache(_cache);
}
-
+
protected void tearDown() throws Exception {
Delete del = new Delete();
del.setProject(new Project());
@@ -76,57 +78,67 @@
public void testDefaults() {
IvyRepResolver resolver = new IvyRepResolver();
_settings.setVariable("ivy.ivyrep.default.ivy.root", "http://www.jayasoft.fr/myivyrep/");
- _settings.setVariable("ivy.ivyrep.default.ivy.pattern", "[organisation]/[module]/ivy-[revision].[ext]");
- _settings.setVariable("ivy.ivyrep.default.artifact.root", "http://www.ibiblio.org/mymaven/");
- _settings.setVariable("ivy.ivyrep.default.artifact.pattern", "[module]/jars/[artifact]-[revision].jar");
+ _settings.setVariable("ivy.ivyrep.default.ivy.pattern",
+ "[organisation]/[module]/ivy-[revision].[ext]");
+ _settings
+ .setVariable("ivy.ivyrep.default.artifact.root", "http://www.ibiblio.org/mymaven/");
+ _settings.setVariable("ivy.ivyrep.default.artifact.pattern",
+ "[module]/jars/[artifact]-[revision].jar");
resolver.setSettings(_settings);
List l = resolver.getIvyPatterns();
assertNotNull(l);
assertEquals(1, l.size());
- assertEquals("http://www.jayasoft.fr/myivyrep/[organisation]/[module]/ivy-[revision].[ext]", l.get(0));
+ assertEquals(
+ "http://www.jayasoft.fr/myivyrep/[organisation]/[module]/ivy-[revision].[ext]", l
+ .get(0));
l = resolver.getArtifactPatterns();
assertNotNull(l);
assertEquals(1, l.size());
- assertEquals("http://www.ibiblio.org/mymaven/[module]/jars/[artifact]-[revision].jar", l.get(0));
+ assertEquals("http://www.ibiblio.org/mymaven/[module]/jars/[artifact]-[revision].jar", l
+ .get(0));
}
- public void testIvyRep() throws Exception {
+ public void testIvyRep() throws Exception {
IvyRepResolver resolver = new IvyRepResolver();
resolver.setName("test");
resolver.setSettings(_settings);
assertEquals("test", resolver.getName());
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("apache", "commons-cli", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
assertEquals(mrid, rmr.getId());
assertEquals(2, rmr.getDescriptor().getDependencies().length);
- DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "commons-cli", "jar", "jar");
- DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache));
+ DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(),
+ "commons-cli", "jar", "jar");
+ DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(
+ _settings, _cache));
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ArtifactDownloadReport ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
// test to ask to download again, should use cache
- report = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, _cache));
+ report = resolver.download(new Artifact[] {artifact},
+ new DownloadOptions(_settings, _cache));
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
}
-
+
/*
* Tests IvyRepResolver with a root path given as 'file:/path_to_root'
*/
@@ -138,26 +150,30 @@
resolver.setIvyroot("file:" + rootpath);
resolver.setIvypattern("[organisation]/[module]/ivys/ivy-[revision].xml");
resolver.setSettings(_settings);
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid,
+ false), _data);
assertNotNull(rmr);
}
-
+
public void testListing() {
IvyRepResolver resolver = new IvyRepResolver();
resolver.setName("test");
resolver.setSettings(_settings);
-
+
OrganisationEntry[] orgs = resolver.listOrganisations();
- ResolverTestHelper.assertOrganisationEntriesContains(resolver, new String[] {"hibernate", "apache"}, orgs);
-
+ ResolverTestHelper.assertOrganisationEntriesContains(resolver, new String[] {"hibernate",
+ "apache"}, orgs);
+
OrganisationEntry org = ResolverTestHelper.getEntry(orgs, "apache");
ModuleEntry[] mods = resolver.listModules(org);
- ResolverTestHelper.assertModuleEntriesContains(resolver, org, new String[] {"commons-logging", "commons-lang"}, mods);
+ ResolverTestHelper.assertModuleEntriesContains(resolver, org, new String[] {
+ "commons-logging", "commons-lang"}, mods);
ModuleEntry mod = ResolverTestHelper.getEntry(mods, "commons-logging");
RevisionEntry[] revs = resolver.listRevisions(mod);
- ResolverTestHelper.assertRevisionEntriesContains(resolver, mod, new String[] {"1.0", "1.0.2", "1.0.3", "1.0.4"}, revs);
+ ResolverTestHelper.assertRevisionEntriesContains(resolver, mod, new String[] {"1.0",
+ "1.0.2", "1.0.3", "1.0.4"}, revs);
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java Tue Jun 5 05:02:27 2007
@@ -35,17 +35,20 @@
import org.apache.ivy.core.resolve.ResolveData;
import org.apache.ivy.core.resolve.ResolvedModuleRevision;
-
-
public class MockResolver extends AbstractResolver {
- static MockResolver buildMockResolver(String name, boolean findRevision, final Date publicationDate) {
- return buildMockResolver(name, findRevision, ModuleRevisionId.newInstance("test", "test", "test"), publicationDate);
+ static MockResolver buildMockResolver(String name, boolean findRevision,
+ final Date publicationDate) {
+ return buildMockResolver(name, findRevision, ModuleRevisionId.newInstance("test", "test",
+ "test"), publicationDate);
}
- static MockResolver buildMockResolver(String name, boolean findRevision, final ModuleRevisionId mrid, final Date publicationDate) {
+ static MockResolver buildMockResolver(String name, boolean findRevision,
+ final ModuleRevisionId mrid, final Date publicationDate) {
return buildMockResolver(name, findRevision, mrid, publicationDate, false);
}
- static MockResolver buildMockResolver(String name, boolean findRevision, final ModuleRevisionId mrid, final Date publicationDate, final boolean isdefault) {
+
+ static MockResolver buildMockResolver(String name, boolean findRevision,
+ final ModuleRevisionId mrid, final Date publicationDate, final boolean isdefault) {
final MockResolver r = new MockResolver();
r.setName(name);
if (findRevision) {
@@ -65,9 +68,11 @@
public ModuleDescriptor getDescriptor() {
return new DefaultModuleDescriptor(mrid, "integration", new Date(), isdefault);
}
+
public boolean isDownloaded() {
return true;
}
+
public boolean isSearched() {
return true;
}
@@ -75,8 +80,9 @@
public DependencyResolver getArtifactResolver() {
return r;
}
+
public URL getLocalMDUrl() {
- return null;
+ return null;
}
};
}
@@ -84,9 +90,11 @@
}
List askedDeps = new ArrayList();
+
ResolvedModuleRevision rmr;
-
- public ResolvedModuleRevision getDependency(DependencyDescriptor dd, ResolveData data) throws ParseException {
+
+ public ResolvedModuleRevision getDependency(DependencyDescriptor dd, ResolveData data)
+ throws ParseException {
askedDeps.add(dd);
return rmr;
}
@@ -94,6 +102,7 @@
public DownloadReport download(Artifact[] artifacts, DownloadOptions options) {
return null;
}
+
public void publish(Artifact artifact, File src, boolean overwrite) throws IOException {
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java Tue Jun 5 05:02:27 2007
@@ -27,13 +27,15 @@
*
*/
public class ResolverTestHelper {
- static void assertOrganisationEntries(DependencyResolver resolver, String[] orgNames, OrganisationEntry[] orgs) {
+ static void assertOrganisationEntries(DependencyResolver resolver, String[] orgNames,
+ OrganisationEntry[] orgs) {
Assert.assertNotNull(orgs);
Assert.assertEquals(orgNames.length, orgs.length);
assertOrganisationEntriesContains(resolver, orgNames, orgs);
}
-
- static void assertOrganisationEntriesContains(DependencyResolver resolver, String[] orgNames, OrganisationEntry[] orgs) {
+
+ static void assertOrganisationEntriesContains(DependencyResolver resolver, String[] orgNames,
+ OrganisationEntry[] orgs) {
Assert.assertNotNull(orgs);
for (int i = 0; i < orgNames.length; i++) {
boolean found = false;
@@ -43,18 +45,19 @@
Assert.assertEquals(resolver, orgs[j].getResolver());
}
}
- Assert.assertTrue("organisation not found: "+orgNames[i], found);
+ Assert.assertTrue("organisation not found: " + orgNames[i], found);
}
}
-
- static void assertModuleEntries(DependencyResolver resolver, OrganisationEntry org, String[] names, ModuleEntry[] mods) {
+
+ static void assertModuleEntries(DependencyResolver resolver, OrganisationEntry org,
+ String[] names, ModuleEntry[] mods) {
Assert.assertNotNull(mods);
Assert.assertEquals(names.length, mods.length);
assertModuleEntriesContains(resolver, org, names, mods);
}
-
-
- static void assertModuleEntriesContains(DependencyResolver resolver, OrganisationEntry org, String[] names, ModuleEntry[] mods) {
+
+ static void assertModuleEntriesContains(DependencyResolver resolver, OrganisationEntry org,
+ String[] names, ModuleEntry[] mods) {
Assert.assertNotNull(mods);
for (int i = 0; i < names.length; i++) {
boolean found = false;
@@ -65,18 +68,19 @@
Assert.assertEquals(org, mods[j].getOrganisationEntry());
}
}
- Assert.assertTrue("module not found: "+names[i], found);
+ Assert.assertTrue("module not found: " + names[i], found);
}
}
-
-
- static void assertRevisionEntries(DependencyResolver resolver, ModuleEntry mod, String[] names, RevisionEntry[] revs) {
+
+ static void assertRevisionEntries(DependencyResolver resolver, ModuleEntry mod, String[] names,
+ RevisionEntry[] revs) {
Assert.assertNotNull(revs);
Assert.assertEquals(names.length, revs.length);
assertRevisionEntriesContains(resolver, mod, names, revs);
}
-
- static void assertRevisionEntriesContains(DependencyResolver resolver, ModuleEntry mod, String[] names, RevisionEntry[] revs) {
+
+ static void assertRevisionEntriesContains(DependencyResolver resolver, ModuleEntry mod,
+ String[] names, RevisionEntry[] revs) {
Assert.assertNotNull(revs);
for (int i = 0; i < names.length; i++) {
boolean found = false;
@@ -87,28 +91,28 @@
Assert.assertEquals(mod, revs[j].getModuleEntry());
}
}
- Assert.assertTrue("revision not found: "+names[i], found);
+ Assert.assertTrue("revision not found: " + names[i], found);
}
}
-
+
static OrganisationEntry getEntry(OrganisationEntry[] orgs, String name) {
for (int i = 0; i < orgs.length; i++) {
if (name.equals(orgs[i].getOrganisation())) {
return orgs[i];
}
}
- Assert.fail("organisation not found: "+name);
+ Assert.fail("organisation not found: " + name);
return null; // for compilation only
}
-
+
static ModuleEntry getEntry(ModuleEntry[] mods, String name) {
for (int i = 0; i < mods.length; i++) {
if (name.equals(mods[i].getModule())) {
return mods[i];
}
}
- Assert.fail("module not found: "+name);
+ Assert.fail("module not found: " + name);
return null; // for compilation only
}
-
+
}