Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SLING-11239 - ContentPackage2FeatureModelConverter prone to NPE #133

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

SLING-11239 - ContentPackage2FeatureModelConverter prone to NPE #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e128a2
Remove unused imports
rombert Mar 31, 2022
4d59241
SLING-11239 - ContentPackage2FeatureModelConverter prone to NPE
rombert Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...t/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.sling.feature.cpconverter;

import static org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter.SlingInitialContentPolicy.EXTRACT_AND_REMOVE;
import static org.apache.sling.feature.cpconverter.Util.normalize;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand Down Expand Up @@ -67,8 +66,6 @@
import org.apache.sling.feature.cpconverter.filtering.RegexBasedResourceFilter;
import org.apache.sling.feature.cpconverter.handlers.DefaultEntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.EntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.slinginitialcontent.BundleSlingInitialContentExtractor;
import org.apache.sling.feature.cpconverter.shared.ConverterConstants;
import org.apache.sling.feature.cpconverter.vltpkg.DefaultPackagesEventsEmitter;
import org.apache.sling.feature.io.json.FeatureJSONReader;
import org.junit.After;
Expand Down Expand Up @@ -220,6 +217,15 @@ public void convertContentPackage() throws Exception {
}
}

@Test
public void convertContentPackageWithDefaultConverter() throws Exception {
// this test verifies that the converter functions without any explicit dependencies set
// please ensure that it always passes and do not modify it to configure dependen
converter.close();
converter = new ContentPackage2FeatureModelConverter();
convertContentPackage();
}

@Test
public void convertContentPackageDropContentTypePackagePolicy() throws Exception {
URL packageUrl = getClass().getResource("test-content-package.zip");
Expand Down