Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreMonitorServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreMonitorServiceTest.java?rev=1836149&r1=1836148&r2=1836149&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreMonitorServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreMonitorServiceTest.java Wed Jul 18 07:42:54 2018 @@ -33,23 +33,25 @@ public class SegmentNodeStoreMonitorServ assertTrue(cd.hasRequireConfigurationPolicy()); assertTrue(cd.hasActivateMethod("activate")); assertTrue(cd.hasImplementationClass("org.apache.jackrabbit.oak.segment.SegmentNodeStoreMonitorService")); + assertTrue(cd.hasProperty("commitsTrackerWriterGroups").check()); assertTrue(cd.hasReference("snsStatsMBean") .withInterface("org.apache.jackrabbit.oak.segment.SegmentNodeStoreStatsMBean") .withMandatoryUnaryCardinality() .withStaticPolicy() - .withField("snsStatsMBean") + .withBind("bindSnsStatsMBean") + .withUnbind("unbindSnsStatsMBean") .check()); } @Test public void testMetatypeInformation() throws Exception { - MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.SegmentNodeStoreMonitorService$Configuration.xml")); + MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.SegmentNodeStoreMonitorService.xml")); assertTrue(mi.hasDesignate() .withPid("org.apache.jackrabbit.oak.segment.SegmentNodeStoreMonitorService") - .withReference("org.apache.jackrabbit.oak.segment.SegmentNodeStoreMonitorService$Configuration") + .withReference("org.apache.jackrabbit.oak.segment.SegmentNodeStoreMonitorService") .check()); - ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.SegmentNodeStoreMonitorService$Configuration"); + ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.SegmentNodeStoreMonitorService"); assertTrue(ocd.hasAttributeDefinition("commitsTrackerWriterGroups") .withStringType() .withCardinality("2147483647")
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceTest.java?rev=1836149&r1=1836148&r2=1836149&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/SegmentNodeStoreServiceTest.java Wed Jul 18 07:42:54 2018 @@ -123,32 +123,35 @@ public class SegmentNodeStoreServiceTest .withStaticPolicy() .withGreedyPolicyOption() .withTarget("(&(!(split.blobstore=old))(!(split.blobstore=new)))") - .withField("blobStore") + .withBind("bindBlobStore") + .withUnbind("unbindBlobStore") .check()); assertTrue(cd.hasReference("segmentStore") .withInterface("org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence") .withOptionalUnaryCardinality() .withStaticPolicy() .withGreedyPolicyOption() - .withField("segmentStore") + .withBind("bindSegmentStore") + .withUnbind("unbindSegmentStore") .check()); assertTrue(cd.hasReference("statisticsProvider") .withInterface("org.apache.jackrabbit.oak.stats.StatisticsProvider") .withMandatoryUnaryCardinality() .withStaticPolicy() - .withField("statisticsProvider") + .withBind("bindStatisticsProvider") + .withUnbind("unbindStatisticsProvider") .check()); } @Test public void testMetatypeInformation() throws Exception { - MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService$Configuration.xml")); + MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.xml")); assertTrue(mi.hasDesignate() .withPid("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService") - .withReference("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService$Configuration") + .withReference("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService") .check()); - ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService$Configuration"); + ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService"); assertTrue(ocd.hasAttributeDefinition("repository.home") .withStringType() .check()); Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java?rev=1836149&r1=1836148&r2=1836149&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java (original) +++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java Wed Jul 18 07:42:54 2018 @@ -22,7 +22,6 @@ package org.apache.jackrabbit.oak.segmen import static org.junit.Assert.assertTrue; import org.apache.jackrabbit.oak.segment.osgi.MetatypeInformation.ObjectClassDefinition; -import org.junit.Ignore; import org.junit.Test; public class StandbyStoreServiceTest { @@ -53,6 +52,8 @@ public class StandbyStoreServiceTest { .withIntegerType() .withValue("5") .check()); + assertTrue(cd.hasProperty("primary.allowed-client-ip-ranges") + .check()); assertTrue(cd.hasProperty("secure") .withBooleanType() .withValue("false") @@ -70,19 +71,20 @@ public class StandbyStoreServiceTest { .withMandatoryUnaryCardinality() .withStaticPolicy() .withGreedyPolicyOption() - .withField("storeProvider") + .withBind("bindStoreProvider") + .withUnbind("unbindStoreProvider") .check()); } @Test public void testMetatypeInformation() throws Exception { - MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService$Configuration.xml")); + MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService.xml")); assertTrue(mi.hasDesignate() .withPid("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService") - .withReference("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService$Configuration") + .withReference("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService") .check()); - ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService$Configuration"); + ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService"); assertTrue(ocd.hasAttributeDefinition("org.apache.sling.installer.configuration.persist") .withBooleanType() .withDefaultValue("false") @@ -104,6 +106,10 @@ public class StandbyStoreServiceTest { .withIntegerType() .withDefaultValue("5") .check()); + assertTrue(ocd.hasAttributeDefinition("primary.allowed-client-ip-ranges") + .withStringType() + .withCardinality("2147483647") + .check()); assertTrue(ocd.hasAttributeDefinition("secure") .withBooleanType() .withDefaultValue("false") @@ -116,10 +122,6 @@ public class StandbyStoreServiceTest { .withBooleanType() .withDefaultValue("true") .check()); - assertTrue(ocd.hasAttributeDefinition("primary.allowed-client-ip-ranges") - .withStringType() - .withCardinality("2147483647") - .check()); } }
