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 [31/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/core/retrieve/RetrieveTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java Tue Jun 5 05:02:27 2007
@@ -33,6 +33,7 @@
public class RetrieveTest extends TestCase {
private final Ivy _ivy;
+
private File _cache;
public RetrieveTest() throws Exception {
@@ -48,7 +49,7 @@
_cache = new File("build/cache");
_cache.mkdirs();
}
-
+
protected void tearDown() throws Exception {
cleanCache();
Delete del = new Delete();
@@ -66,104 +67,119 @@
public void testRetrieveSimple() throws Exception {
// mod1.1 depends on mod1.2
- ResolveReport report = _ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
- getResolveOptions(new String[] {"*"}));
+ ResolveReport report = _ivy.resolve(new File(
+ "test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
+ getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
assertNotNull(md);
-
+
String pattern = "build/test/retrieve/[module]/[conf]/[artifact]-[revision].[ext]";
_ivy.retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions());
- assertTrue(new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar", "default")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2",
+ "jar", "jar", "default")).exists());
pattern = "build/test/retrieve/[module]/[conf]/[type]s/[artifact]-[revision].[ext]";
_ivy.retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions());
- assertTrue(new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar", "default")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2",
+ "jar", "jar", "default")).exists());
}
public void testRetrieveOverwrite() throws Exception {
// mod1.1 depends on mod1.2
- ResolveReport report = _ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
- getResolveOptions(new String[] {"*"}));
+ ResolveReport report = _ivy.resolve(new File(
+ "test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
+ getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
assertNotNull(md);
-
+
String pattern = "build/test/retrieve/[module]/[conf]/[artifact]-[revision].[ext]";
-
+
// we create a fake old file to see if it is overwritten
- File file = new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar", "default"));
+ File file = new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0",
+ "mod1.2", "jar", "jar", "default"));
file.getParentFile().mkdirs();
file.createNewFile();
file.setLastModified(10000);
_ivy.retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions());
- assertEquals(new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").lastModified(), file.lastModified());
+ assertEquals(
+ new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").lastModified(), file
+ .lastModified());
}
public void testRetrieveWithSymlinks() throws Exception {
// mod1.1 depends on mod1.2
- ResolveReport report = _ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
- getResolveOptions(new String[] {"*"}));
+ ResolveReport report = _ivy.resolve(new File(
+ "test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
+ getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
assertNotNull(md);
-
+
String pattern = "build/test/retrieve/[module]/[conf]/[artifact]-[revision].[ext]";
- _ivy.retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions().setMakeSymlinks(true));
- assertLink(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar", "default"));
+ _ivy
+ .retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions().setMakeSymlinks(
+ true));
+ assertLink(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar",
+ "jar", "default"));
pattern = "build/test/retrieve/[module]/[conf]/[type]s/[artifact]-[revision].[ext]";
- _ivy.retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions().setMakeSymlinks(true));
- assertLink(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar", "default"));
+ _ivy
+ .retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions().setMakeSymlinks(
+ true));
+ assertLink(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar",
+ "jar", "default"));
}
private void assertLink(String filename) throws IOException {
- // if the OS is known to support symlink, check that the file is a symlink,
- // otherwise just check the file exist.
-
- File file = new File(filename);
- assertTrue("The file " + filename + " doesn't exist", file.exists());
-
+ // if the OS is known to support symlink, check that the file is a symlink,
+ // otherwise just check the file exist.
+
+ File file = new File(filename);
+ assertTrue("The file " + filename + " doesn't exist", file.exists());
+
String os = System.getProperty("os.name");
- if (os.equals("Linux") ||
- os.equals("Solaris") ||
- os.equals("FreeBSD")) {
- // these OS should support symnlink, so check that the file is actually a symlink.
- // this is done be checking that the canonical path is different from the absolute
- // path.
- File absFile = file.getAbsoluteFile();
- File canFile = file.getCanonicalFile();
- assertFalse("The file " + filename + " isn't a symlink", absFile.equals(canFile));
+ if (os.equals("Linux") || os.equals("Solaris") || os.equals("FreeBSD")) {
+ // these OS should support symnlink, so check that the file is actually a symlink.
+ // this is done be checking that the canonical path is different from the absolute
+ // path.
+ File absFile = file.getAbsoluteFile();
+ File canFile = file.getCanonicalFile();
+ assertFalse("The file " + filename + " isn't a symlink", absFile.equals(canFile));
}
}
public void testRetrieveWithVariable() throws Exception {
// mod1.1 depends on mod1.2
_ivy.setVariable("retrieve.dir", "retrieve");
- ResolveReport report = _ivy.resolve(new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
- getResolveOptions(new String[] {"*"}));
+ ResolveReport report = _ivy.resolve(new File(
+ "test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURL(),
+ getResolveOptions(new String[] {"*"}));
assertNotNull(report);
ModuleDescriptor md = report.getModuleDescriptor();
assertNotNull(md);
-
+
String pattern = "build/test/${retrieve.dir}/[module]/[conf]/[artifact]-[revision].[ext]";
_ivy.retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions());
pattern = IvyPatternHelper.substituteVariable(pattern, "retrieve.dir", "retrieve");
- assertTrue(new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar", "default")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2",
+ "jar", "jar", "default")).exists());
pattern = "build/test/${retrieve.dir}/[module]/[conf]/[type]s/[artifact]-[revision].[ext]";
_ivy.retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions());
pattern = IvyPatternHelper.substituteVariable(pattern, "retrieve.dir", "retrieve");
- assertTrue(new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2", "jar", "jar", "default")).exists());
+ assertTrue(new File(IvyPatternHelper.substitute(pattern, "org1", "mod1.2", "2.0", "mod1.2",
+ "jar", "jar", "default")).exists());
}
- private RetrieveOptions getRetrieveOptions() {
- return new RetrieveOptions().setCache(CacheManager.getInstance(_ivy.getSettings(), _cache));
- }
+ private RetrieveOptions getRetrieveOptions() {
+ return new RetrieveOptions().setCache(CacheManager.getInstance(_ivy.getSettings(), _cache));
+ }
-
private ResolveOptions getResolveOptions(String[] confs) {
- return new ResolveOptions().setConfs(confs).setCache(CacheManager.getInstance(_ivy.getSettings(), _cache));
- }
+ return new ResolveOptions().setConfs(confs).setCache(
+ CacheManager.getInstance(_ivy.getSettings(), _cache));
+ }
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java Tue Jun 5 05:02:27 2007
@@ -32,33 +32,34 @@
public void testDefault() throws ParseException, IOException {
Ivy ivy = new Ivy();
ivy.configureDefault();
-
+
IvySettings settings = ivy.getSettings();
- assertNotNull(settings.getDefaultResolver());
-
+ assertNotNull(settings.getDefaultResolver());
+
DependencyResolver publicResolver = settings.getResolver("public");
- assertNotNull(publicResolver);
- assertTrue(publicResolver instanceof IBiblioResolver);
- IBiblioResolver ibiblio = (IBiblioResolver) publicResolver;
- assertTrue(ibiblio.isM2compatible());
+ assertNotNull(publicResolver);
+ assertTrue(publicResolver instanceof IBiblioResolver);
+ IBiblioResolver ibiblio = (IBiblioResolver) publicResolver;
+ assertTrue(ibiblio.isM2compatible());
}
-
+
public void testDefault14() throws ParseException, IOException {
Ivy ivy = new Ivy();
ivy.configureDefault14();
-
+
IvySettings settings = ivy.getSettings();
- assertNotNull(settings.getDefaultResolver());
-
+ assertNotNull(settings.getDefaultResolver());
+
DependencyResolver publicResolver = settings.getResolver("public");
- assertTrue(publicResolver instanceof IvyRepResolver);
+ assertTrue(publicResolver instanceof IvyRepResolver);
}
-
+
public void testTypedefWithCustomClasspath() throws Exception {
Ivy ivy = new Ivy();
- ivy.setVariable("ivy.custom.test.dir", new File("test/java/org/apache/ivy/core/settings").toURL().toString());
+ ivy.setVariable("ivy.custom.test.dir", new File("test/java/org/apache/ivy/core/settings")
+ .toURL().toString());
ivy.configure(ConfigureTest.class.getResource("ivysettings-custom-typedef.xml"));
-
+
DependencyResolver custom = ivy.getSettings().getResolver("custom");
assertNotNull(custom);
assertEquals("org.apache.ivy.plugins.resolver.CustomResolver", custom.getClass().getName());
@@ -66,9 +67,10 @@
public void testTypedefWithCustomClasspathWithFile() throws Exception {
Ivy ivy = new Ivy();
- ivy.setVariable("ivy.custom.test.dir", new File("test/java/org/apache/ivy/core/settings").toString());
+ ivy.setVariable("ivy.custom.test.dir", new File("test/java/org/apache/ivy/core/settings")
+ .toString());
ivy.configure(ConfigureTest.class.getResource("ivysettings-custom-typedef2.xml"));
-
+
DependencyResolver custom = ivy.getSettings().getResolver("custom");
assertNotNull(custom);
assertEquals("org.apache.ivy.plugins.resolver.CustomResolver", custom.getClass().getName());
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java Tue Jun 5 05:02:27 2007
@@ -31,19 +31,20 @@
* split from XmlIvyConfigurationParserTest due to dependency on network resource
*/
public class OnlineXmlSettingsParserTest extends TestCase {
- // remote.test
-
+ // remote.test
+
public void testIncludeHttpUrl() throws Exception {
configureURLHandler();
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(new URL("http://incubator.apache.org/ivy/test/ivysettings-include-http-url.xml"));
-
+ parser.parse(new URL(
+ "http://incubator.apache.org/ivy/test/ivysettings-include-http-url.xml"));
+
DependencyResolver resolver = settings.getResolver("ivyrep");
assertNotNull(resolver);
assertTrue(resolver instanceof IvyRepResolver);
}
-
+
private void configureURLHandler() {
URLHandlerDispatcher dispatcher = new URLHandlerDispatcher();
URLHandler httpHandler = URLHandlerRegistry.getHttp();
@@ -51,5 +52,5 @@
dispatcher.setDownloader("https", httpHandler);
URLHandlerRegistry.setDefault(dispatcher);
}
-
+
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java Tue Jun 5 05:02:27 2007
@@ -18,7 +18,6 @@
package org.apache.ivy.core.settings;
import java.io.File;
-import java.io.IOException;
import java.text.ParseException;
import java.util.List;
@@ -48,29 +47,30 @@
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-test.xml"));
-
+
File defaultCache = settings.getDefaultCache();
assertNotNull(defaultCache);
assertEquals("mycache", defaultCache.getName());
-
+
assertFalse(settings.isCheckUpToDate());
assertFalse(settings.doValidate());
-
+
assertEquals("[module]/ivys/ivy-[revision].xml", settings.getCacheIvyPattern());
- assertEquals("[module]/[type]s/[artifact]-[revision].[ext]", settings.getCacheArtifactPattern());
-
+ assertEquals("[module]/[type]s/[artifact]-[revision].[ext]", settings
+ .getCacheArtifactPattern());
+
LatestStrategy latest = settings.getLatestStrategy("mylatest-revision");
assertNotNull(latest);
assertTrue(latest instanceof LatestRevisionStrategy);
- LatestRevisionStrategy l = (LatestRevisionStrategy)latest;
+ LatestRevisionStrategy l = (LatestRevisionStrategy) latest;
assertEquals(new Integer(-2), l.getSpecialMeanings().get("pre"));
assertEquals(new Integer(4), l.getSpecialMeanings().get("qa"));
-
+
DependencyResolver defaultResolver = settings.getDefaultResolver();
assertNotNull(defaultResolver);
assertEquals("libraries", defaultResolver.getName());
assertTrue(defaultResolver instanceof FileSystemResolver);
- FileSystemResolver fsres = (FileSystemResolver)defaultResolver;
+ FileSystemResolver fsres = (FileSystemResolver) defaultResolver;
List ivyPatterns = fsres.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
@@ -79,20 +79,21 @@
LatestStrategy strategy = fsres.getLatestStrategy();
assertNotNull(strategy);
assertTrue(strategy instanceof LatestRevisionStrategy);
-
+
DependencyResolver internal = settings.getResolver("internal");
assertNotNull(internal);
assertTrue(internal instanceof ChainResolver);
- ChainResolver chain = (ChainResolver)internal;
+ ChainResolver chain = (ChainResolver) internal;
List subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(2, subresolvers.size());
- FileSystemResolver fsInt1 = (FileSystemResolver)subresolvers.get(0);
+ FileSystemResolver fsInt1 = (FileSystemResolver) subresolvers.get(0);
assertEquals("int1", fsInt1.getName());
assertEquals(1, fsInt1.getIvyPatterns().size());
- assertEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml", fsInt1.getIvyPatterns().get(0));
- assertEquals("int2", ((DependencyResolver)subresolvers.get(1)).getName());
-
+ assertEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml", fsInt1
+ .getIvyPatterns().get(0));
+ assertEquals("int2", ((DependencyResolver) subresolvers.get(1)).getName());
+
strategy = fsInt1.getLatestStrategy();
assertNotNull(strategy);
assertTrue(strategy instanceof LatestTimeStrategy);
@@ -100,59 +101,63 @@
assertEquals("libraries", settings.getResolver(new ModuleId("unknown", "lib")).getName());
assertEquals("internal", settings.getResolver(new ModuleId("apache", "ant")).getName());
assertEquals("int1", settings.getResolver(new ModuleId("apache", "ivy")).getName());
- assertEquals("int1", settings.getResolver(new ModuleId("apache", "ivyde")).getName());
+ assertEquals("int1", settings.getResolver(new ModuleId("apache", "ivyde")).getName());
}
-
+
public void testNoOrgInModule() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
try {
- parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-no-org-in-module.xml"));
- fail("no organisation in module is supposed to raise an exception");
- } catch (ParseException e) {
- assertTrue("bad exception message: "+e.getMessage(), e.getMessage().indexOf("'organisation'") != -1);
- }
+ parser.parse(XmlSettingsParserTest.class
+ .getResource("ivysettings-no-org-in-module.xml"));
+ fail("no organisation in module is supposed to raise an exception");
+ } catch (ParseException e) {
+ assertTrue("bad exception message: " + e.getMessage(), e.getMessage().indexOf(
+ "'organisation'") != -1);
+ }
}
public void testNoNameInModule() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
try {
- parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-no-name-in-module.xml"));
- fail("no name in module is supposed to raise an exception");
- } catch (ParseException e) {
- assertTrue("bad exception message: "+e.getMessage(), e.getMessage().indexOf("'name'") != -1);
- }
+ parser.parse(XmlSettingsParserTest.class
+ .getResource("ivysettings-no-name-in-module.xml"));
+ fail("no name in module is supposed to raise an exception");
+ } catch (ParseException e) {
+ assertTrue("bad exception message: " + e.getMessage(),
+ e.getMessage().indexOf("'name'") != -1);
+ }
}
public void testTypedef() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-typedef.xml"));
-
+
DependencyResolver mock = settings.getResolver("mock3");
assertNotNull(mock);
assertTrue(mock instanceof MockResolver);
-
+
DependencyResolver internal = settings.getResolver("internal");
assertNotNull(internal);
assertTrue(internal instanceof ChainResolver);
- ChainResolver chain = (ChainResolver)internal;
+ ChainResolver chain = (ChainResolver) internal;
List subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(2, subresolvers.size());
-
- assertEquals("mock1", ((DependencyResolver)subresolvers.get(0)).getName());
- assertEquals("mock2", ((DependencyResolver)subresolvers.get(1)).getName());
+
+ assertEquals("mock1", ((DependencyResolver) subresolvers.get(0)).getName());
+ assertEquals("mock2", ((DependencyResolver) subresolvers.get(1)).getName());
assertTrue(subresolvers.get(0) instanceof MockResolver);
assertTrue(subresolvers.get(1) instanceof MockResolver);
}
-
+
public void testStatuses() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-status.xml"));
-
+
assertEquals("bronze", settings.getStatusManager().getDefaultStatus());
assertEquals(0, settings.getStatusManager().getPriority("gold"));
assertEquals(1, settings.getStatusManager().getPriority("silver"));
@@ -161,25 +166,26 @@
assertEquals(false, settings.getStatusManager().isIntegration("silver"));
assertEquals(true, settings.getStatusManager().isIntegration("bronze"));
}
-
+
public void testConflictManager() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-conflict-manager.xml"));
-
- assertEquals("latest-time", settings.getConflictManager(new ModuleId("apache", "ivyde")).getName());
+
+ assertEquals("latest-time", settings.getConflictManager(new ModuleId("apache", "ivyde"))
+ .getName());
assertEquals("all", settings.getConflictManager(new ModuleId("apache", "ant")).getName());
}
-
+
public void testVersionMatchers1() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-vmatcher1.xml"));
-
+
VersionMatcher mock = settings.getVersionMatcher("vmock");
assertNotNull(mock);
assertTrue(mock instanceof MockVersionMatcher);
-
+
VersionMatcher v = settings.getVersionMatcher();
assertTrue(v instanceof ChainVersionMatcher);
ChainVersionMatcher chain = (ChainVersionMatcher) v;
@@ -188,96 +194,100 @@
assertTrue(chain.getMatchers().contains(settings.getVersionMatcher("exact")));
assertTrue(chain.getMatchers().contains(settings.getVersionMatcher("latest")));
}
-
+
public void testVersionMatchers2() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-vmatcher2.xml"));
-
+
VersionMatcher mock = settings.getVersionMatcher("vmock");
assertNotNull(mock);
assertTrue(mock instanceof MockVersionMatcher);
-
+
VersionMatcher v = settings.getVersionMatcher();
assertTrue(v instanceof ChainVersionMatcher);
ChainVersionMatcher chain = (ChainVersionMatcher) v;
assertEquals(5, chain.getMatchers().size());
assertTrue(chain.getMatchers().contains(mock));
}
-
+
public void testRef() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-ref.xml"));
-
+
DependencyResolver internal = settings.getResolver("internal");
assertNotNull(internal);
assertTrue(internal instanceof ChainResolver);
- ChainResolver chain = (ChainResolver)internal;
+ ChainResolver chain = (ChainResolver) internal;
List subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(2, subresolvers.size());
- FileSystemResolver fsInt1 = (FileSystemResolver)subresolvers.get(0);
+ FileSystemResolver fsInt1 = (FileSystemResolver) subresolvers.get(0);
assertEquals("fs", fsInt1.getName());
List ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml", ivyPatterns.get(0));
+ assertEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml", ivyPatterns
+ .get(0));
DependencyResolver external = settings.getResolver("external");
assertNotNull(external);
assertTrue(external instanceof ChainResolver);
- chain = (ChainResolver)external;
+ chain = (ChainResolver) external;
subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(1, subresolvers.size());
- FileSystemResolver fsInt2 = (FileSystemResolver)subresolvers.get(0);
+ FileSystemResolver fsInt2 = (FileSystemResolver) subresolvers.get(0);
assertEquals("fs", fsInt2.getName());
ivyPatterns = fsInt2.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml", ivyPatterns.get(0));
+ assertEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml", ivyPatterns
+ .get(0));
}
-
+
public void testMacro() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-macro.xml"));
-
+
DependencyResolver def = settings.getResolver("default");
assertNotNull(def);
assertTrue(def instanceof ChainResolver);
- ChainResolver chain = (ChainResolver)def;
+ ChainResolver chain = (ChainResolver) def;
List subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(2, subresolvers.size());
- FileSystemResolver fsInt1 = (FileSystemResolver)subresolvers.get(0);
+ FileSystemResolver fsInt1 = (FileSystemResolver) subresolvers.get(0);
assertEquals("default-fs1", fsInt1.getName());
List ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertEquals("path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]", ivyPatterns.get(0));
+ assertEquals("path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
+ ivyPatterns.get(0));
- FileSystemResolver fsInt2 = (FileSystemResolver)subresolvers.get(1);
+ FileSystemResolver fsInt2 = (FileSystemResolver) subresolvers.get(1);
assertEquals("default-fs2", fsInt2.getName());
ivyPatterns = fsInt2.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertEquals("path/to/secondrep/[organisation]/[module]/[type]s/ivy-[revision].xml", ivyPatterns.get(0));
-
+ assertEquals("path/to/secondrep/[organisation]/[module]/[type]s/ivy-[revision].xml",
+ ivyPatterns.get(0));
+
DependencyResolver other = settings.getResolver("other");
assertNotNull(other);
assertTrue(other instanceof ChainResolver);
- chain = (ChainResolver)other;
+ chain = (ChainResolver) other;
subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(2, subresolvers.size());
- fsInt2 = (FileSystemResolver)subresolvers.get(1);
+ fsInt2 = (FileSystemResolver) subresolvers.get(1);
assertEquals("other-fs2", fsInt2.getName());
ivyPatterns = fsInt2.getIvyPatterns();
@@ -285,21 +295,21 @@
assertEquals(1, ivyPatterns.size());
assertEquals("path/to/secondrep/[module]/[type]s/ivy-[revision].xml", ivyPatterns.get(0));
}
-
+
public void testMacroAndRef() throws Exception {
- // test case for IVY-319
- IvySettings settings = new IvySettings();
+ // test case for IVY-319
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-macro+ref.xml"));
-
+
DependencyResolver shared = settings.getResolver("shared");
assertNotNull(shared);
assertTrue(shared instanceof FileSystemResolver);
-
+
DependencyResolver mychain = settings.getResolver("mychain");
assertNotNull(mychain);
assertTrue(mychain instanceof ChainResolver);
- ChainResolver chain = (ChainResolver)mychain;
+ ChainResolver chain = (ChainResolver) mychain;
List subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(1, subresolvers.size());
@@ -307,72 +317,74 @@
assertEquals("shared", shared.getName());
assertTrue(shared instanceof FileSystemResolver);
}
-
+
public void testInclude() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-include.xml"));
-
+
DependencyResolver def = settings.getResolver("default");
assertNotNull(def);
assertTrue(def instanceof ChainResolver);
- ChainResolver chain = (ChainResolver)def;
+ ChainResolver chain = (ChainResolver) def;
List subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(2, subresolvers.size());
- FileSystemResolver fsInt1 = (FileSystemResolver)subresolvers.get(0);
+ FileSystemResolver fsInt1 = (FileSystemResolver) subresolvers.get(0);
assertEquals("default-fs1", fsInt1.getName());
List ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertEquals("path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]", ivyPatterns.get(0));
-
+ assertEquals("path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
+ ivyPatterns.get(0));
+
DependencyResolver inc = settings.getResolver("includeworks");
assertNotNull(inc);
assertTrue(inc instanceof ChainResolver);
- chain = (ChainResolver)inc;
+ chain = (ChainResolver) inc;
subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
assertEquals(2, subresolvers.size());
- fsInt1 = (FileSystemResolver)subresolvers.get(0);
+ fsInt1 = (FileSystemResolver) subresolvers.get(0);
assertEquals("includeworks-fs1", fsInt1.getName());
ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertEquals("included/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]", ivyPatterns.get(0));
+ assertEquals("included/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
+ ivyPatterns.get(0));
}
-
+
public void testParser() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-parser.xml"));
- assertEquals(ModuleDescriptorParserRegistryTest.MyParser.class.getName(), ModuleDescriptorParserRegistry.getInstance().getParsers()[0].getClass().getName());
+ assertEquals(ModuleDescriptorParserRegistryTest.MyParser.class.getName(),
+ ModuleDescriptorParserRegistry.getInstance().getParsers()[0].getClass().getName());
}
-
+
public void testOutputter() throws Exception {
- IvySettings settings = new IvySettings();
+ IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-outputter.xml"));
-
- //System.out.println(Arrays.asList(ivy.getReportOutputters()));
-
+
+ // System.out.println(Arrays.asList(ivy.getReportOutputters()));
+
ReportOutputter testOutputter = settings.getReportOutputter("test");
assertNotNull(testOutputter);
assertTrue(testOutputter instanceof MyOutputter);
}
-
-
+
public static class MyOutputter implements ReportOutputter {
- public void output(ResolveReport report, File destDir) {
- }
+ public void output(ResolveReport report, File destDir) {
+ }
+
+ public String getName() {
+ return "test";
+ }
- public String getName() {
- return "test";
- }
-
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java Tue Jun 5 05:02:27 2007
@@ -37,286 +37,300 @@
import org.apache.ivy.plugins.circular.CircularDependencyStrategy;
public class SortTest extends TestCase {
-
- private DefaultModuleDescriptor md1;
+
+ private DefaultModuleDescriptor md1;
+
private DefaultModuleDescriptor md2;
+
private DefaultModuleDescriptor md3;
+
private DefaultModuleDescriptor md4;
- private static Ivy ivy;
-
- /* (non-Javadoc)
+
+ private static Ivy ivy;
+
+ /*
+ * (non-Javadoc)
+ *
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() throws Exception {
super.setUp();
- md1 = createModuleDescriptorToSort("md1", null); //The revison is often not set in the ivy.xml file that are ordered
- md2 = createModuleDescriptorToSort("md2", "rev2");//But somtimes they are set
+ md1 = createModuleDescriptorToSort("md1", null); // The revison is often not set in the
+ // ivy.xml file that are ordered
+ md2 = createModuleDescriptorToSort("md2", "rev2");// But somtimes they are set
md3 = createModuleDescriptorToSort("md3", "rev3");
md4 = createModuleDescriptorToSort("md4", "rev4");
-
+
ivy = new Ivy();
- ivy.configureDefault();
+ ivy.configureDefault();
}
-
+ public void testSort() throws Exception {
+ addDependency(md2, "md1", "rev1");
+ addDependency(md3, "md2", "rev2");
+ addDependency(md4, "md3", "rev3");
- public void testSort() throws Exception {
- addDependency(md2,"md1" , "rev1");
- addDependency(md3,"md2" , "rev2");
- addDependency(md4,"md3" , "rev3");
+ DefaultModuleDescriptor[][] expectedOrder = new DefaultModuleDescriptor[][] {{md1, md2,
+ md3, md4}};
- DefaultModuleDescriptor[][] expectedOrder = new DefaultModuleDescriptor[][] {{ md1, md2, md3, md4 }};
-
Collection permutations = getAllLists(md1, md3, md2, md4);
for (Iterator it = permutations.iterator(); it.hasNext();) {
- List toSort = (List) it.next();
- assertSorted(expectedOrder, ivy.sortModuleDescriptors(toSort));
- }
+ List toSort = (List) it.next();
+ assertSorted(expectedOrder, ivy.sortModuleDescriptors(toSort));
+ }
}
-
-
/**
- * Sorter does not throw circular dependency, circular dependencies are handled at resolve time only.
- * However the sort respect the transitive order when it is unambiguous. (if A depends transitively of B,
- * but B doesn't depends transitively on A then B always comes before A).
+ * Sorter does not throw circular dependency, circular dependencies are handled at resolve time
+ * only. However the sort respect the transitive order when it is unambiguous. (if A depends
+ * transitively of B, but B doesn't depends transitively on A then B always comes before A).
*/
public void testCircularDependency() throws Exception {
- addDependency(md1,"md4" , "rev4");
- addDependency(md2,"md1" , "rev1");
- addDependency(md3,"md2" , "rev2");
- addDependency(md4,"md3" , "rev3");
-
+ addDependency(md1, "md4", "rev4");
+ addDependency(md2, "md1", "rev1");
+ addDependency(md3, "md2", "rev2");
+ addDependency(md4, "md3", "rev3");
+
DefaultModuleDescriptor[][] possibleOrder = new DefaultModuleDescriptor[][] {
- {md2, md3, md4, md1},
- {md3, md4, md1, md2},
- {md4, md1, md2, md3},
- {md1, md2, md3, md4}
- };
+ {md2, md3, md4, md1}, {md3, md4, md1, md2}, {md4, md1, md2, md3},
+ {md1, md2, md3, md4}};
Collection permutations = getAllLists(md1, md3, md2, md4);
for (Iterator it = permutations.iterator(); it.hasNext();) {
- List toSort = (List) it.next();
- assertSorted(possibleOrder, ivy.sortModuleDescriptors(toSort));
- }
+ List toSort = (List) it.next();
+ assertSorted(possibleOrder, ivy.sortModuleDescriptors(toSort));
+ }
}
-
+
public void testCircularDependency2() throws Exception {
- addDependency(md2,"md3" , "rev3");
- addDependency(md2,"md1" , "rev1");
- addDependency(md3,"md2" , "rev2");
- addDependency(md4,"md3" , "rev3");
+ addDependency(md2, "md3", "rev3");
+ addDependency(md2, "md1", "rev1");
+ addDependency(md3, "md2", "rev2");
+ addDependency(md4, "md3", "rev3");
DefaultModuleDescriptor[][] possibleOrder = new DefaultModuleDescriptor[][] {
- {md1, md3, md2, md4},
- {md1, md2, md3, md4}//,
- //{md3, md1, md2, md4} //we don't have this solution. The loops apear has one contigous element.
- };
+ {md1, md3, md2, md4}, {md1, md2, md3, md4} // ,
+ // {md3, md1, md2, md4} //we don't have this solution. The loops apear has one contigous
+ // element.
+ };
Collection permutations = getAllLists(md1, md3, md2, md4);
for (Iterator it = permutations.iterator(); it.hasNext();) {
- List toSort = (List) it.next();
- assertSorted(possibleOrder, ivy.sortModuleDescriptors(toSort));
- }
+ List toSort = (List) it.next();
+ assertSorted(possibleOrder, ivy.sortModuleDescriptors(toSort));
+ }
}
-
/**
- * In case of Circular dependency a warning is generated.
+ * In case of Circular dependency a warning is generated.
*/
public void testCircularDependencyReport() {
- addDependency(md2,"md3" , "rev3");
- addDependency(md2,"md1" , "rev1");
- addDependency(md3,"md2" , "rev2");
- addDependency(md4,"md3" , "rev3");
-
- //Would be much easier with a tool like jmock
- class CircularDependencyReporterMock implements CircularDependencyStrategy {
- private int nbOfCall = 0;
- public String getName() {
- return "CircularDependencyReporterMock";
- }
- public void handleCircularDependency(ModuleRevisionId[] mrids) {
- assertEquals("handleCircularDependency is expected to be called only once" , 0, nbOfCall);
- assertTrue("incorrect cicular dependency invocation" + CircularDependencyHelper.formatMessage(mrids),
- mrids.length == 3 && (
- (mrids[0].equals(md2.getModuleRevisionId()) && mrids[1].equals(md3.getModuleRevisionId()) && mrids[2].equals(md2.getModuleRevisionId())) ||
- (mrids[0].equals(md3.getModuleRevisionId()) && mrids[1].equals(md2.getModuleRevisionId()) && mrids[2].equals(md3.getModuleRevisionId()))
- ));
- nbOfCall++;
- }
- public void validate() {
- Assert.assertEquals("handleCircularDependency has nor been called" , 1, nbOfCall);
- }
- }
- CircularDependencyReporterMock circularDepReportMock = new CircularDependencyReporterMock();
- ivy.getSettings().setCircularDependencyStrategy(circularDepReportMock);
-
- List toSort = Arrays.asList(new ModuleDescriptor[] {md4 , md3 , md2 , md1});
- ivy.sortModuleDescriptors(toSort);
-
- circularDepReportMock.validate();
+ addDependency(md2, "md3", "rev3");
+ addDependency(md2, "md1", "rev1");
+ addDependency(md3, "md2", "rev2");
+ addDependency(md4, "md3", "rev3");
+
+ // Would be much easier with a tool like jmock
+ class CircularDependencyReporterMock implements CircularDependencyStrategy {
+ private int nbOfCall = 0;
+
+ public String getName() {
+ return "CircularDependencyReporterMock";
+ }
+
+ public void handleCircularDependency(ModuleRevisionId[] mrids) {
+ assertEquals("handleCircularDependency is expected to be called only once", 0,
+ nbOfCall);
+ assertTrue("incorrect cicular dependency invocation"
+ + CircularDependencyHelper.formatMessage(mrids), mrids.length == 3
+ && ((mrids[0].equals(md2.getModuleRevisionId())
+ && mrids[1].equals(md3.getModuleRevisionId()) && mrids[2]
+ .equals(md2.getModuleRevisionId())) || (mrids[0].equals(md3
+ .getModuleRevisionId())
+ && mrids[1].equals(md2.getModuleRevisionId()) && mrids[2]
+ .equals(md3.getModuleRevisionId()))));
+ nbOfCall++;
+ }
+
+ public void validate() {
+ Assert.assertEquals("handleCircularDependency has nor been called", 1, nbOfCall);
+ }
+ }
+ CircularDependencyReporterMock circularDepReportMock = new CircularDependencyReporterMock();
+ ivy.getSettings().setCircularDependencyStrategy(circularDepReportMock);
+
+ List toSort = Arrays.asList(new ModuleDescriptor[] {md4, md3, md2, md1});
+ ivy.sortModuleDescriptors(toSort);
+
+ circularDepReportMock.validate();
}
-
+
/**
- * The dependency can ask for the latest integration. It should match whatever the version declared in the modules to order.
+ * The dependency can ask for the latest integration. It should match whatever the version
+ * declared in the modules to order.
*/
public void testLatestIntegration() {
-
- addDependency(md2,"md1" , "latest.integration");
- addDependency(md3,"md2" , "latest.integration");
- addDependency(md4,"md3" , "latest.integration");
- DefaultModuleDescriptor[][] expectedOrder = new DefaultModuleDescriptor[][] {{ md1, md2, md3, md4 }};
-
+ addDependency(md2, "md1", "latest.integration");
+ addDependency(md3, "md2", "latest.integration");
+ addDependency(md4, "md3", "latest.integration");
+
+ DefaultModuleDescriptor[][] expectedOrder = new DefaultModuleDescriptor[][] {{md1, md2,
+ md3, md4}};
+
Collection permutations = getAllLists(md1, md3, md2, md4);
for (Iterator it = permutations.iterator(); it.hasNext();) {
- List toSort = (List) it.next();
- assertSorted(expectedOrder, ivy.sortModuleDescriptors(toSort));
- }
+ List toSort = (List) it.next();
+ assertSorted(expectedOrder, ivy.sortModuleDescriptors(toSort));
+ }
}
-
+
/**
- * When the version asked by a dependency is not compatible with the version declared in the module to order,
- * the two modules should be considered as independant
- * NB: I'm sure of what 'compatible' means !
+ * When the version asked by a dependency is not compatible with the version declared in the
+ * module to order, the two modules should be considered as independant NB: I'm sure of what
+ * 'compatible' means !
*/
public void testDifferentVersionNotConsidered() {
- //To test it, I use a 'broken' loop (in one step, I change the revision) in such a way that I get only one solution. If the loop was
- //complete more solutions where possible.
+ // To test it, I use a 'broken' loop (in one step, I change the revision) in such a way that
+ // I get only one solution. If the loop was
+ // complete more solutions where possible.
+
+ addDependency(md1, "md4", "rev4-other");
+ addDependency(md2, "md1", "rev1");
+ addDependency(md3, "md2", "rev2");
+ addDependency(md4, "md3", "rev3");
- addDependency(md1,"md4" , "rev4-other");
- addDependency(md2,"md1" , "rev1");
- addDependency(md3,"md2" , "rev2");
- addDependency(md4,"md3" , "rev3");
-
- DefaultModuleDescriptor[][] possibleOrder = new DefaultModuleDescriptor[][] {
- {md1, md2, md3, md4}
- };
+ DefaultModuleDescriptor[][] possibleOrder = new DefaultModuleDescriptor[][] {{md1, md2,
+ md3, md4}};
Collection permutations = getAllLists(md1, md3, md2, md4);
for (Iterator it = permutations.iterator(); it.hasNext();) {
- List toSort = (List) it.next();
- assertSorted(possibleOrder, ivy.sortModuleDescriptors(toSort));
- }
+ List toSort = (List) it.next();
+ assertSorted(possibleOrder, ivy.sortModuleDescriptors(toSort));
+ }
}
-
/**
- * In case of Different version a warning is generated.
+ * In case of Different version a warning is generated.
*/
public void testDifferentVersionWarning() {
- final DependencyDescriptor md4OtherDep = addDependency(md1,"md4" , "rev4-other");
- addDependency(md2,"md1" , "rev1");
- addDependency(md3,"md2" , "rev2");
- addDependency(md4,"md3" , "rev3");
-
- //Would be much easier with a tool like jmock
- class NonMatchingVersionReporterMock implements NonMatchingVersionReporter {
- private int nbOfCall = 0;
- public void reportNonMatchingVersion(DependencyDescriptor descriptor, ModuleDescriptor md) {
- Assert.assertEquals("reportNonMatchingVersion should be invokded only once" , 0, nbOfCall);
- Assert.assertEquals(md4OtherDep, descriptor);
- Assert.assertEquals(md4, md);
- nbOfCall++;
- }
- public void validate() {
- Assert.assertEquals("reportNonMatchingVersion has not be called" , 1, nbOfCall);
- }
- }
- NonMatchingVersionReporterMock nonMatchingVersionReporterMock = new NonMatchingVersionReporterMock();
- List toSort = Arrays.asList(new ModuleDescriptor[] {md4 , md3 , md2 , md1});
- ivy.sortModuleDescriptors(toSort , nonMatchingVersionReporterMock);
- nonMatchingVersionReporterMock.validate();
- }
-
-
-
-
-
-
+ final DependencyDescriptor md4OtherDep = addDependency(md1, "md4", "rev4-other");
+ addDependency(md2, "md1", "rev1");
+ addDependency(md3, "md2", "rev2");
+ addDependency(md4, "md3", "rev3");
+
+ // Would be much easier with a tool like jmock
+ class NonMatchingVersionReporterMock implements NonMatchingVersionReporter {
+ private int nbOfCall = 0;
+
+ public void reportNonMatchingVersion(DependencyDescriptor descriptor,
+ ModuleDescriptor md) {
+ Assert.assertEquals("reportNonMatchingVersion should be invokded only once", 0,
+ nbOfCall);
+ Assert.assertEquals(md4OtherDep, descriptor);
+ Assert.assertEquals(md4, md);
+ nbOfCall++;
+ }
+
+ public void validate() {
+ Assert.assertEquals("reportNonMatchingVersion has not be called", 1, nbOfCall);
+ }
+ }
+ NonMatchingVersionReporterMock nonMatchingVersionReporterMock = new NonMatchingVersionReporterMock();
+ List toSort = Arrays.asList(new ModuleDescriptor[] {md4, md3, md2, md1});
+ ivy.sortModuleDescriptors(toSort, nonMatchingVersionReporterMock);
+ nonMatchingVersionReporterMock.validate();
+ }
+
private DefaultModuleDescriptor createModuleDescriptorToSort(String moduleName, String revision) {
- ModuleRevisionId mrid = ModuleRevisionId.newInstance("org", moduleName, revision);
- return new DefaultModuleDescriptor(mrid, "integration", new Date());
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance("org", moduleName, revision);
+ return new DefaultModuleDescriptor(mrid, "integration", new Date());
}
-
- private DependencyDescriptor addDependency(DefaultModuleDescriptor parent, String moduleName, String revision) {
- ModuleRevisionId mrid = ModuleRevisionId.newInstance("org", moduleName, revision);
- DependencyDescriptor depDescr = new DefaultDependencyDescriptor(parent , mrid , false, false, true);
- parent.addDependency(depDescr);
- return depDescr;
- }
- /**
+ private DependencyDescriptor addDependency(DefaultModuleDescriptor parent, String moduleName,
+ String revision) {
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance("org", moduleName, revision);
+ DependencyDescriptor depDescr = new DefaultDependencyDescriptor(parent, mrid, false, false,
+ true);
+ parent.addDependency(depDescr);
+ return depDescr;
+ }
+
+ /**
* Verifies that sorted in one of the list of listOfPossibleSort.
- * @param An array of possible sort result
- * @param The actual sortedList to compare
+ *
+ * @param An
+ * array of possible sort result
+ * @param The
+ * actual sortedList to compare
*/
private void assertSorted(DefaultModuleDescriptor[][] listOfPossibleSort, List sorted) {
- for (int i = 0; i < listOfPossibleSort.length; i++) {
- DefaultModuleDescriptor[] expectedList = listOfPossibleSort[i];
- assertEquals(expectedList.length, sorted.size());
- boolean isExpected = true;
- for (int j = 0; j < expectedList.length; j++) {
- if(!expectedList[j].equals(sorted.get(j))) {
- isExpected = false;
- break;
- }
- }
- if (isExpected) {
- return;
- }
- }
- //failed, build a nice message
+ for (int i = 0; i < listOfPossibleSort.length; i++) {
+ DefaultModuleDescriptor[] expectedList = listOfPossibleSort[i];
+ assertEquals(expectedList.length, sorted.size());
+ boolean isExpected = true;
+ for (int j = 0; j < expectedList.length; j++) {
+ if (!expectedList[j].equals(sorted.get(j))) {
+ isExpected = false;
+ break;
+ }
+ }
+ if (isExpected) {
+ return;
+ }
+ }
+ // failed, build a nice message
StringBuffer errorMessage = new StringBuffer();
errorMessage.append("Unexpected order : \n{ ");
for (int i = 0; i < sorted.size(); i++) {
- if (i>0) errorMessage.append(" , ");
- errorMessage.append(((DefaultModuleDescriptor)sorted.get(i)).getModuleRevisionId());
- }
+ if (i > 0)
+ errorMessage.append(" , ");
+ errorMessage.append(((DefaultModuleDescriptor) sorted.get(i)).getModuleRevisionId());
+ }
errorMessage.append("}\nEpected : \n");
- for (int i = 0; i < listOfPossibleSort.length; i++) {
- DefaultModuleDescriptor[] expectedList = listOfPossibleSort[i];
- if (i>0) errorMessage.append(" or\n");
- errorMessage.append("{ ");
- for (int j = 0; j < expectedList.length; j++) {
- if (j>0) errorMessage.append(" , ");
- errorMessage.append(expectedList[j].getModuleRevisionId());
- }
- errorMessage.append(" } ");
- }
- fail(errorMessage.toString());
+ for (int i = 0; i < listOfPossibleSort.length; i++) {
+ DefaultModuleDescriptor[] expectedList = listOfPossibleSort[i];
+ if (i > 0)
+ errorMessage.append(" or\n");
+ errorMessage.append("{ ");
+ for (int j = 0; j < expectedList.length; j++) {
+ if (j > 0)
+ errorMessage.append(" , ");
+ errorMessage.append(expectedList[j].getModuleRevisionId());
+ }
+ errorMessage.append(" } ");
+ }
+ fail(errorMessage.toString());
}
-
- /** Returns a collection of lists that contains the elements a,b,c and d */
- private Collection getAllLists(Object a, Object b, Object c, Object d) {
- ArrayList r = new ArrayList(24);
- r.add(Arrays.asList(new Object[] {a, b, c, d}));
- r.add(Arrays.asList(new Object[] {a, b, d, c}));
- r.add(Arrays.asList(new Object[] {a, c, b, d}));
- r.add(Arrays.asList(new Object[] {a, c, d, b}));
- r.add(Arrays.asList(new Object[] {a, d, b, c}));
- r.add(Arrays.asList(new Object[] {a, d, c, b}));
- r.add(Arrays.asList(new Object[] {b, a, c, d}));
- r.add(Arrays.asList(new Object[] {b, a, d, c}));
- r.add(Arrays.asList(new Object[] {b, c, a, d}));
- r.add(Arrays.asList(new Object[] {b, c, d, a}));
- r.add(Arrays.asList(new Object[] {b, d, a, c}));
- r.add(Arrays.asList(new Object[] {b, d, c, a}));
- r.add(Arrays.asList(new Object[] {c, b, a, d}));
- r.add(Arrays.asList(new Object[] {c, b, d, a}));
- r.add(Arrays.asList(new Object[] {c, a, b, d}));
- r.add(Arrays.asList(new Object[] {c, a, d, b}));
- r.add(Arrays.asList(new Object[] {c, d, b, a}));
- r.add(Arrays.asList(new Object[] {c, d, a, b}));
- r.add(Arrays.asList(new Object[] {d, b, c, a}));
- r.add(Arrays.asList(new Object[] {d, b, a, c}));
- r.add(Arrays.asList(new Object[] {d, c, b, a}));
- r.add(Arrays.asList(new Object[] {d, c, a, b}));
- r.add(Arrays.asList(new Object[] {d, a, b, c}));
- r.add(Arrays.asList(new Object[] {d, a, c, b}));
- return r;
- }
+ /** Returns a collection of lists that contains the elements a,b,c and d */
+ private Collection getAllLists(Object a, Object b, Object c, Object d) {
+ ArrayList r = new ArrayList(24);
+ r.add(Arrays.asList(new Object[] {a, b, c, d}));
+ r.add(Arrays.asList(new Object[] {a, b, d, c}));
+ r.add(Arrays.asList(new Object[] {a, c, b, d}));
+ r.add(Arrays.asList(new Object[] {a, c, d, b}));
+ r.add(Arrays.asList(new Object[] {a, d, b, c}));
+ r.add(Arrays.asList(new Object[] {a, d, c, b}));
+ r.add(Arrays.asList(new Object[] {b, a, c, d}));
+ r.add(Arrays.asList(new Object[] {b, a, d, c}));
+ r.add(Arrays.asList(new Object[] {b, c, a, d}));
+ r.add(Arrays.asList(new Object[] {b, c, d, a}));
+ r.add(Arrays.asList(new Object[] {b, d, a, c}));
+ r.add(Arrays.asList(new Object[] {b, d, c, a}));
+ r.add(Arrays.asList(new Object[] {c, b, a, d}));
+ r.add(Arrays.asList(new Object[] {c, b, d, a}));
+ r.add(Arrays.asList(new Object[] {c, a, b, d}));
+ r.add(Arrays.asList(new Object[] {c, a, d, b}));
+ r.add(Arrays.asList(new Object[] {c, d, b, a}));
+ r.add(Arrays.asList(new Object[] {c, d, a, b}));
+ r.add(Arrays.asList(new Object[] {d, b, c, a}));
+ r.add(Arrays.asList(new Object[] {d, b, a, c}));
+ r.add(Arrays.asList(new Object[] {d, c, b, a}));
+ r.add(Arrays.asList(new Object[] {d, c, a, b}));
+ r.add(Arrays.asList(new Object[] {d, a, b, c}));
+ r.add(Arrays.asList(new Object[] {d, a, c, b}));
+ return r;
+ }
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java Tue Jun 5 05:02:27 2007
@@ -34,175 +34,159 @@
public class LatestConflictManagerTest extends TestCase {
- private Ivy ivy;
+ private Ivy ivy;
+
private File _cache;
- protected void setUp() throws Exception {
- ivy = new Ivy();
- ivy.configure(LatestConflictManagerTest.class
- .getResource("ivysettings-latest.xml"));
+ protected void setUp() throws Exception {
+ ivy = new Ivy();
+ ivy.configure(LatestConflictManagerTest.class.getResource("ivysettings-latest.xml"));
_cache = new File("build/cache");
_cache.mkdirs();
- }
-
- protected void tearDown() throws Exception {
- FileUtil.forceDelete(_cache);
- }
-
- // Test case for issue IVY-388
- public void testIvy388() throws Exception {
- ResolveReport report = ivy.resolve(LatestConflictManagerTest.class
- .getResource("ivy-388.xml"),
- getResolveOptions());
-
- List deps = report.getDependencies();
- Iterator dependencies = deps.iterator();
- String[] confs = report.getConfigurations();
- while (dependencies.hasNext()) {
- IvyNode node = (IvyNode) dependencies.next();
- for (int i = 0; i < confs.length; i++) {
- String conf = confs[i];
- if (!node.isEvicted(conf)) {
- boolean flag1 = report.getConfigurationReport(conf)
- .getDependency(node.getResolvedId()) != null;
- boolean flag2 = report.getConfigurationReport(conf)
- .getModuleRevisionIds().contains(node.getResolvedId());
- assertEquals("Inconsistent data for node " + node + " in conf " + conf , flag1, flag2);
- }
- }
- }
- }
-
+ }
+
+ protected void tearDown() throws Exception {
+ FileUtil.forceDelete(_cache);
+ }
+
+ // Test case for issue IVY-388
+ public void testIvy388() throws Exception {
+ ResolveReport report = ivy.resolve(LatestConflictManagerTest.class
+ .getResource("ivy-388.xml"), getResolveOptions());
+
+ List deps = report.getDependencies();
+ Iterator dependencies = deps.iterator();
+ String[] confs = report.getConfigurations();
+ while (dependencies.hasNext()) {
+ IvyNode node = (IvyNode) dependencies.next();
+ for (int i = 0; i < confs.length; i++) {
+ String conf = confs[i];
+ if (!node.isEvicted(conf)) {
+ boolean flag1 = report.getConfigurationReport(conf).getDependency(
+ node.getResolvedId()) != null;
+ boolean flag2 = report.getConfigurationReport(conf).getModuleRevisionIds()
+ .contains(node.getResolvedId());
+ assertEquals("Inconsistent data for node " + node + " in conf " + conf, flag1,
+ flag2);
+ }
+ }
+ }
+ }
+
// Test case for issue IVY-383
public void testIvy383() throws Exception {
- ResolveReport report =
- ivy.resolve( LatestConflictManagerTest.class.getResource( "ivy-383.xml" ),
- getResolveOptions() );
- ConfigurationResolveReport defaultReport =
- report.getConfigurationReport("default");
+ ResolveReport report = ivy.resolve(LatestConflictManagerTest.class
+ .getResource("ivy-383.xml"), getResolveOptions());
+ ConfigurationResolveReport defaultReport = report.getConfigurationReport("default");
Iterator iter = defaultReport.getModuleRevisionIds().iterator();
while (iter.hasNext()) {
- ModuleRevisionId mrid = (ModuleRevisionId)iter.next();
+ ModuleRevisionId mrid = (ModuleRevisionId) iter.next();
if (mrid.getName().equals("mod1.1")) {
assertEquals("1.0", mrid.getRevision());
- }
- else if (mrid.getName().equals("mod1.2")) {
+ } else if (mrid.getName().equals("mod1.2")) {
assertEquals("2.2", mrid.getRevision());
}
}
}
-
+
// Test case for issue IVY-407
public void testLatestTime1() throws Exception {
- ivy = new Ivy();
- ivy.configure(LatestConflictManagerTest.class
- .getResource("ivysettings-latest-time.xml"));
- ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true);
-
- // set timestamps, because svn is not preserving this information,
- // and the latest time strategy is relying on it
- long time = System.currentTimeMillis() - 10000;
- new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").setLastModified(time);
- new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.2.jar").setLastModified(time+2000);
-
- ResolveReport report =
- ivy.resolve( LatestConflictManagerTest.class.getResource( "ivy-latest-time-1.xml" ),
- getResolveOptions() );
- ConfigurationResolveReport defaultReport =
- report.getConfigurationReport("default");
+ ivy = new Ivy();
+ ivy.configure(LatestConflictManagerTest.class.getResource("ivysettings-latest-time.xml"));
+ ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true);
+
+ // set timestamps, because svn is not preserving this information,
+ // and the latest time strategy is relying on it
+ long time = System.currentTimeMillis() - 10000;
+ new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").setLastModified(time);
+ new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.2.jar")
+ .setLastModified(time + 2000);
+
+ ResolveReport report = ivy.resolve(LatestConflictManagerTest.class
+ .getResource("ivy-latest-time-1.xml"), getResolveOptions());
+ ConfigurationResolveReport defaultReport = report.getConfigurationReport("default");
Iterator iter = defaultReport.getModuleRevisionIds().iterator();
while (iter.hasNext()) {
- ModuleRevisionId mrid = (ModuleRevisionId)iter.next();
+ ModuleRevisionId mrid = (ModuleRevisionId) iter.next();
if (mrid.getName().equals("mod1.1")) {
assertEquals("1.0", mrid.getRevision());
- }
- else if (mrid.getName().equals("mod1.2")) {
+ } else if (mrid.getName().equals("mod1.2")) {
assertEquals("2.2", mrid.getRevision());
}
}
}
-
+
public void testLatestTime2() throws Exception {
- ivy = new Ivy();
- ivy.configure(LatestConflictManagerTest.class
- .getResource("ivysettings-latest-time.xml"));
- ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true);
-
- // set timestamps, because svn is not preserving this information,
- // and the latest time strategy is relying on it
- long time = System.currentTimeMillis() - 10000;
- new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").setLastModified(time);
- new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.2.jar").setLastModified(time+2000);
-
- ResolveReport report =
- ivy.resolve( LatestConflictManagerTest.class.getResource( "ivy-latest-time-2.xml" ),
- getResolveOptions() );
- ConfigurationResolveReport defaultReport =
- report.getConfigurationReport("default");
+ ivy = new Ivy();
+ ivy.configure(LatestConflictManagerTest.class.getResource("ivysettings-latest-time.xml"));
+ ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true);
+
+ // set timestamps, because svn is not preserving this information,
+ // and the latest time strategy is relying on it
+ long time = System.currentTimeMillis() - 10000;
+ new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").setLastModified(time);
+ new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.2.jar")
+ .setLastModified(time + 2000);
+
+ ResolveReport report = ivy.resolve(LatestConflictManagerTest.class
+ .getResource("ivy-latest-time-2.xml"), getResolveOptions());
+ ConfigurationResolveReport defaultReport = report.getConfigurationReport("default");
Iterator iter = defaultReport.getModuleRevisionIds().iterator();
while (iter.hasNext()) {
- ModuleRevisionId mrid = (ModuleRevisionId)iter.next();
+ ModuleRevisionId mrid = (ModuleRevisionId) iter.next();
if (mrid.getName().equals("mod1.1")) {
assertEquals("1.0", mrid.getRevision());
- }
- else if (mrid.getName().equals("mod1.2")) {
+ } else if (mrid.getName().equals("mod1.2")) {
assertEquals("2.2", mrid.getRevision());
}
}
}
-
- /*
- Test case for issue IVY-407 (with transitivity)
- There are 5 modules A, B, C, D and E.
- 1) publish C-1.0.0, C-1.0.1 and C-1.0.2
- 2) B needs C-1.0.0 : retrieve ok and publish B-1.0.0
- 3) A needs B-1.0.0 and C-1.0.2 : retrieve ok and publish A-1.0.0
- 4) D needs C-1.0.1 : retrieve ok and publish D-1.0.0
- 5) E needs D-1.0.0 and A-1.0.0 (D before A in ivy file) retrieve failed to get C-1.0.2 from A
- (get apparently C-1.0.1 from D)
+ /*
+ * Test case for issue IVY-407 (with transitivity) There are 5 modules A, B, C, D and E. 1)
+ * publish C-1.0.0, C-1.0.1 and C-1.0.2 2) B needs C-1.0.0 : retrieve ok and publish B-1.0.0 3)
+ * A needs B-1.0.0 and C-1.0.2 : retrieve ok and publish A-1.0.0 4) D needs C-1.0.1 : retrieve
+ * ok and publish D-1.0.0 5) E needs D-1.0.0 and A-1.0.0 (D before A in ivy file) retrieve
+ * failed to get C-1.0.2 from A (get apparently C-1.0.1 from D)
*/
public void testLatestTimeTransitivity() throws Exception {
- ivy = new Ivy();
- ivy.configure(LatestConflictManagerTest.class
- .getResource("ivysettings-latest-time-transitivity.xml"));
- ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true);
-
- // set timestamps, because svn is not preserving this information,
- // and the latest time strategy is relying on it
- long time = System.currentTimeMillis() - 10000;
- new File("test/repositories/IVY-407/MyCompany/C/ivy-1.0.0.xml").setLastModified(time);
- new File("test/repositories/IVY-407/MyCompany/C/ivy-1.0.1.xml").setLastModified(time+2000);
- new File("test/repositories/IVY-407/MyCompany/C/ivy-1.0.2.xml").setLastModified(time+4000);
-
- ResolveReport report =
- ivy.resolve( LatestConflictManagerTest.class.getResource( "ivy-latest-time-transitivity.xml" ),
- getResolveOptions() );
- ConfigurationResolveReport defaultReport =
- report.getConfigurationReport("default");
- Iterator iter = defaultReport.getModuleRevisionIds().iterator();
- while (iter.hasNext()) {
- ModuleRevisionId mrid = (ModuleRevisionId)iter.next();
-
- if (mrid.getName().equals("A")) {
- assertEquals("A revision should be 1.0.0", "1.0.0", mrid.getRevision());
- }
- else if (mrid.getName().equals("D")) {
- assertEquals("D revision should be 1.0.0", "1.0.0", mrid.getRevision());
- }
- // by transitivity
- else if (mrid.getName().equals("B")) {
- assertEquals("B revision should be 1.0.0", "1.0.0", mrid.getRevision());
- }
- else if (mrid.getName().equals("C")) {
- assertEquals("C revision should be 1.0.2", "1.0.2", mrid.getRevision());
- }
- }
+ ivy = new Ivy();
+ ivy.configure(LatestConflictManagerTest.class
+ .getResource("ivysettings-latest-time-transitivity.xml"));
+ ivy.getSettings().setVariable("ivy.log.conflict.resolution", "true", true);
+
+ // set timestamps, because svn is not preserving this information,
+ // and the latest time strategy is relying on it
+ long time = System.currentTimeMillis() - 10000;
+ new File("test/repositories/IVY-407/MyCompany/C/ivy-1.0.0.xml").setLastModified(time);
+ new File("test/repositories/IVY-407/MyCompany/C/ivy-1.0.1.xml")
+ .setLastModified(time + 2000);
+ new File("test/repositories/IVY-407/MyCompany/C/ivy-1.0.2.xml")
+ .setLastModified(time + 4000);
+
+ ResolveReport report = ivy.resolve(LatestConflictManagerTest.class
+ .getResource("ivy-latest-time-transitivity.xml"), getResolveOptions());
+ ConfigurationResolveReport defaultReport = report.getConfigurationReport("default");
+ Iterator iter = defaultReport.getModuleRevisionIds().iterator();
+ while (iter.hasNext()) {
+ ModuleRevisionId mrid = (ModuleRevisionId) iter.next();
+
+ if (mrid.getName().equals("A")) {
+ assertEquals("A revision should be 1.0.0", "1.0.0", mrid.getRevision());
+ } else if (mrid.getName().equals("D")) {
+ assertEquals("D revision should be 1.0.0", "1.0.0", mrid.getRevision());
+ }
+ // by transitivity
+ else if (mrid.getName().equals("B")) {
+ assertEquals("B revision should be 1.0.0", "1.0.0", mrid.getRevision());
+ } else if (mrid.getName().equals("C")) {
+ assertEquals("C revision should be 1.0.2", "1.0.2", mrid.getRevision());
+ }
+ }
}
private ResolveOptions getResolveOptions() {
- return new ResolveOptions()
- .setCache(CacheManager.getInstance(ivy.getSettings()))
- .setValidate(false);
- }
+ return new ResolveOptions().setCache(CacheManager.getInstance(ivy.getSettings()))
+ .setValidate(false);
+ }
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java Tue Jun 5 05:02:27 2007
@@ -26,62 +26,58 @@
import org.apache.ivy.core.resolve.ResolveOptions;
import org.apache.ivy.util.FileUtil;
-
-public class RegexpConflictManagerTest extends TestCase
-{
+public class RegexpConflictManagerTest extends TestCase {
private Ivy ivy;
+
private File _cache;
- protected void setUp() throws Exception
- {
+ protected void setUp() throws Exception {
ivy = new Ivy();
- ivy.configure( RegexpConflictManagerTest.class
- .getResource( "ivysettings-regexp-test.xml" ) );
+ ivy.configure(RegexpConflictManagerTest.class.getResource("ivysettings-regexp-test.xml"));
_cache = new File("build/cache");
_cache.mkdirs();
}
-
- protected void tearDown() throws Exception {
- FileUtil.forceDelete(_cache);
- }
-
- public void testNoApiConflictResolve() throws Exception
- {
- try
- {
- ivy.resolve( RegexpConflictManagerTest.class
- .getResource( "ivy-no-regexp-conflict.xml" ),
- getResolveOptions() );
- }
- catch ( StrictConflictException e )
- {
- fail( "Unexpected conflict: " + e );
+
+ protected void tearDown() throws Exception {
+ FileUtil.forceDelete(_cache);
+ }
+
+ public void testNoApiConflictResolve() throws Exception {
+ try {
+ ivy.resolve(RegexpConflictManagerTest.class.getResource("ivy-no-regexp-conflict.xml"),
+ getResolveOptions());
+ } catch (StrictConflictException e) {
+ fail("Unexpected conflict: " + e);
}
}
- public void testConflictResolve() throws Exception
- {
- try
- {
- ivy.resolve( RegexpConflictManagerTest.class
- .getResource( "ivy-conflict.xml" ),
- getResolveOptions() );
+ public void testConflictResolve() throws Exception {
+ try {
+ ivy.resolve(RegexpConflictManagerTest.class.getResource("ivy-conflict.xml"),
+ getResolveOptions());
- fail( "Resolve should have failed with a conflict" );
- }
- catch ( StrictConflictException e )
- {
+ fail("Resolve should have failed with a conflict");
+ } catch (StrictConflictException e) {
// this is expected
- assertTrue("bad exception message: "+e.getMessage(),
- e.getMessage().indexOf("[ org1 | mod1.2 | 2.0.0 ]:2.0 (needed by [[ apache | resolve-noconflict | 1.0 ]])")!=-1);
- assertTrue("bad exception message: "+e.getMessage(),
- e.getMessage().indexOf("conflicts with")!=-1);
- assertTrue("bad exception message: "+e.getMessage(),
- e.getMessage().indexOf("[ org1 | mod1.2 | 2.1.0 ]:2.1 (needed by [[ apache | resolve-noconflict | 1.0 ]])")!=-1);
+ assertTrue(
+ "bad exception message: " + e.getMessage(),
+ e
+ .getMessage()
+ .indexOf(
+ "[ org1 | mod1.2 | 2.0.0 ]:2.0 (needed by [[ apache | resolve-noconflict | 1.0 ]])") != -1);
+ assertTrue("bad exception message: " + e.getMessage(), e.getMessage().indexOf(
+ "conflicts with") != -1);
+ assertTrue(
+ "bad exception message: " + e.getMessage(),
+ e
+ .getMessage()
+ .indexOf(
+ "[ org1 | mod1.2 | 2.1.0 ]:2.1 (needed by [[ apache | resolve-noconflict | 1.0 ]])") != -1);
}
}
-
+
private ResolveOptions getResolveOptions() {
- return new ResolveOptions().setCache(CacheManager.getInstance(ivy.getSettings())).setValidate(false);
- }
+ return new ResolveOptions().setCache(CacheManager.getInstance(ivy.getSettings()))
+ .setValidate(false);
+ }
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java Tue Jun 5 05:02:27 2007
@@ -27,7 +27,8 @@
import org.apache.ivy.util.FileUtil;
public class StrictConflictManagerTest extends TestCase {
- private Ivy ivy;
+ private Ivy ivy;
+
private File _cache;
protected void setUp() throws Exception {
@@ -36,10 +37,10 @@
_cache = new File("build/cache");
_cache.mkdirs();
}
-
- protected void tearDown() throws Exception {
- FileUtil.forceDelete(_cache);
- }
+
+ protected void tearDown() throws Exception {
+ FileUtil.forceDelete(_cache);
+ }
public void testInitFromConf() throws Exception {
ConflictManager cm = ivy.getSettings().getDefaultConflictManager();
@@ -47,12 +48,14 @@
}
public void testNoConflictResolve() throws Exception {
- ivy.resolve(StrictConflictManagerTest.class.getResource("ivy-noconflict.xml"), getResolveOptions());
+ ivy.resolve(StrictConflictManagerTest.class.getResource("ivy-noconflict.xml"),
+ getResolveOptions());
}
public void testConflictResolve() throws Exception {
try {
- ivy.resolve(StrictConflictManagerTest.class.getResource("ivy-conflict.xml"), getResolveOptions());
+ ivy.resolve(StrictConflictManagerTest.class.getResource("ivy-conflict.xml"),
+ getResolveOptions());
fail("Resolve should have failed with a conflict");
} catch (StrictConflictException e) {
@@ -60,8 +63,8 @@
}
}
-
private ResolveOptions getResolveOptions() {
- return new ResolveOptions().setCache(CacheManager.getInstance(ivy.getSettings())).setValidate(false);
- }
+ return new ResolveOptions().setCache(CacheManager.getInstance(ivy.getSettings()))
+ .setValidate(false);
+ }
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java Tue Jun 5 05:02:27 2007
@@ -27,100 +27,50 @@
public class LatestRevisionStrategyTest extends TestCase {
public void testComparator() {
- ArtifactInfo[] revs = toMockAI(new String[] {
- "0.2a",
- "0.2_b",
- "0.2rc1",
- "0.2-final",
- "1.0-dev1",
- "1.0-dev2",
- "1.0-alpha1",
- "1.0-alpha2",
- "1.0-beta1",
- "1.0-beta2",
- "1.0-gamma",
- "1.0-rc1",
- "1.0-rc2",
- "1.0",
- "1.0.1",
- "2.0"
- });
-
- List shuffled = new ArrayList(Arrays.asList(revs));
+ ArtifactInfo[] revs = toMockAI(new String[] {"0.2a", "0.2_b", "0.2rc1", "0.2-final",
+ "1.0-dev1", "1.0-dev2", "1.0-alpha1", "1.0-alpha2", "1.0-beta1", "1.0-beta2",
+ "1.0-gamma", "1.0-rc1", "1.0-rc2", "1.0", "1.0.1", "2.0"});
+
+ List shuffled = new ArrayList(Arrays.asList(revs));
Collections.shuffle(shuffled);
Collections.sort(shuffled, new LatestRevisionStrategy().COMPARATOR);
assertEquals(Arrays.asList(revs), shuffled);
}
-
+
public void testSort() {
- ArtifactInfo[] revs = toMockAI(new String[] {
- "0.2a",
- "0.2_b",
- "0.2rc1",
- "0.2-final",
- "1.0-dev1",
- "1.0-dev2",
- "1.0-alpha1",
- "1.0-alpha2",
- "1.0-beta1",
- "1.0-beta2",
- "1.0-gamma",
- "1.0-rc1",
- "1.0-rc2",
- "1.0",
- "1.0.1",
- "2.0"
- });
-
- List shuffled = new ArrayList(Arrays.asList(revs));
- ArtifactInfo[] shuffledRevs = (ArtifactInfo[]) shuffled.toArray(new ArtifactInfo[revs.length]);
-
+ ArtifactInfo[] revs = toMockAI(new String[] {"0.2a", "0.2_b", "0.2rc1", "0.2-final",
+ "1.0-dev1", "1.0-dev2", "1.0-alpha1", "1.0-alpha2", "1.0-beta1", "1.0-beta2",
+ "1.0-gamma", "1.0-rc1", "1.0-rc2", "1.0", "1.0.1", "2.0"});
+
+ List shuffled = new ArrayList(Arrays.asList(revs));
+ ArtifactInfo[] shuffledRevs = (ArtifactInfo[]) shuffled
+ .toArray(new ArtifactInfo[revs.length]);
+
LatestRevisionStrategy latestRevisionStrategy = new LatestRevisionStrategy();
List sorted = latestRevisionStrategy.sort(shuffledRevs);
- assertEquals(Arrays.asList(revs), sorted);
+ assertEquals(Arrays.asList(revs), sorted);
}
-
+
public void testFindLatest() {
- ArtifactInfo[] revs = toMockAI(new String[] {
- "0.2a",
- "0.2_b",
- "0.2rc1",
- "0.2-final",
- "1.0-dev1",
- "1.0-dev2",
- "1.0-alpha1",
- "1.0-alpha2",
- "1.0-beta1",
- "1.0-beta2",
- "1.0-gamma",
- "1.0-rc1",
- "1.0-rc2",
- "1.0",
- "1.0.1",
- "2.0"
- });
-
- List shuffled = new ArrayList(Arrays.asList(revs));
- ArtifactInfo[] shuffledRevs = (ArtifactInfo[]) shuffled.toArray(new ArtifactInfo[revs.length]);
-
+ ArtifactInfo[] revs = toMockAI(new String[] {"0.2a", "0.2_b", "0.2rc1", "0.2-final",
+ "1.0-dev1", "1.0-dev2", "1.0-alpha1", "1.0-alpha2", "1.0-beta1", "1.0-beta2",
+ "1.0-gamma", "1.0-rc1", "1.0-rc2", "1.0", "1.0.1", "2.0"});
+
+ List shuffled = new ArrayList(Arrays.asList(revs));
+ ArtifactInfo[] shuffledRevs = (ArtifactInfo[]) shuffled
+ .toArray(new ArtifactInfo[revs.length]);
+
LatestRevisionStrategy latestRevisionStrategy = new LatestRevisionStrategy();
ArtifactInfo latest = latestRevisionStrategy.findLatest(shuffledRevs, new Date());
assertNotNull(latest);
assertEquals("2.0", latest.getRevision());
}
-
+
public void testSpecialMeaningComparator() {
- ArtifactInfo[] revs = toMockAI(new String[] {
- "0.1",
- "0.2-pre",
- "0.2-dev",
- "0.2-rc1",
- "0.2-final",
- "0.2-QA",
- "1.0-dev1",
- });
-
- List shuffled = new ArrayList(Arrays.asList(revs));
+ ArtifactInfo[] revs = toMockAI(new String[] {"0.1", "0.2-pre", "0.2-dev", "0.2-rc1",
+ "0.2-final", "0.2-QA", "1.0-dev1",});
+
+ List shuffled = new ArrayList(Arrays.asList(revs));
Collections.shuffle(shuffled);
LatestRevisionStrategy latestRevisionStrategy = new LatestRevisionStrategy();
LatestRevisionStrategy.SpecialMeaning specialMeaning = new LatestRevisionStrategy.SpecialMeaning();
@@ -135,11 +85,10 @@
assertEquals(Arrays.asList(revs), shuffled);
}
-
-
private static class MockArtifactInfo implements ArtifactInfo {
private long _lastModified;
+
private String _rev;
public MockArtifactInfo(String rev, long lastModified) {
@@ -154,11 +103,12 @@
public long getLastModified() {
return _lastModified;
}
-
+
public String toString() {
- return _rev;
+ return _rev;
}
}
+
private ArtifactInfo[] toMockAI(String[] revs) {
ArtifactInfo[] artifactInfos = new ArtifactInfo[revs.length];
for (int i = 0; i < artifactInfos.length; i++) {