Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84130DF4D for ; Wed, 26 Sep 2012 19:11:10 +0000 (UTC) Received: (qmail 92336 invoked by uid 500); 26 Sep 2012 19:11:08 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 91587 invoked by uid 500); 26 Sep 2012 19:11:07 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 91301 invoked by uid 99); 26 Sep 2012 19:11:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2012 19:11:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2012 19:11:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 69F05238896F; Wed, 26 Sep 2012 19:10:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1390679 - in /sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi: MockBundleContext.java MockComponentContext.java Date: Wed, 26 Sep 2012 19:10:21 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120926191021.69F05238896F@eris.apache.org> Author: justin Date: Wed Sep 26 19:10:20 2012 New Revision: 1390679 URL: http://svn.apache.org/viewvc?rev=1390679&view=rev Log: SLING-2606 - allow the MockBundleContext to be overridden Modified: sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java Modified: sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java?rev=1390679&r1=1390678&r2=1390679&view=diff ============================================================================== --- sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java (original) +++ sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundleContext.java Wed Sep 26 19:10:20 2012 @@ -33,7 +33,7 @@ import org.osgi.framework.ServiceListene import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -class MockBundleContext implements BundleContext { +public class MockBundleContext implements BundleContext { private MockBundle bundle; public MockBundleContext(MockBundle bundle) { Modified: sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java?rev=1390679&r1=1390678&r2=1390679&view=diff ============================================================================== --- sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java (original) +++ sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockComponentContext.java Wed Sep 26 19:10:20 2012 @@ -44,11 +44,20 @@ public class MockComponentContext implem public MockComponentContext(MockBundle bundle) { mockBundleContext = new MockBundleContext(bundle); } + + public MockComponentContext(MockBundleContext mockBundleContext) { + this.mockBundleContext = mockBundleContext; + } public MockComponentContext(MockBundle bundle, Servlet servlet) { mockBundleContext = new MockBundleContext(bundle); this.servlet = servlet; } + + public MockComponentContext(MockBundleContext mockBundleContext, Servlet servlet) { + this.mockBundleContext = mockBundleContext; + this.servlet = servlet; + } public void addService(ServiceReference reference, Object service) { services.put(reference, service);