Add testcase for version ranges in version-plugin

eclipse-tycho · Jan 18, 2024 · 8a9d8fa · 8a9d8fa
1 parent d099c82
commit 8a9d8fa
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 3 deletions.
diff --git a/...ects/tycho-version-plugin/set-version/version_ranges/consumer.narrow/META-INF/MANIFEST.MF b/...ects/tycho-version-plugin/set-version/version_ranges/consumer.narrow/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test Bundle
+Bundle-SymbolicName: consumer.narrow
+Bundle-Version: 1.0.0.qualifier
+Import-Package: my.pkg;version="[1.0.0,1.1.0)"
+Require-Bundle: provider.bundle;bundle-version="[1.0.0,1.1.0)"
+
diff --git a/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/consumer.narrow/pom.xml b/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/consumer.narrow/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.tycho.its</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>consumer.narrow</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/...ojects/tycho-version-plugin/set-version/version_ranges/consumer.open/META-INF/MANIFEST.MF b/...ojects/tycho-version-plugin/set-version/version_ranges/consumer.open/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test Bundle
+Bundle-SymbolicName: consumer.open
+Bundle-Version: 1.0.0.qualifier
+Import-Package: my.pkg;version="1.0.0"
+Require-Bundle: provider.bundle;bundle-version="1.0.0"
+
diff --git a/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/consumer.open/pom.xml b/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/consumer.open/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.tycho.its</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>consumer.open</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/...ojects/tycho-version-plugin/set-version/version_ranges/consumer.wide/META-INF/MANIFEST.MF b/...ojects/tycho-version-plugin/set-version/version_ranges/consumer.wide/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test Bundle
+Bundle-SymbolicName: consumer.wide
+Bundle-Version: 1.0.0.qualifier
+Import-Package: my.pkg;version="[1.0.0,2.0.0)"
+Require-Bundle: provider.bundle;bundle-version="[1.0.0,2.0.0)"
+
diff --git a/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/consumer.wide/pom.xml b/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/consumer.wide/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.tycho.its</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>consumer.wide</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/pom.xml b/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.tycho.its</groupId>
+	<artifactId>parent</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<modules>
+		<module>provider.bundle</module>
+		<module>consumer.narrow</module>
+		<module>consumer.wide</module>
+		<module>consumer.open</module>
+	</modules>
+	<properties>
+		<tycho-version>5.0.0-SNAPSHOT</tycho-version>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/...ects/tycho-version-plugin/set-version/version_ranges/provider.bundle/META-INF/MANIFEST.MF b/...ects/tycho-version-plugin/set-version/version_ranges/provider.bundle/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test Bundle
+Bundle-SymbolicName: provider.bundle
+Bundle-Version: 1.0.0.qualifier
+Export-Package: my.pkg;version="1.0.0"
+
diff --git a/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/provider.bundle/pom.xml b/tycho-its/projects/tycho-version-plugin/set-version/version_ranges/provider.bundle/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.tycho.its</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>provider.bundle</artifactId>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/...in/src/main/java/org/eclipse/tycho/versions/engine/DefaultVersionRangeUpdateStrategy.java b/...in/src/main/java/org/eclipse/tycho/versions/engine/DefaultVersionRangeUpdateStrategy.java
@@ -49,15 +49,15 @@ private VersionRange computeNewVersionRange(VersionRange versionRange, Version o
             Version newReferencedVersion, Version newArtifactVersion) {
         VersionRange newVersionRange;
         if (updateMatchingBounds) {
-            newVersionRange = handleMatchingBouds(versionRange, originalReferencedVersion, newReferencedVersion);
+            newVersionRange = handleMatchingBounds(versionRange, originalReferencedVersion, newReferencedVersion);
         } else {
             newVersionRange = versionRange;
         }
         return handleNewlyOutOfScopeVersions(newVersionRange, originalReferencedVersion, newReferencedVersion,
                 newArtifactVersion);
     }
 
-    private VersionRange handleMatchingBouds(VersionRange versionRange, Version originalReferencedVersion,
+    private VersionRange handleMatchingBounds(VersionRange versionRange, Version originalReferencedVersion,
             Version newReferencedVersion) {
         Version newLeft;
         if (versionRange.getLeft().equals(originalReferencedVersion)) {

diff --git a/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/engine/VersionsEngine.java b/tycho-versions-plugin/src/main/java/org/eclipse/tycho/versions/engine/VersionsEngine.java
@@ -112,7 +112,7 @@ public void reset() {
     public void apply() throws IOException {
 
         VersionChangesDescriptor versionChangeContext = new VersionChangesDescriptor(originalVersionChanges,
-                new DefaultVersionRangeUpdateStrategy(updateVersionRangeMatchingBounds), projects);
+                new DefaultVersionRangeUpdateStrategy(isUpdateVersionRangeMatchingBounds()), projects);
 
         // collecting secondary changes
         boolean newChanges = true;