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 [21/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/core/retrieve/RetrieveTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java Tue Jan 14 08:27:37 2014
@@ -185,9 +185,10 @@ public class RetrieveTest extends TestCa
"mod1.2", "jar", "jar", "default")).getCanonicalFile();
file.getParentFile().mkdirs();
file.createNewFile();
- ivy.retrieve(md.getModuleRevisionId(), pattern, getRetrieveOptions().setOverwriteMode("always"));
+ ivy.retrieve(md.getModuleRevisionId(), pattern,
+ getRetrieveOptions().setOverwriteMode("always"));
assertEquals(
- new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").lastModified(),
+ new File("test/repositories/1/org1/mod1.2/jars/mod1.2-2.0.jar").lastModified(),
file.lastModified());
}
@@ -217,7 +218,7 @@ public class RetrieveTest extends TestCa
if (SystemUtils.IS_OS_WINDOWS) {
return;
}
-
+
// mod1.1 depends on mod1.2
ResolveReport report = ivy.resolve(new File(
"test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml").toURI().toURL(),
@@ -247,7 +248,8 @@ public class RetrieveTest extends TestCa
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") || os.equals("Mac OS X")) {
+ if (os.equals("Linux") || os.equals("Solaris") || os.equals("FreeBSD")
+ || os.equals("Mac OS X")) {
// 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.
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java Tue Jan 14 08:27:37 2014
@@ -38,14 +38,13 @@ public class SearchTest extends TestCase
public void testListInMavenRepo() throws Exception {
Ivy ivy = Ivy.newInstance();
ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURI().toURL());
-
+
Map otherTokenValues = new HashMap();
otherTokenValues.put(IvyPatternHelper.ORGANISATION_KEY, "org.apache");
otherTokenValues.put(IvyPatternHelper.MODULE_KEY, "test-metadata");
String[] revs = ivy.listTokenValues(IvyPatternHelper.REVISION_KEY, otherTokenValues);
-
- assertEquals(
- new HashSet(Arrays.asList(new String[] {"1.0","1.1"})),
+
+ assertEquals(new HashSet(Arrays.asList(new String[] {"1.0", "1.1"})),
new HashSet(Arrays.asList(revs)));
}
@@ -53,15 +52,14 @@ public class SearchTest extends TestCase
Ivy ivy = Ivy.newInstance();
ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURI().toURL());
((IBiblioResolver) ivy.getSettings().getResolver("m2")).setUseMavenMetadata(false);
-
+
Map otherTokenValues = new HashMap();
otherTokenValues.put(IvyPatternHelper.ORGANISATION_KEY, "org.apache");
otherTokenValues.put(IvyPatternHelper.MODULE_KEY, "test-metadata");
String[] revs = ivy.listTokenValues(IvyPatternHelper.REVISION_KEY, otherTokenValues);
-
- assertEquals(
- new HashSet(Arrays.asList(new String[] {"1.0","1.1","1.2"})),
- new HashSet(Arrays.asList(revs)));
+
+ assertEquals(new HashSet(Arrays.asList(new String[] {"1.0", "1.1", "1.2"})), new HashSet(
+ Arrays.asList(revs)));
}
public void testListModulesWithExtraAttributes() throws ParseException, IOException {
@@ -70,11 +68,13 @@ public class SearchTest extends TestCase
IvySettings settings = ivy.getSettings();
Map extendedAttributes = new HashMap();
- extendedAttributes.put("e:att1","extraatt");
- extendedAttributes.put("e:att2","extraatt2");
- ModuleRevisionId criteria = ModuleRevisionId.newInstance("test", "a", "*", extendedAttributes);
+ extendedAttributes.put("e:att1", "extraatt");
+ extendedAttributes.put("e:att2", "extraatt2");
+ ModuleRevisionId criteria = ModuleRevisionId.newInstance("test", "a", "*",
+ extendedAttributes);
- ModuleRevisionId[] mrids = ivy.listModules(criteria, settings.getMatcher(PatternMatcher.REGEXP));
+ ModuleRevisionId[] mrids = ivy.listModules(criteria,
+ settings.getMatcher(PatternMatcher.REGEXP));
assertEquals(2, mrids.length);
ModuleRevisionId mrid = mrids[0];
@@ -87,7 +87,9 @@ public class SearchTest extends TestCase
Map qualifiedExtraAttributes = mrid.getQualifiedExtraAttributes();
assertEquals(2, qualifiedExtraAttributes.size());
- assertTrue(qualifiedExtraAttributes.toString(), qualifiedExtraAttributes.keySet().contains("e:att1"));
- assertTrue(qualifiedExtraAttributes.toString(), qualifiedExtraAttributes.keySet().contains("e:att2"));
+ assertTrue(qualifiedExtraAttributes.toString(),
+ qualifiedExtraAttributes.keySet().contains("e:att1"));
+ assertTrue(qualifiedExtraAttributes.toString(),
+ qualifiedExtraAttributes.keySet().contains("e:att2"));
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java Tue Jan 14 08:27:37 2014
@@ -67,8 +67,8 @@ public class ConfigureTest extends TestC
public void testTypedefWithCustomClasspathWithFile() throws Exception {
Ivy ivy = new Ivy();
- ivy.setVariable("ivy.custom.test.dir", new File("test/java/org/apache/ivy/core/settings")
- .getAbsolutePath());
+ ivy.setVariable("ivy.custom.test.dir",
+ new File("test/java/org/apache/ivy/core/settings").getAbsolutePath());
ivy.configure(ConfigureTest.class.getResource("ivysettings-custom-typedef2.xml"));
DependencyResolver custom = ivy.getSettings().getResolver("custom");
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java Tue Jan 14 08:27:37 2014
@@ -33,11 +33,11 @@ public class IvySettingsTest extends Tes
IvySettings settings = ivy.getSettings();
DependencyResolver defaultResolver = settings.getDefaultResolver();
-
+
assertNotNull(defaultResolver);
assertEquals("default", defaultResolver.getName());
assertSame("default resolver cached", defaultResolver, settings.getDefaultResolver());
-
+
settings.setDefaultResolver("public");
DependencyResolver newDefault = settings.getDefaultResolver();
assertNotNull(newDefault);
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java Tue Jan 14 08:27:37 2014
@@ -38,17 +38,15 @@ public class OnlineXmlSettingsParserTest
configureURLHandler();
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(new URL(
- "http://ant.apache.org/ivy/test/ivysettings-include-http-url.xml"));
+ parser.parse(new URL("http://ant.apache.org/ivy/test/ivysettings-include-http-url.xml"));
DependencyResolver resolver = settings.getResolver("ivyrep");
assertNotNull(resolver);
assertTrue(resolver instanceof IvyRepResolver);
}
-
public void testIncludeHttpRelativeUrl() throws Exception {
- //Use a settings file via http that use an include with relative url
+ // Use a settings file via http that use an include with relative url
configureURLHandler();
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
@@ -60,9 +58,8 @@ public class OnlineXmlSettingsParserTest
assertTrue(resolver instanceof IvyRepResolver);
}
-
public void testIncludeHttpRelativeFile() throws Exception {
- //Use a settings file via http that use an include with relative file
+ // Use a settings file via http that use an include with relative file
configureURLHandler();
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
@@ -74,22 +71,21 @@ public class OnlineXmlSettingsParserTest
assertTrue(resolver instanceof IvyRepResolver);
}
-
public void testIncludeHttpAbsoluteFile() throws Exception {
- //Use a settings file via http that use an include with absolute file
- //WARNING : this test will only work if the test are launched from the project root
- //directory
+ // Use a settings file via http that use an include with absolute file
+ // WARNING : this test will only work if the test are launched from the project root
+ // directory
configureURLHandler();
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(new URL(
"http://ant.apache.org/ivy/test/ivysettings-include-http-absolute-file.xml"));
-
+
DependencyResolver inc = settings.getResolver("includeworks");
assertNotNull(inc);
assertTrue(inc instanceof ChainResolver);
}
-
+
private void configureURLHandler() {
URLHandlerDispatcher dispatcher = new URLHandlerDispatcher();
URLHandler httpHandler = URLHandlerRegistry.getHttp();
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java Tue Jan 14 08:27:37 2014
@@ -66,8 +66,8 @@ public class XmlSettingsParserTest exten
assertFalse(settings.doValidate());
assertEquals("[module]/ivys/ivy-[revision].xml", settings.getDefaultCacheIvyPattern());
- assertEquals("[module]/[type]s/[artifact]-[revision].[ext]", settings
- .getDefaultCacheArtifactPattern());
+ assertEquals("[module]/[type]s/[artifact]-[revision].[ext]",
+ settings.getDefaultCacheArtifactPattern());
LatestStrategy latest = settings.getLatestStrategy("mylatest-revision");
assertNotNull(latest);
@@ -84,7 +84,8 @@ public class XmlSettingsParserTest exten
List ivyPatterns = fsres.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("lib/[organisation]/[module]/ivys/ivy-[revision].xml", ivyPatterns.get(0));
+ assertLocationEquals("lib/[organisation]/[module]/ivys/ivy-[revision].xml",
+ ivyPatterns.get(0));
LatestStrategy strategy = fsres.getLatestStrategy();
assertNotNull(strategy);
@@ -108,15 +109,15 @@ public class XmlSettingsParserTest exten
assertNotNull(strategy);
assertTrue(strategy instanceof LatestTimeStrategy);
- assertEquals("libraries",
+ assertEquals("libraries",
settings.getResolver(ModuleRevisionId.newInstance("unknown", "lib", "1.0")).getName());
- assertEquals("internal",
+ assertEquals("internal",
settings.getResolver(ModuleRevisionId.newInstance("apache", "ant", "1.0")).getName());
- assertEquals("int2",
+ assertEquals("int2",
settings.getResolver(ModuleRevisionId.newInstance("apache", "ivy", "2.0")).getName());
- assertEquals("int1",
+ assertEquals("int1",
settings.getResolver(ModuleRevisionId.newInstance("apache", "ivy", "1.0")).getName());
- assertEquals("int1",
+ assertEquals("int1",
settings.getResolver(ModuleRevisionId.newInstance("apache", "ivyde", "1.0")).getName());
}
@@ -177,11 +178,12 @@ public class XmlSettingsParserTest exten
assertEquals("dynamic", settings.getResolveMode(new ModuleId("apache", "ivyde")));
assertEquals("default", settings.getResolveMode(new ModuleId("apache", "ant")));
}
-
+
public void testExtraModuleAttribute() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-extra-module-attribute.xml"));
+ parser.parse(XmlSettingsParserTest.class
+ .getResource("ivysettings-extra-module-attribute.xml"));
assertEquals("default", settings.getResolveMode(new ModuleId("apache", "ivy")));
}
@@ -191,27 +193,29 @@ public class XmlSettingsParserTest exten
XmlSettingsParser parser = new XmlSettingsParser(settings);
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-cache.xml"));
- assertEquals(new File("repository").getCanonicalFile(),
- settings.getDefaultRepositoryCacheBasedir().getCanonicalFile());
- assertEquals(new File("resolution").getCanonicalFile(),
- settings.getDefaultResolutionCacheBasedir().getCanonicalFile());
+ assertEquals(new File("repository").getCanonicalFile(), settings
+ .getDefaultRepositoryCacheBasedir().getCanonicalFile());
+ assertEquals(new File("resolution").getCanonicalFile(), settings
+ .getDefaultResolutionCacheBasedir().getCanonicalFile());
assertEquals("artifact-lock", settings.getDefaultLockStrategy().getName());
assertEquals("[module]/ivys/ivy-[revision].xml", settings.getDefaultCacheIvyPattern());
- assertEquals("[module]/[type]s/[artifact]-[revision].[ext]", settings
- .getDefaultCacheArtifactPattern());
+ assertEquals("[module]/[type]s/[artifact]-[revision].[ext]",
+ settings.getDefaultCacheArtifactPattern());
assertEquals(true, settings.isDefaultUseOrigin());
-
- DefaultRepositoryCacheManager c = (DefaultRepositoryCacheManager) settings.getRepositoryCacheManager("mycache");
+
+ DefaultRepositoryCacheManager c = (DefaultRepositoryCacheManager) settings
+ .getRepositoryCacheManager("mycache");
assertNotNull(c);
assertEquals("mycache", c.getName());
assertEquals(1000, c.getDefaultTTL());
- assertEquals(200, c.getTTL(ModuleRevisionId.newInstance("apache", "ivy", "latest.integration")));
- assertEquals(10 * 60 * 1000 + 20 * 1000, // 10m 20s
+ assertEquals(200,
+ c.getTTL(ModuleRevisionId.newInstance("apache", "ivy", "latest.integration")));
+ assertEquals(10 * 60 * 1000 + 20 * 1000, // 10m 20s
c.getTTL(ModuleRevisionId.newInstance("org1", "A", "A")));
- assertEquals(5 * 3600 * 1000, // 5h
+ assertEquals(5 * 3600 * 1000, // 5h
c.getTTL(ModuleRevisionId.newInstance("org2", "A", "A")));
- assertEquals(60 * 3600 * 1000, // 2d 12h = 60h
+ assertEquals(60 * 3600 * 1000, // 2d 12h = 60h
c.getTTL(ModuleRevisionId.newInstance("org3", "A", "A")));
assertEquals(new File("mycache").getCanonicalFile(), c.getBasedir().getCanonicalFile());
assertEquals(false, c.isUseOrigin());
@@ -219,8 +223,9 @@ public class XmlSettingsParserTest exten
assertEquals("[module]/ivy-[revision].xml", c.getIvyPattern());
assertEquals("[module]/[artifact]-[revision].[ext]", c.getArtifactPattern());
-
- DefaultRepositoryCacheManager c2 = (DefaultRepositoryCacheManager) settings.getRepositoryCacheManager("mycache2");
+
+ DefaultRepositoryCacheManager c2 = (DefaultRepositoryCacheManager) settings
+ .getRepositoryCacheManager("mycache2");
assertNotNull(c2);
assertEquals("mycache2", c2.getName());
assertEquals(new File("repository").getCanonicalFile(), c2.getBasedir().getCanonicalFile());
@@ -230,7 +235,7 @@ public class XmlSettingsParserTest exten
assertEquals("[module]/[type]s/[artifact]-[revision].[ext]", c2.getArtifactPattern());
assertEquals(true, c2.isUseOrigin());
-
+
assertEquals(c2, settings.getResolver("A").getRepositoryCacheManager());
assertEquals(c, settings.getResolver("B").getRepositoryCacheManager());
}
@@ -238,7 +243,7 @@ public class XmlSettingsParserTest exten
public void testInvalidCache() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
-
+
try {
parser.parse(XmlSettingsParserTest.class.getResource("ivysettings-cache-invalid.xml"));
fail("resolver referencing a non existent cache should raise an exception");
@@ -299,7 +304,8 @@ public class XmlSettingsParserTest exten
List ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml", ivyPatterns.get(0));
+ assertLocationEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml",
+ ivyPatterns.get(0));
DependencyResolver external = settings.getResolver("external");
assertNotNull(external);
@@ -314,7 +320,8 @@ public class XmlSettingsParserTest exten
ivyPatterns = fsInt2.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml", ivyPatterns.get(0));
+ assertLocationEquals("sharedrep/[organisation]/[module]/ivys/ivy-[revision].xml",
+ ivyPatterns.get(0));
}
public void testMacro() throws Exception {
@@ -335,7 +342,8 @@ public class XmlSettingsParserTest exten
List ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
+ assertLocationEquals(
+ "path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
ivyPatterns.get(0));
FileSystemResolver fsInt2 = (FileSystemResolver) subresolvers.get(1);
@@ -344,7 +352,8 @@ public class XmlSettingsParserTest exten
ivyPatterns = fsInt2.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("path/to/secondrep/[organisation]/[module]/[type]s/ivy-[revision].xml",
+ assertLocationEquals(
+ "path/to/secondrep/[organisation]/[module]/[type]s/ivy-[revision].xml",
ivyPatterns.get(0));
DependencyResolver other = settings.getResolver("other");
@@ -361,7 +370,8 @@ public class XmlSettingsParserTest exten
ivyPatterns = fsInt2.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("path/to/secondrep/[module]/[type]s/ivy-[revision].xml", ivyPatterns.get(0));
+ assertLocationEquals("path/to/secondrep/[module]/[type]s/ivy-[revision].xml",
+ ivyPatterns.get(0));
}
public void testMacroAndRef() throws Exception {
@@ -399,7 +409,7 @@ public class XmlSettingsParserTest exten
DependencyResolver testResolver = settings.getResolver("test");
assertNotNull(testResolver);
assertTrue(testResolver instanceof IBiblioResolver);
-
+
ChainResolver chain = (ChainResolver) macrores;
List subresolvers = chain.getResolvers();
assertNotNull(subresolvers);
@@ -410,15 +420,15 @@ public class XmlSettingsParserTest exten
public void testPropertiesMissingFile() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource(
- "ivysettings-properties-missing-file.xml"));
-
+ parser.parse(XmlSettingsParserTest.class
+ .getResource("ivysettings-properties-missing-file.xml"));
+
// no error must have been thrown, check that the parsing didn't stop...
DependencyResolver defaultResolver = settings.getDefaultResolver();
assertNotNull(defaultResolver);
assertEquals("libraries", defaultResolver.getName());
}
-
+
public void testInclude() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
@@ -437,7 +447,8 @@ public class XmlSettingsParserTest exten
List ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
+ assertLocationEquals(
+ "path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
ivyPatterns.get(0));
DependencyResolver inc = settings.getResolver("includeworks");
@@ -454,21 +465,21 @@ public class XmlSettingsParserTest exten
ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("included/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
+ assertLocationEquals(
+ "included/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
ivyPatterns.get(0));
-
+
// properties defined in included file should be available to including file (IVY-780)
assertEquals("myvalue", settings.getVariable("ivy.test.prop"));
}
-
public void testIncludeAbsoluteFile() throws Exception {
- //WARNING : this test will only work if the test are launched from the project root
- //directory
+ // WARNING : this test will only work if the test are launched from the project root
+ // directory
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
- parser.parse(XmlSettingsParserTest.class.getResource(
- "ivysettings-include-absolute-file.xml"));
+ parser.parse(XmlSettingsParserTest.class
+ .getResource("ivysettings-include-absolute-file.xml"));
DependencyResolver inc = settings.getResolver("includeworks");
assertNotNull(inc);
@@ -479,14 +490,14 @@ public class XmlSettingsParserTest exten
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
try {
- parser.parse(XmlSettingsParserTest.class.getResource(
- "ivysettings-include-missing-file.xml"));
+ parser.parse(XmlSettingsParserTest.class
+ .getResource("ivysettings-include-missing-file.xml"));
fail("An exception must be throwed");
} catch (Exception e) {
- //An exception must be throwed
+ // An exception must be throwed
}
}
-
+
public void testIncludeSpecialCharInName() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
@@ -505,7 +516,8 @@ public class XmlSettingsParserTest exten
List ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
+ assertLocationEquals(
+ "path/to/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
ivyPatterns.get(0));
DependencyResolver inc = settings.getResolver("includeworks");
@@ -522,13 +534,14 @@ public class XmlSettingsParserTest exten
ivyPatterns = fsInt1.getIvyPatterns();
assertNotNull(ivyPatterns);
assertEquals(1, ivyPatterns.size());
- assertLocationEquals("included/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
+ assertLocationEquals(
+ "included/myrep/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]",
ivyPatterns.get(0));
-
+
// properties defined in included file should be available to including file (IVY-780)
assertEquals("myvalue", settings.getVariable("ivy.test.prop"));
}
-
+
public void testRelativePropertiesFile() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
@@ -537,7 +550,7 @@ public class XmlSettingsParserTest exten
assertLocationEquals("lib", settings.getVariable("libraries.dir"));
}
-
+
public void testParser() throws Exception {
IvySettings settings = new IvySettings();
XmlSettingsParser parser = new XmlSettingsParser(settings);
@@ -587,18 +600,20 @@ public class XmlSettingsParserTest exten
IvySettings settings = new IvySettings();
settings.setBaseDir(new File("test/base/dir"));
assertEquals(new File("test/base/dir").getAbsolutePath(), settings.getVariable("basedir"));
- assertEquals(new File("test/base/dir").getAbsolutePath(), settings.getVariable("ivy.basedir"));
+ assertEquals(new File("test/base/dir").getAbsolutePath(),
+ settings.getVariable("ivy.basedir"));
settings = new IvySettings();
settings.setVariable("basedir", new File("other/base/dir").getAbsolutePath());
settings.setBaseDir(new File("test/base/dir"));
assertEquals(new File("other/base/dir").getAbsolutePath(), settings.getVariable("basedir"));
- assertEquals(new File("test/base/dir").getAbsolutePath(), settings.getVariable("ivy.basedir"));
+ assertEquals(new File("test/base/dir").getAbsolutePath(),
+ settings.getVariable("ivy.basedir"));
}
public static class MyOutputter implements ReportOutputter {
- public void output(
- ResolveReport report, ResolutionCacheManager cacheMgr, ResolveOptions options) {
+ public void output(ResolveReport report, ResolutionCacheManager cacheMgr,
+ ResolveOptions options) {
}
public String getName() {
@@ -606,9 +621,10 @@ public class XmlSettingsParserTest exten
}
}
-
+
public static class MyLockStrategy extends AbstractLockStrategy {
- public boolean lockArtifact(Artifact artifact, File artifactFileToDownload) throws InterruptedException {
+ public boolean lockArtifact(Artifact artifact, File artifactFileToDownload)
+ throws InterruptedException {
return false;
}
@@ -617,7 +633,7 @@ public class XmlSettingsParserTest exten
}
private void assertLocationEquals(String expected, Object pattern) throws IOException {
- assertEquals(new File(expected).getCanonicalFile(),
- new File((String) pattern).getCanonicalFile());
+ assertEquals(new File(expected).getCanonicalFile(),
+ new File((String) pattern).getCanonicalFile());
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java Tue Jan 14 08:27:37 2014
@@ -49,8 +49,8 @@ public class SortTest extends TestCase {
private DefaultModuleDescriptor md4;
private SortEngine sortEngine;
-
- private SimpleSortEngineSettings settings;
+
+ private SimpleSortEngineSettings settings;
private SilentNonMatchingVersionReporter nonMatchReporter;
@@ -61,7 +61,7 @@ public class SortTest extends TestCase {
*/
protected void setUp() throws Exception {
super.setUp();
- md1 = createModuleDescriptorToSort("md1", null); // The revison is often not set in the
+ 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");
@@ -70,9 +70,9 @@ public class SortTest extends TestCase {
settings = new SimpleSortEngineSettings();
settings.setCircularDependencyStrategy(WarnCircularDependencyStrategy.getInstance());
settings.setVersionMatcher(new ExactVersionMatcher());
-
+
sortEngine = new SortEngine(settings);
-
+
nonMatchReporter = new SilentNonMatchingVersionReporter();
}
@@ -130,19 +130,19 @@ public class SortTest extends TestCase {
}
}
- //Test IVY-624
+ // Test IVY-624
public void testCircularDependencyInfiniteLoop() throws Exception {
addDependency(md1, "md2", "rev2");
addDependency(md1, "md3", "rev3");
- addDependency(md2, "md3", "rev3");
+ addDependency(md2, "md3", "rev3");
addDependency(md3, "md4", "rev4");
addDependency(md4, "md1", "rev1");
addDependency(md4, "md2", "rev2");
List toSort = Arrays.asList(new Object[] {md1, md2, md3, md4});
sortModuleDescriptors(toSort, nonMatchReporter);
- //If it ends, it's ok.
+ // If it ends, it's ok.
}
-
+
/**
* In case of Circular dependency a warning is generated.
*/
@@ -163,17 +163,17 @@ public class SortTest extends TestCase {
public void handleCircularDependency(ModuleRevisionId[] mrids) {
assertEquals("handleCircularDependency is expected to be called only once", 0,
nbOfCall);
- String assertMsg = "incorrect cicular dependency invocation"
+ String assertMsg = "incorrect cicular dependency invocation"
+ CircularDependencyHelper.formatMessage(mrids);
final int expectedLength = 3;
- assertEquals(assertMsg, expectedLength , mrids.length);
+ assertEquals(assertMsg, expectedLength, mrids.length);
if (mrids[0].equals(md2.getModuleRevisionId())) {
- assertEquals(assertMsg , md3.getModuleRevisionId() , mrids[1]);
- assertEquals(assertMsg , md2.getModuleRevisionId() , mrids[2]);
+ assertEquals(assertMsg, md3.getModuleRevisionId(), mrids[1]);
+ assertEquals(assertMsg, md2.getModuleRevisionId(), mrids[2]);
} else {
- assertEquals(assertMsg , md3.getModuleRevisionId() , mrids[0]);
- assertEquals(assertMsg , md2.getModuleRevisionId() , mrids[1]);
- assertEquals(assertMsg , md3.getModuleRevisionId() , mrids[2]);
+ assertEquals(assertMsg, md3.getModuleRevisionId(), mrids[0]);
+ assertEquals(assertMsg, md2.getModuleRevisionId(), mrids[1]);
+ assertEquals(assertMsg, md3.getModuleRevisionId(), mrids[2]);
}
nbOfCall++;
}
@@ -202,7 +202,7 @@ public class SortTest extends TestCase {
addDependency(md4, "md3", "latest.integration");
settings.setVersionMatcher(new LatestVersionMatcher());
-
+
DefaultModuleDescriptor[][] expectedOrder = new DefaultModuleDescriptor[][] {{md1, md2,
md3, md4}};
@@ -266,8 +266,7 @@ public class SortTest extends TestCase {
Assert.assertEquals("reportNonMatchingVersion has not be called", 1, nbOfCall);
}
}
- NonMatchingVersionReporterMock nonMatchingVersionReporterMock =
- new NonMatchingVersionReporterMock();
+ NonMatchingVersionReporterMock nonMatchingVersionReporterMock = new NonMatchingVersionReporterMock();
List toSort = Arrays.asList(new ModuleDescriptor[] {md4, md3, md2, md1});
sortModuleDescriptors(toSort, nonMatchingVersionReporterMock);
nonMatchingVersionReporterMock.validate();
@@ -275,12 +274,11 @@ public class SortTest extends TestCase {
private List sortModuleDescriptors(List toSort,
NonMatchingVersionReporter nonMatchingVersionReporter) {
- return sortEngine.sortModuleDescriptors(toSort,
+ return sortEngine.sortModuleDescriptors(toSort,
new SortOptions().setNonMatchingVersionReporter(nonMatchingVersionReporter));
}
- private DefaultModuleDescriptor createModuleDescriptorToSort(String moduleName,
- String revision) {
+ private DefaultModuleDescriptor createModuleDescriptorToSort(String moduleName, String revision) {
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org", moduleName, revision);
return new DefaultModuleDescriptor(mrid, "integration", new Date());
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java Tue Jan 14 08:27:37 2014
@@ -26,7 +26,8 @@ import junit.framework.TestCase;
public class ExecutionEnvironmentProfileLoaderTest extends TestCase {
public void testLoad() throws Exception {
- Map<String, ExecutionEnvironmentProfile> profiles = ExecutionEnvironmentProfileProvider.loadDefaultProfileList();
+ Map<String, ExecutionEnvironmentProfile> profiles = ExecutionEnvironmentProfileProvider
+ .loadDefaultProfileList();
assertEquals(21, profiles.size());
assertEquals(0, profiles.get("OSGI_MINIMUM-1.0").getPkgNames().size());
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/filter/OSGiFilterTest.java Tue Jan 14 08:27:37 2014
@@ -38,26 +38,21 @@ public class OSGiFilterTest extends Test
checkParse(cgt2, "(c>2)");
OSGiFilter twoeqd = new CompareFilter("2", Operator.EQUALS, "d");
checkParse(twoeqd, "(2=d)");
- OSGiFilter foodotbarge0dot0 = new CompareFilter("foo.bar",
- Operator.GREATER_OR_EQUAL, "0.0");
+ OSGiFilter foodotbarge0dot0 = new CompareFilter("foo.bar", Operator.GREATER_OR_EQUAL, "0.0");
checkParse(foodotbarge0dot0, "(foo.bar>=0.0)");
OSGiFilter and = new AndFilter(new OSGiFilter[] {foodotbarge0dot0});
checkParse(and, "(&(foo.bar>=0.0))");
- OSGiFilter and2 = new AndFilter(new OSGiFilter[] {cgt2, twoeqd,
- foodotbarge0dot0});
+ OSGiFilter and2 = new AndFilter(new OSGiFilter[] {cgt2, twoeqd, foodotbarge0dot0});
checkParse(and2, "(&(c>2)(2=d)(foo.bar>=0.0))");
OSGiFilter spaceAfterAnd = new AndFilter(new OSGiFilter[] {twoeqd});
checkParse(spaceAfterAnd, "(& (2=d))");
- OSGiFilter version350 = new CompareFilter("version", Operator.GREATER_OR_EQUAL,
- "3.5.0");
- OSGiFilter version400 = new CompareFilter("version", Operator.GREATER_OR_EQUAL,
- "4.0.0");
+ OSGiFilter version350 = new CompareFilter("version", Operator.GREATER_OR_EQUAL, "3.5.0");
+ OSGiFilter version400 = new CompareFilter("version", Operator.GREATER_OR_EQUAL, "4.0.0");
OSGiFilter notVersion400 = new NotFilter(version400);
- OSGiFilter bundle = new CompareFilter("bundle", Operator.EQUALS,
- "org.eclipse.core.runtime");
- OSGiFilter andEverythingWithSpace = new AndFilter(new OSGiFilter[] {
- version350, notVersion400, bundle});
+ OSGiFilter bundle = new CompareFilter("bundle", Operator.EQUALS, "org.eclipse.core.runtime");
+ OSGiFilter andEverythingWithSpace = new AndFilter(new OSGiFilter[] {version350,
+ notVersion400, bundle});
checkParse(andEverythingWithSpace,
"(& (version>=3.5.0) (!(version>=4.0.0)) (bundle=org.eclipse.core.runtime) )");
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java Tue Jan 14 08:27:37 2014
@@ -40,6 +40,7 @@ public class UpdateSiteAndIbiblioResolve
private IvySettings settings;
private UpdateSiteResolver resolver;
+
IBiblioResolver resolver2;
private File cache;
@@ -64,8 +65,7 @@ public class UpdateSiteAndIbiblioResolve
resolver2 = new IBiblioResolver();
resolver2.setName("maven2");
- settings.setVariable("ivy.ibiblio.default.artifact.root",
- "http://repo1.maven.org/maven2/");
+ settings.setVariable("ivy.ibiblio.default.artifact.root", "http://repo1.maven.org/maven2/");
settings.setVariable("ivy.ibiblio.default.artifact.pattern",
"[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
resolver2.setSettings(settings);
@@ -99,18 +99,17 @@ public class UpdateSiteAndIbiblioResolve
// Simple Dependency for ibiblio
ModuleRevisionId mrid1 = ModuleRevisionId.newInstance("log4j", "log4j", "1.2.16");
ResolvedModuleRevision rmr1 = chain.getDependency(new DefaultDependencyDescriptor(mrid1,
- false), data);
+ false), data);
// Simple Dependency for updatesite
ModuleRevisionId mrid2 = ModuleRevisionId.newInstance(BundleInfo.BUNDLE_TYPE,
"org.apache.ivy", "2.0.0.final_20090108225011");
ResolvedModuleRevision rmr2 = chain.getDependency(new DefaultDependencyDescriptor(mrid2,
- false), data);
+ false), data);
assertNotNull(rmr1);
assertNotNull(rmr2);
-
Artifact[] artifacts1 = rmr1.getDescriptor().getArtifacts("default");
Artifact[] artifacts2 = rmr2.getDescriptor().getArtifacts("default");
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolverTest.java Tue Jan 14 08:27:37 2014
@@ -90,7 +90,8 @@ public class UpdateSiteResolverTest exte
}
public void testListModules() throws Exception {
- ModuleEntry[] modules = resolver.listModules(new OrganisationEntry(resolver, BundleInfo.BUNDLE_TYPE));
+ ModuleEntry[] modules = resolver.listModules(new OrganisationEntry(resolver,
+ BundleInfo.BUNDLE_TYPE));
assertEquals(3, modules.length);
modules = resolver.listModules(new OrganisationEntry(resolver, BundleInfo.PACKAGE_TYPE));
assertEquals(64, modules.length);
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java Tue Jan 14 08:27:37 2014
@@ -25,25 +25,26 @@ import org.apache.ivy.util.MockMessageLo
public class IgnoreCircularDependencyStrategyTest extends TestCase {
private CircularDependencyStrategy strategy;
+
private MockMessageLogger mockMessageImpl;
protected void setUp() throws Exception {
strategy = IgnoreCircularDependencyStrategy.getInstance();
-
+
mockMessageImpl = new MockMessageLogger();
Message.setDefaultLogger(mockMessageImpl);
}
-
+
public void testLog() throws Exception {
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.0, #B;1.0"));
-
+
mockMessageImpl.assertLogVerboseContains("circular dependency found: #A;1.0->#B;1.0");
}
-
+
public void testRemoveDuplicates() throws Exception {
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
-
+
// should only log the circular dependency once
assertEquals(1, mockMessageImpl.getLogs().size());
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java Tue Jan 14 08:27:37 2014
@@ -32,11 +32,12 @@ import org.apache.ivy.util.MockMessageLo
public class WarnCircularDependencyStrategyTest extends TestCase {
private CircularDependencyStrategy strategy;
+
private MockMessageLogger mockMessageImpl;
protected void setUp() throws Exception {
strategy = WarnCircularDependencyStrategy.getInstance();
-
+
resetLogger();
}
@@ -44,27 +45,27 @@ public class WarnCircularDependencyStrat
mockMessageImpl = new MockMessageLogger();
Message.setDefaultLogger(mockMessageImpl);
}
-
+
public void testLog() throws Exception {
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.0, #B;1.0"));
-
+
mockMessageImpl.assertLogWarningContains("circular dependency found: #A;1.0->#B;1.0");
}
-
+
public void testRemoveDuplicates() throws Exception {
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
-
+
// should only log the circular dependency once
assertEquals(1, mockMessageImpl.getLogs().size());
}
-
+
public void testRemoveDuplicates2() throws Exception {
setResolveContext("1");
resetLogger();
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
-
+
// should only log the circular dependency once
assertEquals(1, mockMessageImpl.getLogs().size());
@@ -75,7 +76,7 @@ public class WarnCircularDependencyStrat
assertEquals(1, mockMessageImpl.getLogs().size());
strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
-
+
// should not log the message again
assertEquals(1, mockMessageImpl.getLogs().size());
}
@@ -83,8 +84,7 @@ public class WarnCircularDependencyStrat
private void setResolveContext(String resolveId) {
IvySettings settings = new IvySettings();
IvyContext.getContext().setResolveData(
- new ResolveData(
- new ResolveEngine(settings, new EventManager(), new SortEngine(settings)),
- new ResolveOptions().setResolveId(resolveId)));
+ new ResolveData(new ResolveEngine(settings, new EventManager(),
+ new SortEngine(settings)), new ResolveOptions().setResolveId(resolveId)));
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java Tue Jan 14 08:27:37 2014
@@ -44,131 +44,87 @@ public class LatestCompatibleConflictMan
public void testInitFromSettings() throws Exception {
Ivy ivy = new Ivy();
- ivy.configure(LatestCompatibleConflictManagerTest
- .class.getResource("ivysettings-latest-compatible.xml"));
+ ivy.configure(LatestCompatibleConflictManagerTest.class
+ .getResource("ivysettings-latest-compatible.xml"));
ConflictManager cm = ivy.getSettings().getDefaultConflictManager();
assertTrue(cm instanceof LatestCompatibleConflictManager);
}
public void testCompatibilityResolve1() throws Exception {
- fixture
- .addMD("#A;1-> { #B;1.4 #C;[2.0,2.5] }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#D;1.5").addMD("#D;1.6")
- .init();
+ fixture.addMD("#A;1-> { #B;1.4 #C;[2.0,2.5] }").addMD("#B;1.4->#D;1.5")
+ .addMD("#C;2.5->#D;[1.0,1.6]").addMD("#D;1.5").addMD("#D;1.6").init();
resolveAndAssert("#A;1", "#B;1.4, #C;2.5, #D;1.5");
}
public void testCompatibilityResolve2() throws Exception {
- fixture
- .addMD("#A;2-> { #B;[1.0,1.5] #C;[2.0,2.5] }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#B;1.5->#D;2.0")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .init();
+ fixture.addMD("#A;2-> { #B;[1.0,1.5] #C;[2.0,2.5] }").addMD("#B;1.4->#D;1.5")
+ .addMD("#B;1.5->#D;2.0").addMD("#C;2.5->#D;[1.0,1.6]").addMD("#D;1.5")
+ .addMD("#D;1.6").addMD("#D;2.0").init();
resolveAndAssert("#A;2", "#B;1.4, #C;2.5, #D;1.5");
}
public void testCompatibilityResolve3() throws Exception {
- fixture
- .addMD("#A;3-> { #B;[2.0,2.5] #C;[3.0,3.5] }")
- .addMD("#B;2.3-> { #D;1.5 #E;1.0 }")
- .addMD("#B;2.4-> { #D;1.5 #E;2.0 }")
- .addMD("#B;2.5-> { #D;2.0 }")
- .addMD("#C;3.4-> { #D;[1.0,1.6] #E;1.0 }")
- .addMD("#C;3.5-> { #D;[1.0,1.6] #E;1.9 }")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .addMD("#E;1.0").addMD("#E;1.9").addMD("#E;2.0")
- .init();
+ fixture.addMD("#A;3-> { #B;[2.0,2.5] #C;[3.0,3.5] }").addMD("#B;2.3-> { #D;1.5 #E;1.0 }")
+ .addMD("#B;2.4-> { #D;1.5 #E;2.0 }").addMD("#B;2.5-> { #D;2.0 }")
+ .addMD("#C;3.4-> { #D;[1.0,1.6] #E;1.0 }")
+ .addMD("#C;3.5-> { #D;[1.0,1.6] #E;1.9 }").addMD("#D;1.5").addMD("#D;1.6")
+ .addMD("#D;2.0").addMD("#E;1.0").addMD("#E;1.9").addMD("#E;2.0").init();
resolveAndAssert("#A;3", "#B;2.3, #C;3.4, #D;1.5, #E;1.0");
}
public void testCompatibilityResolve4() throws Exception {
- fixture
- .addMD("#A;4-> { #B;[1.0,1.5] #C;[2.0,2.5] #F;[1.0,1.1] }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#B;1.5->#D;2.0")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#F;1.0->#D;1.5")
- .addMD("#F;1.1->#D;1.6")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .init();
+ fixture.addMD("#A;4-> { #B;[1.0,1.5] #C;[2.0,2.5] #F;[1.0,1.1] }").addMD("#B;1.4->#D;1.5")
+ .addMD("#B;1.5->#D;2.0").addMD("#C;2.5->#D;[1.0,1.6]").addMD("#F;1.0->#D;1.5")
+ .addMD("#F;1.1->#D;1.6").addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0").init();
resolveAndAssert("#A;4", "#B;1.4, #C;2.5, #D;1.5, #F;1.0");
}
public void testCompatibilityResolve5() throws Exception {
- fixture
- .addMD("#A;5->{ #B;[1.0,1.5] #C;2.6 }")
- .addMD("#B;1.3->{ }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#B;1.5->#D;2.0")
- .addMD("#C;2.6->#D;1.6")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .init();
+ fixture.addMD("#A;5->{ #B;[1.0,1.5] #C;2.6 }").addMD("#B;1.3->{ }").addMD("#B;1.4->#D;1.5")
+ .addMD("#B;1.5->#D;2.0").addMD("#C;2.6->#D;1.6").addMD("#D;1.5").addMD("#D;1.6")
+ .addMD("#D;2.0").init();
resolveAndAssert("#A;5", "#B;1.3, #C;2.6, #D;1.6");
}
public void testCompatibilityResolve6() throws Exception {
- fixture
- .addMD("#A;1-> { #C;[2.0,2.5] #B;1.4 }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#D;1.5").addMD("#D;1.6")
- .init();
+ fixture.addMD("#A;1-> { #C;[2.0,2.5] #B;1.4 }").addMD("#B;1.4->#D;1.5")
+ .addMD("#C;2.5->#D;[1.0,1.6]").addMD("#D;1.5").addMD("#D;1.6").init();
resolveAndAssert("#A;1", "#B;1.4, #C;2.5, #D;1.5");
}
public void testCompatibilityResolveCircularDependency1() throws Exception {
- fixture
- .addMD("#A;6->{ #B;[3.0,3.5] #C;4.6 }")
- .addMD("#B;3.4->#D;2.5")
- .addMD("#B;3.5->#D;3.0")
- .addMD("#C;4.6->#D;2.5")
- .addMD("#D;3.0->#B;3.5") // circular dependency
- .addMD("#D;2.5->#B;3.4") // circular dependency
- .init();
+ fixture.addMD("#A;6->{ #B;[3.0,3.5] #C;4.6 }").addMD("#B;3.4->#D;2.5")
+ .addMD("#B;3.5->#D;3.0").addMD("#C;4.6->#D;2.5").addMD("#D;3.0->#B;3.5") // circular
+ // dependency
+ .addMD("#D;2.5->#B;3.4") // circular dependency
+ .init();
resolveAndAssert("#A;6", "#B;3.4, #C;4.6, #D;2.5");
}
public void testCompatibilityResolveCircularDependency2() throws Exception {
- fixture
- .addMD("#A;1->#C;2")
- .addMD("#C;1->#B;1")
- .addMD("#C;2->#B;2")
- .addMD("#C;3->#B;3")
- .addMD("#B;1->#C;latest.integration") // circular dependency
- .addMD("#B;2->#C;latest.integration") // circular dependency
- .addMD("#B;3->#C;latest.integration") // circular dependency
- .init();
+ fixture.addMD("#A;1->#C;2").addMD("#C;1->#B;1").addMD("#C;2->#B;2").addMD("#C;3->#B;3")
+ .addMD("#B;1->#C;latest.integration") // circular dependency
+ .addMD("#B;2->#C;latest.integration") // circular dependency
+ .addMD("#B;3->#C;latest.integration") // circular dependency
+ .init();
resolveAndAssert("#A;1", "#B;2, #C;2");
}
public void testCompatibilityResolveCircularDependency3() throws Exception {
// same as 2, but A depends on B
- fixture
- .addMD("#A;1->#B;2")
- .addMD("#C;1->#B;1")
- .addMD("#C;2->#B;2")
- .addMD("#C;3->#B;3")
- .addMD("#B;1->#C;latest.integration") // circular dependency
- .addMD("#B;2->#C;latest.integration") // circular dependency
- .addMD("#B;3->#C;latest.integration") // circular dependency
- .init();
+ fixture.addMD("#A;1->#B;2").addMD("#C;1->#B;1").addMD("#C;2->#B;2").addMD("#C;3->#B;3")
+ .addMD("#B;1->#C;latest.integration") // circular dependency
+ .addMD("#B;2->#C;latest.integration") // circular dependency
+ .addMD("#B;3->#C;latest.integration") // circular dependency
+ .init();
resolveAndAssert("#A;1", "#B;2, #C;2");
}
-
public void testConflict() throws Exception {
try {
- fixture
- .addMD("#A;conflict-> { #B;[1.5,1.6] #C;2.5 }")
- .addMD("#B;1.5->#D;2.0")
- .addMD("#B;1.6->#D;2.0")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .init();
+ fixture.addMD("#A;conflict-> { #B;[1.5,1.6] #C;2.5 }").addMD("#B;1.5->#D;2.0")
+ .addMD("#B;1.6->#D;2.0").addMD("#C;2.5->#D;[1.0,1.6]").addMD("#D;1.5")
+ .addMD("#D;1.6").addMD("#D;2.0").init();
fixture.resolve("#A;conflict");
fail("Resolve should have failed with a conflict");
@@ -176,32 +132,29 @@ public class LatestCompatibleConflictMan
// this is expected
}
}
-
+
public void testDynamicRootConflict() throws Exception {
try {
- fixture
- .addMD("#A;conflict-> {#B;[1.2,2.0[ #C;pCC.main.+ #D;[1.5,1.7[ }")
- .addMD("#B;1.0.0->#D;[1.6.1,2.0[")
- .addMD("#B;1.1.0->#D;[1.6.1,2.0[")
- .addMD("#B;pCC.main.0.0->#D;[1.6.1,2.0[")
- .addMD("#C;1.0.0-> {#B;[1.0,2.0[ #D;[1.6.0,1.7[ }")
- .addMD("#C;1.1.0-> {#B;[1.1,2.0[ #D;[1.6.0,1.7[ }")
- .addMD("#C;pCC.main.1.9-> {#B;pCC.main.+ #D;[1.6.0,1.7[ }")
- .addMD("#D;1.6.1").init();
+ fixture.addMD("#A;conflict-> {#B;[1.2,2.0[ #C;pCC.main.+ #D;[1.5,1.7[ }")
+ .addMD("#B;1.0.0->#D;[1.6.1,2.0[").addMD("#B;1.1.0->#D;[1.6.1,2.0[")
+ .addMD("#B;pCC.main.0.0->#D;[1.6.1,2.0[")
+ .addMD("#C;1.0.0-> {#B;[1.0,2.0[ #D;[1.6.0,1.7[ }")
+ .addMD("#C;1.1.0-> {#B;[1.1,2.0[ #D;[1.6.0,1.7[ }")
+ .addMD("#C;pCC.main.1.9-> {#B;pCC.main.+ #D;[1.6.0,1.7[ }").addMD("#D;1.6.1")
+ .init();
fixture.resolve("#A;conflict");
-
+
fail("Resolve should have failed with a conflict");
- } catch (StrictConflictException e) {
+ } catch (StrictConflictException e) {
// this is expected }
}
}
- private void resolveAndAssert(String mrid, String expectedModuleSet)
- throws ParseException, IOException {
+ private void resolveAndAssert(String mrid, String expectedModuleSet) throws ParseException,
+ IOException {
ResolveReport report = fixture.resolve(mrid);
assertFalse(report.hasError());
ConfigurationResolveReport defaultReport = report.getConfigurationReport("default");
- TestHelper.assertModuleRevisionIds(expectedModuleSet,
- defaultReport.getModuleRevisionIds());
+ TestHelper.assertModuleRevisionIds(expectedModuleSet, defaultReport.getModuleRevisionIds());
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java Tue Jan 14 08:27:37 2014
@@ -51,8 +51,8 @@ public class LatestConflictManagerTest e
// Test case for issue IVY-388
public void testIvy388() throws Exception {
- ResolveReport report = ivy.resolve(LatestConflictManagerTest.class
- .getResource("ivy-388.xml"), getResolveOptions());
+ ResolveReport report = ivy.resolve(
+ LatestConflictManagerTest.class.getResource("ivy-388.xml"), getResolveOptions());
List deps = report.getDependencies();
Iterator dependencies = deps.iterator();
@@ -75,8 +75,8 @@ public class LatestConflictManagerTest e
// Test case for issue IVY-383
public void testIvy383() throws Exception {
- ResolveReport report = ivy.resolve(LatestConflictManagerTest.class
- .getResource("ivy-383.xml"), getResolveOptions());
+ ResolveReport report = ivy.resolve(
+ LatestConflictManagerTest.class.getResource("ivy-383.xml"), getResolveOptions());
ConfigurationResolveReport defaultReport = report.getConfigurationReport("default");
Iterator iter = defaultReport.getModuleRevisionIds().iterator();
while (iter.hasNext()) {
@@ -102,8 +102,9 @@ public class LatestConflictManagerTest e
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());
+ 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()) {
@@ -128,8 +129,9 @@ public class LatestConflictManagerTest e
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());
+ 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()) {
@@ -164,8 +166,9 @@ public class LatestConflictManagerTest e
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());
+ 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()) {
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java Tue Jan 14 08:27:37 2014
@@ -61,18 +61,14 @@ public class RegexpConflictManagerTest 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);
+ 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);
+ e.getMessage().indexOf(
+ "org1#mod1.2;2.1.0:2.1 (needed by [apache#resolve-noconflict;1.0])") != -1);
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java Tue Jan 14 08:27:37 2014
@@ -44,6 +44,7 @@ public class ArtifactLockStrategyTest ex
protected void setUp() throws Exception {
FileUtil.forceDelete(new File("build/test/cache"));
}
+
protected void tearDown() throws Exception {
FileUtil.forceDelete(new File("build/test/cache"));
}
@@ -60,13 +61,14 @@ public class ArtifactLockStrategyTest ex
// run 3 concurrent resolves, one taking 100ms to download files, one 20ms and one 5ms
// the first one do 10 resolves, the second one 20 and the third 50
- // note that the download time is useful only at the very beginning, then the cached file is used
- ResolveThread t1 = asyncResolve(
- settings1, createSlowResolver(settings1, 100), "org6#mod6.4;3", 10);
- ResolveThread t2 = asyncResolve(
- settings2, createSlowResolver(settings2, 20), "org6#mod6.4;3", 20);
- ResolveThread t3 = asyncResolve(
- settings3, createSlowResolver(settings3, 5), "org6#mod6.4;3", 50);
+ // note that the download time is useful only at the very beginning, then the cached file is
+ // used
+ ResolveThread t1 = asyncResolve(settings1, createSlowResolver(settings1, 100),
+ "org6#mod6.4;3", 10);
+ ResolveThread t2 = asyncResolve(settings2, createSlowResolver(settings2, 20),
+ "org6#mod6.4;3", 20);
+ ResolveThread t3 = asyncResolve(settings3, createSlowResolver(settings3, 5),
+ "org6#mod6.4;3", 50);
t1.join(100000);
t2.join(20000);
t3.join(20000);
@@ -76,110 +78,116 @@ public class ArtifactLockStrategyTest ex
assertFound("org6#mod6.4;3", t2.getFinalResult());
assertEquals(50, t3.getCount());
assertFound("org6#mod6.4;3", t3.getFinalResult());
- }
+ }
-
private RepositoryCacheManager newCacheManager(IvySettings settings) {
- DefaultRepositoryCacheManager cacheManager
- = new DefaultRepositoryCacheManager("cache", settings, new File("build/test/cache"));
+ DefaultRepositoryCacheManager cacheManager = new DefaultRepositoryCacheManager("cache",
+ settings, new File("build/test/cache"));
cacheManager.setLockStrategy(new CreateFileLockStrategy(false));
return cacheManager;
}
-
-
+
private FileSystemResolver createSlowResolver(IvySettings settings, final int sleep) {
FileSystemResolver resolver = new FileSystemResolver();
resolver.setRepositoryCacheManager(newCacheManager(settings));
resolver.setRepository(new FileRepository() {
- private RepositoryCopyProgressListener progress = new RepositoryCopyProgressListener(this) {
+ private RepositoryCopyProgressListener progress = new RepositoryCopyProgressListener(
+ this) {
public void progress(CopyProgressEvent evt) {
super.progress(evt);
sleepSilently(sleep); // makes the file copy longer to test concurrency issues
}
};
+
protected RepositoryCopyProgressListener getProgressListener() {
- return progress ;
+ return progress;
}
});
resolver.setName("test");
resolver.setSettings(settings);
- resolver.addIvyPattern(
- 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]");
+ resolver.addIvyPattern(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]");
return resolver;
}
-
- private ResolveThread asyncResolve(
- IvySettings settings, FileSystemResolver resolver, String module, int loop) {
+ private ResolveThread asyncResolve(IvySettings settings, FileSystemResolver resolver,
+ String module, int loop) {
ResolveThread thread = new ResolveThread(settings, resolver, module, loop);
thread.start();
return thread;
}
-
-
+
private void assertFound(String module, ResolvedModuleRevision rmr) {
assertNotNull(rmr);
assertEquals(module, rmr.getId().toString());
}
- private ResolvedModuleRevision resolveModule(
- IvySettings settings, FileSystemResolver resolver, String module)
- throws ParseException {
+
+ private ResolvedModuleRevision resolveModule(IvySettings settings, FileSystemResolver resolver,
+ String module) throws ParseException {
return resolver.getDependency(
- new DefaultDependencyDescriptor(ModuleRevisionId.parse(module), false),
- new ResolveData(
- new ResolveEngine(settings, new EventManager(), new SortEngine(settings)),
- new ResolveOptions()));
+ new DefaultDependencyDescriptor(ModuleRevisionId.parse(module), false),
+ new ResolveData(new ResolveEngine(settings, new EventManager(),
+ new SortEngine(settings)), new ResolveOptions()));
}
+
private void sleepSilently(int timeout) {
try {
Thread.sleep(timeout);
} catch (InterruptedException e) {
}
}
+
private class ResolveThread extends Thread {
private IvySettings settings;
+
private FileSystemResolver resolver;
+
private String module;
+
private final int loop;
private ResolvedModuleRevision finalResult;
+
private int count;
-
- public ResolveThread(IvySettings settings, FileSystemResolver resolver, String module, int loop) {
+
+ public ResolveThread(IvySettings settings, FileSystemResolver resolver, String module,
+ int loop) {
this.settings = settings;
this.resolver = resolver;
this.module = module;
this.loop = loop;
}
-
+
public synchronized ResolvedModuleRevision getFinalResult() {
return finalResult;
}
+
public synchronized int getCount() {
return count;
}
+
public void run() {
ResolvedModuleRevision rmr = null;
- for (int i =0; i<loop; i++) {
+ for (int i = 0; i < loop; i++) {
try {
rmr = resolveModule(settings, resolver, module);
if (rmr == null) {
throw new RuntimeException("module not found: " + module);
}
synchronized (this) {
- //Message.info(this.toString() + " count = " + count);
+ // Message.info(this.toString() + " count = " + count);
count++;
}
} catch (ParseException e) {
- Message.info("parse exception "+e);
+ Message.info("parse exception " + e);
} catch (RuntimeException e) {
- Message.info("exception "+e);
+ Message.info("exception " + e);
e.printStackTrace();
throw e;
} catch (Error e) {
- Message.info("exception "+e);
+ Message.info("exception " + e);
e.printStackTrace();
throw e;
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java Tue Jan 14 08:27:37 2014
@@ -53,7 +53,7 @@ public abstract class AbstractPatternMat
matcher.matches("The words aren't what they were.");
assertTrue("Expression '" + expressions[i] + "' should be exact", matcher.isExact());
}
-
+
// test some inexact patterns for this matcher
expressions = getInexactExpressions();
for (int i = 0; i < expressions.length; i++) {
@@ -62,10 +62,11 @@ public abstract class AbstractPatternMat
matcher.matches("The words aren't what they were.");
assertFalse("Expression '" + expressions[i] + "' should be inexact", matcher.isExact());
}
-
+
}
protected abstract String[] getExactExpressions();
+
protected abstract String[] getInexactExpressions();
public void testNullInput() {
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java Tue Jan 14 08:27:37 2014
@@ -53,7 +53,7 @@ public class ExactOrRegexpPatternMatcher
matcher = patternMatcher.getMatcher("abc-123_ABC");
assertTrue(matcher.isExact());
-
+
try {
matcher = patternMatcher.getMatcher("(");
fail("Should fail on invalid regexp syntax");
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java Tue Jan 14 08:27:37 2014
@@ -28,27 +28,27 @@ public class MRIDTransformationRuleTest
r.addSrc(new MRIDRule("apache", "commons.+", null));
r.addDest(new MRIDRule("$m0", "$m0", null));
- assertEquals(ModuleRevisionId.newInstance("commons-client", "commons-client", "1.0"), r
- .transform(ModuleRevisionId.newInstance("apache", "commons-client", "1.0")));
- assertEquals(ModuleRevisionId.newInstance("apache", "module", "1.0"), r
- .transform(ModuleRevisionId.newInstance("apache", "module", "1.0")));
+ assertEquals(ModuleRevisionId.newInstance("commons-client", "commons-client", "1.0"),
+ r.transform(ModuleRevisionId.newInstance("apache", "commons-client", "1.0")));
+ assertEquals(ModuleRevisionId.newInstance("apache", "module", "1.0"),
+ r.transform(ModuleRevisionId.newInstance("apache", "module", "1.0")));
r = new MRIDTransformationRule();
r.addSrc(new MRIDRule(null, "commons\\-(.+)", null));
r.addDest(new MRIDRule("$o0.commons", "$m1", null));
- assertEquals(ModuleRevisionId.newInstance("apache.commons", "client", "1.0"), r
- .transform(ModuleRevisionId.newInstance("apache", "commons-client", "1.0")));
- assertEquals(ModuleRevisionId.newInstance("apache", "module", "1.0"), r
- .transform(ModuleRevisionId.newInstance("apache", "module", "1.0")));
+ assertEquals(ModuleRevisionId.newInstance("apache.commons", "client", "1.0"),
+ r.transform(ModuleRevisionId.newInstance("apache", "commons-client", "1.0")));
+ assertEquals(ModuleRevisionId.newInstance("apache", "module", "1.0"),
+ r.transform(ModuleRevisionId.newInstance("apache", "module", "1.0")));
r = new MRIDTransformationRule();
r.addSrc(new MRIDRule("(.+)\\.(.+)", ".+", null));
r.addDest(new MRIDRule("$o1", "$o2-$m0", null));
- assertEquals(ModuleRevisionId.newInstance("apache", "commons-client", "1.0"), r
- .transform(ModuleRevisionId.newInstance("apache.commons", "client", "1.0")));
- assertEquals(ModuleRevisionId.newInstance("apache", "module", "1.0"), r
- .transform(ModuleRevisionId.newInstance("apache", "module", "1.0")));
+ assertEquals(ModuleRevisionId.newInstance("apache", "commons-client", "1.0"),
+ r.transform(ModuleRevisionId.newInstance("apache.commons", "client", "1.0")));
+ assertEquals(ModuleRevisionId.newInstance("apache", "module", "1.0"),
+ r.transform(ModuleRevisionId.newInstance("apache", "module", "1.0")));
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/NameSpaceHelperTest.java Tue Jan 14 08:27:37 2014
@@ -29,19 +29,17 @@ import org.apache.ivy.core.module.id.Mod
public class NameSpaceHelperTest extends TestCase {
public void testTransformArtifactWithExtraAttributes() throws Exception {
- Artifact artifact = new DefaultArtifact(
- ArtifactRevisionId.newInstance(
- ModuleRevisionId.parse("org.apache#test;1.0"), "test", "jar", "jar",
- Collections.singletonMap("m:qualifier", "sources")),
- new Date(), null, false);
-
+ Artifact artifact = new DefaultArtifact(ArtifactRevisionId.newInstance(
+ ModuleRevisionId.parse("org.apache#test;1.0"), "test", "jar", "jar",
+ Collections.singletonMap("m:qualifier", "sources")), new Date(), null, false);
+
MRIDTransformationRule r = new MRIDTransformationRule();
r.addSrc(new MRIDRule("org.apache", "test", null));
r.addDest(new MRIDRule("apache", "test", null));
-
+
Artifact transformed = NameSpaceHelper.transform(artifact, r);
assertEquals("apache#test;1.0", transformed.getModuleRevisionId().toString());
- assertEquals(Collections.singletonMap("m:qualifier", "sources"),
- transformed.getQualifiedExtraAttributes());
+ assertEquals(Collections.singletonMap("m:qualifier", "sources"),
+ transformed.getQualifiedExtraAttributes());
}
}
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java Tue Jan 14 08:27:37 2014
@@ -33,8 +33,8 @@ import org.apache.ivy.plugins.repository
public class ModuleDescriptorParserRegistryTest extends TestCase {
public static class MyParser extends AbstractModuleDescriptorParser {
- public ModuleDescriptor parseDescriptor(ParserSettings ivy, URL descriptorURL, Resource res,
- boolean validate) throws ParseException, IOException {
+ public ModuleDescriptor parseDescriptor(ParserSettings ivy, URL descriptorURL,
+ Resource res, boolean validate) throws ParseException, IOException {
return DefaultModuleDescriptor.newDefaultInstance(ModuleRevisionId.newInstance("test",
"parser", "1.0"));
}
@@ -55,7 +55,7 @@ public class ModuleDescriptorParserRegis
ModuleDescriptor md = ModuleDescriptorParserRegistry.getInstance().parseDescriptor(
settings, ModuleDescriptorParserRegistryTest.class.getResource("nores"), false);
assertNotNull(md);
- assertEquals(ModuleRevisionId.newInstance("test", "parser", "1.0"), md
- .getModuleRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("test", "parser", "1.0"),
+ md.getModuleRevisionId());
}
}