This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 65289c0 SLING-8028 Split FeatureExtensionHandler into MergeHandler
and PostProcessor
65289c0 is described below
commit 65289c06b4dea2b8e2c5f493e9b920e9fcd18f40
Author: David Bosschaert <[email protected]>
AuthorDate: Wed Oct 31 08:57:41 2018 +0000
SLING-8028 Split FeatureExtensionHandler into MergeHandler and PostProcessor
Re-enable temporarily disabled unit tests
---
.../maven/mojos/AggregateFeaturesMojoTest.java | 49 +++++++++++-----------
...pache.sling.feature.builder.PostProcessHandler} | 0
2 files changed, 24 insertions(+), 25 deletions(-)
diff --git
a/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojoTest.java
b/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojoTest.java
index 7b27110..d74ff47 100644
---
a/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojoTest.java
+++
b/src/test/java/org/apache/sling/feature/maven/mojos/AggregateFeaturesMojoTest.java
@@ -16,29 +16,6 @@
*/
package org.apache.sling.feature.maven.mojos;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Field;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -57,12 +34,34 @@ import org.apache.sling.feature.io.json.FeatureJSONReader;
import
org.apache.sling.feature.maven.mojos.AggregateFeaturesMojo.FeatureConfig;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import java.io.File;
+import java.io.FileReader;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class AggregateFeaturesMojoTest {
private Path tempDir;
private static Map<String, ArtifactId> pluginCallbacks;
@@ -531,7 +530,7 @@ public class AggregateFeaturesMojoTest {
assertEquals("Expected only one bundle", 1, numFound);
}
- @Test @Ignore("Need to fix this test")
+ @Test
public void testPluginHandling() throws Exception {
File featuresDir = new File(
getClass().getResource("/aggregate-features/dir3").getFile());
diff --git
a/src/test/resources/META-INF/services/org.apache.sling.feature.builder.FeatureExtensionHandler
b/src/test/resources/META-INF/services/org.apache.sling.feature.builder.PostProcessHandler
similarity index 100%
rename from
src/test/resources/META-INF/services/org.apache.sling.feature.builder.FeatureExtensionHandler
rename to
src/test/resources/META-INF/services/org.apache.sling.feature.builder.PostProcessHandler
