commit fabb89dae43677da33cccac2060d637fcece594c
author Simo Tripodi <stripodi@adobe.com> Fri Jul 12 13:43:10 2019 +0200
committer Simo Tripodi <stripodi@adobe.com> Fri Jul 12 13:43:10 2019 +0200
tree a29676aa967100dd72cde510558159dee34aa29b
parent 3b55351b80edf6c17aadbd2ad48b063e1d55afa8

SLING-8569 - Detect & reports PackageTypes and nesting structures during
conversion

fixed broken branch

src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java

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.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 @@
 
         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 @@
 
         converter.setFeaturesManager(new DefaultFeaturesManager(true, 5, outputDirectory, null, null))
                  .setBundlesDeployer(new DefaultArtifactsDeployer(outputDirectory))
+                 .setEmitter(DefaultPackagesEventsEmitter.open(outputDirectory))
                  .convert(packageFile);
     }
 
@@ -294,6 +297,7 @@
 
         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 @@
         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 @@
 
         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");