This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch SLING-8569
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/SLING-8569 by this push:
new fabb89d SLING-8569 - Detect & reports PackageTypes and nesting
structures during conversion
fabb89d is described below
commit fabb89dae43677da33cccac2060d637fcece594c
Author: Simo Tripodi <[email protected]>
AuthorDate: Fri Jul 12 13:43:10 2019 +0200
SLING-8569 - Detect & reports PackageTypes and nesting structures during
conversion
fixed broken branch
---
.../cpconverter/ContentPackage2FeatureModelConverterTest.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git
a/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
b/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
index 617a6c2..f8808c7 100644
---
a/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
+++
b/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
@@ -47,6 +47,7 @@ import
org.apache.sling.feature.cpconverter.artifacts.DefaultArtifactsDeployer;
import org.apache.sling.feature.cpconverter.features.DefaultFeaturesManager;
import org.apache.sling.feature.cpconverter.filtering.RegexBasedResourceFilter;
import
org.apache.sling.feature.cpconverter.handlers.DefaultEntryHandlersManager;
+import
org.apache.sling.feature.cpconverter.vltpkg.DefaultPackagesEventsEmitter;
import org.apache.sling.feature.io.json.FeatureJSONReader;
import org.junit.After;
import org.junit.Before;
@@ -117,6 +118,7 @@ public class ContentPackage2FeatureModelConverterTest {
converter.setFeaturesManager(new DefaultFeaturesManager(true, 5,
outputDirectory, null, null))
.setBundlesDeployer(new
DefaultArtifactsDeployer(outputDirectory))
+
.setEmitter(DefaultPackagesEventsEmitter.open(outputDirectory))
.convert(packageFile);
verifyFeatureFile(outputDirectory,
@@ -274,6 +276,7 @@ public class ContentPackage2FeatureModelConverterTest {
converter.setFeaturesManager(new DefaultFeaturesManager(true, 5,
outputDirectory, null, null))
.setBundlesDeployer(new
DefaultArtifactsDeployer(outputDirectory))
+
.setEmitter(DefaultPackagesEventsEmitter.open(outputDirectory))
.convert(packageFile);
}
@@ -294,6 +297,7 @@ public class ContentPackage2FeatureModelConverterTest {
converter.setBundlesDeployer(new
DefaultArtifactsDeployer(outputDirectory))
.setFeaturesManager(new DefaultFeaturesManager(false, 5,
outputDirectory, null, null))
+
.setEmitter(DefaultPackagesEventsEmitter.open(outputDirectory))
.convert(packageFile);
String pid = "this.is.just.a.pid";
@@ -311,6 +315,7 @@ public class ContentPackage2FeatureModelConverterTest {
String overrideId =
"${project.groupId}:${project.artifactId}:slingosgifeature:asd.test.all-1.0.0:${project.version}";
converter.setFeaturesManager(new DefaultFeaturesManager(true, 5,
outputDirectory, overrideId, null))
.setBundlesDeployer(new
DefaultArtifactsDeployer(outputDirectory))
+
.setEmitter(DefaultPackagesEventsEmitter.open(outputDirectory))
.convert(packageFile);
verifyFeatureFile(outputDirectory,
@@ -378,6 +383,7 @@ public class ContentPackage2FeatureModelConverterTest {
converter.setFeaturesManager(new DefaultFeaturesManager(true, 5,
outputDirectory, null, null))
.setBundlesDeployer(new
DefaultArtifactsDeployer(outputDirectory))
+
.setEmitter(DefaultPackagesEventsEmitter.open(outputDirectory))
.convert(contentPackages[0]);
File featureFile = new File(outputDirectory, "test_a.json");