Author: gscokart
Date: Mon Oct 8 05:01:36 2007
New Revision: 582793
URL: http://svn.apache.org/viewvc?rev=582793&view=rev
Log:
add test for IVY-618
Added:
incubator/ivy/core/trunk/test/repositories/2/mod9.1/
incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml (with
props)
incubator/ivy/core/trunk/test/repositories/2/modpom-dbunit/
incubator/ivy/core/trunk/test/repositories/2/modpom-dbunit/ivy-2.2.xml
(with props)
incubator/ivy/core/trunk/test/repositories/2/modpom-junit/
incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.1.xml
(with props)
incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.2.xml
(with props)
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Modified:
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=582793&r1=582792&r2=582793&view=diff
==============================================================================
---
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
(original)
+++
incubator/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
Mon Oct 8 05:01:36 2007
@@ -1323,6 +1323,7 @@
assertTrue(getArchiveFileInCache("org3", "mod3.1", "1.0", "mod3.1",
"jar", "jar").exists());
}
+
public void testResolveConflict() throws Exception {
// mod4.1 v 4.1 depends on
// - mod1.1 v 1.0 which depends on mod1.2 v 2.0
@@ -1448,6 +1449,17 @@
"jar").exists());
}
+ /**
+ * Test IVY-618.
+ */
+/* public void testResolveConflictFromPoms() throws Exception {
+ ResolveReport report = ivy.resolve(new
File("test/repositories/2/mod9.1/ivy-1.0.xml")
+ .toURL(), getResolveOptions(new String[] {"*"}));
+ assertNotNull(report);
+ assertFalse(report.hasError());
+ }
+*/
+
public void testTransitiveEviction() throws Exception {
// mod7.3 depends on mod7.2 v1.0 and on mod7.1 v2.0
// mod7.2 v1.0 depends on mod7.1 v1.0 (which then should be evicted)
Added: incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml?rev=582793&view=auto
==============================================================================
--- incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml (added)
+++ incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml Mon Oct 8
05:01:36 2007
@@ -0,0 +1,30 @@
+<!--
+ 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="org9"
+ module="mod9.1"
+ revision="1.0"
+ status="integration"
+ publication="20050704110000"
+ />
+ <dependencies>
+ <dependency org="org.dbunit" name="modpom-dbunit" rev="2.2"/>
+ <dependency org="junit" name="modpom-junit" rev="3.8.1"/>
+ </dependencies>
+</ivy-module>
Propchange: incubator/ivy/core/trunk/test/repositories/2/mod9.1/ivy-1.0.xml
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ivy/core/trunk/test/repositories/2/modpom-dbunit/ivy-2.2.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/2/modpom-dbunit/ivy-2.2.xml?rev=582793&view=auto
==============================================================================
--- incubator/ivy/core/trunk/test/repositories/2/modpom-dbunit/ivy-2.2.xml
(added)
+++ incubator/ivy/core/trunk/test/repositories/2/modpom-dbunit/ivy-2.2.xml Mon
Oct 8 05:01:36 2007
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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="org.dbunit"
+ module="modpom-dbunit"
+ revision="2.2"
+ status="integration"
+ publication="20070101192524"
+ />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf"
extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains
only the artifact published by this module itself, with no transitive
dependencies"/>
+ <conf name="compile" visibility="public" description="this is
the default scope, used if none is specified. Compile dependencies are
available in all classpaths."/>
+ <conf name="provided" visibility="public" description="this is
much like compile, but indicates you expect the JDK or a container to provide
it. It is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this
scope indicates that the dependency is not required for compilation, but is for
execution. It is in the runtime and test classpaths, but not the compile
classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="this scope
indicates that the dependency is not required for normal use of the
application, and is only available for the test compilation and execution
phases."/>
+ <conf name="system" visibility="public" description="this scope
is similar to provided except that you have to provide the JAR which contains
it explicitly. The artifact is always available and is not looked up in a
repository."/>
+ <conf name="optional" visibility="public" description="contains
all optional dependencies"/>
+ </configurations>
+ <publications>
+ <!-- artifact name="dbunit" type="jar" ext="jar"
conf="master"/-->
+ </publications>
+ <dependencies>
+ <dependency org="junit" name="modpom-junit" rev="3.8.2"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <!-- Those dependencies are used in the real dbunit, but we
don't need them for the test -->
+ <!-- dependency org="junit-addons" name="modpom-junitaddons"
rev="1.4" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="poi" name="poi" rev="2.5.1-final-20040804"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="ant" name="ant" rev="1.5.4" force="true"
conf="optional->compile(*),runtime(*),master(*)"/>
+ <dependency org="commons-collections"
name="commons-collections" rev="3.1" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.1"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="mockobjects" name="mockobjects-core"
rev="0.07" force="true" conf="test->compile(*),runtime(*),master(*)"/>
+ <dependency org="mockmaker" name="mmmockobjects" rev="1.12.0"
force="true" conf="test->compile(*),runtime(*),master(*)"/>
+ <dependency org="mockobjects" name="mockobjects-jdk1.3"
rev="0.07" force="true" conf="test->compile(*),runtime(*),master(*)"/>
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.1"
force="true" conf="test->compile(*),runtime(*),master(*)"/>
+ <dependency org="commons-logging" name="commons-logging"
rev="1.0.4" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/ -->
+ </dependencies>
+</ivy-module>
Propchange:
incubator/ivy/core/trunk/test/repositories/2/modpom-dbunit/ivy-2.2.xml
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.1.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.1.xml?rev=582793&view=auto
==============================================================================
--- incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.1.xml
(added)
+++ incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.1.xml Mon
Oct 8 05:01:36 2007
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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="junit"
+ module="modpom-junit"
+ revision="3.8.1"
+ status="integration"
+ publication="20070514233453"
+ />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf"
extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains
only the artifact published by this module itself, with no transitive
dependencies"/>
+ <conf name="compile" visibility="public" description="this is
the default scope, used if none is specified. Compile dependencies are
available in all classpaths."/>
+ <conf name="provided" visibility="public" description="this is
much like compile, but indicates you expect the JDK or a container to provide
it. It is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this
scope indicates that the dependency is not required for compilation, but is for
execution. It is in the runtime and test classpaths, but not the compile
classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="this scope
indicates that the dependency is not required for normal use of the
application, and is only available for the test compilation and execution
phases."/>
+ <conf name="system" visibility="public" description="this scope
is similar to provided except that you have to provide the JAR which contains
it explicitly. The artifact is always available and is not looked up in a
repository."/>
+ </configurations>
+ <publications>
+ <!-- artifact name="junit" type="jar" ext="jar" conf="master"/
-->
+ </publications>
+</ivy-module>
Propchange:
incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.1.xml
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.2.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.2.xml?rev=582793&view=auto
==============================================================================
--- incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.2.xml
(added)
+++ incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.2.xml Mon
Oct 8 05:01:36 2007
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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="junit"
+ module="modpom-junit"
+ revision="3.8.2"
+ status="integration"
+ publication="20070514233453"
+ />
+ <configurations>
+ <conf name="default" visibility="public" description="runtime
dependencies and master artifact can be used with this conf"
extends="runtime,master"/>
+ <conf name="master" visibility="public" description="contains
only the artifact published by this module itself, with no transitive
dependencies"/>
+ <conf name="compile" visibility="public" description="this is
the default scope, used if none is specified. Compile dependencies are
available in all classpaths."/>
+ <conf name="provided" visibility="public" description="this is
much like compile, but indicates you expect the JDK or a container to provide
it. It is only available on the compilation classpath, and is not transitive."/>
+ <conf name="runtime" visibility="public" description="this
scope indicates that the dependency is not required for compilation, but is for
execution. It is in the runtime and test classpaths, but not the compile
classpath." extends="compile"/>
+ <conf name="test" visibility="private" description="this scope
indicates that the dependency is not required for normal use of the
application, and is only available for the test compilation and execution
phases."/>
+ <conf name="system" visibility="public" description="this scope
is similar to provided except that you have to provide the JAR which contains
it explicitly. The artifact is always available and is not looked up in a
repository."/>
+ </configurations>
+ <publications>
+ <!-- artifact name="junit" type="jar" ext="jar" conf="master"/
-->
+ </publications>
+</ivy-module>
Propchange:
incubator/ivy/core/trunk/test/repositories/2/modpom-junit/ivy-3.8.2.xml
------------------------------------------------------------------------------
svn:executable = *
