You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2023/02/25 07:37:57 UTC
[maven] branch 770 created (now 7a0fa64e3)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch 770
in repository https://gitbox.apache.org/repos/asf/maven.git
at 7a0fa64e3 add tests for MNG-7700
This branch includes the following new commits:
new d33c37de7 wip
new 7a0fa64e3 add tests for MNG-7700
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 02/02: add tests for MNG-7700
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch 770
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7a0fa64e3d76183e232c679ce6715582ca11e189
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sat Feb 25 02:37:38 2023 -0500
add tests for MNG-7700
---
.../artifact/versioning/ComparableVersionTest.java | 36 +++++++++++++++++-----
1 file changed, 28 insertions(+), 8 deletions(-)
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index 6ddc29722..2f7c579cf 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
@SuppressWarnings("unchecked")
public class ComparableVersionTest {
- private Comparable newComparable(String version) {
+ private ComparableVersion newComparable(String version) {
ComparableVersion ret = new ComparableVersion(version);
String canonical = ret.getCanonical();
String parsedCanonical = new ComparableVersion(canonical).getCanonical();
@@ -94,11 +94,11 @@ public class ComparableVersionTest {
private void checkVersionsEqual(String v1, String v2) {
Comparable c1 = newComparable(v1);
Comparable c2 = newComparable(v2);
- assertTrue(c1.compareTo(c2) == 0, "expected " + v1 + " == " + v2);
- assertTrue(c2.compareTo(c1) == 0, "expected " + v2 + " == " + v1);
- assertTrue(c1.hashCode() == c2.hashCode(), "expected same hashcode for " + v1 + " and " + v2);
- assertTrue(c1.equals(c2), "expected " + v1 + ".equals( " + v2 + " )");
- assertTrue(c2.equals(c1), "expected " + v2 + ".equals( " + v1 + " )");
+ assertEquals(0, c1.compareTo(c2), "expected " + v1 + " == " + v2);
+ assertEquals(0, c2.compareTo(c1), "expected " + v2 + " == " + v1);
+ assertEquals(c1.hashCode(), c2.hashCode(), "expected same hashcode for " + v1 + " and " + v2);
+ assertEquals(c1, c2, "expected " + v1 + ".equals( " + v2 + " )");
+ assertEquals(c2, c1, "expected " + v2 + ".equals( " + v1 + " )");
}
private void checkVersionsArrayEqual(String[] array) {
@@ -207,7 +207,27 @@ public class ComparableVersionTest {
checkVersionsOrder("2.0.1", "2.0.1-123");
checkVersionsOrder("2.0.1-xyz", "2.0.1-123");
}
-
+
+ @Test
+ public void testLeadingZeroes() {
+ checkVersionsOrder("0.7", "2");
+ checkVersionsOrder( "0.2", "1.0.7");
+ }
+
+ @Test
+ public void testGetCanonical() {
+ // MNG-7700
+ newComparable("0.x");
+ newComparable("0-x");
+ newComparable("0.rc");
+ newComparable("0-1");
+
+ ComparableVersion version = new ComparableVersion("0.x");
+ assertEquals("x", version.getCanonical());
+ ComparableVersion version2 = new ComparableVersion("0.2");
+ assertEquals("0.2", version2.getCanonical());
+ }
+
/**
* Test <a href="https://issues.apache.org/jira/browse/MNG-5568">MNG-5568</a> edge case
* which was showing transitive inconsistency: since A > B and B > C then we should have A > C
@@ -342,7 +362,7 @@ public class ComparableVersionTest {
ComparableVersion c1 = new ComparableVersion("1");
c1.parseVersion("2");
- Comparable c2 = newComparable("2");
+ Comparable<?> c2 = newComparable("2");
assertEquals(c1, c2, "reused instance should be equivalent to new instance");
}
[maven] 01/02: wip
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch 770
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d33c37de73399d1cff237d987620bc50e20f35f8
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sat Feb 25 01:58:15 2023 -0500
wip
---
.../java/org/apache/maven/artifact/versioning/ComparableVersion.java | 2 +-
.../org/apache/maven/artifact/versioning/ComparableVersionTest.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index ff6310821..ef84afdcf 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -58,7 +58,7 @@ import java.util.Properties;
* over {@code 1.0.0.X1}.</li>
* </ul>
*
- * @see <a href="https://cwiki.apache.org/confluence/display/MAVENOLD/Versioning">"Versioning" on Maven Wiki</a>
+ * @see <a href="https://maven.apache.org/pom.html#version-order-specification">"Versioning" in the POM reference</a>
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
* @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
*/
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index 5695a2b9a..6ddc29722 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -37,7 +37,6 @@ public class ComparableVersionTest {
String canonical = ret.getCanonical();
String parsedCanonical = new ComparableVersion(canonical).getCanonical();
- System.out.println("canonical( " + version + " ) = " + canonical);
assertEquals(
canonical,
parsedCanonical,