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/03/08 12:24:21 UTC
[sling-org-apache-sling-testing-osgi-mock] 01/03: Merge branch
'master' into feature/add-volatile-list-example
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-testing-osgi-mock.git
commit df60d1d235a6e3eb25d1fb25298ed3a64f2b623a
Merge: 47dc982 1265ada
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Mon Mar 8 11:38:16 2021 +0100
Merge branch 'master' into feature/add-volatile-list-example
core/pom.xml | 2 +-
.../testing/mock/osgi/ComponentContextBuilder.java | 16 ++---
.../sling/testing/mock/osgi/ManifestScanner.java | 6 +-
.../sling/testing/mock/osgi/MapMergeUtil.java | 16 ++---
.../apache/sling/testing/mock/osgi/MapUtil.java | 6 +-
.../apache/sling/testing/mock/osgi/MockBundle.java | 30 ++++----
.../sling/testing/mock/osgi/MockBundleContext.java | 28 ++++----
.../testing/mock/osgi/MockComponentContext.java | 2 +-
.../sling/testing/mock/osgi/MockConfiguration.java | 8 +--
.../testing/mock/osgi/MockConfigurationAdmin.java | 43 ++++++++----
.../sling/testing/mock/osgi/MockEventAdmin.java | 26 +++----
.../apache/sling/testing/mock/osgi/MockOsgi.java | 16 ++---
.../testing/mock/osgi/MockServiceReference.java | 4 +-
.../testing/mock/osgi/MockServiceRegistration.java | 6 +-
.../sling/testing/mock/osgi/OsgiMetadataUtil.java | 42 +++++------
.../sling/testing/mock/osgi/OsgiServiceUtil.java | 82 +++++++++++-----------
.../mock/osgi/context/AbstractContextPlugin.java | 2 +-
.../testing/mock/osgi/context/ContextPlugins.java | 22 +++---
.../testing/mock/osgi/context/OsgiContextImpl.java | 6 +-
.../sling/testing/mock/osgi/MapUtilTest.java | 14 ++--
...ckBundleContextDynamicReferencesOsgiR6Test.java | 62 ++++++++--------
.../MockBundleContextDynamicReferencesTest.java | 40 +++++------
...ockBundleContextStaticGreedyReferencesTest.java | 44 ++++++------
.../testing/mock/osgi/MockBundleContextTest.java | 56 +++++++--------
.../sling/testing/mock/osgi/MockBundleTest.java | 58 ++++++++-------
.../mock/osgi/MockComponentContextTest.java | 2 +-
.../mock/osgi/MockConfigurationAdminTest.java | 28 +++++++-
.../testing/mock/osgi/MockEventAdminTest.java | 24 +++----
.../mock/osgi/MockServiceReferencesSortTest.java | 18 ++---
.../testing/mock/osgi/OsgiServiceRegisterTest.java | 8 +--
.../OsgiServiceUtilActivateDeactivateTest.java | 62 ++++++++--------
.../testing/mock/osgi/OsgiServiceUtilTest.java | 10 +--
.../mock/osgi/context/ContextPluginsTest.java | 46 ++++++------
.../mock/osgi/context/OsgiContextImplTest.java | 4 +-
.../mock/osgi/junit/OsgiContextBuilder.java | 8 +--
.../mock/osgi/junit/OsgiContextCallback.java | 2 +-
core/src/test/resources/META-INF/test.txt | 2 +-
...sting.mock.osgi.context.OsgiContextImplTest.xml | 2 +-
.../src/test/resources/bundleData/nested/first.txt | 2 +-
.../test/resources/bundleData/nested/second.txt | 2 +-
junit4/pom.xml | 2 +-
.../mock/osgi/junit/OsgiContextBuilder.java | 8 +--
.../mock/osgi/junit/OsgiContextCallback.java | 2 +-
junit5/pom.xml | 6 +-
.../junit5/OsgiContextMemberInstantiatedTest.java | 2 +-
.../junit5/OsgiContextMemberSuperClassTest.java | 2 +-
.../mock/osgi/junit5/OsgiContextMemberTest.java | 2 +-
.../testing/mock/osgi/junit5/OsgiContextTest.java | 2 +-
parent/pom.xml | 4 +-
pom.xml | 2 +-
50 files changed, 463 insertions(+), 426 deletions(-)
diff --cc core/src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilTest.java
index d25a6db,7a847d7..3365140
--- a/core/src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilTest.java
+++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilTest.java
@@@ -622,66 -622,7 +622,66 @@@ public class OsgiServiceUtilTest
@Component(service = ServiceFactory1.class, servicefactory = true)
public static class ServiceFactory1 {
-
+
}
+ public interface RankedService {
+ int getRanking();
+ }
+
+ @Component(
+ properties = {
+ "service.ranking:Integer=5"
+ }
+ )
+ public static class RankedServiceFive implements RankedService {
+
+ private int ranking;
+
+ @Activate
+ public void activate(Map<String, Object> properties) {
+ this.ranking = (Integer) properties.get("service.ranking");
+ }
+
+ @Override
+ public int getRanking() {
+ return ranking;
+ }
+ }
+
+ @Component(
+ properties = {
+ "service.ranking:Integer=10"
+ }
+ )
+ public static class RankedServiceTen implements RankedService {
+
+ private int ranking;
+
+ @Activate
+ public void activate(Map<String, Object> properties) {
+ this.ranking = (Integer) properties.get("service.ranking");
+ }
+
+ @Override
+ public int getRanking() {
+ return ranking;
+ }
+ }
+
+ @Component(service = Service6VolatileMultipleReferences.class)
+ public static class Service6VolatileMultipleReferences {
+
+ @Reference
+ private volatile List<RankedService> rankedServices;
+
+ public String getRanks() {
+ StringBuilder builder = new StringBuilder();
+ for(RankedService rankedService : rankedServices) {
+ builder.append(rankedService.getClass().getSimpleName()).append("=").append(rankedService.getRanking());
+ }
+ return builder.toString();
+ }
+ }
+
}