Author: tomekr Date: Fri May 12 10:59:54 2017 New Revision: 1794953 URL: http://svn.apache.org/viewvc?rev=1794953&view=rev Log: OAK-6050: Unify used version of osgi-mock
Original patch provided by [email protected] Modified: jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java jackrabbit/oak/trunk/oak-parent/pom.xml jackrabbit/oak/trunk/oak-segment-tar/pom.xml jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java Modified: jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java (original) +++ jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java Fri May 12 10:59:54 2017 @@ -127,7 +127,7 @@ public class SynMBeanImplOSGiTest extend context.registerService(ContentRepository.class, getContentRepository()); context.registerService(SecurityProvider.class, getSecurityProvider()); - MockOsgi.deactivate(externalLoginModuleFactory); + MockOsgi.deactivate(externalLoginModuleFactory, context.bundleContext()); assertSyncBeanRegistration(externalLoginModuleFactory, false); } Modified: jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java (original) +++ jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java Fri May 12 10:59:54 2017 @@ -55,6 +55,7 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import static org.junit.Assert.assertEquals; @@ -79,7 +80,7 @@ public class ExternalPrincipalConfigurat } private void enable() { - context.registerService(DefaultSyncHandler.class, new DefaultSyncHandler(), ImmutableMap.<String, Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true)); + context.registerService(SyncHandler.class, new DefaultSyncHandler(), ImmutableMap.<String, Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true)); } private void assertIsEnabled(ExternalPrincipalConfiguration externalPrincipalConfiguration, boolean expected) throws Exception { @@ -260,9 +261,10 @@ public class ExternalPrincipalConfigurat DefaultSyncHandler sh = new DefaultSyncHandler(); BundleContext bundleContext = context.bundleContext(); - ServiceRegistration registration1 = bundleContext.registerService(DefaultSyncHandler.class.getName(), sh, enableProps); - ServiceRegistration registration2 = bundleContext.registerService(DefaultSyncHandler.class.getName(), sh, enableProps); - ServiceRegistration registration3 = bundleContext.registerService(DefaultSyncHandler.class.getName(), sh, disableProps); + ServiceRegistration registration1 = bundleContext.registerService(SyncHandler.class.getName(), sh, enableProps); + ServiceRegistration registration2 = bundleContext.registerService(SyncHandler.class.getName(), sh, enableProps); + ServiceRegistration registration3 = bundleContext.registerService(SyncHandler.class.getName(), sh, disableProps); + assertIsEnabled(principalConfiguration, true); registration2.unregister(); Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java Fri May 12 10:59:54 2017 @@ -100,6 +100,6 @@ public class S3DataStoreServiceTest { } private void unregisterBlobStore() { - deactivate(service); + deactivate(service, context.bundleContext()); } } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java Fri May 12 10:59:54 2017 @@ -62,6 +62,6 @@ public class DocumentBlobTrackerRegistra @Override protected void unregisterNodeStoreService() { - deactivate(service); + deactivate(service, context.bundleContext()); } } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java Fri May 12 10:59:54 2017 @@ -62,7 +62,7 @@ public class DocumentNodeStoreServiceTes @After public void tearDown() throws Exception { - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); MongoUtils.dropCollections(MongoUtils.DB); } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java Fri May 12 10:59:54 2017 @@ -78,7 +78,7 @@ public class SecondaryStoreCacheServiceT assertNotNull(context.getService(BackgroundObserverMBean.class)); assertNotNull(context.getService(DocumentNodeStateCache.class)); - MockOsgi.deactivate(cacheService); + MockOsgi.deactivate(cacheService, context.bundleContext()); assertNull(context.getService(Observer.class)); assertNull(context.getService(BackgroundObserverMBean.class)); Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java Fri May 12 10:59:54 2017 @@ -76,7 +76,7 @@ public class AsyncIndexerServiceTest { assertNotNull(mbean); assertEquals("async", mbean.getName()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); assertNull(context.getService(Runnable.class)); assertTrue(indexUpdate.isClosed()); } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java Fri May 12 10:59:54 2017 @@ -64,7 +64,7 @@ public class PropertyIndexStatsTest { assertNotNull(context.getService(PropertyIndexStatsMBean.class)); - MockOsgi.deactivate(mbean); + MockOsgi.deactivate(mbean, context.bundleContext()); assertNull(context.getService(PropertyIndexStatsMBean.class)); } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java Fri May 12 10:59:54 2017 @@ -55,7 +55,7 @@ public class StatisticsProviderFactoryTe assertTrue(context.getService(StatisticsProvider.class) instanceof MetricStatisticsProvider); assertNotNull(context.getService(MetricRegistry.class)); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); assertNull(context.getService(StatisticsProvider.class)); } Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java (original) +++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java Fri May 12 10:59:54 2017 @@ -149,7 +149,7 @@ public class PrivateStoreValidatorProvid assertTrue(validator instanceof PrivateStoreValidatorProvider); assertTrue(((PrivateStoreValidatorProvider)validator).isFailOnDetection()); - MockOsgi.deactivate(privateStoreValidatorProvider); + MockOsgi.deactivate(privateStoreValidatorProvider, context.bundleContext()); assertNull(context.getService(EditorProvider.class)); } Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java (original) +++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java Fri May 12 10:59:54 2017 @@ -91,10 +91,10 @@ public class DocumentCachingDataStoreSta assertServiceActivated(); ConsolidatedDataStoreCacheStats dataStoreStats = - context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats(), null); + context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats()); assertNotNull(context.getService(ConsolidatedDataStoreCacheStatsMBean.class)); - deactivate(dataStoreStats); + deactivate(dataStoreStats, context.bundleContext()); unregisterDocumentNodeStoreService(); unregisterBlobStore(); delegateReg.unregister(); @@ -111,7 +111,7 @@ public class DocumentCachingDataStoreSta try { ConsolidatedDataStoreCacheStats dataStoreStats = - context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats(), null); + context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats()); assertNull(context.getService(ConsolidatedDataStoreCacheStatsMBean.class)); } finally { unregisterDocumentNodeStoreService(); @@ -133,7 +133,7 @@ public class DocumentCachingDataStoreSta } private void unregisterDocumentNodeStoreService() { - deactivate(documentNodeStoreService); + deactivate(documentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java (original) +++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java Fri May 12 10:59:54 2017 @@ -84,10 +84,10 @@ public class DocumentS3DataStoreStatsTes assertServiceActivated(); S3DataStoreStats s3DataStoreStats = - context.registerInjectActivateService(new S3DataStoreStats(), null); + context.registerInjectActivateService(new S3DataStoreStats()); assertNotNull(context.getService(S3DataStoreStatsMBean.class)); - deactivate(s3DataStoreStats); + deactivate(s3DataStoreStats, context.bundleContext()); unregisterDocumentNodeStoreService(); unregisterBlobStore(); delegateReg.unregister(); @@ -104,7 +104,7 @@ public class DocumentS3DataStoreStatsTes try { S3DataStoreStats s3DataStoreStats = - context.registerInjectActivateService(new S3DataStoreStats(), null); + context.registerInjectActivateService(new S3DataStoreStats()); assertNull(context.getService(S3DataStoreStatsMBean.class)); } finally { unregisterDocumentNodeStoreService(); @@ -126,7 +126,7 @@ public class DocumentS3DataStoreStatsTes } private void unregisterDocumentNodeStoreService() { - deactivate(documentNodeStoreService); + deactivate(documentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java (original) +++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java Fri May 12 10:59:54 2017 @@ -76,10 +76,10 @@ public class SegmentCachingDataStoreStat assertServiceActivated(); ConsolidatedDataStoreCacheStats dataStoreStats = - context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats(), null); + context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats()); assertNotNull(context.getService(ConsolidatedDataStoreCacheStatsMBean.class)); - deactivate(dataStoreStats); + deactivate(dataStoreStats, context.bundleContext()); unregisterSegmentNodeStoreService(); unregisterBlobStore(); delegateReg.unregister(); @@ -95,7 +95,7 @@ public class SegmentCachingDataStoreStat assertServiceActivated(); ConsolidatedDataStoreCacheStats dataStoreStats = - context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats(), null); + context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats()); assertNull(context.getService(ConsolidatedDataStoreCacheStatsMBean.class)); unregisterSegmentNodeStoreService(); @@ -115,7 +115,7 @@ public class SegmentCachingDataStoreStat } private void unregisterSegmentNodeStoreService() { - deactivate(segmentNodeStoreService); + deactivate(segmentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java (original) +++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java Fri May 12 10:59:54 2017 @@ -75,10 +75,10 @@ public class SegmentS3DataStoreStatsTest assertServiceActivated(); S3DataStoreStats s3DataStoreStats = - context.registerInjectActivateService(new S3DataStoreStats(), null); + context.registerInjectActivateService(new S3DataStoreStats()); assertNotNull(context.getService(S3DataStoreStatsMBean.class)); - deactivate(s3DataStoreStats); + deactivate(s3DataStoreStats, context.bundleContext()); unregisterSegmentNodeStoreService(); unregisterBlobStore(); delegateReg.unregister(); @@ -94,7 +94,7 @@ public class SegmentS3DataStoreStatsTest assertServiceActivated(); S3DataStoreStats s3DataStoreStats = - context.registerInjectActivateService(new S3DataStoreStats(), null); + context.registerInjectActivateService(new S3DataStoreStats()); assertNull(context.getService(S3DataStoreStatsMBean.class)); unregisterSegmentNodeStoreService(); @@ -114,7 +114,7 @@ public class SegmentS3DataStoreStatsTest } private void unregisterSegmentNodeStoreService() { - deactivate(segmentNodeStoreService); + deactivate(segmentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java Fri May 12 10:59:54 2017 @@ -84,7 +84,7 @@ public class LuceneIndexProviderServiceT context.registerService(MountInfoProvider.class, Mounts.defaultMountInfoProvider()); context.registerService(StatisticsProvider.class, StatisticsProvider.NOOP); context.registerService(ScorerProviderFactory.class, ScorerProviderFactory.DEFAULT); - context.registerService(IndexAugmentorFactory.class, mock(IndexAugmentorFactory.class)); + context.registerService(IndexAugmentorFactory.class, new IndexAugmentorFactory()); context.registerService(NodeStore.class, new MemoryNodeStore()); context.registerService(IndexPathService.class, mock(IndexPathService.class)); context.registerService(AsyncIndexInfoService.class, mock(AsyncIndexInfoService.class)); @@ -126,7 +126,7 @@ public class LuceneIndexProviderServiceT assertNotNull(context.getService(JournalPropertyService.class)); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -144,7 +144,7 @@ public class LuceneIndexProviderServiceT assertTrue(context.getService(Observer.class) instanceof LuceneIndexProvider); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -159,7 +159,7 @@ public class LuceneIndexProviderServiceT assertNotNull(editorProvider); assertNotNull(editorProvider.getIndexCopier()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -171,7 +171,7 @@ public class LuceneIndexProviderServiceT IndexCopier indexCopier = service.getIndexCopier(); assertTrue(indexCopier.isPrefetchEnabled()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -181,7 +181,7 @@ public class LuceneIndexProviderServiceT MockOsgi.activate(service, context.bundleContext(), config); assertEquals(LoggingInfoStream.INSTANCE, InfoStream.getDefault()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -196,7 +196,7 @@ public class LuceneIndexProviderServiceT assertEquals(11 * FileUtils.ONE_MB, textCache.getCacheStats().getMaxTotalWeight()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); assertNull(context.getService(CacheStatsMBean.class)); } Modified: jackrabbit/oak/trunk/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-parent/pom.xml (original) +++ jackrabbit/oak/trunk/oak-parent/pom.xml Fri May 12 10:59:54 2017 @@ -588,7 +588,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.osgi-mock</artifactId> - <version>1.3.0</version> + <version>2.2.4</version> <scope>test</scope> </dependency> <dependency> Modified: jackrabbit/oak/trunk/oak-segment-tar/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/pom.xml?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original) +++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Fri May 12 10:59:54 2017 @@ -269,7 +269,6 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.osgi-mock</artifactId> - <version>1.9.2</version> <scope>test</scope> </dependency> <dependency> Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java Fri May 12 10:59:54 2017 @@ -51,7 +51,7 @@ public class SegmentNodeStoreFactoryTest @Override protected void unregisterSegmentNodeStoreService() { - deactivate(segmentNodeStoreFactory); + deactivate(segmentNodeStoreFactory, context.bundleContext()); } @Override Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java Fri May 12 10:59:54 2017 @@ -152,7 +152,7 @@ public class SegmentNodeStoreServiceTest } protected void unregisterSegmentNodeStoreService() { - deactivate(segmentNodeStoreService); + deactivate(segmentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; Modified: jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java?rev=1794953&r1=1794952&r2=1794953&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java Fri May 12 10:59:54 2017 @@ -51,7 +51,7 @@ public class MountInfoProviderServiceTes assertNotNull(provider); assertEquals(defaultMountInfoProvider(), provider); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); assertNull(context.getService(MountInfoProvider.class)); }
