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=1835837&r1=1835836&r2=1835837&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 Fri Jul 13 13:23:24 2018 @@ -123,35 +123,32 @@ public class SegmentNodeStoreServiceTest .withStaticPolicy() .withGreedyPolicyOption() .withTarget("(&(!(split.blobstore=old))(!(split.blobstore=new)))") - .withBind("bindBlobStore") - .withUnbind("unbindBlobStore") + .withField("blobStore") .check()); assertTrue(cd.hasReference("segmentStore") .withInterface("org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence") .withOptionalUnaryCardinality() .withStaticPolicy() .withGreedyPolicyOption() - .withBind("bindSegmentStore") - .withUnbind("unbindSegmentStore") + .withField("segmentStore") .check()); assertTrue(cd.hasReference("statisticsProvider") .withInterface("org.apache.jackrabbit.oak.stats.StatisticsProvider") .withMandatoryUnaryCardinality() .withStaticPolicy() - .withBind("bindStatisticsProvider") - .withUnbind("unbindStatisticsProvider") + .withField("statisticsProvider") .check()); } @Test public void testMetatypeInformation() throws Exception { - MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.xml")); + MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService$Configuration.xml")); assertTrue(mi.hasDesignate() .withPid("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService") - .withReference("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService") + .withReference("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService$Configuration") .check()); - ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService"); + ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService$Configuration"); 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=1835837&r1=1835836&r2=1835837&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 Fri Jul 13 13:23:24 2018 @@ -22,6 +22,7 @@ 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 { @@ -52,8 +53,6 @@ public class StandbyStoreServiceTest { .withIntegerType() .withValue("5") .check()); - assertTrue(cd.hasProperty("primary.allowed-client-ip-ranges") - .check()); assertTrue(cd.hasProperty("secure") .withBooleanType() .withValue("false") @@ -71,20 +70,19 @@ public class StandbyStoreServiceTest { .withMandatoryUnaryCardinality() .withStaticPolicy() .withGreedyPolicyOption() - .withBind("bindStoreProvider") - .withUnbind("unbindStoreProvider") + .withField("storeProvider") .check()); } @Test public void testMetatypeInformation() throws Exception { - MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService.xml")); + MetatypeInformation mi = MetatypeInformation.open(getClass().getResourceAsStream("/OSGI-INF/metatype/org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService$Configuration.xml")); assertTrue(mi.hasDesignate() .withPid("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService") - .withReference("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService") + .withReference("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService$Configuration") .check()); - ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService"); + ObjectClassDefinition ocd = mi.getObjectClassDefinition("org.apache.jackrabbit.oak.segment.standby.store.StandbyStoreService$Configuration"); assertTrue(ocd.hasAttributeDefinition("org.apache.sling.installer.configuration.persist") .withBooleanType() .withDefaultValue("false") @@ -106,10 +104,6 @@ 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") @@ -122,6 +116,10 @@ public class StandbyStoreServiceTest { .withBooleanType() .withDefaultValue("true") .check()); + assertTrue(ocd.hasAttributeDefinition("primary.allowed-client-ip-ranges") + .withStringType() + .withCardinality("2147483647") + .check()); } }
