X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Ftoaster-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsample%2Ftoaster%2Fit%2FToasterTest.java;h=9bc905c3f412dbdff456b33c85e3f9799d61eab4;hb=c18f35dc4659c301354e25aca4d41178201975f1;hp=a7e1e9b44522e4e465c5c474a2c302d3d82bb224;hpb=94d0d20b41d64bb6696c2a573ec367fcfddc44e9;p=controller.git diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java index a7e1e9b445..9bc905c3f4 100644 --- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java +++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java @@ -7,116 +7,65 @@ */ package org.opendaylight.controller.sample.toaster.it; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.CoreOptions.maven; + +import java.lang.management.ManagementFactory; +import javax.inject.Inject; +import javax.management.MBeanServer; +import javax.management.ObjectName; import org.junit.Test; import org.junit.runner.RunWith; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sample.toaster.provider.api.ToastConsumer; +import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; +import org.opendaylight.controller.sample.kitchen.api.EggsType; +import org.opendaylight.controller.sample.kitchen.api.KitchenService; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.HashBrown; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterService; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.WhiteBread; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; -import org.osgi.framework.BundleContext; - -import javax.inject.Inject; - -import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.options; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import org.ops4j.pax.exam.util.PathUtils; +import org.ops4j.pax.exam.options.MavenUrlReference; +import org.ops4j.pax.exam.util.Filter; @RunWith(PaxExam.class) -public class ToasterTest { - - public static final String ODL = "org.opendaylight.controller"; - public static final String YANG = "org.opendaylight.yangtools"; - public static final String CONTROLLER = "org.opendaylight.controller"; - public static final String YANGTOOLS = "org.opendaylight.yangtools"; - - - public static final String SAMPLE = "org.opendaylight.controller.samples"; +public class ToasterTest extends AbstractMdsalTestBase { + @Inject + @Filter(timeout = 60 * 1000) + KitchenService kitchenService; + @Inject + @Filter(timeout = 60 * 1000) + ToasterService toasterService; - @Test - public void properInitialized() throws Exception { + @Override + public MavenUrlReference getFeatureRepo() { + return maven().groupId("org.opendaylight.controller").artifactId("features-controller-experimental") + .classifier("features").type("xml").versionAsInProject(); + } - Thread.sleep(500); // Waiting for services to get wired. + @Override + public String getFeatureName() { + return "odl-toaster"; + } - assertTrue(consumer.createToast(WhiteBread.class, 5)); + @Test + public void testToaster() throws Exception { + MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer(); + ObjectName providerOn = new ObjectName( + "org.opendaylight.controller:name=OpendaylightToaster,type=toaster-provider"); - } + long toastsMade = (long) platformMBeanServer.getAttribute(providerOn, "ToastsMade"); + assertEquals(0, toastsMade); - @Inject - BindingAwareBroker broker; + boolean success = true; - @Inject - ToastConsumer consumer; + // Make toasts using OSGi service + success &= kitchenService.makeBreakfast(EggsType.SCRAMBLED, HashBrown.VALUE, 4).get().isSuccessful(); + success &= kitchenService.makeBreakfast(EggsType.POACHED, WhiteBread.VALUE, 8).get().isSuccessful(); - @Inject - BundleContext ctx; + assertTrue("Not all breakfasts succeeded", success); - @Configuration - public Option[] config() { - return options(systemProperty("osgi.console").value("2401"), - systemProperty("logback.configurationFile").value( - "file:" + PathUtils.getBaseDir() - + "/src/test/resources/logback.xml"), - mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(), // - mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(), // - mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), // - mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(), // - - mavenBundle(ODL, "sal-common").versionAsInProject(), // - mavenBundle(ODL, "sal-common-api").versionAsInProject(),// - mavenBundle(ODL, "sal-common-impl").versionAsInProject(), // - mavenBundle(ODL, "sal-common-util").versionAsInProject(), // - - mavenBundle(ODL, "config-api").versionAsInProject(), // - mavenBundle(ODL, "config-manager").versionAsInProject(), // - mavenBundle("commons-io", "commons-io").versionAsInProject(), - mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(), - - mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(), - mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), // - mavenBundle("org.javassist", "javassist").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject(), // - - mavenBundle(YANGTOOLS, "yang-data-api").versionAsInProject(), // - mavenBundle(YANGTOOLS, "yang-data-impl").versionAsInProject(), // - mavenBundle(YANGTOOLS, "yang-model-api").versionAsInProject(), // - mavenBundle(YANGTOOLS, "yang-model-util").versionAsInProject(), // - mavenBundle(YANGTOOLS, "yang-parser-api").versionAsInProject(), - mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(), - - - mavenBundle(YANGTOOLS, "binding-generator-spi").versionAsInProject(), // - mavenBundle(YANGTOOLS, "binding-model-api").versionAsInProject(), // - mavenBundle(YANGTOOLS, "binding-generator-util").versionAsInProject(), - mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(), - mavenBundle(YANGTOOLS, "binding-type-provider").versionAsInProject(), - mavenBundle(YANGTOOLS, "binding-generator-api").versionAsInProject(), - mavenBundle(YANGTOOLS, "binding-generator-spi").versionAsInProject(), - mavenBundle(YANGTOOLS, "binding-generator-impl").versionAsInProject(), - - - mavenBundle(CONTROLLER, "sal-core-api").versionAsInProject().update(), // - mavenBundle(CONTROLLER, "sal-broker-impl").versionAsInProject(), // - mavenBundle(CONTROLLER, "sal-core-spi").versionAsInProject().update(), // - - mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // - - mavenBundle(SAMPLE, "sample-toaster").versionAsInProject(), // - mavenBundle(SAMPLE, "sample-toaster-consumer").versionAsInProject(), // - mavenBundle(SAMPLE, "sample-toaster-provider").versionAsInProject(), // - mavenBundle(YANG, "concepts").versionAsInProject(), - mavenBundle(YANG, "yang-binding").versionAsInProject(), // - mavenBundle(YANG, "yang-common").versionAsInProject(), // - mavenBundle(YANG+".thirdparty", "xtend-lib-osgi").versionAsInProject(), - mavenBundle("com.google.guava", "guava").versionAsInProject(), // - mavenBundle("org.javassist", "javassist").versionAsInProject(), - junitBundles() - ); + // Verify toasts made count on provider via JMX/config-subsystem + toastsMade = (long) platformMBeanServer.getAttribute(providerOn, "ToastsMade"); + assertEquals(2, toastsMade); } - }