natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor asList() in test cases

This commit is contained in:
Gintas Grigelionis 2017-08-19 17:05:36 +02:00
parent 463a2c89c3
commit 3c047a1e70
11 changed files with 255 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/java/org/apache/ivy/TestHelper.java
View File

@ -17,6 +17,10 @@
*/
package org.apache.ivy;
import com.sun.net.httpserver.Authenticator.Failure;
import com.sun.net.httpserver.Authenticator.Result;
import com.sun.net.httpserver.Authenticator.Retry;
import com.sun.net.httpserver.Authenticator.Success;
import com.sun.net.httpserver.BasicAuthenticator;
import com.sun.net.httpserver.Filter;
import com.sun.net.httpserver.HttpContext;
@ -168,8 +172,8 @@ public class TestHelper {
new Date());
}
Pattern oneDependencyPattern = Pattern.compile("(" + mridPattern.pattern() + ")\\s*->\\s*("
+ mridPattern.pattern() + ")");
Pattern oneDependencyPattern = Pattern.compile(String.format("(%s)\\s*->\\s*(%s)",
mridPattern.pattern(), mridPattern.pattern()));
m = oneDependencyPattern.matcher(microIvy);
if (m.matches()) {
DefaultModuleDescriptor md = DefaultModuleDescriptor.newBasicInstance(
@ -179,8 +183,8 @@ public class TestHelper {
return md;
}
String p = "(" + mridPattern.pattern() + ")\\s*->\\s*\\{\\s*((?:" + mridPattern.pattern()
+ ",?\\s+)*" + mridPattern.pattern() + ")?\\s*\\}";
String p = String.format("(%s)\\s*->\\s*\\{\\s*((?:%s,?\\s+)*%s)?\\s*\\}",
mridPattern.pattern(), mridPattern.pattern(), mridPattern.pattern());
Pattern multipleDependenciesPattern = Pattern.compile(p);
m = multipleDependenciesPattern.matcher(microIvy);
if (m.matches()) {
@ -471,22 +475,22 @@ public class TestHelper {
chain.doFilter(httpExchange);
return;
}
final com.sun.net.httpserver.Authenticator.Result authResult = this.authenticator.authenticate(httpExchange);
if(authResult instanceof com.sun.net.httpserver.Authenticator.Success) {
final Result authResult = this.authenticator.authenticate(httpExchange);
if (authResult instanceof Success) {
@SuppressWarnings("unused")
final com.sun.net.httpserver.Authenticator.Success success = (com.sun.net.httpserver.Authenticator.Success)authResult;
final Success success = (Success) authResult;
// auth succeeded - move to next filter
chain.doFilter(httpExchange);
} else if(authResult instanceof com.sun.net.httpserver.Authenticator.Retry) {
final com.sun.net.httpserver.Authenticator.Retry retry = (com.sun.net.httpserver.Authenticator.Retry)authResult;
} else if (authResult instanceof Retry) {
final Retry retry = (Retry) authResult;
this.drainInput(httpExchange);
// send auth retry (401)
httpExchange.sendResponseHeaders(retry.getResponseCode(), -1L);
} else if(authResult instanceof com.sun.net.httpserver.Authenticator.Failure) {
final com.sun.net.httpserver.Authenticator.Failure var7 = (com.sun.net.httpserver.Authenticator.Failure)authResult;
} else if (authResult instanceof Failure) {
final Failure failure = (Failure) authResult;
this.drainInput(httpExchange);
// send auth failure (401)
httpExchange.sendResponseHeaders(var7.getResponseCode(), -1L);
httpExchange.sendResponseHeaders(failure.getResponseCode(), -1L);
}
}

17
test/java/org/apache/ivy/core/report/ResolveReportTest.java
View File

@ -19,6 +19,7 @@ package org.apache.ivy.core.report;
import java.io.File;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import org.apache.ivy.Ivy;
@ -102,7 +103,7 @@ public class ResolveReportTest {
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.1", "1.0");
assertEquals(mrid, fixedMd.getModuleRevisionId());
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(fixedMd.getConfigurationsNames()));
assertEquals(1, fixedMd.getDependencies().length);
@ -123,7 +124,7 @@ public class ResolveReportTest {
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.1", "0.3");
assertEquals(mrid, fixedMd.getModuleRevisionId());
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(fixedMd.getConfigurationsNames()));
assertEquals(2, fixedMd.getDependencies().length);
@ -152,7 +153,7 @@ public class ResolveReportTest {
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org6", "mod6.2", "0.3");
assertEquals(mrid, fixedMd.getModuleRevisionId());
assertEquals(Arrays.asList(new String[] {"default", "extension"}),
assertEquals(Arrays.asList("default", "extension"),
Arrays.asList(fixedMd.getConfigurationsNames()));
assertEquals(2, fixedMd.getDependencies().length);
@ -179,7 +180,7 @@ public class ResolveReportTest {
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.4", "1.0.2");
assertEquals(mrid, fixedMd.getModuleRevisionId());
assertEquals(Arrays.asList(new String[] {"default", "compile"}),
assertEquals(Arrays.asList("default", "compile"),
Arrays.asList(fixedMd.getConfigurationsNames()));
assertEquals(1, fixedMd.getDependencies().length);
@ -198,12 +199,12 @@ public class ResolveReportTest {
assertNotNull(report);
assertFalse(report.hasError());
ModuleDescriptor fixedMd = report.toFixedModuleDescriptor(ivy.getSettings(),
Arrays.asList(new ModuleId[] {ModuleId.newInstance("org1", "mod1.2")}));
Collections.singletonList(ModuleId.newInstance("org1", "mod1.2")));
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org1", "mod1.4", "1.0.2");
assertEquals(mrid, fixedMd.getModuleRevisionId());
assertEquals(Arrays.asList(new String[] {"default", "compile"}),
assertEquals(Arrays.asList("default", "compile"),
Arrays.asList(fixedMd.getConfigurationsNames()));
assertEquals(1, fixedMd.getDependencies().length);
@ -222,12 +223,12 @@ public class ResolveReportTest {
assertNotNull(report);
assertFalse(report.hasError());
ModuleDescriptor fixedMd = report.toFixedModuleDescriptor(ivy.getSettings(),
Arrays.asList(new ModuleId[] {ModuleId.newInstance("org1", "mod1.2")}));
Collections.singletonList(ModuleId.newInstance("org1", "mod1.2")));
ModuleRevisionId mrid = ModuleRevisionId.newInstance("org2", "mod2.9", "0.6");
assertEquals(mrid, fixedMd.getModuleRevisionId());
assertEquals(Arrays.asList(new String[] {"default", "compile"}),
assertEquals(Arrays.asList("default", "compile"),
Arrays.asList(fixedMd.getConfigurationsNames()));
assertEquals(2, fixedMd.getDependencies().length);

4
test/java/org/apache/ivy/core/search/SearchTest.java
View File

@ -47,7 +47,7 @@ public class SearchTest {
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("1.0", "1.1")),
new HashSet<>(Arrays.asList(revs)));
}
@ -62,7 +62,7 @@ public class SearchTest {
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"})),
assertEquals(new HashSet<>(Arrays.asList("1.0", "1.1", "1.2")),
new HashSet<>(Arrays.asList(revs)));
}

5
test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
View File

@ -772,8 +772,7 @@ public class XmlSettingsParserTest {
}
}
private void assertLocationEquals(String expected, Object pattern) throws IOException {
assertEquals(new File(expected).getCanonicalFile(),
new File((String) pattern).getCanonicalFile());
private void assertLocationEquals(String expected, String pattern) throws IOException {
assertEquals(new File(expected).getCanonicalFile(), new File(pattern).getCanonicalFile());
}
}

69
test/java/org/apache/ivy/core/sort/SortTest.java
View File

@ -82,8 +82,7 @@ public class SortTest {
DefaultModuleDescriptor[][] expectedOrder = new DefaultModuleDescriptor[][] {
{md1, md2, md3, md4}};
Collection<List<ModuleDescriptor>> permutations = getAllLists(md1, md3, md2, md4);
for (List<ModuleDescriptor> toSort : permutations) {
for (List<ModuleDescriptor> toSort : getAllLists(md1, md3, md2, md4)) {
assertSorted(expectedOrder, sortModuleDescriptors(toSort, nonMatchReporter));
}
}
@ -106,8 +105,7 @@ public class SortTest {
{md2, md3, md4, md1}, {md3, md4, md1, md2}, {md4, md1, md2, md3},
{md1, md2, md3, md4}};
Collection<List<ModuleDescriptor>> permutations = getAllLists(md1, md3, md2, md4);
for (List<ModuleDescriptor> toSort : permutations) {
for (List<ModuleDescriptor> toSort : getAllLists(md1, md3, md2, md4)) {
assertSorted(possibleOrder, sortModuleDescriptors(toSort, nonMatchReporter));
}
}
@ -123,8 +121,7 @@ public class SortTest {
// {md3, md1, md2, md4}
// we don't have this solution. The loops appear has one contiguous element.
};
Collection<List<ModuleDescriptor>> permutations = getAllLists(md1, md3, md2, md4);
for (List<ModuleDescriptor> toSort : permutations) {
for (List<ModuleDescriptor> toSort : getAllLists(md1, md3, md2, md4)) {
assertSorted(possibleOrder, sortModuleDescriptors(toSort, nonMatchReporter));
}
}
@ -143,8 +140,7 @@ public class SortTest {
addDependency(md3, "md4", "rev4");
addDependency(md4, "md1", "rev1");
addDependency(md4, "md2", "rev2");
List<ModuleDescriptor> toSort = Arrays.asList(new ModuleDescriptor[] {md1, md2, md3, md4});
sortModuleDescriptors(toSort, nonMatchReporter);
sortModuleDescriptors(Arrays.<ModuleDescriptor> asList(md1, md2, md3, md4), nonMatchReporter);
// If it ends, it's ok.
}
@ -191,8 +187,7 @@ public class SortTest {
CircularDependencyReporterMock circularDepReportMock = new CircularDependencyReporterMock();
settings.setCircularDependencyStrategy(circularDepReportMock);
List<ModuleDescriptor> toSort = Arrays.asList(new ModuleDescriptor[] {md4, md3, md2, md1});
sortModuleDescriptors(toSort, nonMatchReporter);
sortModuleDescriptors(Arrays.<ModuleDescriptor> asList(md4, md3, md2, md1), nonMatchReporter);
circularDepReportMock.validate();
}
@ -212,8 +207,7 @@ public class SortTest {
DefaultModuleDescriptor[][] expectedOrder = new DefaultModuleDescriptor[][] {
{md1, md2, md3, md4}};
Collection<List<ModuleDescriptor>> permutations = getAllLists(md1, md3, md2, md4);
for (List<ModuleDescriptor> toSort : permutations) {
for (List<ModuleDescriptor> toSort : getAllLists(md1, md3, md2, md4)) {
assertSorted(expectedOrder, sortModuleDescriptors(toSort, nonMatchReporter));
}
}
@ -237,8 +231,7 @@ public class SortTest {
DefaultModuleDescriptor[][] possibleOrder = new DefaultModuleDescriptor[][] {
{md1, md2, md3, md4}};
Collection<List<ModuleDescriptor>> permutations = getAllLists(md1, md3, md2, md4);
for (List<ModuleDescriptor> toSort : permutations) {
for (List<ModuleDescriptor> toSort : getAllLists(md1, md3, md2, md4)) {
assertSorted(possibleOrder, sortModuleDescriptors(toSort, nonMatchReporter));
}
}
@ -353,30 +346,30 @@ public class SortTest {
ModuleDescriptor c, ModuleDescriptor d) {
final int nbOfList = 24;
Collection<List<ModuleDescriptor>> r = new ArrayList<>(nbOfList);
r.add(Arrays.asList(new ModuleDescriptor[] {a, b, c, d}));
r.add(Arrays.asList(new ModuleDescriptor[] {a, b, d, c}));
r.add(Arrays.asList(new ModuleDescriptor[] {a, c, b, d}));
r.add(Arrays.asList(new ModuleDescriptor[] {a, c, d, b}));
r.add(Arrays.asList(new ModuleDescriptor[] {a, d, b, c}));
r.add(Arrays.asList(new ModuleDescriptor[] {a, d, c, b}));
r.add(Arrays.asList(new ModuleDescriptor[] {b, a, c, d}));
r.add(Arrays.asList(new ModuleDescriptor[] {b, a, d, c}));
r.add(Arrays.asList(new ModuleDescriptor[] {b, c, a, d}));
r.add(Arrays.asList(new ModuleDescriptor[] {b, c, d, a}));
r.add(Arrays.asList(new ModuleDescriptor[] {b, d, a, c}));
r.add(Arrays.asList(new ModuleDescriptor[] {b, d, c, a}));
r.add(Arrays.asList(new ModuleDescriptor[] {c, b, a, d}));
r.add(Arrays.asList(new ModuleDescriptor[] {c, b, d, a}));
r.add(Arrays.asList(new ModuleDescriptor[] {c, a, b, d}));
r.add(Arrays.asList(new ModuleDescriptor[] {c, a, d, b}));
r.add(Arrays.asList(new ModuleDescriptor[] {c, d, b, a}));
r.add(Arrays.asList(new ModuleDescriptor[] {c, d, a, b}));
r.add(Arrays.asList(new ModuleDescriptor[] {d, b, c, a}));
r.add(Arrays.asList(new ModuleDescriptor[] {d, b, a, c}));
r.add(Arrays.asList(new ModuleDescriptor[] {d, c, b, a}));
r.add(Arrays.asList(new ModuleDescriptor[] {d, c, a, b}));
r.add(Arrays.asList(new ModuleDescriptor[] {d, a, b, c}));
r.add(Arrays.asList(new ModuleDescriptor[] {d, a, c, b}));
r.add(Arrays.asList(a, b, c, d));
r.add(Arrays.asList(a, b, d, c));
r.add(Arrays.asList(a, c, b, d));
r.add(Arrays.asList(a, c, d, b));
r.add(Arrays.asList(a, d, b, c));
r.add(Arrays.asList(a, d, c, b));
r.add(Arrays.asList(b, a, c, d));
r.add(Arrays.asList(b, a, d, c));
r.add(Arrays.asList(b, c, a, d));
r.add(Arrays.asList(b, c, d, a));
r.add(Arrays.asList(b, d, a, c));
r.add(Arrays.asList(b, d, c, a));
r.add(Arrays.asList(c, b, a, d));
r.add(Arrays.asList(c, b, d, a));
r.add(Arrays.asList(c, a, b, d));
r.add(Arrays.asList(c, a, d, b));
r.add(Arrays.asList(c, d, b, a));
r.add(Arrays.asList(c, d, a, b));
r.add(Arrays.asList(d, b, c, a));
r.add(Arrays.asList(d, b, a, c));
r.add(Arrays.asList(d, c, b, a));
r.add(Arrays.asList(d, c, a, b));
r.add(Arrays.asList(d, a, b, c));
r.add(Arrays.asList(d, a, c, b));
return r;
}

19
test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
View File

@ -17,16 +17,20 @@
*/
package org.apache.ivy.osgi.core;
import org.apache.ivy.osgi.util.VersionRange;
import org.junit.Test;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.ivy.osgi.util.VersionRange;
import org.junit.Test;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
public class ManifestParserTest {
@ -83,9 +87,8 @@ public class ManifestParserTest {
List<String> cp = bundleInfo.getClasspath();
assertNotNull(cp);
assertEquals(4, cp.size());
assertEquals(
Arrays.asList(new String[] {"lib/ant-antlr.jar", "lib/ant-apache-bcel.jar",
"lib/ant-apache-bsf.jar", "lib/ant-apache-log4j.jar"}), cp);
assertEquals(Arrays.asList("lib/ant-antlr.jar", "lib/ant-apache-bcel.jar",
"lib/ant-apache-bsf.jar", "lib/ant-apache-log4j.jar"), cp);
in = this.getClass()
.getResourceAsStream("/org/apache/ivy/osgi/core/MANIFEST_classpath2.MF");
@ -97,7 +100,7 @@ public class ManifestParserTest {
cp = bundleInfo.getClasspath();
assertNotNull(cp);
assertEquals(1, cp.size());
assertEquals(Arrays.asList(new String[] {"."}), cp);
assertEquals(Collections.singletonList("."), cp);
}
@Test

5
test/java/org/apache/ivy/osgi/core/OSGiManifestParserTest.java
View File

@ -60,9 +60,8 @@ public class OSGiManifestParserTest extends AbstractModuleDescriptorParserTester
assertEquals("1.0.0", md.getModuleRevisionId().getRevision());
assertNotNull(md.getConfigurations());
assertEquals(
Arrays.asList(new Configuration[] {new Configuration("default"),
new Configuration("optional"), new Configuration("transitive-optional")}),
assertEquals(Arrays.asList(new Configuration("default"),
new Configuration("optional"), new Configuration("transitive-optional")),
Arrays.asList(md.getConfigurations()));
assertEquals(0, md.getAllArtifacts().length);

60
test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
View File

@ -528,29 +528,28 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals(3, dds.length);
assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
dds[0].getDependencyRevisionId());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"optional"})),
assertEquals(new HashSet<>(Collections.singletonList("optional")),
new HashSet<>(Arrays.asList(dds[0].getModuleConfigurations())));
// I don't know what it should be. Ivy has no notion of optional dependencies
// assertEquals(new HashSet(Arrays.asList(new String[] {"compile(*)", "runtime(*)",
// "master(*)"})), new HashSet(Arrays.asList(dds[0]
// .getDependencyConfigurations("optional"))));
// assertEquals(new HashSet<>(Arrays.asList("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"})),
assertEquals(new HashSet<>(Arrays.asList("compile", "runtime")),
new HashSet<>(Arrays.asList(dds[1].getModuleConfigurations())));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
assertEquals(new HashSet<>(Arrays.asList("master(*)", "compile(*)")),
new HashSet<>(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime(*)"})),
assertEquals(new HashSet<>(Collections.singletonList("runtime(*)")),
new HashSet<>(Arrays.asList(dds[1].getDependencyConfigurations("runtime"))));
assertEquals(ModuleRevisionId.newInstance("cglib", "cglib-extra", "2.0.2"),
dds[2].getDependencyRevisionId());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"compile", "runtime"})),
assertEquals(new HashSet<>(Arrays.asList("compile", "runtime")),
new HashSet<>(Arrays.asList(dds[2].getModuleConfigurations())));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
assertEquals(new HashSet<>(Arrays.asList("master(*)", "compile(*)")),
new HashSet<>(Arrays.asList(dds[2].getDependencyConfigurations("compile"))));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime(*)"})),
assertEquals(new HashSet<>(Collections.singletonList("runtime(*)")),
new HashSet<>(Arrays.asList(dds[2].getDependencyConfigurations("runtime"))));
}
@ -568,28 +567,27 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals(3, dds.length);
assertEquals(ModuleRevisionId.newInstance("odmg", "odmg", "3.0"),
dds[0].getDependencyRevisionId());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime"})),
assertEquals(new HashSet<>(Collections.singletonList("runtime")),
new HashSet<>(Arrays.asList(dds[0].getModuleConfigurations())));
assertEquals(
new HashSet<>(Arrays.asList(new String[] {"compile(*)", "runtime(*)", "master(*)"})),
assertEquals(new HashSet<>(Arrays.asList("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"})),
assertEquals(new HashSet<>(Arrays.asList("compile", "runtime")),
new HashSet<>(Arrays.asList(dds[1].getModuleConfigurations())));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
assertEquals(new HashSet<>(Arrays.asList("master(*)", "compile(*)")),
new HashSet<>(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime(*)"})),
assertEquals(new HashSet<>(Collections.singletonList("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"})),
assertEquals(new HashSet<>(Arrays.asList("compile", "runtime")),
new HashSet<>(Arrays.asList(dds[2].getModuleConfigurations())));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
assertEquals(new HashSet<>(Arrays.asList("master(*)", "compile(*)")),
new HashSet<>(Arrays.asList(dds[2].getDependencyConfigurations("compile"))));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime(*)"})),
assertEquals(new HashSet<>(Collections.singletonList("runtime(*)")),
new HashSet<>(Arrays.asList(dds[2].getDependencyConfigurations("runtime"))));
}
@ -607,21 +605,21 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals(4, dds.length);
assertEquals(ModuleRevisionId.newInstance("commons-logging", "commons-logging", "1.0.4"),
dds[0].getDependencyRevisionId());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"compile", "runtime"})),
assertEquals(new HashSet<>(Arrays.asList("compile", "runtime")),
new HashSet<>(Arrays.asList(dds[0].getModuleConfigurations())));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
assertEquals(new HashSet<>(Arrays.asList("master(*)", "compile(*)")),
new HashSet<>(Arrays.asList(dds[0].getDependencyConfigurations("compile"))));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime(*)"})),
assertEquals(new HashSet<>(Collections.singletonList("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"})),
assertEquals(new HashSet<>(Arrays.asList("compile", "runtime")),
new HashSet<>(Arrays.asList(dds[1].getModuleConfigurations())));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
assertEquals(new HashSet<>(Arrays.asList("master(*)", "compile(*)")),
new HashSet<>(Arrays.asList(dds[1].getDependencyConfigurations("compile"))));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime(*)"})),
assertEquals(new HashSet<>(Collections.singletonList("runtime(*)")),
new HashSet<>(Arrays.asList(dds[1].getDependencyConfigurations("runtime"))));
assertDependencyModulesExcludes(dds[1], new String[] {"compile"},
new String[] {"jaxme-api", "jaxen"});
@ -630,11 +628,11 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals(ModuleRevisionId.newInstance("cglib", "cglib", "2.0.2"),
dds[2].getDependencyRevisionId());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"compile", "runtime"})),
assertEquals(new HashSet<>(Arrays.asList("compile", "runtime")),
new HashSet<>(Arrays.asList(dds[2].getModuleConfigurations())));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
assertEquals(new HashSet<>(Arrays.asList("master(*)", "compile(*)")),
new HashSet<>(Arrays.asList(dds[2].getDependencyConfigurations("compile"))));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime(*)"})),
assertEquals(new HashSet<>(Collections.singletonList("runtime(*)")),
new HashSet<>(Arrays.asList(dds[2].getDependencyConfigurations("runtime"))));
assertEquals(0, dds[2].getAllExcludeRules().length);
@ -642,11 +640,11 @@ public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParse
final DependencyDescriptor excludeAllTransitiveDepsDescriptor = dds[3];
assertEquals(ModuleRevisionId.newInstance("org.owasp.esapi", "esapi", "2.1.0"),
excludeAllTransitiveDepsDescriptor.getDependencyRevisionId());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"compile", "runtime"})),
assertEquals(new HashSet<>(Arrays.asList("compile", "runtime")),
new HashSet<>(Arrays.asList(excludeAllTransitiveDepsDescriptor.getModuleConfigurations())));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"master(*)", "compile(*)"})),
assertEquals(new HashSet<>(Arrays.asList("master(*)", "compile(*)")),
new HashSet<>(Arrays.asList(excludeAllTransitiveDepsDescriptor.getDependencyConfigurations("compile"))));
assertEquals(new HashSet<>(Arrays.asList(new String[] {"runtime(*)"})),
assertEquals(new HashSet<>(Collections.singletonList("runtime(*)")),
new HashSet<>(Arrays.asList(excludeAllTransitiveDepsDescriptor.getDependencyConfigurations("runtime"))));
assertEquals("No exclusion elements were expected to be present for " + excludeAllTransitiveDepsDescriptor,
0, excludeAllTransitiveDepsDescriptor.getAllExcludeRules().length);

240
test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
View File

@ -91,7 +91,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals("integration", md.getStatus());
assertNotNull(md.getConfigurations());
assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}),
assertEquals(Collections.singletonList(new Configuration("default")),
Arrays.asList(md.getConfigurations()));
assertNotNull(md.getArtifacts("default"));
@ -130,7 +130,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals("integration", md.getStatus());
assertNotNull(md.getConfigurations());
assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}),
assertEquals(Collections.singletonList(new Configuration("default")),
Arrays.asList(md.getConfigurations()));
assertNotNull(md.getArtifacts("default"));
@ -265,11 +265,10 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(
Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf2", "myconf3",
"myconf4"})));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
@ -294,12 +293,11 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals("yourorg#yourmodule1#branch1;1+", dd
.getDynamicConstraintDependencyRevisionId().toString());
assertEquals(Arrays.asList(new String[] {"myconf1"}),
assertEquals(Collections.singletonList("myconf1"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"myconf1"}),
assertEquals(Collections.singletonList("myconf1"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(
Arrays.asList(new String[] {}),
assertEquals(Collections.emptyList(),
Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf2", "myconf3",
"myconf4"})));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
@ -310,12 +308,11 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("2+", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"myconf1"}),
assertEquals(Collections.singletonList("myconf1"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"yourconf1"}),
assertEquals(Collections.singletonList("yourconf1"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(
Arrays.asList(new String[] {}),
assertEquals(Collections.emptyList(),
Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf2", "myconf3",
"myconf4"})));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
@ -326,12 +323,11 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("3.1", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"myconf1"}),
assertEquals(Collections.singletonList("myconf1"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}),
assertEquals(Arrays.asList("yourconf1", "yourconf2"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(
Arrays.asList(new String[] {}),
assertEquals(Collections.emptyList(),
Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf2", "myconf3",
"myconf4"})));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
@ -342,13 +338,13 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("4.1", dd.getDependencyRevisionId().getRevision());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"myconf1", "myconf2"})),
assertEquals(new HashSet<>(Arrays.asList("myconf1", "myconf2")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}),
assertEquals(Arrays.asList("yourconf1", "yourconf2"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}),
assertEquals(Arrays.asList("yourconf1", "yourconf2"),
Arrays.asList(dd.getDependencyConfigurations("myconf2")));
assertEquals(Arrays.asList(new String[] {}),
assertEquals(Collections.emptyList(),
Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
"myconf4"}, new String[0]);
@ -358,13 +354,13 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("5.1", dd.getDependencyRevisionId().getRevision());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"myconf1", "myconf2"})),
assertEquals(new HashSet<>(Arrays.asList("myconf1", "myconf2")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertEquals(Arrays.asList(new String[] {"yourconf1"}),
assertEquals(Collections.singletonList("yourconf1"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}),
assertEquals(Arrays.asList("yourconf1", "yourconf2"),
Arrays.asList(dd.getDependencyConfigurations("myconf2")));
assertEquals(Arrays.asList(new String[] {}),
assertEquals(Collections.emptyList(),
Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
"myconf4"}, new String[0]);
@ -374,28 +370,28 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("11.1", dd.getDependencyRevisionId().getRevision());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"*"})),
assertEquals(new HashSet<>(Collections.singletonList("*")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertEquals(Arrays.asList(new String[] {"myconf1"}),
assertEquals(Collections.singletonList("myconf1"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(Arrays.asList(new String[] {"myconf2"}),
assertEquals(Collections.singletonList("myconf2"),
Arrays.asList(dd.getDependencyConfigurations("myconf2")));
assertEquals(Arrays.asList(new String[] {"myconf3"}),
assertEquals(Collections.singletonList("myconf3"),
Arrays.asList(dd.getDependencyConfigurations("myconf3")));
assertEquals(Arrays.asList(new String[] {"myconf4"}),
assertEquals(Collections.singletonList("myconf4"),
Arrays.asList(dd.getDependencyConfigurations("myconf4")));
dd = getDependency(dependencies, "yourmodule6");
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("latest.integration", dd.getDependencyRevisionId().getRevision());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"myconf1", "myconf2"})),
assertEquals(new HashSet<>(Arrays.asList("myconf1", "myconf2")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertEquals(Arrays.asList(new String[] {"yourconf1"}),
assertEquals(Collections.singletonList("yourconf1"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}),
assertEquals(Arrays.asList("yourconf1", "yourconf2"),
Arrays.asList(dd.getDependencyConfigurations("myconf2")));
assertEquals(Arrays.asList(new String[] {}),
assertEquals(Collections.emptyList(),
Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
"myconf4"}, new String[0]);
@ -404,13 +400,13 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("7.1", dd.getDependencyRevisionId().getRevision());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"myconf1", "myconf2"})),
assertEquals(new HashSet<>(Arrays.asList("myconf1", "myconf2")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertEquals(Arrays.asList(new String[] {"yourconf1"}),
assertEquals(Collections.singletonList("yourconf1"),
Arrays.asList(dd.getDependencyConfigurations("myconf1")));
assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}),
assertEquals(Arrays.asList("yourconf1", "yourconf2"),
Arrays.asList(dd.getDependencyConfigurations("myconf2")));
assertEquals(Arrays.asList(new String[] {}),
assertEquals(Collections.emptyList(),
Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
"myconf4"}, new String[0]);
@ -419,7 +415,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("8.1", dd.getDependencyRevisionId().getRevision());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"*"})),
assertEquals(new HashSet<>(Collections.singletonList("*")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertDependencyArtifacts(dd, new String[] {"myconf1"}, new String[] {"yourartifact8-1",
"yourartifact8-2"});
@ -434,7 +430,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("9.1", dd.getDependencyRevisionId().getRevision());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"myconf1", "myconf2", "myconf3"})),
assertEquals(new HashSet<>(Arrays.asList("myconf1", "myconf2", "myconf3")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertDependencyArtifacts(dd, new String[] {"myconf1"}, new String[] {"yourartifact9-1"});
assertDependencyArtifacts(dd, new String[] {"myconf2"}, new String[] {"yourartifact9-1",
@ -450,7 +446,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("yourorg", dd.getDependencyId().getOrganisation());
assertEquals("10.1", dd.getDependencyRevisionId().getRevision());
assertEquals(new HashSet<>(Arrays.asList(new String[] {"*"})),
assertEquals(new HashSet<>(Collections.singletonList("*")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1"}, new String[] {"your.*",
PatternMatcher.ANY_EXPRESSION});
@ -499,10 +495,10 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals(2, rules.length);
assertEquals(GlobPatternMatcher.INSTANCE, rules[0].getMatcher());
assertEquals(ExactPatternMatcher.INSTANCE, rules[1].getMatcher());
assertEquals(Arrays.asList(new String[] {"myconf1"}),
assertEquals(Collections.singletonList("myconf1"),
Arrays.asList(rules[0].getConfigurations()));
assertEquals(
Arrays.asList(new String[] {"myconf1", "myconf2", "myconf3", "myconf4", "myoldconf"}),
Arrays.asList("myconf1", "myconf2", "myconf3", "myconf4", "myoldconf"),
Arrays.asList(rules[1].getConfigurations()));
}
@ -585,7 +581,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
assertEquals(pubdate, md.getPublicationDate());
assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}),
assertEquals(Collections.singletonList(new Configuration("default")),
Arrays.asList(md.getConfigurations()));
assertArtifacts(md.getArtifacts("default"), new String[] {"myartifact1", "myartifact2"});
@ -602,7 +598,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals("integration", md.getStatus());
assertNotNull(md.getConfigurations());
assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}),
assertEquals(Collections.singletonList(new Configuration("default")),
Arrays.asList(md.getConfigurations()));
assertNotNull(md.getArtifacts("default"));
@ -625,7 +621,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertEquals(pubdate, md.getPublicationDate());
assertNotNull(md.getConfigurations());
assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}),
assertEquals(Collections.singletonList(new Configuration("default")),
Arrays.asList(md.getConfigurations()));
assertNotNull(md.getArtifacts("default"));
@ -669,9 +665,9 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("1.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getDependencyConfigurations("default")));
// confs def: *->*
@ -679,9 +675,9 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"test"}),
assertEquals(Collections.singletonList("test"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getDependencyConfigurations("test")));
}
@ -700,9 +696,9 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("1.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getDependencyConfigurations("default")));
// confs def: *->*
@ -710,8 +706,8 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("default")));
}
@ -730,10 +726,10 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("1.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getDependencyConfigurations("default")));
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getDependencyConfigurations("test")));
// confs def: test: should not use default conf for the right side (use of
@ -742,9 +738,9 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"test"}),
assertEquals(Collections.singletonList("test"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"test"}),
assertEquals(Collections.singletonList("test"),
Arrays.asList(dd.getDependencyConfigurations("test")));
}
@ -782,10 +778,10 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("1.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getDependencyConfigurations("default")));
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getDependencyConfigurations("test")));
// confs def: test: should use default conf mapping for the right side => test->default
@ -793,9 +789,9 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(dd);
assertEquals("myorg", dd.getDependencyId().getOrganisation());
assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
assertEquals(Arrays.asList(new String[] {"test"}),
assertEquals(Collections.singletonList("test"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(dd.getDependencyConfigurations("test")));
}
@ -838,9 +834,8 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// should have imported configurations
assertNotNull(md.getConfigurations());
assertEquals(
Arrays.asList(new Configuration[] {
new Configuration("conf1", Visibility.PUBLIC, "", new String[0], true, null),
new Configuration("conf2", Visibility.PRIVATE, "", new String[0], true, null)}),
Arrays.asList(new Configuration("conf1", Visibility.PUBLIC, "", new String[0], true, null),
new Configuration("conf2", Visibility.PRIVATE, "", new String[0], true, null)),
Arrays.asList(md.getConfigurations()));
DependencyDescriptor[] dependencies = md.getDependencies();
@ -849,15 +844,15 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// no conf def => defaults to defaultConf: *->*
DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("conf1")));
// confs def: conf1->*
dd = getDependency(dependencies, "mymodule2");
assertEquals(Arrays.asList(new String[] {"conf1"}),
assertEquals(Collections.singletonList("conf1"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("conf1")));
}
@ -871,10 +866,9 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// should have imported configurations and added the one defined in the file itself
assertNotNull(md.getConfigurations());
assertEquals(
Arrays.asList(new Configuration[] {
new Configuration("conf1", Visibility.PUBLIC, "", new String[0], true, null),
Arrays.asList(new Configuration("conf1", Visibility.PUBLIC, "", new String[0], true, null),
new Configuration("conf2", Visibility.PRIVATE, "", new String[0], true, null),
new Configuration("conf3", Visibility.PUBLIC, "", new String[0], true, null)}),
new Configuration("conf3", Visibility.PUBLIC, "", new String[0], true, null)),
Arrays.asList(md.getConfigurations()));
DependencyDescriptor[] dependencies = md.getDependencies();
@ -883,17 +877,17 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// no conf def => defaults to defaultConf: *->*
DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("conf1")));
// confs def: conf2,conf3->*
dd = getDependency(dependencies, "mymodule2");
assertEquals(new HashSet<>(Arrays.asList(new String[] {"conf2", "conf3"})),
assertEquals(new HashSet<>(Arrays.asList("conf2", "conf3")),
new HashSet<>(Arrays.asList(dd.getModuleConfigurations())));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("conf2")));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("conf3")));
}
@ -907,9 +901,8 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// should have imported configurations
assertNotNull(md.getConfigurations());
assertEquals(
Arrays.asList(new Configuration[] {
new Configuration("conf1", Visibility.PUBLIC, "", new String[0], true, null),
new Configuration("conf2", Visibility.PRIVATE, "", new String[0], true, null)}),
Arrays.asList(new Configuration("conf1", Visibility.PUBLIC, "", new String[0], true, null),
new Configuration("conf2", Visibility.PRIVATE, "", new String[0], true, null)),
Arrays.asList(md.getConfigurations()));
DependencyDescriptor[] dependencies = md.getDependencies();
@ -918,17 +911,17 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// no conf def => defaults to defaultConf defined in imported file: *->@
DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"conf1"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("conf1"),
Arrays.asList(dd.getDependencyConfigurations("conf1")));
assertEquals(Arrays.asList(new String[] {"conf2"}),
assertEquals(Collections.singletonList("conf2"),
Arrays.asList(dd.getDependencyConfigurations("conf2")));
// confs def: conf1->*
dd = getDependency(dependencies, "mymodule2");
assertEquals(Arrays.asList(new String[] {"conf1"}),
assertEquals(Collections.singletonList("conf1"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("conf1")));
}
@ -943,9 +936,8 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// should have imported configurations
assertNotNull(md.getConfigurations());
assertEquals(
Arrays.asList(new Configuration[] {
new Configuration("conf1", Visibility.PUBLIC, "", new String[0], true, null),
new Configuration("conf2", Visibility.PRIVATE, "", new String[0], true, null)}),
Arrays.asList(new Configuration("conf1", Visibility.PUBLIC, "", new String[0], true, null),
new Configuration("conf2", Visibility.PRIVATE, "", new String[0], true, null)),
Arrays.asList(md.getConfigurations()));
DependencyDescriptor[] dependencies = md.getDependencies();
@ -954,15 +946,15 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// no conf def => defaults to defaultConf: *->*
DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("conf1")));
// confs def: conf1->*
dd = getDependency(dependencies, "mymodule2");
assertEquals(Arrays.asList(new String[] {"conf1"}),
assertEquals(Collections.singletonList("conf1"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"*"}),
assertEquals(Collections.singletonList("*"),
Arrays.asList(dd.getDependencyConfigurations("conf1")));
}
@ -979,7 +971,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// 'all-public' extends all other public configurations
String[] allPublicExt = allPublic.getExtends();
assertEquals(Arrays.asList(new String[] {"default", "test"}), Arrays.asList(allPublicExt));
assertEquals(Arrays.asList("default", "test"), Arrays.asList(allPublicExt));
}
@Test
@ -995,7 +987,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// 'all-public' extends all other public configurations
String[] allPublicExt = allPublic.getExtends();
assertEquals(Arrays.asList(new String[] {"default", "test", "extra"}),
assertEquals(Arrays.asList("default", "test", "extra"),
Arrays.asList(allPublicExt));
}
@ -1013,18 +1005,18 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// confs dep1: conf1->A;conf2->B (mappingoverride = true)
DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
assertEquals(Arrays.asList(new String[] {"conf1", "conf2"}),
assertEquals(Arrays.asList("conf1", "conf2"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"A"}),
assertEquals(Collections.singletonList("A"),
Arrays.asList(dd.getDependencyConfigurations("conf1")));
assertEquals(Arrays.asList(new String[] {"B"}),
assertEquals(Collections.singletonList("B"),
Arrays.asList(dd.getDependencyConfigurations("conf2")));
// confs dep2: conf2->B
dd = getDependency(dependencies, "mymodule2");
assertEquals(Arrays.asList(new String[] {"conf2"}),
assertEquals(Collections.singletonList("conf2"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"B"}),
assertEquals(Collections.singletonList("B"),
Arrays.asList(dd.getDependencyConfigurations("conf2")));
}
@ -1042,18 +1034,18 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// confs dep1: all-public->all-public (mappingoverride = true)
DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
assertEquals(Arrays.asList(new String[] {"all-public"}),
assertEquals(Collections.singletonList("all-public"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"all-public"}),
assertEquals(Collections.singletonList("all-public"),
Arrays.asList(dd.getDependencyConfigurations("all-public")));
// confs dep2: extra->extra;all-public->all-public (mappingoverride = true)
dd = getDependency(dependencies, "mymodule2");
assertEquals(Arrays.asList(new String[] {"extra", "all-public"}),
assertEquals(Arrays.asList("extra", "all-public"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"extra"}),
assertEquals(Collections.singletonList("extra"),
Arrays.asList(dd.getDependencyConfigurations("extra")));
assertEquals(Arrays.asList(new String[] {"all-public"}),
assertEquals(Collections.singletonList("all-public"),
Arrays.asList(dd.getDependencyConfigurations("all-public")));
}
@ -1071,21 +1063,21 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
// confs dep1: *->default1,default3
DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default1", "default3"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList("default1", "default3"),
Arrays.asList(dd.getDependencyConfigurations("default")));
// confs dep2: test->default2,default3
dd = getDependency(dependencies, "mymodule2");
assertEquals(Arrays.asList(new String[] {"test"}),
assertEquals(Collections.singletonList("test"),
Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default2", "default3"}),
assertEquals(Arrays.asList("default2", "default3"),
Arrays.asList(dd.getDependencyConfigurations("test")));
// confs dep3: *->default4
dd = getDependency(dependencies, "mymodule3");
assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Arrays.asList(new String[] {"default4"}),
assertEquals(Collections.singletonList("*"), Arrays.asList(dd.getModuleConfigurations()));
assertEquals(Collections.singletonList("default4"),
Arrays.asList(dd.getDependencyConfigurations("bla")));
}
@ -1152,14 +1144,14 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(deps);
assertEquals(2, deps.length);
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(deps[0].getModuleConfigurations()));
ModuleRevisionId dep = deps[0].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
assertEquals("mymodule1", dep.getModuleId().getName());
assertEquals("1.0", dep.getRevision());
assertEquals(Arrays.asList(new String[] {"conf1", "conf2"}),
assertEquals(Arrays.asList("conf1", "conf2"),
Arrays.asList(deps[1].getModuleConfigurations()));
dep = deps[1].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
@ -1199,14 +1191,14 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(deps);
assertEquals(2, deps.length);
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(deps[0].getModuleConfigurations()));
ModuleRevisionId dep = deps[0].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
assertEquals("mymodule1", dep.getModuleId().getName());
assertEquals("1.0", dep.getRevision());
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(deps[1].getModuleConfigurations()));
dep = deps[1].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
@ -1247,7 +1239,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(deps);
assertEquals(1, deps.length);
assertEquals(Arrays.asList(new String[] {"conf1", "conf2"}),
assertEquals(Arrays.asList("conf1", "conf2"),
Arrays.asList(deps[0].getModuleConfigurations()));
ModuleRevisionId dep = deps[0].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
@ -1287,7 +1279,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(deps);
assertEquals(1, deps.length);
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(deps[0].getModuleConfigurations()));
ModuleRevisionId dep = deps[0].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
@ -1327,7 +1319,7 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(deps);
assertEquals(1, deps.length);
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(deps[0].getModuleConfigurations()));
ModuleRevisionId dep = deps[0].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
@ -1368,14 +1360,14 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(deps);
assertEquals(2, deps.length);
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(deps[0].getModuleConfigurations()));
ModuleRevisionId dep = deps[0].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
assertEquals("mymodule1", dep.getModuleId().getName());
assertEquals("1.0", dep.getRevision());
assertEquals(Arrays.asList(new String[] {"conf1", "conf2"}),
assertEquals(Arrays.asList("conf1", "conf2"),
Arrays.asList(deps[1].getModuleConfigurations()));
dep = deps[1].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
@ -1433,14 +1425,14 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse
assertNotNull(deps);
assertEquals(2, deps.length);
assertEquals(Arrays.asList(new String[] {"default"}),
assertEquals(Collections.singletonList("default"),
Arrays.asList(deps[0].getModuleConfigurations()));
ModuleRevisionId dep = deps[0].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());
assertEquals("mymodule1", dep.getModuleId().getName());
assertEquals("1.0", dep.getRevision());
assertEquals(Arrays.asList(new String[] {"conf1", "conf2"}),
assertEquals(Arrays.asList("conf1", "conf2"),
Arrays.asList(deps[1].getModuleConfigurations()));
dep = deps[1].getDependencyRevisionId();
assertEquals("myorg", dep.getModuleId().getOrganisation());

46
test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
View File

@ -124,8 +124,8 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("2", rmr.getResolver().getName());
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), resolvers[0].askedDeps);
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), resolvers[1].askedDeps);
assertEquals(Collections.<DependencyDescriptor> singletonList(dd), resolvers[0].askedDeps);
assertEquals(Collections.<DependencyDescriptor> singletonList(dd), resolvers[1].askedDeps);
assertTrue(resolvers[2].askedDeps.isEmpty());
}
@ -140,7 +140,8 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
new GregorianCalendar(2005, 1, 20).getTime()),
MockResolver.buildMockResolver(settings, "2", false, null),
MockResolver.buildMockResolver(settings, "3", true,
new GregorianCalendar(2005, 1, 25).getTime()), // younger -> should the one kept
new GregorianCalendar(2005, 1, 25).getTime()),
// younger -> should the one kept
MockResolver.buildMockResolver(settings, "4", false, null),
MockResolver.buildMockResolver(settings, "5", true,
new GregorianCalendar(2005, 1, 22).getTime()),
@ -157,7 +158,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("3", rmr.getResolver().getName());
List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
List<DependencyDescriptor> ddAsList = Collections.<DependencyDescriptor> singletonList(dd);
for (MockResolver resolver : resolvers) {
assertEquals(ddAsList, resolver.askedDeps);
}
@ -180,9 +181,8 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
MockResolver.buildMockResolver(settings, "4", false, null),
MockResolver.buildMockResolver(settings, "5", true,
ModuleRevisionId.newInstance("org", "mod", "4"),
new GregorianCalendar(2005, 1, 22).getTime()), // latest ->
// should the
// one kept
new GregorianCalendar(2005, 1, 22).getTime()),
// latest -> should the one kept
MockResolver.buildMockResolver(settings, "6", true,
ModuleRevisionId.newInstance("org", "mod", "3"),
new GregorianCalendar(2005, 1, 18).getTime()),
@ -197,7 +197,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("5", rmr.getResolver().getName());
List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
List<DependencyDescriptor> ddAsList = Collections.<DependencyDescriptor> singletonList(dd);
for (MockResolver resolver : resolvers) {
assertEquals(ddAsList, resolver.askedDeps);
}
@ -214,13 +214,13 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
MockResolver.buildMockResolver(settings, "2", true,
ModuleRevisionId.newInstance("org", "mod", "4"),
new GregorianCalendar(2005, 1, 22).getTime(), true),
// latest -> but default
// latest -> but default
MockResolver.buildMockResolver(settings, "3", false, null),
MockResolver.buildMockResolver(settings, "4", false, null),
MockResolver.buildMockResolver(settings, "5", true,
ModuleRevisionId.newInstance("org", "mod", "4"),
new GregorianCalendar(2005, 1, 22).getTime()),
// latest -> should be the one kept
// latest -> should be the one kept
MockResolver.buildMockResolver(settings, "6", false, null),
MockResolver.buildMockResolver(settings, "7", false, null)};
for (MockResolver resolver : resolvers) {
@ -233,7 +233,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("5", rmr.getResolver().getName());
List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
List<DependencyDescriptor> ddAsList = Collections.<DependencyDescriptor> singletonList(dd);
for (int i = 0; i < 5; i++) {
assertEquals(ddAsList, resolvers[i].askedDeps);
}
@ -254,19 +254,16 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
new GregorianCalendar(2005, 1, 20).getTime()),
MockResolver.buildMockResolver(settings, "2", true,
ModuleRevisionId.newInstance("org", "mod", "4"),
new GregorianCalendar(2005, 1, 22).getTime(), true), // latest
// ->
// but
// default
new GregorianCalendar(2005, 1, 22).getTime(), true),
// latest -> but default
MockResolver.buildMockResolver(settings, "3", true,
ModuleRevisionId.newInstance("org", "mod", "2"),
new GregorianCalendar(2005, 1, 25).getTime()),
MockResolver.buildMockResolver(settings, "4", false, null),
MockResolver.buildMockResolver(settings, "5", true,
ModuleRevisionId.newInstance("org", "mod", "4"),
new GregorianCalendar(2005, 1, 22).getTime()), // latest ->
// should the
// one kept
new GregorianCalendar(2005, 1, 22).getTime()),
// latest -> should the one kept
MockResolver.buildMockResolver(settings, "6", true,
ModuleRevisionId.newInstance("org", "mod", "3"),
new GregorianCalendar(2005, 1, 18).getTime()),
@ -281,7 +278,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("5", rmr.getResolver().getName());
List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
List<DependencyDescriptor> ddAsList = Collections.<DependencyDescriptor> singletonList(dd);
for (MockResolver resolver : resolvers) {
assertEquals(ddAsList, resolver.askedDeps);
}
@ -298,12 +295,12 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
MockResolver.buildMockResolver(settings, "2", true,
ModuleRevisionId.newInstance("org", "mod", "4"),
new GregorianCalendar(2005, 1, 22).getTime(), true),
// default
// default
MockResolver.buildMockResolver(settings, "3", false, null),
MockResolver.buildMockResolver(settings, "4", true,
ModuleRevisionId.newInstance("org", "mod", "4"),
new GregorianCalendar(2005, 1, 22).getTime()),
// not default -> should be the one kept
// not default -> should be the one kept
MockResolver.buildMockResolver(settings, "5", false, null)};
for (MockResolver resolver : resolvers) {
chain.add(resolver);
@ -315,7 +312,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("4", rmr.getResolver().getName());
List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
List<DependencyDescriptor> ddAsList = Collections.<DependencyDescriptor> singletonList(dd);
for (int i = 0; i < 4; i++) {
assertEquals("invalid asked dependencies for " + resolvers[i], ddAsList,
resolvers[i].askedDeps);
@ -385,7 +382,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
}
chain.getDependency(dd, data);
// should not have asked any dependency, should have hit the cache
assertEquals(Collections.EMPTY_LIST, resolvers[0].askedDeps);
assertEquals(Collections.emptyList(), resolvers[0].askedDeps);
}
public void testReturnFirst() throws Exception {
@ -399,7 +396,8 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
new GregorianCalendar(2005, 1, 20).getTime()),
MockResolver.buildMockResolver(settings, "2", false, null),
MockResolver.buildMockResolver(settings, "3", true,
new GregorianCalendar(2005, 1, 25).getTime()), // younger -> should the one kept
new GregorianCalendar(2005, 1, 25).getTime()),
// younger -> should the one kept
MockResolver.buildMockResolver(settings, "4", false, null),
MockResolver.buildMockResolver(settings, "5", true,
new GregorianCalendar(2005, 1, 22).getTime()),

28
test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java
View File

@ -17,12 +17,6 @@
*/
package org.apache.ivy.plugins.resolver;
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.util.Arrays;
import java.util.GregorianCalendar;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
@ -34,11 +28,19 @@ import org.apache.ivy.core.resolve.ResolvedModuleRevision;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.settings.XmlSettingsParser;
import org.apache.ivy.core.sort.SortEngine;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.util.Collections;
import java.util.GregorianCalendar;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
* Test for DualResolver
@ -125,7 +127,7 @@ public class DualResolverTest extends AbstractDependencyResolverTest {
assertNotNull(rmr);
assertEquals(dual, rmr.getArtifactResolver());
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), ivyResolver.askedDeps);
assertEquals(Collections.<DependencyDescriptor> singletonList(dd), ivyResolver.askedDeps);
assertTrue(artifactResolver.askedDeps.isEmpty());
}
@ -144,8 +146,8 @@ public class DualResolverTest extends AbstractDependencyResolverTest {
assertNotNull(rmr);
assertEquals(artifactResolver, rmr.getResolver());
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), ivyResolver.askedDeps);
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), artifactResolver.askedDeps);
assertEquals(Collections.<DependencyDescriptor> singletonList(dd), ivyResolver.askedDeps);
assertEquals(Collections.<DependencyDescriptor> singletonList(dd), artifactResolver.askedDeps);
}
@Test
@ -162,7 +164,7 @@ public class DualResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = dual.getDependency(dd, _data);
assertNull(rmr);
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), ivyResolver.askedDeps);
assertEquals(Arrays.asList(new DependencyDescriptor[] {dd}), artifactResolver.askedDeps);
assertEquals(Collections.<DependencyDescriptor> singletonList(dd), ivyResolver.askedDeps);
assertEquals(Collections.<DependencyDescriptor> singletonList(dd), artifactResolver.askedDeps);
}
}