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

Little code cleanup 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@926307 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maarten Coene 2010-03-22 20:13:12 +00:00
parent 89e1144881
commit cce5289e58
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/java/org/apache/ivy/core/resolve/ResolveTest.java
View File

@ -54,7 +54,6 @@ import org.apache.ivy.plugins.circular.CircularDependencyException;
import org.apache.ivy.plugins.circular.ErrorCircularDependencyStrategy;
import org.apache.ivy.plugins.circular.IgnoreCircularDependencyStrategy;
import org.apache.ivy.plugins.circular.WarnCircularDependencyStrategy;
import org.apache.ivy.plugins.conflict.LatestCompatibleConflictManager;
import org.apache.ivy.plugins.conflict.StrictConflictException;
import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
@ -5016,7 +5015,7 @@ public class ResolveTest extends TestCase {
public void testIVY956() throws Exception {
ivy.getSettings().setDefaultConflictManager(ivy.getSettings().getConflictManager("latest-compatible"));
try {
ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-956.xml"),
ivy.resolve(ResolveTest.class.getResource("ivy-956.xml"),
getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false));
fail("No StrictConflictException has been thrown");
} catch (StrictConflictException e) {