Merge "Bug 809: Enhancements to the toaster example"

diff --combined opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
index eb826055295d68bf7873edfbd3008175db002604,0c3b48a071165a30e773c2566d95dfa88a99eb84..907b35475f80f3565e18d2965885ff505bb55d6e
--- 1/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
--- 2/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
@@@ -10,7 -10,8 +10,8 @@@ package org.opendaylight.controller.sam
  import org.junit.Assert;
  import org.junit.Test;
  import org.junit.runner.RunWith;
- import org.opendaylight.controller.sample.toaster.provider.api.ToastConsumer;
+ 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.WhiteBread;
  import org.ops4j.pax.exam.Configuration;
@@@ -23,6 -24,7 +24,7 @@@ import org.ops4j.pax.exam.util.PathUtil
  import javax.inject.Inject;
  import javax.management.MBeanServer;
  import javax.management.ObjectName;
+ 
  import java.lang.management.ManagementFactory;
  
  import static org.junit.Assert.assertEquals;
@@@ -42,7 -44,7 +44,7 @@@ public class ToasterTest 
  
      @Inject
      @Filter(timeout=60*1000)
-     ToastConsumer toastConsumer;
+     KitchenService kitchenService;
  
      @Configuration
      public Option[] config() {
@@@ -77,8 -79,8 +79,8 @@@
                  mavenBundle("org.opendaylight.controller.samples", "sample-toaster-provider").versionAsInProject(),
                  mavenBundle("org.opendaylight.controller.samples", "sample-toaster-consumer").versionAsInProject(),
                  mavenBundle("org.opendaylight.controller.samples", "sample-toaster").versionAsInProject(),
 -                mavenBundle("org.opendaylight.controller.thirdparty", "nagasena").versionAsInProject(),
 -                mavenBundle("org.opendaylight.controller.thirdparty", "nagasena-rta").versionAsInProject()
 +                mavenBundle("org.openexi", "nagasena").versionAsInProject(),
 +                mavenBundle("org.openexi", "nagasena-rta").versionAsInProject()
          );
      }
  
@@@ -86,7 -88,6 +88,6 @@@
      public void testToaster() throws Exception {
  
          MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
-         ObjectName consumerOn = new ObjectName("org.opendaylight.controller:instanceName=toaster-consumer-impl,type=RuntimeBean,moduleFactoryName=toaster-consumer-impl");
          ObjectName providerOn = new ObjectName("org.opendaylight.controller:instanceName=toaster-provider-impl,type=RuntimeBean,moduleFactoryName=toaster-provider-impl");
  
          long toastsMade = (long) platformMBeanServer.getAttribute(providerOn, "ToastsMade");
@@@ -95,17 -96,14 +96,14 @@@
          boolean toasts = true;
  
          // Make toasts using OSGi service
-         toasts &= toastConsumer.createToast(HashBrown.class, 4);
-         toasts &= toastConsumer.createToast(WhiteBread.class, 8);
- 
-         // Make toast using JMX/config-subsystem
-         toasts &= (Boolean)platformMBeanServer.invoke(consumerOn, "makeHashBrownToast", new Object[]{4}, new String[]{Integer.class.getName()});
+         toasts &= kitchenService.makeBreakfast( EggsType.SCRAMBLED, HashBrown.class, 4);
+         toasts &= kitchenService.makeBreakfast( EggsType.POACHED, WhiteBread.class, 8 );
  
-         Assert.assertTrue("Not all toasts done by " + toastConsumer, toasts);
+         Assert.assertTrue("Not all toasts done by " + kitchenService, toasts);
  
          // Verify toasts made count on provider via JMX/config-subsystem
          toastsMade = (long) platformMBeanServer.getAttribute(providerOn, "ToastsMade");
-         assertEquals(3, toastsMade);
+         assertEquals(2, toastsMade);
      }
  
  }