From 2179aa4b44f566949dfc1721f9fc343dd57ad34d Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Thu, 6 Apr 2017 17:11:53 +0200 Subject: [PATCH] OAK-6050 - Unify used version of osgi-mock Update osgi-mock to 2.2.4 and remove the override from oak-segment-tar. Notable test changes: - ExternalPrincipalConfigurationTest was registering services with the incorrect service interface - LuceneIndexProviderServiceTest was registering a mock IndexAugmentorFactory which seemed to interact badly with the deactivate method. Instead, just register a new object which works fine --- .../external/impl/jmx/SynMBeanImplOSGiTest.java | 2 +- .../impl/principal/ExternalPrincipalConfigurationTest.java | 10 ++++++---- .../oak/blob/cloud/s3/S3DataStoreServiceTest.java | 2 +- .../plugins/blob/DocumentBlobTrackerRegistrationTest.java | 2 +- .../oak/plugins/document/DocumentNodeStoreServiceTest.java | 2 +- .../document/secondary/SecondaryStoreCacheServiceTest.java | 2 +- .../oak/plugins/index/AsyncIndexerServiceTest.java | 2 +- .../plugins/index/property/jmx/PropertyIndexStatsTest.java | 2 +- .../oak/plugins/metric/StatisticsProviderFactoryTest.java | 2 +- .../plugins/multiplex/MountInfoProviderServiceTest.java | 2 +- .../multiplex/PrivateStoreValidatorProviderTest.java | 2 +- .../document/DocumentCachingDataStoreStatsTest.java | 8 ++++---- .../oak/plugins/document/DocumentS3DataStoreStatsTest.java | 8 ++++---- .../oak/segment/SegmentCachingDataStoreStatsTest.java | 8 ++++---- .../oak/segment/SegmentS3DataStoreStatsTest.java | 8 ++++---- .../index/lucene/LuceneIndexProviderServiceTest.java | 14 +++++++------- oak-parent/pom.xml | 2 +- oak-segment-tar/pom.xml | 1 - .../oak/segment/SegmentNodeStoreFactoryTest.java | 2 +- .../oak/segment/SegmentNodeStoreServiceTest.java | 2 +- 20 files changed, 42 insertions(+), 41 deletions(-) diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java index 6a210ca42d..51a2b34d72 100644 --- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java +++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynMBeanImplOSGiTest.java @@ -127,7 +127,7 @@ public class SynMBeanImplOSGiTest extends ExternalLoginModuleTestBase { context.registerService(ContentRepository.class, getContentRepository()); context.registerService(SecurityProvider.class, getSecurityProvider()); - MockOsgi.deactivate(externalLoginModuleFactory); + MockOsgi.deactivate(externalLoginModuleFactory, context.bundleContext()); assertSyncBeanRegistration(externalLoginModuleFactory, false); } diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java index 4a0a13c427..314a20d375 100644 --- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java +++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java @@ -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 ExternalPrincipalConfigurationTest extends AbstractExternalAuthTest } private void enable() { - context.registerService(DefaultSyncHandler.class, new DefaultSyncHandler(), ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true)); + context.registerService(SyncHandler.class, new DefaultSyncHandler(), ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true)); } private void assertIsEnabled(ExternalPrincipalConfiguration externalPrincipalConfiguration, boolean expected) throws Exception { @@ -260,9 +261,10 @@ public class ExternalPrincipalConfigurationTest extends AbstractExternalAuthTest 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(); diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java index 9b2e3167e6..d347dcfffc 100644 --- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java +++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java @@ -100,6 +100,6 @@ public class S3DataStoreServiceTest { } private void unregisterBlobStore() { - deactivate(service); + deactivate(service, context.bundleContext()); } } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java index d3be51ba20..c563211617 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java @@ -64,6 +64,6 @@ public class DocumentBlobTrackerRegistrationTest extends AbstractBlobTrackerRegi @Override protected void unregisterNodeStoreService() { - deactivate(service); + deactivate(service, context.bundleContext()); } } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java index 3f3fff0788..448f7c8cd3 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java @@ -62,7 +62,7 @@ public class DocumentNodeStoreServiceTest { @After public void tearDown() throws Exception { - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); MongoUtils.dropCollections(MongoUtils.DB); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java index 57086638fd..80b21d855e 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java @@ -78,7 +78,7 @@ public class SecondaryStoreCacheServiceTest { 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)); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java index c4b63c02db..37e6b1076a 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java @@ -71,7 +71,7 @@ public class AsyncIndexerServiceTest { AsyncIndexUpdate indexUpdate = getIndexUpdate("async"); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); assertNull(context.getService(Runnable.class)); assertTrue(indexUpdate.isClosed()); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java index 0ac38155af..671ff4ca48 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStatsTest.java @@ -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)); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java index 2ade8f91b6..d61a02a036 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/StatisticsProviderFactoryTest.java @@ -55,7 +55,7 @@ public class StatisticsProviderFactoryTest { 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)); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java index 74f1eb2503..d297952dd0 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java @@ -51,7 +51,7 @@ public class MountInfoProviderServiceTest { assertNotNull(provider); assertEquals(defaultMountInfoProvider(), provider); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); assertNull(context.getService(MountInfoProvider.class)); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java index fd312c8b6a..c168db0d87 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java @@ -150,7 +150,7 @@ public class PrivateStoreValidatorProviderTest { assertTrue(validator instanceof PrivateStoreValidatorProvider); assertTrue(((PrivateStoreValidatorProvider)validator).isFailOnDetection()); - MockOsgi.deactivate(privateStoreValidatorProvider); + MockOsgi.deactivate(privateStoreValidatorProvider, context.bundleContext()); assertNull(context.getService(EditorProvider.class)); } diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java index 9cc26fa1f0..926fff2883 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java @@ -91,10 +91,10 @@ public class DocumentCachingDataStoreStatsTest { 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 DocumentCachingDataStoreStatsTest { 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 DocumentCachingDataStoreStatsTest { } private void unregisterDocumentNodeStoreService() { - deactivate(documentNodeStoreService); + deactivate(documentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java index c1323e35fc..e0a118d270 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java @@ -84,10 +84,10 @@ public class DocumentS3DataStoreStatsTest { 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 DocumentS3DataStoreStatsTest { 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 DocumentS3DataStoreStatsTest { } private void unregisterDocumentNodeStoreService() { - deactivate(documentNodeStoreService); + deactivate(documentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java index a9050ad23e..5f797712f6 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java @@ -76,10 +76,10 @@ public class SegmentCachingDataStoreStatsTest { 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 SegmentCachingDataStoreStatsTest { assertServiceActivated(); ConsolidatedDataStoreCacheStats dataStoreStats = - context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats(), null); + context.registerInjectActivateService(new ConsolidatedDataStoreCacheStats()); assertNull(context.getService(ConsolidatedDataStoreCacheStatsMBean.class)); unregisterSegmentNodeStoreService(); @@ -115,7 +115,7 @@ public class SegmentCachingDataStoreStatsTest { } private void unregisterSegmentNodeStoreService() { - deactivate(segmentNodeStoreService); + deactivate(segmentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java index a6bb1f5d64..88af2301de 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreStatsTest.java @@ -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; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java index 266f9e44f8..9953b196aa 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java @@ -80,7 +80,7 @@ public class LuceneIndexProviderServiceTest { 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()); MockOsgi.injectServices(service, context.bundleContext()); } @@ -119,7 +119,7 @@ public class LuceneIndexProviderServiceTest { assertNotNull(context.getService(JournalPropertyService.class)); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -137,7 +137,7 @@ public class LuceneIndexProviderServiceTest { assertTrue(context.getService(Observer.class) instanceof LuceneIndexProvider); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -152,7 +152,7 @@ public class LuceneIndexProviderServiceTest { assertNotNull(editorProvider); assertNotNull(editorProvider.getIndexCopier()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -164,7 +164,7 @@ public class LuceneIndexProviderServiceTest { IndexCopier indexCopier = service.getIndexCopier(); assertTrue(indexCopier.isPrefetchEnabled()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -174,7 +174,7 @@ public class LuceneIndexProviderServiceTest { MockOsgi.activate(service, context.bundleContext(), config); assertEquals(LoggingInfoStream.INSTANCE, InfoStream.getDefault()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -189,7 +189,7 @@ public class LuceneIndexProviderServiceTest { assertEquals(11 * FileUtils.ONE_MB, textCache.getCacheStats().getMaxTotalWeight()); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); assertNull(context.getService(CacheStatsMBean.class)); } diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index 6ce5e5de18..42d1d37f08 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -578,7 +578,7 @@ org.apache.sling org.apache.sling.testing.osgi-mock - 1.3.0 + 2.2.4 test diff --git a/oak-segment-tar/pom.xml b/oak-segment-tar/pom.xml index 4de30c696b..2eb55b31aa 100644 --- a/oak-segment-tar/pom.xml +++ b/oak-segment-tar/pom.xml @@ -255,7 +255,6 @@ org.apache.sling org.apache.sling.testing.osgi-mock - 1.9.2 test diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java index 82d3303c1d..6349e646c8 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactoryTest.java @@ -51,7 +51,7 @@ public class SegmentNodeStoreFactoryTest extends SegmentNodeStoreServiceTest { @Override protected void unregisterSegmentNodeStoreService() { - deactivate(segmentNodeStoreFactory); + deactivate(segmentNodeStoreFactory, context.bundleContext()); } @Override diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java index 3c4efd646e..7b08cd8926 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java @@ -152,7 +152,7 @@ public class SegmentNodeStoreServiceTest { } protected void unregisterSegmentNodeStoreService() { - deactivate(segmentNodeStoreService); + deactivate(segmentNodeStoreService, context.bundleContext()); } private ServiceRegistration blobStore; -- 2.12.2