You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/12/15 17:29:09 UTC
[sling-org-apache-sling-caconfig-bnd-plugin] branch master updated: update testing dependencies
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new a299b7f update testing dependencies
a299b7f is described below
commit a299b7f13297cfe914be96105b282760f95a704e
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Dec 15 18:28:37 2021 +0100
update testing dependencies
---
pom.xml | 13 +++++++------
.../bndplugin/AbstractConfigurationClassScannerPlugin.java | 12 ++++++------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index f74bc61..346e0e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,11 +57,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -69,7 +64,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.2.15</version>
+ <version>4.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java b/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
index e0e9e31..4e3e158 100644
--- a/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
+++ b/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
@@ -33,7 +33,7 @@ import org.apache.commons.lang3.StringUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import aQute.bnd.osgi.Builder;
import aQute.bnd.osgi.Jar;
@@ -42,19 +42,19 @@ import aQute.service.reporter.Reporter;
@RunWith(MockitoJUnitRunner.class)
public abstract class AbstractConfigurationClassScannerPlugin {
-
+
protected Builder builder;
@Before
public final void setUp() throws Exception {
builder = new Builder();
-
+
Jar classesDirJar = new Jar("test.jar", new File("target/test-classes"));
classesDirJar.setManifest(new Manifest());
builder.setJar(classesDirJar);
-
+
builder.setSourcepath(new File[] { new File("src/test/java") } );
-
+
Plugin plugin = new ConfigurationClassScannerPlugin();
plugin.setReporter(mock(Reporter.class));
plugin.setProperties(new HashMap<String,String>());
@@ -68,7 +68,7 @@ public abstract class AbstractConfigurationClassScannerPlugin {
}
builder.close();
}
-
+
protected final void assertHeader(Jar jar, String headerName, String... headerValues) throws Exception {
Set<String> expectedValues = new HashSet<>(Arrays.asList(headerValues));
String[] actual = StringUtils.split(jar.getManifest().getMainAttributes().getValue(headerName), ",");