You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jl...@apache.org on 2014/01/14 09:27:43 UTC
svn commit: r1557968 [25/26] - in /ant/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/
src...
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java Tue Jan 14 08:27:37 2014
@@ -53,13 +53,15 @@ import org.apache.ivy.util.FileUtil;
*
*/
public class FileSystemResolverTest extends AbstractDependencyResolverTest {
- //CheckStyle:MagicNumberCheck OFF
+ // CheckStyle:MagicNumberCheck OFF
private static final String FS = System.getProperty("file.separator");
private static final String REL_IVY_PATTERN = "test" + FS + "repositories" + FS + "1" + FS
- + "[organisation]" + FS + "[module]" + FS + "ivys" + FS + "ivy-[revision].xml";
- private static final String IVY_PATTERN = new File(".").getAbsolutePath() + FS + REL_IVY_PATTERN;
+ + "[organisation]" + FS + "[module]" + FS + "ivys" + FS + "ivy-[revision].xml";
+
+ private static final String IVY_PATTERN = new File(".").getAbsolutePath() + FS
+ + REL_IVY_PATTERN;
private IvySettings settings;
@@ -109,9 +111,8 @@ public class FileSystemResolverTest exte
assertEquals("test", resolver.getName());
resolver.addIvyPattern(IVY_PATTERN);
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/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,
@@ -124,8 +125,7 @@ public class FileSystemResolverTest exte
// test to ask to download
DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar");
- DownloadReport report = resolver.download(new Artifact[] {artifact},
- getDownloadOptions());
+ DownloadReport report = resolver.download(new Artifact[] {artifact}, getDownloadOptions());
assertNotNull(report);
assertEquals(1, report.getArtifactsReports().length);
@@ -148,21 +148,24 @@ public class FileSystemResolverTest exte
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
}
-
+
public void testFindIvyFileRefWithMultipleIvyPatterns() throws Exception {
// cfr IVY-676
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("test");
resolver.setSettings(settings);
- resolver.addIvyPattern(settings.getBaseDir() + "/test/repositories/multi-ivypattern/ivy1/ivy-[revision].xml");
- resolver.addIvyPattern(settings.getBaseDir() + "/test/repositories/multi-ivypattern/ivy2/ivy-[revision].xml");
-
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/multi-ivypattern/ivy1/ivy-[revision].xml");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/multi-ivypattern/ivy2/ivy-[revision].xml");
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0+");
- ResolvedResource ivyRef = resolver.findIvyFileRef(
- new DefaultDependencyDescriptor(mrid, false), data);
-
+ ResolvedResource ivyRef = resolver.findIvyFileRef(new DefaultDependencyDescriptor(mrid,
+ false), data);
+
// check that the found ivy file is the one from the first pattern!
- assertEquals(new File("test/repositories/multi-ivypattern/ivy1/ivy-1.0.xml").getCanonicalPath(),
+ assertEquals(
+ new File("test/repositories/multi-ivypattern/ivy1/ivy-1.0.xml").getCanonicalPath(),
new File(ivyRef.getResource().getName()).getCanonicalPath());
}
@@ -177,14 +180,10 @@ public class FileSystemResolverTest exte
resolver.setM2compatible(true);
assertEquals("test", resolver.getName());
- resolver
- .addIvyPattern(
- settings.getBaseDir() + "/test/repositories/m2/"
+ resolver.addIvyPattern(settings.getBaseDir() + "/test/repositories/m2/"
+ + "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir() + "/test/repositories/m2/"
+ "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/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,
@@ -202,10 +201,10 @@ public class FileSystemResolverTest exte
resolver.setName("test");
resolver.setSettings(settings);
- resolver.addIvyPattern(settings.getBaseDir() + "/test/repositories/checksums/[module]/[artifact]-[revision].[ext]");
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/checksums/[module]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/checksums/[module]/[artifact]-[revision].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/checksums/[module]/[artifact]-[revision].[ext]");
resolver.setChecksums("sha1, md5");
ModuleRevisionId mrid = ModuleRevisionId.newInstance("test", "allright", "1.0");
@@ -250,8 +249,8 @@ public class FileSystemResolverTest exte
settings.addResolver(resolver);
assertEquals("test", resolver.getName());
- resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "checkmodified" + FS
- + "ivy-[revision].xml");
+ resolver.addIvyPattern(settings.getBaseDir() + FS + "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);
@@ -278,8 +277,8 @@ public class FileSystemResolverTest exte
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);
@@ -297,10 +296,10 @@ public class FileSystemResolverTest exte
settings.addResolver(resolver);
assertEquals("test", resolver.getName());
- resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "norevision" + FS
- + "ivy-[module].xml");
- resolver.addArtifactPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "norevision" + FS
- + "[artifact].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS
+ + "norevision" + FS + "ivy-[module].xml");
+ resolver.addArtifactPattern(settings.getBaseDir() + FS + "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");
@@ -368,10 +367,10 @@ public class FileSystemResolverTest exte
settings.addResolver(resolver);
assertEquals("test", resolver.getName());
- resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "checkmodified" + FS
- + "ivy-[revision].xml");
- resolver.addArtifactPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "checkmodified" + FS
- + "[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS
+ + "checkmodified" + FS + "ivy-[revision].xml");
+ resolver.addArtifactPattern(settings.getBaseDir() + FS + "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");
@@ -415,8 +414,8 @@ public class FileSystemResolverTest exte
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));
@@ -447,17 +446,14 @@ public class FileSystemResolverTest exte
assertEquals("test", resolver.getName());
resolver.addIvyPattern(IVY_PATTERN);
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/"
- + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(settings.getBaseDir() + "/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());
@@ -472,17 +468,14 @@ public class FileSystemResolverTest exte
assertEquals("test", resolver.getName());
resolver.addIvyPattern(IVY_PATTERN);
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/"
- + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(settings.getBaseDir() + "/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());
@@ -497,17 +490,14 @@ public class FileSystemResolverTest exte
assertEquals("test", resolver.getName());
resolver.addIvyPattern(new File("src/java").getAbsolutePath() + "/../../" + REL_IVY_PATTERN);
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/src/../test/repositories/1/"
- + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(settings.getBaseDir() + "/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());
@@ -522,10 +512,8 @@ public class FileSystemResolverTest exte
assertEquals("test", resolver.getName());
resolver.addIvyPattern(IVY_PATTERN);
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/"
- + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(settings.getBaseDir() + "/test/repositories/1/"
+ + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
resolver.setLatestStrategy(new LatestTimeStrategy());
@@ -546,10 +534,8 @@ public class FileSystemResolverTest exte
assertEquals("test", resolver.getName());
resolver.addIvyPattern(IVY_PATTERN);
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/"
- + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(settings.getBaseDir() + "/test/repositories/1/"
+ + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
resolver.setLatestStrategy(new LatestRevisionStrategy());
@@ -570,12 +556,11 @@ public class FileSystemResolverTest exte
resolver.setSettings(settings);
assertEquals("test", resolver.getName());
- resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS + "1" + FS + "[organisation]"
- + FS + "[module]" + FS + "[revision]" + FS + "[artifact].[ext]");
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + FS + "test/repositories/1/"
- + "[organisation]/[module]/[type]s/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir() + FS + "test" + FS + "repositories" + FS
+ + "1" + FS + "[organisation]" + FS + "[module]" + FS + "[revision]" + FS
+ + "[artifact].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir() + FS + "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");
@@ -603,16 +588,17 @@ public class FileSystemResolverTest exte
resolver.setSettings(settings);
assertEquals("test", resolver.getName());
- resolver.addIvyPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
File ivyFile = new File("test/repositories/1/myorg/mymodule/myrevision/ivy.xml");
- File artifactFile = new File("test/repositories/1/myorg/mymodule/myrevision/myartifact-myrevision.myext");
+ File artifactFile = new File(
+ "test/repositories/1/myorg/mymodule/myrevision/myartifact-myrevision.myext");
touch(ivyFile);
touch(artifactFile);
-
+
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",
@@ -642,27 +628,27 @@ public class FileSystemResolverTest exte
resolver.setName("test");
resolver.setSettings(settings);
- resolver.addIvyPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[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");
File src = new File("test/repositories/ivysettings.xml");
-
+
resolver.beginPublishTransaction(mrid, false);
-
+
// files should not be available until the transaction is committed
resolver.publish(ivyArtifact, src, false);
assertFalse(new File("test/repositories/1/myorg/mymodule/myrevision/ivy.xml").exists());
resolver.publish(artifact, src, false);
assertFalse(new File(
- "test/repositories/1/myorg/mymodule/myrevision/myartifact-myrevision.myext")
- .exists());
+ "test/repositories/1/myorg/mymodule/myrevision/myartifact-myrevision.myext")
+ .exists());
resolver.commitPublishTransaction();
@@ -681,31 +667,34 @@ public class FileSystemResolverTest exte
resolver.setName("test");
resolver.setSettings(settings);
- resolver.addIvyPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[branch]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[branch]/[revision]/[artifact].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[branch]/[revision]/[artifact]-[revision].[ext]");
- ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "mybranch", "myrevision");
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "mybranch",
+ "myrevision");
Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml");
Artifact artifact = new DefaultArtifact(mrid, new Date(), "myartifact", "mytype",
"myext");
File src = new File("test/repositories/ivysettings.xml");
-
+
resolver.beginPublishTransaction(mrid, false);
-
+
// files should not be available until the transaction is committed
resolver.publish(ivyArtifact, src, false);
- assertFalse(new File("test/repositories/1/myorg/mymodule/mybranch/myrevision/ivy.xml").exists());
+ assertFalse(new File("test/repositories/1/myorg/mymodule/mybranch/myrevision/ivy.xml")
+ .exists());
resolver.publish(artifact, src, false);
assertFalse(new File(
- "test/repositories/1/myorg/mymodule/mybranch/myrevision/myartifact-myrevision.myext")
- .exists());
+ "test/repositories/1/myorg/mymodule/mybranch/myrevision/myartifact-myrevision.myext")
+ .exists());
resolver.commitPublishTransaction();
- assertTrue(new File("test/repositories/1/myorg/mymodule/mybranch/myrevision/ivy.xml").exists());
+ assertTrue(new File("test/repositories/1/myorg/mymodule/mybranch/myrevision/ivy.xml")
+ .exists());
assertTrue(new File(
"test/repositories/1/myorg/mymodule/mybranch/myrevision/myartifact-myrevision.myext")
.exists());
@@ -713,40 +702,43 @@ public class FileSystemResolverTest exte
FileUtil.forceDelete(new File("test/repositories/1/myorg"));
}
}
-
+
public void testPublishTransactionWithSubDirectories() throws Exception {
try {
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("test");
resolver.setSettings(settings);
- resolver.addIvyPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[type]/[artifact].[ext]");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[type]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[type]/[artifact].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[type]/[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");
File src = new File("test/repositories/ivysettings.xml");
-
+
resolver.beginPublishTransaction(mrid, false);
-
+
// files should not be available until the transaction is committed
resolver.publish(ivyArtifact, src, false);
- assertFalse(new File("test/repositories/1/myorg/mymodule/myrevision/ivy/ivy.xml").exists());
+ assertFalse(new File("test/repositories/1/myorg/mymodule/myrevision/ivy/ivy.xml")
+ .exists());
resolver.publish(artifact, src, false);
assertFalse(new File(
- "test/repositories/1/myorg/mymodule/myrevision/mytype/myartifact-myrevision.myext")
- .exists());
+ "test/repositories/1/myorg/mymodule/myrevision/mytype/myartifact-myrevision.myext")
+ .exists());
resolver.commitPublishTransaction();
- assertTrue(new File("test/repositories/1/myorg/mymodule/myrevision/ivy/ivy.xml").exists());
- assertTrue(
- new File("test/repositories/1/myorg/mymodule/myrevision/mytype/myartifact-myrevision.myext").exists());
+ assertTrue(new File("test/repositories/1/myorg/mymodule/myrevision/ivy/ivy.xml")
+ .exists());
+ assertTrue(new File(
+ "test/repositories/1/myorg/mymodule/myrevision/mytype/myartifact-myrevision.myext")
+ .exists());
} finally {
FileUtil.forceDelete(new File("test/repositories/1/myorg"));
}
@@ -759,27 +751,37 @@ public class FileSystemResolverTest exte
resolver.setM2compatible(true);
resolver.setSettings(settings);
- resolver.addIvyPattern(
- settings.getBaseDir() + "/test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
- ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "mymodule", "myrevision");
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "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.beginPublishTransaction(mrid, false);
-
+
// files should not be available until the transaction is committed
resolver.publish(ivyArtifact, src, false);
- assertFalse(new File("test/repositories/m2/org/apache/mymodule/myrevision/ivy-myrevision.xml").exists());
+ assertFalse(new File(
+ "test/repositories/m2/org/apache/mymodule/myrevision/ivy-myrevision.xml")
+ .exists());
resolver.publish(artifact, src, false);
- assertFalse(new File("test/repositories/m2/org/apache/mymodule/myrevision/myartifact-myrevision.myext").exists());
+ assertFalse(new File(
+ "test/repositories/m2/org/apache/mymodule/myrevision/myartifact-myrevision.myext")
+ .exists());
resolver.commitPublishTransaction();
- assertTrue(new File("test/repositories/m2/org/apache/mymodule/myrevision/ivy-myrevision.xml").exists());
- assertTrue(new File("test/repositories/m2/org/apache/mymodule/myrevision/myartifact-myrevision.myext").exists());
+ assertTrue(new File(
+ "test/repositories/m2/org/apache/mymodule/myrevision/ivy-myrevision.xml")
+ .exists());
+ assertTrue(new File(
+ "test/repositories/m2/org/apache/mymodule/myrevision/myartifact-myrevision.myext")
+ .exists());
} finally {
FileUtil.forceDelete(new File("test/repositories/m2/org/apache/mymodule"));
}
@@ -791,10 +793,10 @@ public class FileSystemResolverTest exte
resolver.setName("test");
resolver.setSettings(settings);
- resolver.addIvyPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision");
Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml");
@@ -823,8 +825,9 @@ public class FileSystemResolverTest exte
resolver.setTransactional("true");
resolver.addArtifactPattern(
- // this pattern is not supported for transaction publish
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[artifact]-[revision].[ext]");
+ // this pattern is not supported for transaction publish
+ settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[artifact]-[revision].[ext]");
ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision");
Artifact artifact = new DefaultArtifact(mrid, new Date(), "myartifact", "mytype",
@@ -832,7 +835,7 @@ public class FileSystemResolverTest exte
File src = new File("test/repositories/ivysettings.xml");
try {
resolver.beginPublishTransaction(mrid, false);
-
+
resolver.publish(artifact, src, false);
fail("publishing with transaction=true and an unsupported pattern should raise an exception");
} catch (IllegalStateException ex) {
@@ -851,10 +854,10 @@ public class FileSystemResolverTest exte
resolver.setTransactional("true");
// the two patterns are inconsistent and thus not supported for transactions
- resolver.addIvyPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]-[module]/[revision]/[artifact]-[revision].[ext]");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]-[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision");
Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml");
@@ -881,8 +884,8 @@ public class FileSystemResolverTest exte
resolver.setSettings(settings);
resolver.setTransactional("true");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision");
Artifact artifact = new DefaultArtifact(mrid, new Date(), "myartifact", "mytype",
@@ -891,7 +894,7 @@ public class FileSystemResolverTest exte
try {
// overwrite transaction not supported
resolver.beginPublishTransaction(mrid, true);
-
+
resolver.publish(artifact, src, true);
fail("publishing with transaction=true and overwrite mode should raise an exception");
} catch (IllegalStateException ex) {
@@ -901,7 +904,7 @@ public class FileSystemResolverTest exte
FileUtil.forceDelete(new File("test/repositories/1/myorg"));
}
}
-
+
public void testDisableTransaction() throws Exception {
try {
FileSystemResolver resolver = new FileSystemResolver();
@@ -909,10 +912,10 @@ public class FileSystemResolverTest exte
resolver.setSettings(settings);
resolver.setTransactional("false");
- resolver.addIvyPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]");
- resolver.addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
+ resolver.addIvyPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir()
+ + "/test/repositories/1/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
ModuleRevisionId mrid = ModuleRevisionId.newInstance("myorg", "mymodule", "myrevision");
Artifact ivyArtifact = new DefaultArtifact(mrid, new Date(), "ivy", "ivy", "xml");
@@ -920,18 +923,18 @@ public class FileSystemResolverTest exte
"myext");
File src = new File("test/repositories/ivysettings.xml");
resolver.beginPublishTransaction(mrid, false);
-
+
// with transactions disabled the file should be available as soon as they are published
resolver.publish(ivyArtifact, src, false);
assertTrue(new File("test/repositories/1/myorg/mymodule/myrevision/ivy.xml").exists());
-
+
resolver.publish(artifact, src, false);
assertTrue(new File(
- "test/repositories/1/myorg/mymodule/myrevision/myartifact-myrevision.myext")
- .exists());
+ "test/repositories/1/myorg/mymodule/myrevision/myartifact-myrevision.myext")
+ .exists());
resolver.commitPublishTransaction();
-
+
assertTrue(new File("test/repositories/1/myorg/mymodule/myrevision/ivy.xml").exists());
assertTrue(new File(
"test/repositories/1/myorg/mymodule/myrevision/myartifact-myrevision.myext")
@@ -941,7 +944,6 @@ public class FileSystemResolverTest exte
}
}
-
public void testListing() throws Exception {
FileSystemResolver resolver = new FileSystemResolver();
resolver.setName("test");
@@ -949,15 +951,12 @@ public class FileSystemResolverTest exte
assertEquals("test", resolver.getName());
resolver.addIvyPattern(IVY_PATTERN);
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/"
- + "[organisation]/[module]/[type]s/[artifact]-[revision].[ext]");
+ resolver.addArtifactPattern(settings.getBaseDir() + "/test/repositories/1/"
+ + "[organisation]/[module]/[type]s/[artifact]-[revision].[ext]");
OrganisationEntry[] orgs = resolver.listOrganisations();
- ResolverTestHelper.assertOrganisationEntriesContains(resolver,
- new String[] {"org1", "org2", "org6", "org9", "orgfailure", "yourorg", "IVY-644"},
- orgs);
+ ResolverTestHelper.assertOrganisationEntriesContains(resolver, new String[] {"org1",
+ "org2", "org6", "org9", "orgfailure", "yourorg", "IVY-644"}, orgs);
OrganisationEntry org = ResolverTestHelper.getEntry(orgs, "org1");
ModuleEntry[] mods = resolver.listModules(org);
@@ -971,8 +970,8 @@ public class FileSystemResolverTest exte
mod = ResolverTestHelper.getEntry(mods, "mod1.2");
revs = resolver.listRevisions(mod);
- ResolverTestHelper.assertRevisionEntries(resolver, mod, new String[] {"0.9", "1.0", "1.1", "2.0",
- "2.1", "2.2"}, revs);
+ ResolverTestHelper.assertRevisionEntries(resolver, mod, new String[] {"0.9", "1.0", "1.1",
+ "2.0", "2.1", "2.2"}, revs);
}
public void testDownloadWithUseOriginIsTrue() throws Exception {
@@ -983,10 +982,8 @@ public class FileSystemResolverTest exte
assertEquals("test", resolver.getName());
resolver.addIvyPattern(IVY_PATTERN);
- resolver
- .addArtifactPattern(
- settings.getBaseDir() + "/test/repositories/1/"
- + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(settings.getBaseDir() + "/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,
@@ -999,8 +996,7 @@ public class FileSystemResolverTest exte
// test to ask to download
DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar");
- DownloadReport report = resolver.download(new Artifact[] {artifact},
- getDownloadOptions());
+ DownloadReport report = resolver.download(new Artifact[] {artifact}, getDownloadOptions());
assertNotNull(report);
assertEquals(1, report.getArtifactsReports().length);
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java Tue Jan 14 08:27:37 2014
@@ -91,8 +91,8 @@ public class IBiblioResolverTest extends
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 {
@@ -115,8 +115,8 @@ public class IBiblioResolverTest extends
assertNotNull(l);
assertEquals(1, l.size());
assertEquals(
- "http://www.ibiblio.org/mymaven/[organisation]/jars/[artifact]-[revision].jar", l
- .get(0));
+ "http://www.ibiblio.org/mymaven/[organisation]/jars/[artifact]-[revision].jar",
+ l.get(0));
resolver = (IBiblioResolver) _settings.getResolver("ibiblioC");
assertTrue(resolver.isM2compatible());
@@ -134,8 +134,8 @@ public class IBiblioResolverTest extends
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");
assertTrue(resolver.isM2compatible());
@@ -190,8 +190,7 @@ public class IBiblioResolverTest extends
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
// test to ask to download again, should use cache
- report = resolver.download(new Artifact[] {artifact},
- downloadOptions());
+ report = resolver.download(new Artifact[] {artifact}, downloadOptions());
assertNotNull(report);
assertEquals(1, report.getArtifactsReports().length);
@@ -210,22 +209,24 @@ public class IBiblioResolverTest extends
resolver.setM2compatible(true);
assertEquals("test", resolver.getName());
- ModuleEntry[] modules = resolver.listModules(new OrganisationEntry(resolver, "commons-lang"));
+ ModuleEntry[] modules = resolver
+ .listModules(new OrganisationEntry(resolver, "commons-lang"));
assertNotNull(modules);
assertEquals(1, modules.length);
assertEquals("commons-lang", modules[0].getModule());
-
+
RevisionEntry[] revisions = resolver.listRevisions(modules[0]);
assertTrue(revisions.length > 0);
-
+
Map otherTokenValues = new HashMap();
otherTokenValues.put(IvyPatternHelper.ORGANISATION_KEY, "commons-lang");
String[] values = resolver.listTokenValues(IvyPatternHelper.MODULE_KEY, otherTokenValues);
assertNotNull(values);
assertEquals(1, values.length);
assertEquals("commons-lang", values[0]);
-
- Map[] valuesMaps = resolver.listTokenValues(new String[] {IvyPatternHelper.MODULE_KEY}, otherTokenValues);
+
+ Map[] valuesMaps = resolver.listTokenValues(new String[] {IvyPatternHelper.MODULE_KEY},
+ otherTokenValues);
Set vals = new HashSet();
for (int i = 0; i < valuesMaps.length; i++) {
vals.add(valuesMaps[i].get(IvyPatternHelper.MODULE_KEY));
@@ -332,8 +333,9 @@ public class IBiblioResolverTest extends
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: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java Tue Jan 14 08:27:37 2014
@@ -79,15 +79,15 @@ public class IvyRepResolverTest extends
assertNotNull(l);
assertEquals(1, l.size());
assertEquals(
- "http://www.jayasoft.fr/myivyrep/[organisation]/[module]/ivy-[revision].[ext]", l
- .get(0));
+ "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 testMandatoryRoot() throws Exception {
// IVY-625: should fail if no ivyroot specified
IvyRepResolver resolver = new IvyRepResolver();
@@ -100,8 +100,8 @@ public class IvyRepResolverTest extends
fail("using ivyrep resolver without ivyroot should raise an exception");
} catch (IllegalStateException ex) {
assertTrue(
- "exception thrown when using ivyrep with no ivyroot should talk about the root",
- ex.getMessage().indexOf("ivyroot") != -1);
+ "exception thrown when using ivyrep with no ivyroot should talk about the root", ex
+ .getMessage().indexOf("ivyroot") != -1);
}
}
@@ -112,7 +112,7 @@ public class IvyRepResolverTest extends
resolver.setName("testLocal");
resolver.setIvyroot("file:" + rootpath);
resolver.setIvypattern("[organisation]/[module]/ivys/ivy-[revision].xml");
- resolver.setArtroot("file:"+rootpath);
+ resolver.setArtroot("file:" + rootpath);
resolver.setArtpattern("[organisation]/[module]/jars/[artifact]-[revision].[ext]");
resolver.setSettings(_settings);
@@ -121,8 +121,8 @@ public class IvyRepResolverTest extends
false), _data);
assertNotNull(rmr);
- DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(),
- "mod1.1", "jar", "jar");
+ DefaultArtifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "mod1.1",
+ "jar", "jar");
DownloadReport report = resolver.download(new Artifact[] {artifact}, downloadOptions());
assertNotNull(report);
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java Tue Jan 14 08:27:37 2014
@@ -41,7 +41,7 @@ public class Maven2LocalTest extends Tes
private ResolveData data;
private File cache;
-
+
protected void setUp() throws Exception {
settings = new IvySettings();
engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings));
@@ -57,33 +57,27 @@ public class Maven2LocalTest extends Tes
public void testUseMetadataForListing() throws Exception {
IBiblioResolver resolver = maven2Resolver();
-
- ResolvedModuleRevision m = resolver.getDependency(
- new DefaultDependencyDescriptor(
- ModuleRevisionId.newInstance(
- "org.apache", "test-metadata", "latest.integration"),
+
+ ResolvedModuleRevision m = resolver.getDependency(new DefaultDependencyDescriptor(
+ ModuleRevisionId.newInstance("org.apache", "test-metadata", "latest.integration"),
false), data);
-
+
assertNotNull(m);
// should trust the metadata (latest=1.1) instead of listing revisions (latest=1.2)
- assertEquals(ModuleRevisionId.newInstance(
- "org.apache", "test-metadata", "1.1"), m.getId());
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test-metadata", "1.1"), m.getId());
}
public void testNotUseMetadataForListing() throws Exception {
IBiblioResolver resolver = maven2Resolver();
resolver.setUseMavenMetadata(false);
-
- ResolvedModuleRevision m = resolver.getDependency(
- new DefaultDependencyDescriptor(
- ModuleRevisionId.newInstance(
- "org.apache", "test-metadata", "latest.integration"),
+
+ ResolvedModuleRevision m = resolver.getDependency(new DefaultDependencyDescriptor(
+ ModuleRevisionId.newInstance("org.apache", "test-metadata", "latest.integration"),
false), data);
-
+
assertNotNull(m);
- // should trust listing revisions (latest=1.2) instead of the metadata (latest=1.1)
- assertEquals(ModuleRevisionId.newInstance(
- "org.apache", "test-metadata", "1.2"), m.getId());
+ // should trust listing revisions (latest=1.2) instead of the metadata (latest=1.1)
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test-metadata", "1.2"), m.getId());
}
private IBiblioResolver maven2Resolver() throws MalformedURLException {
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java Tue Jan 14 08:27:37 2014
@@ -53,8 +53,8 @@ public class MirroredURLResolverTest ext
settings.setDefaultCache(cache);
settings.setVariable("test.mirroredurl.mirrorlist-solo.url",
this.getClass().getResource("mirrorlist-solo.txt").toExternalForm());
- settings.setVariable("test.mirroredurl.mirrorlist-failover.url",
- this.getClass().getResource("mirrorlist-failover.txt").toExternalForm());
+ settings.setVariable("test.mirroredurl.mirrorlist-failover.url", this.getClass()
+ .getResource("mirrorlist-failover.txt").toExternalForm());
settings.setVariable("test.mirroredurl.mirrorlist-fail.url",
this.getClass().getResource("mirrorlist-fail.txt").toExternalForm());
new XmlSettingsParser(settings).parse(MirroredURLResolverTest.class
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java Tue Jan 14 08:27:37 2014
@@ -40,8 +40,8 @@ import org.apache.ivy.plugins.resolver.u
public class MockResolver extends AbstractResolver {
static MockResolver buildMockResolver(ResolverSettings settings, String name,
boolean findRevision, final Date publicationDate) {
- return buildMockResolver(settings, name, findRevision, ModuleRevisionId.newInstance("test",
- "test", "test"), publicationDate);
+ return buildMockResolver(settings, name, findRevision,
+ ModuleRevisionId.newInstance("test", "test", "test"), publicationDate);
}
static MockResolver buildMockResolver(ResolverSettings settings, String name,
@@ -56,10 +56,10 @@ public class MockResolver extends Abstra
r.setName(name);
r.setSettings(settings);
if (findRevision) {
- DefaultModuleDescriptor md = new DefaultModuleDescriptor(
- mrid, "integration", publicationDate, isdefault);
- r.rmr = new ResolvedModuleRevision(
- r, r, md, new MetadataArtifactDownloadReport(md.getMetadataArtifact()));
+ DefaultModuleDescriptor md = new DefaultModuleDescriptor(mrid, "integration",
+ publicationDate, isdefault);
+ r.rmr = new ResolvedModuleRevision(r, r, md, new MetadataArtifactDownloadReport(
+ md.getMetadataArtifact()));
}
return r;
}
@@ -79,16 +79,16 @@ public class MockResolver extends Abstra
askedDeps.add(dd);
return checkLatest(dd, rmr, data);
}
-
+
private boolean shouldReturnResolvedModule(DependencyDescriptor dd, ResolvedModuleRevision mr) {
// a resolved module revision has already been found by a prior dependency resolver
// let's see if it should be returned and bypass this resolver
-
+
ModuleRevisionId mrid = dd.getDependencyRevisionId();
boolean isDynamic = getSettings().getVersionMatcher().isDynamic(mrid);
boolean shouldReturn = mr.isForce();
shouldReturn |= !isDynamic && !mr.getDescriptor().isDefault();
-
+
return shouldReturn;
}
@@ -106,7 +106,7 @@ public class MockResolver extends Abstra
public ResolvedResource findIvyFileRef(DependencyDescriptor dd, ResolveData data) {
return null;
}
-
+
public RepositoryCacheManager getRepositoryCacheManager() {
return null;
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java Tue Jan 14 08:27:37 2014
@@ -53,14 +53,17 @@ public class PackagerResolverTest extend
private File cache;
private File workdir;
+
private File builddir;
+
private File cachedir;
protected void setUp() throws Exception {
Message.setDefaultLogger(new DefaultMessageLogger(99));
settings = new IvySettings();
- ResolveEngine engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings));
+ ResolveEngine engine = new ResolveEngine(settings, new EventManager(), new SortEngine(
+ settings));
cache = new File("build/cache");
data = new ResolveData(engine, new ResolveOptions());
cache.mkdirs();
@@ -87,15 +90,16 @@ public class PackagerResolverTest extend
public void testFile() throws Exception {
Locale oldLocale = Locale.getDefault();
-
+
try {
// set the locale to UK as workaround for SUN bug 6240963
Locale.setDefault(Locale.UK);
-
+
// Create and configure resolver
PackagerResolver resolver = new PackagerResolver();
resolver.setSettings(settings);
- String repoRoot = new File("test/repositories/packager/repo").toURI().toURL().toExternalForm();
+ String repoRoot = new File("test/repositories/packager/repo").toURI().toURL()
+ .toExternalForm();
resolver.addIvyPattern(repoRoot + "[organisation]/[module]/[revision]/ivy.xml");
resolver.setPackagerPattern(repoRoot
+ "[organisation]/[module]/[revision]/packager.xml");
@@ -103,76 +107,76 @@ public class PackagerResolverTest extend
resolver.setResourceCache(cachedir);
resolver.setPreserveBuildDirectories(true);
resolver.setVerbose(true);
-
- resolver.setProperty("packager.website.url",
- new File("test/repositories/packager/website").toURI().toURL().toExternalForm());
-
+
+ resolver.setProperty("packager.website.url", new File(
+ "test/repositories/packager/website").toURI().toURL().toExternalForm());
+
resolver.setName("packager");
assertEquals("packager", resolver.getName());
-
+
// Get module descriptor
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org", "mod", "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());
-
+
// Download artifact
Artifact artifact = new DefaultArtifact(mrid, pubdate, "mod", "jar", "jar");
DownloadReport report = resolver.download(new Artifact[] {artifact}, downloadOptions());
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ArtifactDownloadReport ar = report.getArtifactReport(artifact);
System.out.println("downloaddetails: " + ar.getDownloadDetails());
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
-
+
// Verify resource cache now contains the distribution archive
assertTrue(new File(cachedir, "mod-1.0.tar.gz").exists());
-
+
// Download again, should use Ivy cache this time
report = resolver.download(new Artifact[] {artifact}, downloadOptions());
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.NO, ar.getDownloadStatus());
-
+
// Now download the maven2 artifact
artifact = DefaultArtifact.cloneWithAnotherName(artifact, "foobar-janfu");
report = resolver.download(new Artifact[] {artifact}, downloadOptions());
assertNotNull(report);
-
+
assertEquals(1, report.getArtifactsReports().length);
-
+
ar = report.getArtifactReport(artifact);
assertNotNull(ar);
-
+
assertEquals(artifact, ar.getArtifact());
assertEquals(DownloadStatus.SUCCESSFUL, ar.getDownloadStatus());
} finally {
Locale.setDefault(oldLocale);
}
}
-
+
public void testZipResourceInclusion() throws Exception {
Locale oldLocale = Locale.getDefault();
-
+
try {
// set the locale to UK as workaround for SUN bug 6240963
Locale.setDefault(Locale.UK);
-
+
// Create and configure resolver
PackagerResolver resolver = new PackagerResolver();
resolver.setSettings(settings);
@@ -185,25 +189,26 @@ public class PackagerResolverTest extend
resolver.setResourceCache(cachedir);
resolver.setPreserveBuildDirectories(true);
resolver.setVerbose(true);
-
- resolver.setProperty("packager.website.url",
- new File("test/repositories/IVY-1179/website").toURI().toURL().toExternalForm());
-
+
+ resolver.setProperty("packager.website.url", new File(
+ "test/repositories/IVY-1179/website").toURI().toURL().toExternalForm());
+
resolver.setName("packager");
-
+
// Get module descriptor
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org", "A", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(
- new DefaultDependencyDescriptor(mrid, false), data);
-
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(
+ mrid, false), data);
+
// Download artifact
- Artifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "A", "jar", "jar");
+ Artifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "A", "jar",
+ "jar");
resolver.download(new Artifact[] {artifact}, downloadOptions());
-
+
// assert that the file A.jar is extracted from the archive
File jar = new File(builddir, "org/A/1.0/artifacts/jars/A.jar");
assertTrue(jar.exists());
-
+
// assert that the file README is not extracted from the archive
File readme = new File(builddir, "org/A/1.0/extract/A-1.0/README");
assertFalse(readme.exists());
@@ -211,10 +216,10 @@ public class PackagerResolverTest extend
Locale.setDefault(oldLocale);
}
}
-
+
public void testTarResourceInclusion() throws Exception {
Locale oldLocale = Locale.getDefault();
-
+
try {
// set the locale to UK as workaround for SUN bug 6240963
Locale.setDefault(Locale.UK);
@@ -231,25 +236,26 @@ public class PackagerResolverTest extend
resolver.setResourceCache(cachedir);
resolver.setPreserveBuildDirectories(true);
resolver.setVerbose(true);
-
- resolver.setProperty("packager.website.url",
- new File("test/repositories/IVY-1179/website").toURI().toURL().toExternalForm());
-
+
+ resolver.setProperty("packager.website.url", new File(
+ "test/repositories/IVY-1179/website").toURI().toURL().toExternalForm());
+
resolver.setName("packager");
-
+
// Get module descriptor
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org", "B", "1.0");
- ResolvedModuleRevision rmr = resolver.getDependency(
- new DefaultDependencyDescriptor(mrid, false), data);
-
+ ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(
+ mrid, false), data);
+
// Download artifact
- Artifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "B", "jar", "jar");
+ Artifact artifact = new DefaultArtifact(mrid, rmr.getPublicationDate(), "B", "jar",
+ "jar");
resolver.download(new Artifact[] {artifact}, downloadOptions());
-
+
// assert that the file B.jar is extracted from the archive
File jar = new File(builddir, "org/B/1.0/artifacts/jars/B.jar");
assertTrue(jar.exists());
-
+
// assert that the file README is not extracted from the archive
File readme = new File(builddir, "org/B/1.0/extract/B-1.0/README");
assertFalse(readme.exists());
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java Tue Jan 14 08:27:37 2014
@@ -32,9 +32,9 @@ public class ResolverTestHelper {
static void assertOrganisationEntries(DependencyResolver resolver, String[] orgNames,
OrganisationEntry[] orgs) {
Assert.assertNotNull(orgs);
- Assert.assertEquals("invalid organisation entries: unmatched number: expected: "
- + Arrays.asList(orgNames) + " but was "+Arrays.asList(orgs),
- orgNames.length, orgs.length);
+ Assert.assertEquals(
+ "invalid organisation entries: unmatched number: expected: " + Arrays.asList(orgNames)
+ + " but was " + Arrays.asList(orgs), orgNames.length, orgs.length);
assertOrganisationEntriesContains(resolver, orgNames, orgs);
}
@@ -56,9 +56,9 @@ public class ResolverTestHelper {
static void assertModuleEntries(DependencyResolver resolver, OrganisationEntry org,
String[] names, ModuleEntry[] mods) {
Assert.assertNotNull(mods);
- Assert.assertEquals("invalid module entries: unmatched number: expected: "
- + Arrays.asList(names) + " but was "+Arrays.asList(mods),
- names.length, mods.length);
+ Assert.assertEquals(
+ "invalid module entries: unmatched number: expected: " + Arrays.asList(names)
+ + " but was " + Arrays.asList(mods), names.length, mods.length);
assertModuleEntriesContains(resolver, org, names, mods);
}
@@ -81,9 +81,9 @@ public class ResolverTestHelper {
static void assertRevisionEntries(DependencyResolver resolver, ModuleEntry mod, String[] names,
RevisionEntry[] revs) {
Assert.assertNotNull(revs);
- Assert.assertEquals("invalid revision entries: unmatched number: expected: "
- + Arrays.asList(names) + " but was "+Arrays.asList(revs),
- names.length, revs.length);
+ Assert.assertEquals(
+ "invalid revision entries: unmatched number: expected: " + Arrays.asList(names)
+ + " but was " + Arrays.asList(revs), names.length, revs.length);
assertRevisionEntriesContains(resolver, mod, names, revs);
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java Tue Jan 14 08:27:37 2014
@@ -123,14 +123,14 @@ public class URLResolverTest extends Abs
resolver.setSettings(settings);
String rootpath = new File("test/repositories/1").toURI().toURL().toExternalForm();
resolver.addIvyPattern(rootpath + "[organisation]/[module]/ivys/ivy-[revision].xml");
- resolver.addArtifactPattern(rootpath + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(rootpath
+ + "[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
resolver.setName("test");
assertEquals("test", resolver.getName());
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());
@@ -141,16 +141,17 @@ public class URLResolverTest extends Abs
public void testLatestFileWithOpaqueURL() throws Exception {
URLResolver resolver = new URLResolver();
resolver.setSettings(settings);
- String rootpath = new File("test/repositories/1").getAbsoluteFile().toURI().toURL().toExternalForm();
+ String rootpath = new File("test/repositories/1").getAbsoluteFile().toURI().toURL()
+ .toExternalForm();
resolver.addIvyPattern(rootpath + "/[organisation]/[module]/ivys/ivy-[revision].xml");
- resolver.addArtifactPattern(rootpath + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
+ resolver.addArtifactPattern(rootpath
+ + "/[organisation]/[module]/[type]s/[artifact]-[revision].[type]");
resolver.setName("test");
assertEquals("test", resolver.getName());
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());
@@ -318,8 +319,9 @@ public class URLResolverTest extends Abs
+ "/maven/[module]/[type]s/[artifact]-[revision].[type]");
resolver.setName("test");
- 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));
}
public void testDownloadWithUseOriginIsTrue() throws Exception {
@@ -345,8 +347,7 @@ public class URLResolverTest extends Abs
// test to ask to download
DefaultArtifact artifact = new DefaultArtifact(mrid, pubdate, "mod1.1", "jar", "jar");
- DownloadReport report = resolver.download(new Artifact[] {artifact},
- new DownloadOptions());
+ DownloadReport report = resolver.download(new Artifact[] {artifact}, new DownloadOptions());
assertNotNull(report);
assertEquals(1, report.getArtifactsReports().length);
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java Tue Jan 14 08:27:37 2014
@@ -17,7 +17,6 @@
*/
package org.apache.ivy.plugins.resolver;
-
public class VfsResolverTest extends AbstractDependencyResolverTest {
VfsResolver resolver = null;
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java Tue Jan 14 08:27:37 2014
@@ -28,14 +28,15 @@ public class ResolverHelperTest extends
public void testListTokenValuesForIvy1238() {
FileRepository rep = new FileRepository(new File(".").getAbsoluteFile());
- String[] revisions = ResolverHelper.listTokenValues(rep, "test/repositories/IVY-1238/ivy-org/modA/v[revision]/ivy.xml", "revision");
+ String[] revisions = ResolverHelper.listTokenValues(rep,
+ "test/repositories/IVY-1238/ivy-org/modA/v[revision]/ivy.xml", "revision");
assertNotNull(revisions);
assertEquals(2, revisions.length);
-
+
Arrays.sort(revisions);
assertEquals("1.0", revisions[0]);
assertEquals("2.0", revisions[1]);
}
-
+
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java Tue Jan 14 08:27:37 2014
@@ -31,60 +31,61 @@ import org.apache.ivy.util.MockMessageLo
public class LogTriggerTest extends TestCase {
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-
+
private StartResolveEvent ev;
+
private LogTrigger trigger;
+
private File testDir;
protected void setUp() {
- ev = new StartResolveEvent(
- DefaultModuleDescriptor.newBasicInstance(ModuleRevisionId.parse("o#A;1"), new Date()),
- new String[] {"c"});
+ ev = new StartResolveEvent(DefaultModuleDescriptor.newBasicInstance(
+ ModuleRevisionId.parse("o#A;1"), new Date()), new String[] {"c"});
trigger = new LogTrigger();
trigger.setEvent(ev.getName());
testDir = new File("build/test/trigger");
testDir.mkdirs();
}
-
+
protected void tearDown() throws Exception {
FileUtil.forceDelete(testDir);
}
public void testMessage() throws Exception {
trigger.setMessage("msg: ${organisation} ${module} ${revision}");
-
+
MockMessageLogger mockLogger = new MockMessageLogger();
Message.setDefaultLogger(mockLogger);
trigger.progress(ev);
-
+
mockLogger.assertLogInfoContains("msg: o A 1");
}
-
+
public void testFile() throws Exception {
trigger.setMessage("msg: ${organisation} ${module} ${revision}");
File f = new File(testDir, "test.log");
trigger.setFile(f);
-
+
trigger.progress(ev);
-
+
assertTrue(f.exists());
assertEquals("msg: o A 1" + LINE_SEPARATOR, FileUtil.readEntirely(f));
trigger.progress(ev);
-
- assertEquals("msg: o A 1" + LINE_SEPARATOR + "msg: o A 1" + LINE_SEPARATOR,
+
+ assertEquals("msg: o A 1" + LINE_SEPARATOR + "msg: o A 1" + LINE_SEPARATOR,
FileUtil.readEntirely(f));
}
-
+
public void testFileNoAppend() throws Exception {
trigger.setMessage("msg: ${organisation} ${module} ${revision}");
File f = new File(testDir, "test.log");
trigger.setFile(f);
trigger.setAppend(false);
-
+
trigger.progress(ev);
trigger.progress(ev);
-
+
assertTrue(f.exists());
assertEquals("msg: o A 1" + LINE_SEPARATOR, FileUtil.readEntirely(f));
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java Tue Jan 14 08:27:37 2014
@@ -26,11 +26,11 @@ import org.apache.ivy.core.module.status
public class LatestVersionMatcherTest extends TestCase {
private LatestVersionMatcher vm = new LatestVersionMatcher();
-
+
protected void setUp() {
IvyContext.pushNewContext();
}
-
+
protected void tearDown() {
IvyContext.popContext();
}
@@ -40,7 +40,7 @@ public class LatestVersionMatcherTest ex
assertNeed("latest.milestone", true);
assertNeed("latest.integration", false);
}
-
+
public void testNeedModuleDescriptorCustomStatus() throws Exception {
StatusManager.getCurrent().addStatus(new Status("release", false));
StatusManager.getCurrent().addStatus(new Status("snapshot", true));
@@ -51,6 +51,7 @@ public class LatestVersionMatcherTest ex
// assertion helper methods
private void assertNeed(String askedVersion, boolean b) {
- assertEquals(b, vm.needModuleDescriptor(ModuleRevisionId.newInstance("org", "name", askedVersion), null));
+ assertEquals(b, vm.needModuleDescriptor(
+ ModuleRevisionId.newInstance("org", "name", askedVersion), null));
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java Tue Jan 14 08:27:37 2014
@@ -25,36 +25,37 @@ public class PatternVersionMatcherTest e
public void testSingleMatch() {
PatternVersionMatcher pvm = new PatternVersionMatcher();
pvm.addMatch(generateRegexpMatch1());
-
+
assertAccept(pvm, "foo(1,3)", "1.4.1", false);
assertAccept(pvm, "foo(1,3)", "1.3", false);
assertAccept(pvm, "foo(1,3)", "2.3.1", false);
-
+
assertAccept(pvm, "foo(1,3)", "1.3.1", true);
}
-
+
public void testMultipleMatchEqualRevisions() {
PatternVersionMatcher pvm = new PatternVersionMatcher();
pvm.addMatch(generateRegexpMatch1());
pvm.addMatch(generateRegexpMatch2());
-
- assertAccept(pvm, "foo(1,3)", "1.3", true);
- assertAccept(pvm, "foo(1,3)", "1.3.1", true);
+
+ assertAccept(pvm, "foo(1,3)", "1.3", true);
+ assertAccept(pvm, "foo(1,3)", "1.3.1", true);
}
-
+
public void testMultipleMatchNonEqualRevisions() {
PatternVersionMatcher pvm = new PatternVersionMatcher();
pvm.addMatch(generateRegexpMatch1());
pvm.addMatch(generateRegexpMatch3());
-
+
assertAccept(pvm, "foo(1,3)", "1.3", false);
assertAccept(pvm, "bar(1,3)", "1.3", true);
- assertAccept(pvm, "foo(1,3)", "1.3.1", true);
+ assertAccept(pvm, "foo(1,3)", "1.3.1", true);
}
/**
- * Generates a Match instance that has the following xml representation:
- * <match revision="foo" pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" />
+ * Generates a Match instance that has the following xml representation: <match revision="foo"
+ * pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" />
+ *
* @return
*/
private Match generateRegexpMatch1() {
@@ -68,8 +69,9 @@ public class PatternVersionMatcherTest e
}
/**
- * Generates a Match instance that has the following xml representation:
- * <match revision="foo" pattern="${major}\.${minor}" args="major, minor" matcher="regexp" />
+ * Generates a Match instance that has the following xml representation: <match revision="foo"
+ * pattern="${major}\.${minor}" args="major, minor" matcher="regexp" />
+ *
* @return
*/
private Match generateRegexpMatch2() {
@@ -81,7 +83,7 @@ public class PatternVersionMatcherTest e
return match;
}
-
+
private Match generateRegexpMatch3() {
Match match = new Match();
match.setRevision("bar");
@@ -91,7 +93,6 @@ public class PatternVersionMatcherTest e
return match;
}
-
private void assertAccept(PatternVersionMatcher matcher, String askedVersion,
String depVersion, boolean b) {
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java Tue Jan 14 08:27:37 2014
@@ -158,7 +158,9 @@ public class VersionRangeMatcherTest ext
}
private void assertAccept(String askedVersion, String depVersion, boolean b) {
- assertEquals(b, vm.accept(ModuleRevisionId.newInstance("org", "name", askedVersion),
- ModuleRevisionId.newInstance("org", "name", depVersion)));
+ assertEquals(
+ b,
+ vm.accept(ModuleRevisionId.newInstance("org", "name", askedVersion),
+ ModuleRevisionId.newInstance("org", "name", depVersion)));
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/util/CacheCleaner.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/util/CacheCleaner.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/util/CacheCleaner.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/util/CacheCleaner.java Tue Jan 14 08:27:37 2014
@@ -21,10 +21,9 @@ import java.io.File;
public class CacheCleaner {
- /**
- * Delete the directory and all it contains.
- * Previously, we used the ant delete task, but it occasionaly failed (access denied)
- * on my machine for unknown reason.
+ /**
+ * Delete the directory and all it contains. Previously, we used the ant delete task, but it
+ * occasionaly failed (access denied) on my machine for unknown reason.
**/
public static void deleteDir(File toDelete) {
FileUtil.forceDelete(toDelete);
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java Tue Jan 14 08:27:37 2014
@@ -28,19 +28,19 @@ import junit.framework.TestCase;
*
*/
public class ConfiguratorTest extends TestCase {
-
+
public static class FileTester {
private File file;
-
+
public void setFile(File file) {
this.file = file;
}
-
+
public File getFile() {
return file;
}
}
-
+
public static class City {
private List _housings = new ArrayList();
@@ -77,7 +77,7 @@ public class ConfiguratorTest extends Te
private Class _clazz;
private List _trees = new ArrayList();
-
+
private List _walkers = new ArrayList();
public List getTrees() {
@@ -87,11 +87,11 @@ public class ConfiguratorTest extends Te
public void addConfiguredTree(Tree tree) {
_trees.add(tree);
}
-
+
public List getWalkers() {
return _walkers;
}
-
+
public void addConfiguredWalker(Map walkerAttributes) {
_walkers.add(new Person((String) walkerAttributes.get("name")));
}
@@ -314,10 +314,10 @@ public class ConfiguratorTest extends Te
_conf.endCreateChild();
assertEquals(city, _conf.getCurrent());
assertEquals(2, ((Housing) city.getHousings().get(0)).getRooms().size());
- assertEquals(20, ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(0))
- .getSurface());
- assertEquals(25, ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(1))
- .getSurface());
+ assertEquals(20,
+ ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(0)).getSurface());
+ assertEquals(25,
+ ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(1)).getSurface());
}
public void testMacro() throws Exception {
@@ -357,29 +357,29 @@ public class ConfiguratorTest extends Te
// first castle : 2 default rooms of 10 of surface
assertEquals(2, ((Housing) city.getHousings().get(0)).getRooms().size());
- assertEquals(10, ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(0))
- .getSurface());
- assertEquals(10, ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(1))
- .getSurface());
+ assertEquals(10,
+ ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(0)).getSurface());
+ assertEquals(10,
+ ((Room) ((Housing) city.getHousings().get(0)).getRooms().get(1)).getSurface());
// second castle : 2 default rooms of default surface 40, + one addroom of surface 20
assertEquals(3, ((Housing) city.getHousings().get(1)).getRooms().size());
- assertEquals(40, ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(0))
- .getSurface());
- assertEquals(40, ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(1))
- .getSurface());
- assertEquals(20, ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(2))
- .getSurface());
+ assertEquals(40,
+ ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(0)).getSurface());
+ assertEquals(40,
+ ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(1)).getSurface());
+ assertEquals(20,
+ ((Room) ((Housing) city.getHousings().get(1)).getRooms().get(2)).getSurface());
}
-
+
public void testFileAttribute() {
FileTester root = new FileTester();
_conf.setRoot(root);
_conf.setAttribute("file", "path/to/file.txt");
-
+
String filePath = root.getFile().getPath();
filePath = filePath.replace('\\', '/');
-
+
assertEquals("path/to/file.txt", filePath);
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java Tue Jan 14 08:27:37 2014
@@ -27,8 +27,8 @@ import org.apache.ivy.core.IvyPatternHel
public class IvyPatternHelperTest extends TestCase {
public void testSubstitute() {
String pattern = "[organisation]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]";
- assertEquals("apache/Test/build/archives/jars/test-1.0.jar", IvyPatternHelper.substitute(
- pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
+ assertEquals("apache/Test/build/archives/jars/test-1.0.jar",
+ IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
}
public void testCyclicSubstitute() {
@@ -50,23 +50,23 @@ public class IvyPatternHelperTest extend
Map tokens = new HashMap();
tokens.put("token", "");
tokens.put("othertoken", "myval");
- assertEquals("test-myval", IvyPatternHelper.substituteTokens(
- "test(-[token])(-[othertoken])", tokens));
+ assertEquals("test-myval",
+ IvyPatternHelper.substituteTokens("test(-[token])(-[othertoken])", tokens));
tokens.put("token", "val");
- assertEquals("test-val-myval", IvyPatternHelper.substituteTokens(
- "test(-[token])(-[othertoken])", tokens));
+ assertEquals("test-val-myval",
+ IvyPatternHelper.substituteTokens("test(-[token])(-[othertoken])", tokens));
}
public void testOrganization() {
String pattern = "[organization]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]";
- assertEquals("apache/Test/build/archives/jars/test-1.0.jar", IvyPatternHelper.substitute(
- pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
+ assertEquals("apache/Test/build/archives/jars/test-1.0.jar",
+ IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
}
-
+
public void testSpecialCharsInsidePattern() {
String pattern = "[organization]/[module]/build/archives (x86)/[type]s/[artifact]-[revision].[ext]";
- assertEquals("apache/Test/build/archives (x86)/jars/test-1.0.jar", IvyPatternHelper.substitute(
- pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
+ assertEquals("apache/Test/build/archives (x86)/jars/test-1.0.jar",
+ IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
}
public void testTokenRoot() {