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 [32/36] - in /incubator/ivy/core/trunk:
src/java/org/apache/ivy/ src/java/org/apache/ivy/ant/
src/java/org/apache/ivy/core/ src/java/org/apache/ivy/core/cache/
src/java/org/apache/ivy/core/check/ src/java/org/apache/ivy/core/deliver...
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcherTest.java Tue Jun 5 05:02:27 2007
@@ -19,15 +19,16 @@
import junit.framework.TestCase;
-
/**
* Base test classes for PatternMatcher testcase implementation
*/
public abstract class AbstractPatternMatcherTest extends TestCase {
protected PatternMatcher patternMatcher;
+
protected boolean exact;
protected abstract void setUp() throws Exception;
+
protected void setUp(PatternMatcher matcher, boolean exact) {
this.patternMatcher = matcher;
this.exact = exact;
@@ -40,7 +41,6 @@
assertTrue(matcher.matches(" "));
}
-
public void testIsExact() {
Matcher matcher = patternMatcher.getMatcher("*");
assertEquals(false, matcher.isExact());
@@ -74,27 +74,22 @@
public abstract void testImplementation();
-
public void testLoadTestMatches() {
Matcher matcher = patternMatcher.getMatcher("this.is.an.expression");
- String[] inputs = {
- "this.is.an.expression", "this:is:an:expression", "this is an expression",
- "whatever this is", "maybe, maybe not"
- };
+ String[] inputs = {"this.is.an.expression", "this:is:an:expression",
+ "this is an expression", "whatever this is", "maybe, maybe not"};
for (int i = 0; i < 100000; i++) {
- String input = inputs[i%inputs.length];
+ String input = inputs[i % inputs.length];
boolean success = matcher.matches(input);
}
}
public void testLoadTestGetMatcher() {
- String[] inputs = {
- "this.is.an.expression", "this:is:an:expression", "this is an expression",
- "whatever this is", "maybe, maybe not"
- };
+ String[] inputs = {"this.is.an.expression", "this:is:an:expression",
+ "this is an expression", "whatever this is", "maybe, maybe not"};
for (int i = 0; i < 100000; i++) {
- String expression = inputs[i%inputs.length];
+ String expression = inputs[i % inputs.length];
Matcher matcher = patternMatcher.getMatcher(expression);
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java Tue Jun 5 05:02:27 2007
@@ -45,7 +45,7 @@
matcher = patternMatcher.getMatcher("(");
fail("Should fail on invalid regexp syntax");
} catch (PatternSyntaxException e) {
-
+
}
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactPatternMatcherTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactPatternMatcherTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactPatternMatcherTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactPatternMatcherTest.java Tue Jun 5 05:02:27 2007
@@ -17,12 +17,10 @@
*/
package org.apache.ivy.plugins.matcher;
-
/**
-* @see ExactPatternMatcher
+ * @see ExactPatternMatcher
*/
public class ExactPatternMatcherTest extends AbstractPatternMatcherTest {
-
protected void setUp() throws Exception {
setUp(new ExactPatternMatcher(), true);
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java Tue Jun 5 05:02:27 2007
@@ -20,7 +20,7 @@
import java.util.regex.PatternSyntaxException;
/**
-* @see GlobPatternMatcher
+ * @see GlobPatternMatcher
*/
public class GlobPatternMatcherTest extends AbstractPatternMatcherTest {
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java Tue Jun 5 05:02:27 2007
@@ -22,33 +22,33 @@
import org.apache.ivy.core.module.id.ModuleRevisionId;
public class MRIDTransformationRuleTest extends TestCase {
-
+
public void testTransformation() {
MRIDTransformationRule r = new MRIDTransformationRule();
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: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java Tue Jun 5 05:02:27 2007
@@ -54,11 +54,12 @@
break;
}
}
- assertTrue("artifact not found: "+artifactsNames[i], found);
+ assertTrue("artifact not found: " + artifactsNames[i], found);
}
}
- protected void assertDependencyArtifacts(DependencyDescriptor dd, String[] confs, String[] artifactsNames) {
+ protected void assertDependencyArtifacts(DependencyDescriptor dd, String[] confs,
+ String[] artifactsNames) {
DependencyArtifactDescriptor[] dads = dd.getDependencyArtifacts(confs);
assertNotNull(dads);
assertEquals(artifactsNames.length, dads.length);
@@ -71,11 +72,12 @@
break;
}
}
- assertTrue("dependency artifact not found: "+artifactsNames[i], found);
+ assertTrue("dependency artifact not found: " + artifactsNames[i], found);
}
}
- protected void assertDependencyArtifactIncludeRules(DependencyDescriptor dd, String[] confs, String[] artifactsNames) {
+ protected void assertDependencyArtifactIncludeRules(DependencyDescriptor dd, String[] confs,
+ String[] artifactsNames) {
IncludeRule[] dads = dd.getIncludeRules(confs);
assertNotNull(dads);
assertEquals(artifactsNames.length, dads.length);
@@ -88,11 +90,12 @@
break;
}
}
- assertTrue("dependency include not found: "+artifactsNames[i], found);
+ assertTrue("dependency include not found: " + artifactsNames[i], found);
}
}
- protected void assertDependencyArtifactExcludeRules(DependencyDescriptor dd, String[] confs, String[] artifactsNames) {
+ protected void assertDependencyArtifactExcludeRules(DependencyDescriptor dd, String[] confs,
+ String[] artifactsNames) {
ExcludeRule[] rules = dd.getExcludeRules(confs);
assertNotNull(rules);
assertEquals(artifactsNames.length, rules.length);
@@ -105,12 +108,13 @@
break;
}
}
- assertTrue("dependency exclude not found: "+artifactsNames[i], found);
+ assertTrue("dependency exclude not found: " + artifactsNames[i], found);
}
}
- protected void assertDependencyModulesExcludes(DependencyDescriptor dd, String[] confs, String[] moduleNames) {
- ExcludeRule[] rules = dd.getExcludeRules(confs);
+ protected void assertDependencyModulesExcludes(DependencyDescriptor dd, String[] confs,
+ String[] moduleNames) {
+ ExcludeRule[] rules = dd.getExcludeRules(confs);
assertNotNull(rules);
assertEquals(moduleNames.length, rules.length);
for (int i = 0; i < moduleNames.length; i++) {
@@ -122,13 +126,14 @@
break;
}
}
- assertTrue("dependency module exclude not found: "+moduleNames[i], found);
+ assertTrue("dependency module exclude not found: " + moduleNames[i], found);
}
}
- protected void assertConf(ModuleDescriptor md, String name, String desc, Visibility visibility, String[] exts) {
+ protected void assertConf(ModuleDescriptor md, String name, String desc, Visibility visibility,
+ String[] exts) {
Configuration conf = md.getConfiguration(name);
- assertNotNull("configuration not found: "+name, conf);
+ assertNotNull("configuration not found: " + name, conf);
assertEquals(name, conf.getName());
assertEquals(desc, conf.getDescription());
assertEquals(visibility, conf.getVisibility());
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java Tue Jun 5 05:02:27 2007
@@ -33,11 +33,14 @@
public class ModuleDescriptorParserRegistryTest extends TestCase {
public static class MyParser extends AbstractModuleDescriptorParser {
- public ModuleDescriptor parseDescriptor(IvySettings ivy, URL descriptorURL, Resource res, boolean validate) throws ParseException, IOException {
- return DefaultModuleDescriptor.newDefaultInstance(ModuleRevisionId.newInstance("test", "parser", "1.0"));
+ public ModuleDescriptor parseDescriptor(IvySettings ivy, URL descriptorURL, Resource res,
+ boolean validate) throws ParseException, IOException {
+ return DefaultModuleDescriptor.newDefaultInstance(ModuleRevisionId.newInstance("test",
+ "parser", "1.0"));
}
- public void toIvyFile(InputStream is, Resource res, File destFile, ModuleDescriptor md) throws ParseException, IOException {
+ public void toIvyFile(InputStream is, Resource res, File destFile, ModuleDescriptor md)
+ throws ParseException, IOException {
}
public boolean accept(Resource res) {
@@ -45,11 +48,14 @@
}
}
+
public void testAddConfigured() throws Exception {
IvySettings settings = new IvySettings();
settings.addConfigured(new MyParser());
- ModuleDescriptor md = ModuleDescriptorParserRegistry.getInstance().parseDescriptor(settings, ModuleDescriptorParserRegistryTest.class.getResource("nores"), false);
+ 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());
}
}
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java Tue Jun 5 05:02:27 2007
@@ -32,28 +32,28 @@
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest;
import org.apache.ivy.plugins.repository.url.URLResource;
-
public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParserTester {
// junit test -- DO NOT REMOVE used by ant to know it's a junit test
-
public void testAccept() throws Exception {
assertTrue(PomModuleDescriptorParser.getInstance().accept(
- new URLResource(getClass().getResource("test-simple.pom"))));
+ new URLResource(getClass().getResource("test-simple.pom"))));
assertFalse(PomModuleDescriptorParser.getInstance().accept(
- new URLResource(XmlModuleDescriptorParserTest.class.getResource("test.xml"))));
+ new URLResource(XmlModuleDescriptorParserTest.class.getResource("test.xml"))));
}
-
+
public void testSimple() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-simple.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-simple.pom"), false);
assertNotNull(md);
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "test", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
-
+
assertNotNull(md.getConfigurations());
- assertEquals(Arrays.asList(PomModuleDescriptorParser.MAVEN2_CONFIGURATIONS), Arrays.asList(md.getConfigurations()));
-
+ assertEquals(Arrays.asList(PomModuleDescriptorParser.MAVEN2_CONFIGURATIONS), Arrays
+ .asList(md.getConfigurations()));
+
Artifact[] artifact = md.getArtifacts("master");
assertEquals(1, artifact.length);
assertEquals(mrid, artifact[0].getModuleRevisionId());
@@ -61,17 +61,19 @@
assertEquals("jar", artifact[0].getExt());
assertEquals("jar", artifact[0].getType());
}
-
+
public void testPackaging() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-packaging.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-packaging.pom"), false);
assertNotNull(md);
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "test", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
-
+
assertNotNull(md.getConfigurations());
- assertEquals(Arrays.asList(PomModuleDescriptorParser.MAVEN2_CONFIGURATIONS), Arrays.asList(md.getConfigurations()));
-
+ assertEquals(Arrays.asList(PomModuleDescriptorParser.MAVEN2_CONFIGURATIONS), Arrays
+ .asList(md.getConfigurations()));
+
Artifact[] artifact = md.getArtifacts("master");
assertEquals(1, artifact.length);
assertEquals(mrid, artifact[0].getModuleRevisionId());
@@ -79,247 +81,320 @@
assertEquals("war", artifact[0].getExt());
assertEquals("war", artifact[0].getType());
}
-
+
public void testParent() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-parent.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-parent.pom"), false);
assertNotNull(md);
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "test", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
-
+
assertNotNull(md.getConfigurations());
- assertEquals(Arrays.asList(PomModuleDescriptorParser.MAVEN2_CONFIGURATIONS), Arrays.asList(md.getConfigurations()));
-
+ assertEquals(Arrays.asList(PomModuleDescriptorParser.MAVEN2_CONFIGURATIONS), Arrays
+ .asList(md.getConfigurations()));
+
Artifact[] artifact = md.getArtifacts("master");
assertEquals(1, artifact.length);
assertEquals(mrid, artifact[0].getModuleRevisionId());
assertEquals("test", artifact[0].getName());
}
-
+
public void testParent2() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-parent2.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-parent2.pom"), false);
assertNotNull(md);
-
+
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "test", "1.0");
assertEquals(mrid, md.getModuleRevisionId());
-
+
assertNotNull(md.getConfigurations());
- assertEquals(Arrays.asList(PomModuleDescriptorParser.MAVEN2_CONFIGURATIONS), Arrays.asList(md.getConfigurations()));
-
+ assertEquals(Arrays.asList(PomModuleDescriptorParser.MAVEN2_CONFIGURATIONS), Arrays
+ .asList(md.getConfigurations()));
+
Artifact[] artifact = md.getArtifacts("master");
assertEquals(1, artifact.length);
assertEquals(mrid, artifact[0].getModuleRevisionId());
assertEquals("test", artifact[0].getName());
}
-
+
public void testDependencies() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-dependencies.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-dependencies.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md
+ .getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(1, dds.length);
- assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"), dds[0].getDependencyRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
+ dds[0].getDependencyRevisionId());
}
-
+
public void testDependenciesWithClassifier() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-dependencies-with-classifier.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-dependencies-with-classifier.pom"),
+ false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md
+ .getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(1, dds.length);
- assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"), dds[0].getDependencyRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
+ dds[0].getDependencyRevisionId());
Map extraAtt = new HashMap();
extraAtt.put("classifier", "asl");
assertEquals(1, dds[0].getAllDependencyArtifacts().length);
assertEquals(extraAtt, dds[0].getAllDependencyArtifacts()[0].getExtraAttributes());
}
-
+
public void testWithVersionProperty() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-version.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-version.pom"), false);
assertNotNull(md);
-
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(1, dds.length);
- assertEquals(ModuleRevisionId.newInstance("org.apache", "test-other", "1.0"), dds[0].getDependencyRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test-other", "1.0"), dds[0]
+ .getDependencyRevisionId());
}
-
+
// IVY-392
public void testDependenciesWithProfile() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-dependencies-with-profile.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-dependencies-with-profile.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md
+ .getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(1, dds.length);
- assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"), dds[0].getDependencyRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
+ dds[0].getDependencyRevisionId());
}
-
+
public void testWithoutVersion() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-without-version.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-without-version.pom"), false);
assertNotNull(md);
-
+
assertEquals(new ModuleId("org.apache", "test"), md.getModuleRevisionId().getModuleId());
-
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(1, dds.length);
- assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"), dds[0].getDependencyRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
+ dds[0].getDependencyRevisionId());
}
-
+
public void testProperties() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-properties.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-properties.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("drools", "drools-smf", "2.0-beta-18"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("drools", "drools-smf", "2.0-beta-18"), md
+ .getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(1, dds.length);
- assertEquals(ModuleRevisionId.newInstance("drools", "drools-core", "2.0-beta-18"), dds[0].getDependencyRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("drools", "drools-core", "2.0-beta-18"), dds[0]
+ .getDependencyRevisionId());
}
-
+
public void testReal() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("commons-lang-1.0.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("commons-lang-1.0.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("commons-lang", "commons-lang", "1.0"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("commons-lang", "commons-lang", "1.0"), md
+ .getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(1, dds.length);
- assertEquals(ModuleRevisionId.newInstance("junit", "junit", "3.7"), dds[0].getDependencyRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("junit", "junit", "3.7"), dds[0]
+ .getDependencyRevisionId());
}
-
+
public void testReal2() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("wicket-1.3-incubating-SNAPSHOT.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("wicket-1.3-incubating-SNAPSHOT.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.apache.wicket", "wicket", "1.3-incubating-SNAPSHOT"), md.getModuleRevisionId());
+
+ assertEquals(ModuleRevisionId.newInstance("org.apache.wicket", "wicket",
+ "1.3-incubating-SNAPSHOT"), md.getModuleRevisionId());
}
-
+
public void testVariables() throws Exception {
- // test case for IVY-425
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("spring-hibernate3-2.0.2.pom"), false);
+ // test case for IVY-425
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("spring-hibernate3-2.0.2.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.springframework", "spring-hibernate3", "2.0.2"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("org.springframework", "spring-hibernate3",
+ "2.0.2"), md.getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(11, dds.length);
- assertEquals(ModuleRevisionId.newInstance("org.springframework", "spring-web", "2.0.2"), dds[10].getDependencyRevisionId());
+ assertEquals(ModuleRevisionId.newInstance("org.springframework", "spring-web", "2.0.2"),
+ dds[10].getDependencyRevisionId());
}
-
+
public void testDependenciesInProfile() throws Exception {
- // test case for IVY-423
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("mule-module-builders-1.3.3.pom"), false);
+ // test case for IVY-423
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("mule-module-builders-1.3.3.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.mule.modules", "mule-module-builders", "1.3.3"), md.getModuleRevisionId());
+
+ assertEquals(ModuleRevisionId.newInstance("org.mule.modules", "mule-module-builders",
+ "1.3.3"), md.getModuleRevisionId());
}
-
+
public void testIVY424() throws Exception {
- // test case for IVY-424
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("shale-tiger-1.1.0-SNAPSHOT.pom"), false);
+ // test case for IVY-424
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("shale-tiger-1.1.0-SNAPSHOT.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.apache.shale", "shale-tiger", "1.1.0-SNAPSHOT"), md.getModuleRevisionId());
+
+ assertEquals(ModuleRevisionId.newInstance("org.apache.shale", "shale-tiger",
+ "1.1.0-SNAPSHOT"), md.getModuleRevisionId());
}
-
+
public void testOptional() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-optional.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-optional.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md.getModuleRevisionId());
+
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md
+ .getModuleRevisionId());
assertTrue(Arrays.asList(md.getConfigurationsNames()).contains("optional"));
-
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(2, dds.length);
- assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"), dds[0].getDependencyRevisionId());
- assertEquals(new HashSet(Arrays.asList(new String[] {"optional"})), new HashSet(Arrays.asList(dds[0].getModuleConfigurations())));
- assertEquals(new HashSet(Arrays.asList(new String[] {"compile(*)", "runtime(*)", "master(*)"})), new HashSet(Arrays.asList(dds[0].getDependencyConfigurations("optional"))));
-
- assertEquals(ModuleRevisionId.newInstance("cglib", "cglib", "2.0.2"), dds[1].getDependencyRevisionId());
- assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(Arrays.asList(dds[1].getModuleConfigurations())));
- assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})), new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
- assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("runtime"))));
+ assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
+ dds[0].getDependencyRevisionId());
+ assertEquals(new HashSet(Arrays.asList(new String[] {"optional"})), new HashSet(Arrays
+ .asList(dds[0].getModuleConfigurations())));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"compile(*)", "runtime(*)",
+ "master(*)"})), new HashSet(Arrays.asList(dds[0]
+ .getDependencyConfigurations("optional"))));
+
+ assertEquals(ModuleRevisionId.newInstance("cglib", "cglib", "2.0.2"), dds[1]
+ .getDependencyRevisionId());
+ assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(
+ Arrays.asList(dds[1].getModuleConfigurations())));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
+ new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays
+ .asList(dds[1].getDependencyConfigurations("runtime"))));
}
-
+
public void testDependenciesWithScope() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-dependencies-with-scope.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md
+ .getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(3, dds.length);
- assertEquals(ModuleRevisionId.newInstance("odmg", "odmg", "3.0"), dds[0].getDependencyRevisionId());
- assertEquals(new HashSet(Arrays.asList(new String[] {"runtime"})), new HashSet(Arrays.asList(dds[0].getModuleConfigurations())));
- assertEquals(new HashSet(Arrays.asList(new String[] {"compile(*)", "runtime(*)", "master(*)"})), new HashSet(Arrays.asList(dds[0].getDependencyConfigurations("runtime"))));
-
- assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"), dds[1].getDependencyRevisionId());
- assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(Arrays.asList(dds[1].getModuleConfigurations())));
- assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})), new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
- assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("runtime"))));
-
-
- assertEquals(ModuleRevisionId.newInstance("cglib", "cglib", "2.0.2"), dds[2].getDependencyRevisionId());
- assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(Arrays.asList(dds[2].getModuleConfigurations())));
- assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})), new HashSet(Arrays.asList(dds[2].getDependencyConfigurations("compile"))));
- assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays.asList(dds[2].getDependencyConfigurations("runtime"))));
+ assertEquals(ModuleRevisionId.newInstance("odmg", "odmg", "3.0"), dds[0]
+ .getDependencyRevisionId());
+ assertEquals(new HashSet(Arrays.asList(new String[] {"runtime"})), new HashSet(Arrays
+ .asList(dds[0].getModuleConfigurations())));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"compile(*)", "runtime(*)",
+ "master(*)"})), new HashSet(Arrays.asList(dds[0]
+ .getDependencyConfigurations("runtime"))));
+
+ assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
+ dds[1].getDependencyRevisionId());
+ assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(
+ Arrays.asList(dds[1].getModuleConfigurations())));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
+ new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays
+ .asList(dds[1].getDependencyConfigurations("runtime"))));
+
+ assertEquals(ModuleRevisionId.newInstance("cglib", "cglib", "2.0.2"), dds[2]
+ .getDependencyRevisionId());
+ assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(
+ Arrays.asList(dds[2].getModuleConfigurations())));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
+ new HashSet(Arrays.asList(dds[2].getDependencyConfigurations("compile"))));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays
+ .asList(dds[2].getDependencyConfigurations("runtime"))));
}
-
+
public void testExclusion() throws Exception {
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("test-exclusion.pom"), false);
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("test-exclusion.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("org.apache", "test", "1.0"), md
+ .getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(3, dds.length);
- assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"), dds[0].getDependencyRevisionId());
- assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(Arrays.asList(dds[0].getModuleConfigurations())));
- assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})), new HashSet(Arrays.asList(dds[0].getDependencyConfigurations("compile"))));
- assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays.asList(dds[0].getDependencyConfigurations("runtime"))));
+ assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
+ dds[0].getDependencyRevisionId());
+ assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(
+ Arrays.asList(dds[0].getModuleConfigurations())));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
+ new HashSet(Arrays.asList(dds[0].getDependencyConfigurations("compile"))));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays
+ .asList(dds[0].getDependencyConfigurations("runtime"))));
assertEquals(0, dds[0].getAllExcludeRules().length);
-
- assertEquals(ModuleRevisionId.newInstance("dom4j", "dom4j", "1.6"), dds[1].getDependencyRevisionId());
- assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(Arrays.asList(dds[1].getModuleConfigurations())));
- assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})), new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
- assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("runtime"))));
- assertDependencyModulesExcludes(dds[1], new String[] {"compile"}, new String[] {"jaxme-api", "jaxen"});
- assertDependencyModulesExcludes(dds[1], new String[] {"runtime"}, new String[] {"jaxme-api", "jaxen"});
-
- assertEquals(ModuleRevisionId.newInstance("cglib", "cglib", "2.0.2"), dds[2].getDependencyRevisionId());
- assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(Arrays.asList(dds[2].getModuleConfigurations())));
- assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})), new HashSet(Arrays.asList(dds[2].getDependencyConfigurations("compile"))));
- assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays.asList(dds[2].getDependencyConfigurations("runtime"))));
+
+ assertEquals(ModuleRevisionId.newInstance("dom4j", "dom4j", "1.6"), dds[1]
+ .getDependencyRevisionId());
+ assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(
+ Arrays.asList(dds[1].getModuleConfigurations())));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
+ new HashSet(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays
+ .asList(dds[1].getDependencyConfigurations("runtime"))));
+ assertDependencyModulesExcludes(dds[1], new String[] {"compile"}, new String[] {
+ "jaxme-api", "jaxen"});
+ assertDependencyModulesExcludes(dds[1], new String[] {"runtime"}, new String[] {
+ "jaxme-api", "jaxen"});
+
+ assertEquals(ModuleRevisionId.newInstance("cglib", "cglib", "2.0.2"), dds[2]
+ .getDependencyRevisionId());
+ assertEquals(new HashSet(Arrays.asList(new String[] {"compile", "runtime"})), new HashSet(
+ Arrays.asList(dds[2].getModuleConfigurations())));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
+ new HashSet(Arrays.asList(dds[2].getDependencyConfigurations("compile"))));
+ assertEquals(new HashSet(Arrays.asList(new String[] {"runtime(*)"})), new HashSet(Arrays
+ .asList(dds[2].getDependencyConfigurations("runtime"))));
assertEquals(0, dds[2].getAllExcludeRules().length);
}
public void testWithPlugins() throws Exception {
- // test case for IVY-417
- ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), getClass().getResource("mule-1.3.3.pom"), false);
+ // test case for IVY-417
+ ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
+ new IvySettings(), getClass().getResource("mule-1.3.3.pom"), false);
assertNotNull(md);
-
- assertEquals(ModuleRevisionId.newInstance("org.mule", "mule", "1.3.3"), md.getModuleRevisionId());
-
+
+ assertEquals(ModuleRevisionId.newInstance("org.mule", "mule", "1.3.3"), md
+ .getModuleRevisionId());
+
DependencyDescriptor[] dds = md.getDependencies();
assertNotNull(dds);
assertEquals(0, dds.length);
}
-
}