You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/04/23 00:57:04 UTC

svn commit: r767705 [16/31] - in /maven/mercury/trunk/mercury-core: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/java/org/apache/maven/mercury/ src/main/java/org/apache/maven/mer...

Added: maven/mercury/trunk/mercury-core/src/main/mdo/metadata.mdo
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/mdo/metadata.mdo?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/mdo/metadata.mdo (added)
+++ maven/mercury/trunk/mercury-core/src/main/mdo/metadata.mdo Wed Apr 22 22:56:48 2009
@@ -0,0 +1,170 @@
+<!--
+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.
+-->
+
+<model>
+  <id>repository-metadata</id>
+  <name>Metadata</name>
+  <description>Per-directory repository metadata.</description>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.apache.maven.mercury.repository.metadata</value>
+    </default>
+  </defaults>
+  <classes>
+    <class rootElement="true">
+      <name>Metadata</name>
+      <version>1.0.0</version>
+      <fields>
+        <field>
+          <name>groupId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>The groupId that is directory represents, if any.</description>
+        </field>
+        <field>
+          <name>artifactId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>The artifactId that is directory represents, if any.</description>
+        </field>
+        <field>
+          <name>version</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>The version that is directory represents, if any.</description>
+        </field>
+        <field>
+          <name>versioning</name>
+          <version>1.0.0</version>
+          <association>
+            <type>Versioning</type>
+          </association>
+          <description>Versioning information for the artifact.</description>
+        </field>
+        <field>
+          <name>plugins</name>
+          <version>1.0.0</version>
+          <description>The set of plugin mappings for the group</description>
+          <association>
+            <type>Plugin</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+     </class>
+    <class>
+      <name>Versioning</name>
+      <version>1.0.0</version>
+      <description>Versioning information for an artifact</description>
+      <fields>
+        <field>
+          <name>latest</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>What the latest version in the directory is, including snapshots</description>
+        </field>
+        <field>
+          <name>release</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>What the latest version in the directory is, of the releases</description>
+        </field>
+        <field>
+          <name>snapshot</name>
+          <version>1.0.0</version>
+          <association>
+            <type>Snapshot</type>
+          </association>
+          <description>The current snapshot data in use for this version</description>
+        </field>
+        <field>
+          <name>versions</name>
+          <version>1.0.0</version>
+          <description>Versions available for the artifact</description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>lastUpdated</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>When the metadata was last updated</description>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>Snapshot</name>
+      <version>1.0.0</version>
+      <description>Snapshot data for the current version</description>
+      <fields>
+        <field>
+          <name>timestamp</name>
+          <version>1.0.0</version>
+          <description>The time it was deployed</description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>buildNumber</name>
+          <version>1.0.0</version>
+          <description>The incremental build number</description>
+          <type>int</type>
+        </field>
+        <field>
+          <name>localCopy</name>
+          <version>1.0.0</version>
+          <description>Whether to use a local copy instead (with filename that includes the base version)</description>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>Plugin</name>
+      <version>1.0.0</version>
+      <description>Mapping information for a single plugin within this group</description>
+      <comment>NOTE: plugin version is _NOT_ included here, since it is resolved using a separate algorithm.</comment>
+      <fields>
+        <field>
+          <name>name</name>
+          <type>String</type>
+          <required>true</required>
+          <version>1.0.0</version>
+          <description>Display name for the plugin.</description>
+        </field>
+        <field>
+          <name>prefix</name>
+          <type>String</type>
+          <required>true</required>
+          <version>1.0.0</version>
+          <description>The plugin invocation prefix (i.e. eclipse for eclipse:eclipse)</description>
+        </field>
+        <field>
+          <name>artifactId</name>
+          <type>String</type>
+          <required>true</required>
+          <version>1.0.0</version>
+          <description>The plugin artifactId</description>
+        </field>
+      </fields>
+    </class>
+  </classes>
+</model>

Propchange: maven/mercury/trunk/mercury-core/src/main/mdo/metadata.mdo
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/main/mdo/metadata.mdo
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/ArtifactMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/ArtifactMetadataTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/ArtifactMetadataTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/ArtifactMetadataTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,42 @@
+/*
+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.
+*/
+
+package org.apache.maven.mercury.artifact;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class ArtifactMetadataTest
+    extends TestCase
+{
+    public void testTestJar()
+    {
+        ArtifactMetadata md = new ArtifactMetadata("a:a:1::test-jar");
+        
+        assertEquals( "tests", md.getClassifier() );
+        
+        assertEquals( "jar", md.getType() );
+    }
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/ArtifactMetadataTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/ArtifactMetadataTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,109 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.artifact;
+
+import java.util.ArrayList;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.mercury.artifact.version.VersionException;
+
+/**
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
+public class DependencyFilterTest
+    extends TestCase
+{
+    ArtifactMetadata a1;
+
+    ArtifactMetadata a2;
+
+    ArtifactMetadata a3;
+
+    ArtifactMetadata a4;
+
+    ArrayList<ArtifactMetadata> inc;
+
+    ArrayList<ArtifactMetadata> exc;
+
+    @Override
+    protected void setUp()
+        throws Exception
+    {
+        a1 = new ArtifactMetadata( "a:a:1.1" );
+        a2 = new ArtifactMetadata( "a:a:2.1" );
+        a3 = new ArtifactMetadata( "a:a:3.1" );
+        a4 = new ArtifactMetadata( "a:a:4.1" );
+
+        inc = new ArrayList<ArtifactMetadata>();
+        inc.add( new ArtifactMetadata( "a:a" ) );
+        inc.add( new ArtifactMetadata( "b:b:2.0.0" ) );
+
+        exc = new ArrayList<ArtifactMetadata>();
+        exc.add( new ArtifactMetadata( "c:c" ) );
+        exc.add( new ArtifactMetadata( "b:b:2.0.1" ) );
+
+        a2.setInclusions( inc );
+
+        a3.setExclusions( exc );
+
+        a4.setInclusions( inc );
+        a4.setExclusions( exc );
+    }
+
+    public void testNoFilter()
+        throws VersionException
+    {
+        assertTrue( a1.allowDependency( new ArtifactMetadata( "a:a:2.0.0" ) ) );
+        assertTrue( a1.allowDependency( new ArtifactMetadata( "b:b:1.0.0" ) ) );
+        assertTrue( a1.allowDependency( new ArtifactMetadata( "c:c:1.0.0" ) ) );
+    }
+
+    public void testInclusionsFilter()
+        throws VersionException
+    {
+        assertTrue( a2.allowDependency( new ArtifactMetadata( "a:a:2.0.0" ) ) );
+        assertFalse( a2.allowDependency( new ArtifactMetadata( "b:b:1.0.0" ) ) );
+        assertTrue( a2.allowDependency( new ArtifactMetadata( "b:b:2.0.0" ) ) );
+        assertFalse( a2.allowDependency( new ArtifactMetadata( "b:b:2.0.1" ) ) );
+        assertFalse( a2.allowDependency( new ArtifactMetadata( "c:c:1.0.0" ) ) );
+    }
+
+    public void testExclusionsFilter()
+        throws VersionException
+    {
+        assertTrue( a3.allowDependency( new ArtifactMetadata( "a:a:2.0.0" ) ) );
+        assertTrue( a3.allowDependency( new ArtifactMetadata( "b:b:1.0.0" ) ) );
+        assertFalse( a3.allowDependency( new ArtifactMetadata( "b:b:2.0.1" ) ) );
+        assertFalse( a3.allowDependency( new ArtifactMetadata( "c:c:1.0.0" ) ) );
+    }
+
+    public void testInclusionsExclusionsFilter()
+        throws VersionException
+    {
+        assertTrue( a4.allowDependency( new ArtifactMetadata( "a:a:2.0.0" ) ) );
+        assertFalse( a4.allowDependency( new ArtifactMetadata( "b:b:1.0.0" ) ) );
+        assertTrue( a4.allowDependency( new ArtifactMetadata( "b:b:2.0.0" ) ) );
+        assertFalse( a4.allowDependency( new ArtifactMetadata( "b:b:2.0.1" ) ) );
+        assertFalse( a4.allowDependency( new ArtifactMetadata( "b:b:3.0.1" ) ) );
+        assertFalse( a4.allowDependency( new ArtifactMetadata( "c:c:1.0.0" ) ) );
+    }
+
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/QualityTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/QualityTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/QualityTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/QualityTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,113 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.artifact;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
+public class QualityTest
+    extends TestCase
+{
+
+    public void testParser()
+    {
+        Quality q = new Quality( "a-b_a-1" );
+
+        assertNotNull( q.quality );
+        assertEquals( QualityEnum.release, q.getQuality() );
+        assertEquals( Quality.DEFAULT_QUANTITY, q.getQuantity() );
+    }
+
+    public void testSn1()
+    {
+        Quality q = new Quality( "5.5-SNAPSHOT" );
+
+        assertNotNull( q.quality );
+        assertEquals( QualityEnum.snapshot, q.getQuality() );
+        assertEquals( Quality.DEFAULT_QUANTITY, q.getQuantity() );
+    }
+
+    public void testSn2()
+    {
+        Quality q = new Quality( "5.5-20080815.231708-12" );
+
+        assertNotNull( q.quality );
+        assertEquals( QualityEnum.snapshot, q.getQuality() );
+        assertEquals( Quality.SNAPSHOT_TS_QUANTITY, q.getQuantity() );
+    }
+
+    public void testSn3()
+    {
+        Quality q = new Quality( "5.5-20080815.231708-" );
+
+        assertNotNull( q.quality );
+        assertEquals( QualityEnum.release, q.getQuality() );
+    }
+
+    public void testSn4()
+    {
+        Quality q = new Quality( "5.5-20080815.23-15" );
+
+        assertNotNull( q.quality );
+        assertEquals( QualityEnum.release, q.getQuality() );
+    }
+
+    public void testAlpha()
+    {
+        Quality q = new Quality( "5.5-alpha-12" );
+
+        assertNotNull( q.quality );
+        assertEquals( QualityEnum.alpha, q.getQuality() );
+        assertEquals( 12, q.getQuantity() );
+    }
+
+    public void testBeta()
+    {
+        Quality q = new Quality( "5.5-beta-1" );
+
+        assertNotNull( q.quality );
+        assertEquals( QualityEnum.beta, q.getQuality() );
+        assertEquals( 1, q.getQuantity() );
+    }
+
+    public void testCompateQ()
+    {
+        Quality u = Quality.UNKNOWN_QUALITY;
+        Quality sn = new Quality( "5.5-SNAPSHOT" );
+        Quality snts = new Quality( "5.5-5.5-20080815.231708-12" );
+        Quality a1 = new Quality( "5.5-5.5-alpha-1" );
+        Quality a2 = new Quality( "5.5-5.5-alpha-20" );
+        Quality b1 = new Quality( "5.5-5.5-beta-1" );
+        Quality b2 = new Quality( "5.5-5.5-beta-10" );
+        Quality r = new Quality( "5.5" );
+
+        assertTrue( u.compareTo( sn ) < 0 );
+        assertTrue( sn.compareTo( snts ) == 0 );
+        assertTrue( snts.compareTo( a1 ) < 0 );
+        assertEquals( 0, a1.compareTo( a1 ) );
+        assertTrue( a1.compareTo( a2 ) < 0 );
+        assertTrue( a2.compareTo( b1 ) < 0 );
+        assertTrue( b1.compareTo( b2 ) < 0 );
+        assertTrue( b2.compareTo( r ) < 0 );
+        assertEquals( 0, r.compareTo( r ) );
+    }
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/QualityTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/QualityTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,183 @@
+package org.apache.maven.mercury.artifact.version;
+
+/*
+ * 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.
+ */
+
+import java.util.Locale;
+
+import junit.framework.TestCase;
+
+/**
+ * Test ComparableVersion.
+ * 
+ * @author <a href="mailto:hboutemy@apache.org">Herve Boutemy</a>
+ * @version $Id$
+ */
+public class ComparableVersionTest
+    extends TestCase
+{
+    private Comparable newComparable( String version )
+    {
+        return new ComparableVersion( version );
+    }
+
+    private static final String[] VERSIONS_QUALIFIER =
+        { "1-SNAPSHOT", "1-alpha2snapshot", "1-alpha2", "1-alpha-123", "1-beta-2", "1-beta123", "1-m2", "1-m11",
+            "1-rc", "1-cr2", "1-rc123", "1", "1-sp", "1-sp2", "1-sp123", "1-abc", "1-def", "1-pom-1", "1-1-snapshot",
+            "1-1", "1-2", "1-123" };
+
+    private static final String[] VERSIONS_NUMBER =
+        { "2.0", "2-1", "2.0.a", "2.0.0.a", "2.0.2", "2.0.123", "2.1.0", "2.1-a", "2.1b", "2.1-c", "2.1-1", "2.1.0.1",
+            "2.2", "2.123", "11.a2", "11.a11", "11.b2", "11.b11", "11.m2", "11.m11", "11", "11.a", "11b", "11c", "11m" };
+
+    private void checkVersionsOrder( String[] versions )
+    {
+        Comparable[] c = new Comparable[versions.length];
+        for ( int i = 0; i < versions.length; i++ )
+        {
+            c[i] = newComparable( versions[i] );
+        }
+
+        for ( int i = 1; i < versions.length; i++ )
+        {
+            Comparable low = c[i - 1];
+            for ( int j = i; j < versions.length; j++ )
+            {
+                Comparable high = c[j];
+                assertTrue( "expected " + low + " < " + high, low.compareTo( high ) < 0 );
+                assertTrue( "expected " + high + " > " + low, high.compareTo( low ) > 0 );
+            }
+        }
+    }
+
+    private void checkVersionsEqual( String v1, String v2 )
+    {
+        Comparable c1 = newComparable( v1 );
+        Comparable c2 = newComparable( v2 );
+        assertTrue( "expected " + v1 + " == " + v2, c1.compareTo( c2 ) == 0 );
+        assertTrue( "expected " + v2 + " == " + v1, c2.compareTo( c1 ) == 0 );
+        assertTrue( "expected same hashcode for " + v1 + " and " + v2, c1.hashCode() == c2.hashCode() );
+        assertTrue( "expected " + v1 + ".equals( " + v2 + " )", c1.equals( c2 ) );
+        assertTrue( "expected " + v2 + ".equals( " + v1 + " )", c2.equals( c1 ) );
+    }
+
+    private void checkVersionsOrder( String v1, String v2 )
+    {
+        Comparable c1 = newComparable( v1 );
+        Comparable c2 = newComparable( v2 );
+        assertTrue( "expected " + v1 + " < " + v2, c1.compareTo( c2 ) < 0 );
+        assertTrue( "expected " + v2 + " > " + v1, c2.compareTo( c1 ) > 0 );
+    }
+
+    public void testVersionsQualifier()
+    {
+        checkVersionsOrder( VERSIONS_QUALIFIER );
+    }
+
+    public void testVersionsNumber()
+    {
+        checkVersionsOrder( VERSIONS_NUMBER );
+    }
+
+    public void testVersionsEqual()
+    {
+        checkVersionsEqual( "1", "1" );
+        checkVersionsEqual( "1", "1.0" );
+        checkVersionsEqual( "1", "1.0.0" );
+        checkVersionsEqual( "1.0", "1.0.0" );
+        checkVersionsEqual( "1", "1-0" );
+        checkVersionsEqual( "1", "1.0-0" );
+        checkVersionsEqual( "1.0", "1.0-0" );
+        checkVersionsEqual( "1a", "1.a" );
+        checkVersionsEqual( "1a", "1-a" );
+        checkVersionsEqual( "1a", "1.0-a" );
+        checkVersionsEqual( "1a", "1.0.0-a" );
+        checkVersionsEqual( "1.0a", "1.0.a" );
+        checkVersionsEqual( "1.0.0a", "1.0.0.a" );
+
+        // aliases
+        checkVersionsEqual( "1ga", "1" );
+        checkVersionsEqual( "1final", "1" );
+        checkVersionsEqual( "1cr", "1rc" );
+
+        // special "aliases" a, b and m for alpha, beta and milestone
+        checkVersionsEqual( "1a1", "1alpha1" );
+        checkVersionsEqual( "1b2", "1beta2" );
+        checkVersionsEqual( "1m3", "1milestone3" );
+    }
+
+    public void testVersionComparing()
+    {
+        checkVersionsOrder( "1", "2" );
+        checkVersionsOrder( "1.5", "2" );
+        checkVersionsOrder( "1", "2.5" );
+        checkVersionsOrder( "1.0", "1.1" );
+        checkVersionsOrder( "1.1", "1.2" );
+        checkVersionsOrder( "1.0.0", "1.1" );
+        checkVersionsOrder( "1.0.1", "1.1" );
+        checkVersionsOrder( "1.1", "1.2.0" );
+
+        checkVersionsOrder( "1.0-alpha-1", "1.0" );
+        checkVersionsOrder( "1.0-alpha-1", "1.0-alpha-2" );
+        checkVersionsOrder( "1.0-alpha-1", "1.0-beta-1" );
+
+        checkVersionsOrder( "1.0-SNAPSHOT", "1.0-beta-1" );
+        checkVersionsOrder( "1.0-SNAPSHOT", "1.0" );
+        checkVersionsOrder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-1" );
+
+        checkVersionsOrder( "1.0", "1.0-1" );
+        checkVersionsOrder( "1.0-1", "1.0-2" );
+        checkVersionsOrder( "1.0.0", "1.0-1" );
+
+        checkVersionsOrder( "2.0-1", "2.0.1" );
+        checkVersionsOrder( "2.0.1-klm", "2.0.1-lmn" );
+        checkVersionsOrder( "2.0.1", "2.0.1-xyz" );
+
+        checkVersionsOrder( "2.0.1", "2.0.1-123" );
+        checkVersionsOrder( "2.0.1-xyz", "2.0.1-123" );
+    }
+
+    public void testLocaleIndependent()
+    {
+        Locale orig = Locale.getDefault();
+        Locale[] locales = { Locale.ENGLISH, new Locale( "tr" ), Locale.getDefault() };
+        try
+        {
+            for ( Locale locale : locales )
+            {
+                Locale.setDefault( locale );
+                checkVersionsEqual( "1-abcdefghijklmnopqrstuvwxyz", "1-ABCDEFGHIJKLMNOPQRSTUVWXYZ" );
+            }
+        }
+        finally
+        {
+            Locale.setDefault( orig );
+        }
+    }
+
+    public void testReuse()
+    {
+        ComparableVersion c1 = new ComparableVersion( "1" );
+        c1.parseVersion( "2" );
+
+        Comparable c2 = newComparable( "2" );
+
+        assertEquals( "reused instance should be equivalent to new instance", c1, c2 );
+    }
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/ComparableVersionTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersionTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersionTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersionTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersionTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,195 @@
+package org.apache.maven.mercury.artifact.version;
+
+/*
+ * 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.
+ */
+
+import junit.framework.TestCase;
+
+/**
+ * Test DefaultArtifactVersion.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public class DefaultArtifactVersionTest
+    extends TestCase
+{
+    private ArtifactVersion newArtifactVersion( String version )
+    {
+        return new DefaultArtifactVersion( version );
+    }
+
+    private void checkVersionParsing( String version, int major, int minor, int incremental, int buildnumber,
+                                      String qualifier )
+    {
+        ArtifactVersion artifactVersion = newArtifactVersion( version );
+        String parsed = "'" + version + "' parsed as ('" + artifactVersion.getMajorVersion() + "', '"
+            + artifactVersion.getMinorVersion() + "', '" + artifactVersion.getIncrementalVersion() + "', '"
+            + artifactVersion.getBuildNumber() + "', '" + artifactVersion.getQualifier() + "'), ";
+        assertEquals( parsed + "check major version", major, artifactVersion.getMajorVersion() );
+        assertEquals( parsed + "check minor version", minor, artifactVersion.getMinorVersion() );
+        assertEquals( parsed + "check incremental version", incremental, artifactVersion.getIncrementalVersion() );
+        assertEquals( parsed + "check build number", buildnumber, artifactVersion.getBuildNumber() );
+        assertEquals( parsed + "check qualifier", qualifier, artifactVersion.getQualifier() );
+        assertEquals( "check " + version + " string value", version, artifactVersion.toString() );
+    }
+
+    public void testVersionParsing()
+    {
+        checkVersionParsing( "1" , 1, 0, 0, 0, null );
+        checkVersionParsing( "1.2" , 1, 2, 0, 0, null );
+        checkVersionParsing( "1.2.3" , 1, 2, 3, 0, null );
+        checkVersionParsing( "1.2.3-1" , 1, 2, 3, 1, null );
+        checkVersionParsing( "1.2.3-alpha-1" , 1, 2, 3, 0, "alpha-1" );
+        checkVersionParsing( "1.2-alpha-1" , 1, 2, 0, 0, "alpha-1" );
+        checkVersionParsing( "1.2-alpha-1-20050205.060708-1" , 1, 2, 0, 0, "alpha-1-20050205.060708-1" );
+        checkVersionParsing( "RELEASE" , 0, 0, 0, 0, "RELEASE" );
+        checkVersionParsing( "2.0-1" , 2, 0, 0, 1, null );
+
+        // 0 at the beginning of a number has a special handling
+        checkVersionParsing( "02" , 0, 0, 0, 0, "02" );
+        checkVersionParsing( "0.09" , 0, 0, 0, 0, "0.09" );
+        checkVersionParsing( "0.2.09" , 0, 0, 0, 0, "0.2.09" );
+        checkVersionParsing( "2.0-01" , 2, 0, 0, 0, "01" );
+
+        // version schemes not really supported: fully transformed as qualifier
+        checkVersionParsing( "1.0.1b" , 0, 0, 0, 0, "1.0.1b" );
+        checkVersionParsing( "1.0M2" , 0, 0, 0, 0, "1.0M2" );
+        checkVersionParsing( "1.0RC2" , 0, 0, 0, 0, "1.0RC2" );
+        checkVersionParsing( "1.7.3.0" , 0, 0, 0, 0, "1.7.3.0" );
+        checkVersionParsing( "1.7.3.0-1" , 0, 0, 0, 0, "1.7.3.0-1" );
+        checkVersionParsing( "PATCH-1193602" , 0, 0, 0, 0, "PATCH-1193602" );
+        checkVersionParsing( "5.0.0alpha-2006020117" , 0, 0, 0, 0, "5.0.0alpha-2006020117" );
+        checkVersionParsing( "1.0.0.-SNAPSHOT", 0, 0, 0, 0, "1.0.0.-SNAPSHOT" );
+        checkVersionParsing( "1..0-SNAPSHOT", 0, 0, 0, 0, "1..0-SNAPSHOT" );
+        checkVersionParsing( "1.0.-SNAPSHOT", 0, 0, 0, 0, "1.0.-SNAPSHOT" );
+        checkVersionParsing( ".1.0-SNAPSHOT", 0, 0, 0, 0, ".1.0-SNAPSHOT" );
+
+        checkVersionParsing( "1.2.3.200705301630" , 0, 0, 0, 0, "1.2.3.200705301630" );
+        checkVersionParsing( "1.2.3-200705301630" , 1, 2, 3, 0, "200705301630" );
+    }
+
+    public void testVersionComparing()
+    {
+        assertVersionEqual( "1", "1" );
+        assertVersionOlder( "1", "2" );
+        assertVersionOlder( "1.5", "2" );
+        assertVersionOlder( "1", "2.5" );
+        assertVersionEqual( "1", "1.0" );
+        assertVersionEqual( "1", "1.0.0" );
+        assertVersionOlder( "1.0", "1.1" );
+        assertVersionOlder( "1.1", "1.2" );
+        assertVersionOlder( "1.0.0", "1.1" );
+        assertVersionOlder( "1.1", "1.2.0" );
+
+        assertVersionOlder( "1.0-alpha-1", "1.0" );
+        assertVersionOlder( "1.0-alpha-1", "1.0-alpha-2" );
+        assertVersionOlder( "1.0-alpha-2", "1.0-alpha-15" );
+        assertVersionOlder( "1.0-alpha-1", "1.0-beta-1" );
+
+        assertVersionOlder( "1.0-SNAPSHOT", "1.0-beta-1" );
+        assertVersionOlder( "1.0-SNAPSHOT", "1.0" );
+        assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-1" );
+
+        assertVersionOlder( "1.0", "1.0-1" );
+        assertVersionOlder( "1.0-1", "1.0-2" );
+        assertVersionEqual( "2.0-0", "2.0" );
+        assertVersionOlder( "2.0", "2.0-1" );
+        assertVersionOlder( "2.0.0", "2.0-1" );
+        assertVersionOlder( "2.0-1", "2.0.1" );
+
+        assertVersionOlder( "2.0.1-klm", "2.0.1-lmn" );
+        //assertVersionOlder( "2.0.1-xyz", "2.0.1" );
+
+        assertVersionOlder( "2.0.1", "2.0.1-123" );
+        assertVersionOlder( "2.0.1-xyz", "2.0.1-123" );
+
+        assertVersionOlder( "1.2.3-10000000000", "1.2.3-10000000001" );
+        assertVersionOlder( "1.2.3-1", "1.2.3-10000000001" );
+        assertVersionOlder( "2.3.0-v200706262000", "2.3.0-v200706262130" ); // org.eclipse:emf:2.3.0-v200706262000
+        // org.eclipse.wst.common_core.feature_2.0.0.v200706041905-7C78EK9E_EkMNfNOd2d8qq
+        assertVersionOlder( "2.0.0.v200706041905-7C78EK9E_EkMNfNOd2d8qq", "2.0.0.v200706041906-7C78EK9E_EkMNfNOd2d8qq" );
+    }
+
+    public void testVersionSnapshotComparing()
+    {
+        assertVersionEqual( "1-SNAPSHOT", "1-SNAPSHOT" );
+        assertVersionOlder( "1-SNAPSHOT", "2-SNAPSHOT" );
+        assertVersionOlder( "1.5-SNAPSHOT", "2-SNAPSHOT" );
+        assertVersionOlder( "1-SNAPSHOT", "2.5-SNAPSHOT" );
+        assertVersionEqual( "1-SNAPSHOT", "1.0-SNAPSHOT" );
+        assertVersionEqual( "1-SNAPSHOT", "1.0.0-SNAPSHOT" );
+        assertVersionOlder( "1.0-SNAPSHOT", "1.1-SNAPSHOT" );
+        assertVersionOlder( "1.1-SNAPSHOT", "1.2-SNAPSHOT" );
+        assertVersionOlder( "1.0.0-SNAPSHOT", "1.1-SNAPSHOT" );
+        assertVersionOlder( "1.1-SNAPSHOT", "1.2.0-SNAPSHOT" );
+
+        //assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-SNAPSHOT" );
+        assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-alpha-2-SNAPSHOT" );
+        assertVersionOlder( "1.0-alpha-1-SNAPSHOT", "1.0-beta-1-SNAPSHOT" );
+
+        assertVersionOlder( "1.0-SNAPSHOT-SNAPSHOT", "1.0-beta-1-SNAPSHOT" );
+        assertVersionOlder( "1.0-SNAPSHOT-SNAPSHOT", "1.0-SNAPSHOT" );
+        assertVersionOlder( "1.0-alpha-1-SNAPSHOT-SNAPSHOT", "1.0-alpha-1-SNAPSHOT" );
+
+        assertVersionOlder( "1.0-SNAPSHOT", "1.0-1-SNAPSHOT" );
+        assertVersionOlder( "1.0-1-SNAPSHOT", "1.0-2-SNAPSHOT" );
+        //assertVersionEqual( "2.0-0-SNAPSHOT", "2.0-SNAPSHOT" );
+        assertVersionOlder( "2.0-SNAPSHOT", "2.0-1-SNAPSHOT" );
+        assertVersionOlder( "2.0.0-SNAPSHOT", "2.0-1-SNAPSHOT" );
+        assertVersionOlder( "2.0-1-SNAPSHOT", "2.0.1-SNAPSHOT" );
+
+        assertVersionOlder( "2.0.1-klm-SNAPSHOT", "2.0.1-lmn-SNAPSHOT" );
+        // assertVersionOlder( "2.0.1-xyz-SNAPSHOT", "2.0.1-SNAPSHOT" );
+        assertVersionOlder( "2.0.1-SNAPSHOT", "2.0.1-123-SNAPSHOT" );
+        assertVersionOlder( "2.0.1-xyz-SNAPSHOT", "2.0.1-123-SNAPSHOT" );
+    }
+
+    public void testSnapshotVsReleases()
+    {
+        //assertVersionOlder( "1.0-RC1", "1.0-SNAPSHOT" ); not feasible if "1.0-SNAPSHOT" < "1.0-beta-1" too
+        assertVersionOlder( "1.0-SNAPSHOT", "1.0-RC1" );
+        assertVersionOlder( "1.0-SNAPSHOT", "1.0-rc1" );
+        assertVersionOlder( "1.0-SNAPSHOT", "1.0-rc-1" );
+    }
+
+    public void testHashCode()
+    {
+        ArtifactVersion v1 = newArtifactVersion( "1" );
+        ArtifactVersion v2 = newArtifactVersion( "1.0" );
+        assertEquals( true, v1.equals( v2 ) );
+        assertEquals( v1.hashCode(), v2.hashCode() );
+    }
+
+    private void assertVersionOlder( String left, String right )
+    {
+        assertTrue( left + " should be older than " + right,
+                    newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) < 0 );
+        assertTrue( right + " should be newer than " + left,
+                    newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) > 0 );
+    }
+
+    private void assertVersionEqual( String left, String right )
+    {
+        assertTrue( left + " should be equal to " + right,
+                    newArtifactVersion( left ).compareTo( newArtifactVersion( right ) ) == 0 );
+        assertTrue( right + " should be equal to " + left,
+                    newArtifactVersion( right ).compareTo( newArtifactVersion( left ) ) == 0 );
+    }
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/DefaultArtifactVersionTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/MavenVersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/MavenVersionRangeTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/MavenVersionRangeTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/MavenVersionRangeTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,132 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.artifact.version;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.mercury.artifact.Quality;
+import org.apache.maven.mercury.artifact.QualityRange;
+
+/**
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
+public class MavenVersionRangeTest
+    extends TestCase
+{
+    MavenVersionRange range;
+
+    public void testSimple()
+        throws VersionException
+    {
+        String rangeS = "[ 1.2.3 , 2.0.0 )";
+        range = new MavenVersionRange( rangeS );
+
+        assertTrue( "1.2.4 did not match the range " + rangeS, range.includes( "1.2.4" ) );
+        assertTrue( "1.3.1 did not match the range " + rangeS, range.includes( "1.3.1" ) );
+        assertTrue( "1.2.3 did not match the range " + rangeS, range.includes( "1.2.3" ) );
+        assertFalse( "1.2.2 did matches the range " + rangeS, range.includes( "1.2.2" ) );
+        assertFalse( "2.0.0 did matches the range " + rangeS, range.includes( "2.0.0" ) );
+        assertFalse( "3.1.0 did matches the range " + rangeS, range.includes( "3.1.0" ) );
+    }
+
+    public void testEternity()
+        throws VersionException
+    {
+        String rangeS = "[ 1.2.3 , )";
+        range = new MavenVersionRange( rangeS );
+
+        assertTrue( "1.2.4 did not match the range " + rangeS, range.includes( "1.2.4" ) );
+        assertTrue( "1.3.1 did not match the range " + rangeS, range.includes( "1.3.1" ) );
+        assertTrue( "1.2.3 did not match the range " + rangeS, range.includes( "1.2.3" ) );
+        assertFalse( "1.2.2 does matches the range " + rangeS, range.includes( "1.2.2" ) );
+        assertTrue( "2.0.0 does matches the range " + rangeS, range.includes( "2.0.0" ) );
+        assertTrue( "3.1.0 does matches the range " + rangeS, range.includes( "3.1.0" ) );
+    }
+
+    public void test6Digits()
+        throws VersionException
+    {
+        String rangeS = "[ 1.0.0.1.2.1 , )";
+        range = new MavenVersionRange( rangeS );
+
+        assertTrue( "1.0.0.1.2.1 did not match the range " + rangeS, range.includes( "1.0.0.1.2.1" ) );
+        assertTrue( "1.0.0.1.2.2 did not match the range " + rangeS, range.includes( "1.0.0.1.2.2" ) );
+        assertTrue( "1.0.0.1.3.0 did not match the range " + rangeS, range.includes( "1.0.0.1.3.0" ) );
+        assertFalse( "1.0.0.1.2.0 does matches the range " + rangeS, range.includes( "1.0.0.1.2.0" ) );
+        assertFalse( "1.0.0.1.2.1-alpha-1 does match the range " + rangeS, range.includes( "1.0.0.1.2.1-alpha-1" ) );
+        assertTrue( "1.0.0.1.2.2-alpha-1 does not match the range " + rangeS, range.includes( "1.0.0.1.2.2-alpha-1" ) );
+    }
+
+    public void testAlphaNumeric()
+        throws VersionException
+    {
+        String rangeS = "[1.0.0.0.22,)";
+        range = new MavenVersionRange( rangeS );
+
+        assertFalse( "1.0.0.0.9 does match the range " + rangeS, range.includes( "1.0.0.0.9" ) );
+    }
+
+    public void testEdge()
+        throws VersionException
+    {
+        String rangeS = "[1.0,2.0)";
+        range = new MavenVersionRange( rangeS );
+
+        assertFalse( range.includes( "1.0-SNAPSHOT" ) );
+        assertTrue( range.includes( "1.1-SNAPSHOT" ) );
+        assertTrue( range.includes( "2.0-SNAPSHOT" ) );
+        assertFalse( range.includes( "2.0-20080815.235653-15" ) ); // this is still considered a release :(
+        assertTrue( range.includes( "2.0-alpha-1" ) );
+        assertFalse( range.includes( "2.0" ) );
+    }
+
+    public void testBetaEdge()
+        throws VersionException
+    {
+        String rangeS = "[1.0,2.0)";
+        range = new MavenVersionRange( rangeS );
+        range.setToQualityRange( new QualityRange( Quality.BETA_QUALITY, true, Quality.RELEASE_QUALITY, true ) );
+
+        assertFalse( range.includes( "1.0-SNAPSHOT" ) );
+        assertTrue( range.includes( "1.1-SNAPSHOT" ) );
+        assertFalse( range.includes( "2.0-SNAPSHOT" ) );
+        assertFalse( range.includes( "2.0-20080815.235653-15" ) );
+        assertFalse( range.includes( "2.0-alpha-35" ) );
+        assertTrue( range.includes( "2.0-beta-1" ) );
+        assertFalse( range.includes( "2.0" ) );
+    }
+
+    public void testAlphaEdge()
+        throws VersionException
+    {
+        String rangeS = "[1.0,2.0)";
+        range = new MavenVersionRange( rangeS );
+        range.setToQualityRange( new QualityRange( Quality.ALPHA_QUALITY, true, Quality.RELEASE_QUALITY, true ) );
+
+        assertFalse( range.includes( "1.0-SNAPSHOT" ) );
+        assertTrue( range.includes( "1.1-SNAPSHOT" ) );
+        assertFalse( range.includes( "2.0-SNAPSHOT" ) );
+        assertFalse( range.includes( "2.0-20080815.235653-15" ) );
+        assertTrue( range.includes( "2.0-alpha-35" ) );
+        assertTrue( range.includes( "2.0-beta-1" ) );
+        assertFalse( range.includes( "2.0" ) );
+    }
+
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/MavenVersionRangeTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/MavenVersionRangeTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,45 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.artifact.version;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.mercury.artifact.Quality;
+
+/**
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
+public class QualityTest
+    extends TestCase
+{
+    Quality q;
+
+    public void testEquality()
+    {
+        q = new Quality( "LATEST" );
+        assertTrue( q.equals( Quality.FIXED_LATEST_QUALITY ) );
+
+        q = new Quality( "RELEASE" );
+        assertTrue( q.equals( Quality.FIXED_RELEASE_QUALITY ) );
+
+        q = new Quality( "1.1-SNAPSHOT" );
+        assertTrue( q.equals( Quality.SNAPSHOT_QUALITY ) );
+    }
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,154 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.crypto.pgp;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.mercury.crypto.api.StreamObserverException;
+import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class PgpStreamVerifierTest
+    extends TestCase
+{
+  private static final String keyId   = "0EDB5D91141BC4F2";
+
+  private static final String secretKeyFile = "/secring.gpg";
+  private static final String secretKeyPass = "testKey82";
+
+  private static final String publicKeyFile = "/pubring.gpg";
+  
+  private PGPSecretKeyRing secretKeyRing;
+  private PGPSecretKey secretKey;
+  private PGPPublicKey publicKey;
+  
+  PgpStreamVerifierFactory svf;
+  
+  PgpStreamVerifier sv;
+
+  protected void setUp()
+      throws Exception
+  {
+    InputStream in = getClass().getResourceAsStream( secretKeyFile );
+    assertNotNull( in );
+    
+    secretKeyRing = PgpHelper.readKeyRing( in, keyId );
+    assertNotNull( secretKeyRing );
+    
+    secretKey = secretKeyRing.getSecretKey( Long.parseLong( keyId, 16 ) );
+    publicKey = secretKeyRing.getPublicKey();
+    
+    StreamVerifierAttributes attributes = new StreamVerifierAttributes(PgpStreamVerifierFactory.DEFAULT_EXTENSION, true, true);
+    
+    InputStream is = getClass().getResourceAsStream( publicKeyFile );
+    svf = new PgpStreamVerifierFactory( attributes, is );
+    is.close();
+    
+    is = getClass().getResourceAsStream( secretKeyFile );
+    svf.init( is, keyId, secretKeyPass );
+    is.close();
+  }
+
+  protected void tearDown()
+      throws Exception
+  {
+    super.tearDown();
+  }
+  //-------------------------------------------------------------------------------------------------
+  public void testGenerateSignature()
+  throws IOException, StreamObserverException
+  {
+    PgpStreamVerifier sv = (PgpStreamVerifier)svf.newInstance();
+    InputStream in = getClass().getResourceAsStream( "/file.gif" );
+    
+    int b;
+    while( (b = in.read()) != -1 )
+      sv.byteReady( b );
+    
+    String sig = sv.getSignature();
+    
+    assertNotNull( sig );
+    
+    assertTrue( sig.length() > 10 );
+    
+//    System.out.println("Signature is \n"+sig+"\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
+  }
+  //-------------------------------------------------------------------------------------------------
+  public void testVerifySignature()
+  throws IOException, StreamObserverException
+  {
+    PgpStreamVerifier sv = (PgpStreamVerifier)svf.newInstance();
+
+    InputStream in = getClass().getResourceAsStream( "/file.gif" );
+    String sig = PgpHelper.streamToString( getClass().getResourceAsStream( "/file.gif.asc" ) );
+    
+    sv.initSignature( sig );
+    
+    int b;
+    while( (b = in.read()) != -1 )
+      sv.byteReady( b );
+    
+    boolean verified = sv.verifySignature();
+    
+    assertTrue( verified );
+    
+    System.out.println("BouncyCastle Signature is "+verified);
+  }
+  //-------------------------------------------------------------------------------------------------
+  public void testVerifyExternalSignature2()
+  throws IOException, StreamObserverException
+  {
+    InputStream in = getClass().getResourceAsStream( "/file.gif" );
+    InputStream sig = getClass().getResourceAsStream( "/file.gif.asc.external" );
+    InputStream publicKeyRingStream = getClass().getResourceAsStream( publicKeyFile );
+    
+    boolean verified = PgpHelper.verifyStream( in, sig, publicKeyRingStream );
+    
+    assertTrue( verified );
+    
+    System.out.println("3rd Party Signature is "+verified);
+  }
+  //-------------------------------------------------------------------------------------------------
+  public void testVerifyBCSignature()
+  throws IOException, StreamObserverException
+  {
+    InputStream in = getClass().getResourceAsStream( "/file.gif" );
+    InputStream sig = getClass().getResourceAsStream( "/file.gif.asc" );
+    InputStream publicKeyRingStream = getClass().getResourceAsStream( publicKeyFile );
+    
+    boolean verified = PgpHelper.verifyStream( in, sig, publicKeyRingStream );
+    
+    assertTrue( verified );
+    
+    System.out.println("BC Signature is "+verified);
+  }
+  //-------------------------------------------------------------------------------------------------
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,207 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.event;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.mercury.event.MercuryEvent.EventMask;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class EventFrameworkTest
+extends TestCase
+{
+  static final int THREAD_COUNT = 5;
+  static final int EVENT_COUNT  = 10;
+  
+  ExecutorService es;
+  
+  EventManager em;
+  
+  Listener listener;
+  
+  @Override
+  protected void setUp()
+  throws Exception
+  {
+    es = Executors.newFixedThreadPool( THREAD_COUNT );
+  }
+  
+  public void testListenAllEvents()
+  throws Exception
+  {
+    runTest( null, null, THREAD_COUNT * EventFrameworkTest.EVENT_COUNT,  THREAD_COUNT * EventFrameworkTest.EVENT_COUNT );
+  }
+
+  public void testListenMaskedListenerEvents()
+  throws Exception
+  {
+    runTest(  null
+            , new MercuryEvent.EventMask(EventTypeEnum.localRepository)
+            , THREAD_COUNT * EventFrameworkTest.EVENT_COUNT
+            , 0
+           );
+  }
+
+  public void testListenMaskedManagerEvents()
+  throws Exception
+  {
+    runTest( new MercuryEvent.EventMask(EventTypeEnum.remoteRepository)
+            , null
+            , 0
+            , THREAD_COUNT * EventFrameworkTest.EVENT_COUNT
+       );
+  }
+
+  public void testListenMismatchedMaskEvents()
+  throws Exception
+  {
+    runTest( new MercuryEvent.EventMask(EventTypeEnum.remoteRepository)
+            , new MercuryEvent.EventMask(EventTypeEnum.localRepository)
+            , 0
+            , 0
+          );
+  }
+  //-------------------------------------------------------------------------------------------------------------------------------
+  private void runTest( MercuryEvent.EventMask emMask, MercuryEvent.EventMask listenerMask, int expectedLocal, int expectedRemote )
+  throws Exception
+  {
+    em = new EventManager( emMask );
+    
+    listener = new Listener( listenerMask  );
+    
+    em.register( listener );
+
+    for( int i=0; i<THREAD_COUNT; i++ )
+    {
+      es.execute( new Generator( em, EventTypeEnum.localRepository, ""+i ) );
+    }
+
+    for( int i=0; i<THREAD_COUNT; i++ )
+    {
+      es.execute( new Generator( em, EventTypeEnum.remoteRepository, ""+i ) );
+    }
+    
+    es.awaitTermination( 2, TimeUnit.SECONDS );
+    
+    assertEquals( expectedLocal, listener.localRepoCount );
+    assertEquals( expectedRemote, listener.remoteRepoCount );
+  }
+}
+
+//=====================  helper classes  =====================
+class Listener
+implements MercuryEventListener
+{
+  MercuryEvent.EventMask _mask;
+  
+  int localRepoCount = 0;
+  
+  int remoteRepoCount = 0;
+  
+  public Listener( MercuryEvent.EventMask mask )
+  {
+    _mask = mask;
+  }
+
+  public void fire( MercuryEvent event )
+  {
+//    System.out.println( EventManager.toString( event ) );
+//    System.out.flush();
+    
+    if( event.getType().equals( EventTypeEnum.localRepository ) )
+      ++localRepoCount;
+    else
+      if( event.getType().equals( EventTypeEnum.remoteRepository ) )
+        ++remoteRepoCount;
+  }
+
+  public EventMask getMask()
+  {
+    return _mask;
+  }
+  
+}
+
+class Generator
+implements Runnable, EventGenerator
+{
+  
+  EventManager _eventManager;
+  
+  String _msg;
+  
+  EventTypeEnum _myType;
+  
+  public Generator( EventManager em, EventTypeEnum type, String msg  )
+  {
+    _eventManager = em;
+    _msg = msg;
+    _myType = type;
+  }
+  
+  public void run()
+  {
+    for( int i=0; i< EventFrameworkTest.EVENT_COUNT; i++ )
+      try
+      {
+        GenericEvent event = new GenericEvent( _myType, _msg );
+        Thread.sleep( (int)(100.0*Math.random()) );
+        event.stop();
+        _eventManager.fireEvent( event );
+      }
+      catch( InterruptedException e )
+      {
+        return;
+      }
+  }
+
+  public void register( MercuryEventListener listener )
+  {
+    if( _eventManager == null )
+      _eventManager = new EventManager();
+      
+    _eventManager.register( listener );
+  }
+
+  public void unRegister( MercuryEventListener listener )
+  {
+    if( _eventManager != null )
+      _eventManager.unRegister( listener );
+  }
+  
+  public void setEventManager( EventManager eventManager )
+  {
+    if( _eventManager == null )
+      _eventManager = eventManager;
+    else
+      _eventManager.getListeners().addAll( eventManager.getListeners() );
+      
+  }
+}
+

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,61 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.metadata;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.MetadataTreeNode;
+
+public abstract class AbstractSimpleTreeTest
+extends TestCase
+{
+  //       b:b:1
+  //      / 
+  // a:a:1       b:b:2
+  //    \     /
+  //     c:c:1
+  //          \ b:b:1
+  
+  ArtifactMetadata mdaa1 = new ArtifactMetadata("a:a:1");
+  ArtifactMetadata mdbb1 = new ArtifactMetadata("b:b:1");
+  ArtifactMetadata mdbb2 = new ArtifactMetadata("b:b:2");
+  ArtifactMetadata mdcc1 = new ArtifactMetadata("c:c:1");
+  
+  MetadataTreeNode aa1;
+  MetadataTreeNode bb1;
+  MetadataTreeNode cc1;
+  MetadataTreeNode cc1bb1;
+  MetadataTreeNode cc1bb2;
+  
+  @Override
+  protected void setUp() throws Exception
+  {
+    aa1 = new MetadataTreeNode( mdaa1, null, mdaa1 );
+    bb1 = new MetadataTreeNode( mdbb1, aa1, mdbb1 );
+    aa1.addChild(bb1);
+    cc1 = new MetadataTreeNode( mdcc1, aa1, mdcc1 );
+    aa1.addChild(cc1);
+    cc1bb1 = new MetadataTreeNode( mdbb1, cc1, mdbb1 );
+    cc1.addChild( cc1bb1 );
+    cc1bb2 = new MetadataTreeNode( mdbb2, cc1, mdbb2 );
+    cc1.addChild( cc1bb2 );
+  }
+
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicDepthComparatorTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicDepthComparatorTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicDepthComparatorTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicDepthComparatorTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,65 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.metadata;
+
+import java.util.Comparator;
+
+import org.apache.maven.mercury.artifact.MetadataTreeNode;
+
+public class ClassicDepthComparatorTest
+extends AbstractSimpleTreeTest
+{
+  
+  @Override
+  protected void setUp()
+  throws Exception
+  {
+    super.setUp();
+  }
+
+  public void testNearestBest()
+  {
+    Comparator<MetadataTreeNode> comparator = new ClassicDepthComparator();
+    
+    int res = comparator.compare( bb1, cc1bb1 );
+    
+    assertTrue( "bb1 should be closer'n cc1bb1",  res > 0 );
+    
+    res = comparator.compare( bb1, cc1 );
+    assertTrue( "bb1 should be the same as cc1",  res == 0 );
+    
+    res = comparator.compare( cc1, aa1 );
+    assertTrue( "cc1 should be deeper'n aa11",  res < 0 );
+  }
+
+  public void testFarestBest()
+  {
+    Comparator<MetadataTreeNode> comparator = new ClassicDepthComparator(false);
+    
+    int res = comparator.compare( bb1, cc1bb1 );
+    
+    assertTrue( "bb1 should be closer'n cc1bb1",  res < 0 );
+    
+    res = comparator.compare( bb1, cc1 );
+    assertTrue( "bb1 should be the same as cc1",  res == 0 );
+    
+    res = comparator.compare( cc1, aa1 );
+    assertTrue( "cc1 should be deeper'n aa11",  res > 0 );
+  }
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicDepthComparatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicDepthComparatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicVersionComparatorTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicVersionComparatorTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicVersionComparatorTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicVersionComparatorTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,60 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.metadata;
+
+import java.util.Comparator;
+
+import org.apache.maven.mercury.artifact.MetadataTreeNode;
+
+
+public class ClassicVersionComparatorTest
+extends AbstractSimpleTreeTest
+{
+  
+  @Override
+  protected void setUp()
+  throws Exception
+  {
+    super.setUp();
+  }
+
+  public void testNewestBest()
+  {
+    Comparator<MetadataTreeNode> comparator = new ClassicVersionComparator();
+    
+    int res = comparator.compare( bb1, cc1bb1 );
+    
+    assertTrue( "bb1 should be the same cc1bb1",  res == 0 );
+    
+    res = comparator.compare( bb1, cc1bb2 );
+    assertTrue( "bb1 should be older'n cc1bb2",  res < 0 );
+  }
+
+  public void testOldestBest()
+  {
+    Comparator<MetadataTreeNode> comparator = new ClassicVersionComparator(false);
+    
+    int res = comparator.compare( bb1, cc1bb1 );
+    
+    assertTrue( "bb1 should be the same cc1bb1",  res == 0 );
+    
+    res = comparator.compare( bb1, cc1bb2 );
+    assertTrue( "bb1 should be older'n cc1bb2",  res > 0 );
+  }
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicVersionComparatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/ClassicVersionComparatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java?rev=767705&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java (added)
+++ maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java Wed Apr 22 22:56:48 2009
@@ -0,0 +1,309 @@
+/**
+ *  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.
+ */
+package org.apache.maven.mercury.metadata;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
+import org.apache.maven.mercury.artifact.MetadataTreeNode;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
+import org.apache.maven.mercury.repository.api.Repository;
+import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
+import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
+
+
+/**
+ * 
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
+public class DependencyTreeBuilderTest
+extends TestCase
+{
+  private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( DependencyTreeBuilderTest.class ); 
+  
+//  ArtifactMetadata md = new ArtifactMetadata( "pmd:pmd:3.9" );
+//  File repo = new File("./target/test-classes/localRepo");
+
+  File repoDir = new File("./target/test-classes/controlledRepoSat");
+  
+  DependencyBuilder mt;
+  LocalRepositoryM2 localRepo;
+  List<Repository> reps;
+  DependencyProcessor processor;
+  
+  //----------------------------------------------------------------------------------------------
+  @Override
+  protected void setUp()
+  throws Exception
+  {
+    processor = new MetadataProcessorMock();
+    localRepo = new LocalRepositoryM2( "local", repoDir, new MetadataProcessorMock() );
+    
+    reps = new ArrayList<Repository>(4);
+    reps.add(  localRepo );
+
+    mt = new DependencyTreeBuilder( reps, null, null, null );
+  }
+  //----------------------------------------------------------------------------------------------
+  @Override
+  protected void tearDown()
+  throws Exception
+  {
+    super.tearDown();
+  }
+  //----------------------------------------------------------------------------------------------
+  private static boolean assertHasArtifact( List<ArtifactMetadata> res, String gav )
+  {
+    ArtifactMetadata gavMd = new ArtifactMetadata(gav);
+    
+    for( ArtifactMetadata md : res )
+      if( md.sameGAV( gavMd ) )
+        return true;
+    
+    return false;
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testCircularDependency()
+  {
+    ArtifactMetadata circularMd = new ArtifactMetadata( "a:a:1" );
+    try
+    {
+      mt.buildTree( circularMd, null );
+    }
+    catch (MetadataTreeException e)
+    {
+      assertTrue( "expected circular dependency exception, but got "+e.getClass().getName()
+          , e instanceof MetadataTreeCircularDependencyException
+      );
+      return;
+    }
+    fail("circular dependency was not detected");
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testBuildTree()
+  throws MetadataTreeException
+  {
+    ArtifactMetadata md = new ArtifactMetadata( "a:a:2" );
+    
+    MetadataTreeNode root = mt.buildTree( md, null );
+    assertNotNull( "null tree built", root );
+    assertEquals( "wrong tree size", 4, root.countNodes() );
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testResolveConflicts()
+  throws MetadataTreeException
+  {
+    ArtifactMetadata md = new ArtifactMetadata( "a:a:2" );
+    
+    MetadataTreeNode root = mt.buildTree( md, ArtifactScopeEnum.compile );
+    assertNotNull( "null tree built", root );
+    assertEquals( "wrong tree size", 4, root.countNodes() );
+
+    List<ArtifactMetadata> res = mt.resolveConflicts( root );
+    assertNotNull( "null resolution", res );
+    assertEquals( "wrong tree size", 3, res.size() );
+    
+    assertTrue( "no a:a:2 in the result", assertHasArtifact( res, "a:a:2" ) );
+    assertTrue( "no b:b:2 in the result", assertHasArtifact( res, "b:b:2" ) );
+    assertTrue( "no c:c:2 in the result", assertHasArtifact( res, "c:c:2" ) );
+    
+    System.out.println( "testResolveConflicts: " + res );
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testResolveScopedConflicts()
+  throws MetadataTreeException
+  {
+    ArtifactMetadata md = new ArtifactMetadata( "a:a:4" );
+    
+    MetadataTreeNode root = mt.buildTree( md, ArtifactScopeEnum.compile );
+    assertNotNull( "null tree built", root );
+    assertEquals( "wrong tree size", 3, root.countNodes() );
+
+    List<ArtifactMetadata> res = mt.resolveConflicts( root );
+    assertNotNull( "null resolution", res );
+    assertEquals( "wrong tree size", 2, res.size() );
+
+    System.out.println( "testResolveScopedConflicts: " + res );
+    
+    assertTrue( "no a:a:4 in the result", assertHasArtifact( res, "a:a:4" ) );
+    assertTrue( "no c:c:3 in the result", assertHasArtifact( res, "c:c:3" ) );
+    
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testResolveScopedConflictsWithFiltering()
+  throws MetadataTreeException
+  {
+    String title = "testResolveScopedConflictsWithFiltering";
+    ArtifactMetadata md = new ArtifactMetadata( "a:a:4" );
+    
+    List<ArtifactMetadata> exclusions = new ArrayList<ArtifactMetadata>();
+    exclusions.add( new ArtifactMetadata("c:c:3") );
+    md.setExclusions( exclusions );
+    
+    MetadataTreeNode root = mt.buildTree( md, ArtifactScopeEnum.compile );
+    assertNotNull( "null tree built", root );
+    assertEquals( "wrong tree size", 2, root.countNodes() );
+
+    List<ArtifactMetadata> res = mt.resolveConflicts( root );
+    assertNotNull( "null resolution", res );
+    assertEquals( "wrong tree size", 2, res.size() );
+
+    System.out.println( title+": " + res );
+    
+    assertTrue( assertHasArtifact( res, "a:a:4" ) );
+    assertFalse( assertHasArtifact( res, "c:c:3" ) );
+    
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testResolveScopedConflictsWithFilteringOne()
+  throws MetadataTreeException
+  {
+    String title = "testResolveScopedConflictsWithFilteringOne";
+    ArtifactMetadata md = new ArtifactMetadata( "a:a:2" );
+    
+    List<ArtifactMetadata> exclusions = new ArrayList<ArtifactMetadata>();
+    exclusions.add( new ArtifactMetadata("c:c:2") );
+    md.setExclusions( exclusions );
+    
+    MetadataTreeNode root = mt.buildTree( md, ArtifactScopeEnum.compile );
+    assertNotNull( "null tree built", root );
+    assertEquals( "wrong tree size", 3, root.countNodes() );
+
+    List<ArtifactMetadata> res = mt.resolveConflicts( root );
+    assertNotNull( "null resolution", res );
+    assertEquals( "wrong tree size", 2, res.size() );
+    
+    assertTrue( "no a:a:2 in the result", assertHasArtifact( res, "a:a:2" ) );
+    assertTrue( "no b:b:2 in the result", assertHasArtifact( res, "b:b:2" ) );
+    assertFalse( "no c:c:2 in the result", assertHasArtifact( res, "c:c:2" ) );
+    
+    System.out.println( title+": " + res );
+    
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testResolveScopedConflictsWithFilteringTwo()
+  throws MetadataTreeException
+  {
+    String title = "testResolveScopedConflictsWithFilteringTwo";
+    ArtifactMetadata md = new ArtifactMetadata( "a:a:2" );
+    
+    List<ArtifactMetadata> exclusions = new ArrayList<ArtifactMetadata>();
+    exclusions.add( new ArtifactMetadata("b:b:2") );
+    exclusions.add( new ArtifactMetadata("c:c:2") );
+    md.setExclusions( exclusions );
+    
+    MetadataTreeNode root = mt.buildTree( md, ArtifactScopeEnum.compile );
+    assertNotNull( "null tree built", root );
+    assertEquals( "wrong tree size", 2, root.countNodes() );
+
+    List<ArtifactMetadata> res = mt.resolveConflicts( root );
+    assertNotNull( "null resolution", res );
+    assertEquals( "wrong tree size", 2, res.size() );
+    
+    assertTrue( "no a:a:2 in the result", assertHasArtifact( res, "a:a:2" ) );
+    assertTrue( "no b:b:2 in the result", assertHasArtifact( res, "b:b:1" ) );
+    assertFalse( "no b:b:2 in the result", assertHasArtifact( res, "b:b:2" ) );
+    assertFalse( "no c:c:2 in the result", assertHasArtifact( res, "c:c:2" ) );
+    
+    System.out.println( title+": " + res );
+    
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testResolveScopedConflictsWithFilteringAll()
+  throws MetadataTreeException
+  {
+    String title = "testResolveScopedConflictsWithFilteringTwo";
+    ArtifactMetadata md = new ArtifactMetadata( "a:a:2" );
+    
+    List<ArtifactMetadata> exclusions = new ArrayList<ArtifactMetadata>();
+    exclusions.add( new ArtifactMetadata("b:b:1") );
+    exclusions.add( new ArtifactMetadata("b:b:2") );
+    exclusions.add( new ArtifactMetadata("c:c:2") );
+    md.setExclusions( exclusions );
+    
+    MetadataTreeNode root = mt.buildTree( md, ArtifactScopeEnum.compile );
+    assertNotNull( "null tree built", root );
+    assertEquals( "wrong tree size", 1, root.countNodes() );
+
+    List<ArtifactMetadata> res = mt.resolveConflicts( root );
+    assertNotNull( "null resolution", res );
+    assertEquals( "wrong tree size", 1, res.size() );
+    
+    assertTrue( "no a:a:2 in the result", assertHasArtifact( res, "a:a:2" ) );
+    assertFalse( "no b:b:1 in the result", assertHasArtifact( res, "b:b:1" ) );
+    assertFalse( "no b:b:2 in the result", assertHasArtifact( res, "b:b:2" ) );
+    assertFalse( "no c:c:2 in the result", assertHasArtifact( res, "c:c:2" ) );
+    
+    System.out.println( title+": " + res );
+    
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testResolveBigConflicts()
+  throws MetadataTreeException
+  {
+    ArtifactMetadata md = new ArtifactMetadata( "a:a:3" );
+    
+    MetadataTreeNode root = mt.buildTree( md, ArtifactScopeEnum.compile );
+    assertNotNull( "null tree built", root );
+    assertTrue( "wrong tree size, expected gte 4", 4 <= root.countNodes() );
+
+    List<ArtifactMetadata> res = mt.resolveConflicts( root );
+    assertNotNull( "null resolution", res );
+
+System.out.println("BigRes: "+res);    
+    
+    assertEquals( "wrong tree size", 3, res.size() );
+    
+//    assertTrue( "no a:a:2 in the result", assertHasArtifact( res, "a:a:2" ) );
+//    assertTrue( "no b:b:1 in the result", assertHasArtifact( res, "b:b:1" ) );
+//    assertTrue( "no c:c:2 in the result", assertHasArtifact( res, "c:c:2" ) );
+  }
+  //----------------------------------------------------------------------------------------------
+  public void testResolveMultiple()
+  throws MetadataTreeException
+  {
+    ArtifactMetadata md1 = new ArtifactMetadata( "a:a:3" );
+    ArtifactMetadata md2 = new ArtifactMetadata( "a:a:4" );
+    
+    MetadataTreeNode root = mt.buildTree( md1, ArtifactScopeEnum.compile );
+    assertNotNull( "null tree built", root );
+    assertTrue( "wrong tree size, expected gte 4", 4 <= root.countNodes() );
+
+    List<ArtifactMetadata> res = mt.resolveConflicts( root );
+    assertNotNull( "null resolution", res );
+
+    System.out.println("BigRes: "+res);    
+    
+    assertEquals( "wrong tree size", 3, res.size() );
+    
+//    assertTrue( "no a:a:2 in the result", assertHasArtifact( res, "a:a:2" ) );
+//    assertTrue( "no b:b:1 in the result", assertHasArtifact( res, "b:b:1" ) );
+//    assertTrue( "no c:c:2 in the result", assertHasArtifact( res, "c:c:2" ) );
+  }
+  //----------------------------------------------------------------------------------------------
+  //----------------------------------------------------------------------------------------------
+}

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-core/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision