Author: maartenc Date: Mon Dec 7 23:24:38 2009 New Revision: 888184 URL: http://svn.apache.org/viewvc?rev=888184&view=rev Log: Added junit test for IVY-956
Added: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml (with props) Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=888184&r1=888183&r2=888184&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Mon Dec 7 23:24:38 2009 @@ -54,6 +54,8 @@ 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; import org.apache.ivy.plugins.resolver.BasicResolver; @@ -4985,4 +4987,15 @@ getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false)); assertFalse(report.hasError()); } + + public void testIVY956() throws Exception { + ivy.getSettings().setDefaultConflictManager(ivy.getSettings().getConflictManager("latest-compatible")); + try { + ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-956.xml"), + getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false)); + fail("No StrictConflictException has been thrown"); + } catch (StrictConflictException e) { + // ignore + } + } } Added: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml?rev=888184&view=auto ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml (added) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml Mon Dec 7 23:24:38 2009 @@ -0,0 +1,25 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<ivy-module version="1.0"> + <info organisation="apache" module="ivy-956" /> + <dependencies> + <dependency org="org1" name="mod1.4" rev="1.0.2" /> + <dependency org="org1" name="mod1.2" rev="[0.9,1.0[" extra="yes"/> + </dependencies> +</ivy-module> Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml ------------------------------------------------------------------------------ svn:mime-type = text/plain