You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/03/31 11:48:51 UTC
[jackrabbit-filevault-package-maven-plugin] branch master updated:
add unit test for computing dependencies
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new a25777a add unit test for computing dependencies
a25777a is described below
commit a25777a9969f347b805bc5e50facc0fa0984d9e0
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Mar 31 13:48:43 2021 +0200
add unit test for computing dependencies
---
.../filevault/maven/packaging/GenerateMetadataMojo.java | 4 ++--
.../maven/packaging/MavenBasedPackageDependency.java | 8 ++++++++
.../maven/packaging/GenerateMetadataMojoTest.java | 14 ++++++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java
index e13e0ab..0c3d041 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojo.java
@@ -234,7 +234,7 @@ public class GenerateMetadataMojo extends AbstractMetadataPackageMojo {
* {@code ()} or excluded using brackets {@code []}
*/
@Parameter(property = "vault.dependencies")
- private Collection<MavenBasedPackageDependency> dependencies = new LinkedList<>();
+ Collection<MavenBasedPackageDependency> dependencies = new LinkedList<>();
/**
@@ -773,7 +773,7 @@ public class GenerateMetadataMojo extends AbstractMetadataPackageMojo {
* @return the dependency string
* @throws URISyntaxException
*/
- private String computeDependencies() throws IOException {
+ String computeDependencies() throws IOException {
String dependenciesString = null;
if (!dependencies.isEmpty()) {
MavenBasedPackageDependency.resolve(project, getLog(), dependencies);
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
index fa88841..5ef7dc9 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/MavenBasedPackageDependency.java
@@ -117,6 +117,14 @@ public class MavenBasedPackageDependency {
}
+ static MavenBasedPackageDependency fromGroupNameAndVersion(String group, String name, String version) {
+ MavenBasedPackageDependency dependency = new MavenBasedPackageDependency();
+ dependency.group = group;
+ dependency.name = name;
+ dependency.version = version;
+ return dependency;
+ }
+
/**
* Converts a list of {@link MavenBasedPackageDependency} instances to vault dependencies.
*
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojoTest.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojoTest.java
index fed386f..2355ce9 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojoTest.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojoTest.java
@@ -23,6 +23,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -123,6 +124,18 @@ public class GenerateMetadataMojoTest {
}
}
+ @Test
+ public void testComputeDependencies() throws IOException {
+ GenerateMetadataMojo mojo = new GenerateMetadataMojo();
+ mojo.dependencies = new ArrayList<>();
+ MavenBasedPackageDependency dependency = MavenBasedPackageDependency.fromGroupNameAndVersion("day/cq60/product", "cq-content", "[6.3.64,)");
+ mojo.dependencies.add(dependency);
+ dependency = MavenBasedPackageDependency.fromGroupNameAndVersion("mygroup", "mypackage", "[1,2)");
+ mojo.dependencies.add(dependency);
+ // upper bound of the first dependency is left out in case it is unlimited
+ Assert.assertEquals("day/cq60/product:cq-content:6.3.64,mygroup:mypackage:[1,2)", mojo.computeDependencies());
+ }
+
private void assertEscapedValueWorksInManifest(String value) throws IOException {
String escapedValue = GenerateMetadataMojo.escapeManifestValue(value);
Manifest manifest = new Manifest();
@@ -156,4 +169,5 @@ public class GenerateMetadataMojoTest {
return value.replaceAll("\r ", "");
}
+
}