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 2018/07/31 10:00:24 UTC
[sling-org-apache-sling-testing-osgi-mock] branch master updated
(06443ce -> bf71f40)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git.
from 06443ce SLING-7769 osgi-mock: Remove compile dependencies to findbugs and animal sniffer annotations
add 01d0eba SLING-7788: added ignored test for ServiceTracker
add 2c5abc6 SLING-7788: restructured MockServiceRegistration
new 2883d38 SLING-7788 always initialize array with proper size
new bf71f40 Merge branch 'SLING-7788'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../testing/mock/osgi/MockServiceRegistration.java | 8 +++---
.../mock/osgi/context/OsgiContextImplTest.java | 33 ++++++++++++++++++++++
...sting.mock.osgi.context.OsgiContextImplTest.xml | 27 ++++++++++++++++++
3 files changed, 64 insertions(+), 4 deletions(-)
create mode 100644 src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.context.OsgiContextImplTest.xml
[sling-org-apache-sling-testing-osgi-mock] 02/02: Merge branch
'SLING-7788'
Posted by ss...@apache.org.
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 bf71f40288c140b9206b1e55b9e90b21431a29a5
Merge: 06443ce 2883d38
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Jul 31 11:59:57 2018 +0200
Merge branch 'SLING-7788'
.../testing/mock/osgi/MockServiceRegistration.java | 8 +++---
.../mock/osgi/context/OsgiContextImplTest.java | 33 ++++++++++++++++++++++
...sting.mock.osgi.context.OsgiContextImplTest.xml | 27 ++++++++++++++++++
3 files changed, 64 insertions(+), 4 deletions(-)
[sling-org-apache-sling-testing-osgi-mock] 01/02: SLING-7788 always
initialize array with proper size
Posted by ss...@apache.org.
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 2883d389dff97140e6c3cf7435fd8819e6ee7b47
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Jul 31 11:58:52 2018 +0200
SLING-7788 always initialize array with proper size
---
.../org/apache/sling/testing/mock/osgi/MockServiceRegistration.java | 2 +-
.../org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java b/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java
index 94c3cec..57b8c3b 100644
--- a/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java
+++ b/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java
@@ -66,7 +66,7 @@ class MockServiceRegistration<T> implements ServiceRegistration<T>, Comparable<M
this.properties = properties != null ? properties : new Hashtable<String,Object>();
this.properties.put(Constants.SERVICE_ID, this.serviceId);
- this.properties.put(Constants.OBJECTCLASS, this.clazzes.toArray(new String[0]));
+ this.properties.put(Constants.OBJECTCLASS, this.clazzes.toArray(new String[this.clazzes.size()]));
this.serviceReference = new MockServiceReference<T>(bundle, this);
this.bundleContext = bundleContext;
}
diff --git a/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java b/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java
index 174c6a1..d4bee18 100644
--- a/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java
@@ -34,7 +34,6 @@ import org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest.ServiceInterface1;
import org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest.ServiceInterface2;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;