[jboss-osgi-commits] JBoss-OSGI SVN: r90316 - in projects/jboss-osgi/trunk/blueprint/testsuite/src/test: resources/parser and 1 other directory.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-06-17 07:48:08 -0400 (Wed, 17 Jun 2009)
New Revision: 90316

Modified:
   projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java
   projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml
Log:
More BP parser test coverage

Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java	2009-06-17 10:51:02 UTC (rev 90315)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/parser/AllElementsParserTestCase.java	2009-06-17 11:48:08 UTC (rev 90316)
@@ -27,6 +27,7 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.net.URL;
+import java.util.Collection;
 import java.util.List;
 
 import org.jboss.osgi.blueprint.parser.BlueprintParser;
@@ -38,6 +39,8 @@
 import org.junit.Test;
 import org.osgi.service.blueprint.reflect.BeanMetadata;
 import org.osgi.service.blueprint.reflect.ReferenceMetadata;
+import org.osgi.service.blueprint.reflect.ServiceMetadata;
+import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata;
 
 /**
  * Blueprint parser tests
@@ -106,4 +109,28 @@
       BeanMetadata conv5 = (BeanMetadata)converters.get(4);
       assertNotNull("Converter not null", conv5);
    }
+
+   @Test
+   public void getExportedServicesMetadata() throws Exception
+   {
+      Collection<ServiceMetadata> services = blueprint.getExportedServicesMetadata();
+      assertNotNull("ServiceMetadata not null", services);
+      assertEquals("ServiceMetadata size", 2, services.size());
+   }
+
+   @Test
+   public void getReferencedServicesMetadata() throws Exception
+   {
+      Collection<ServiceReferenceMetadata> serviceRefs = blueprint.getReferencedServicesMetadata();
+      assertNotNull("ServiceReferenceMetadata not null", serviceRefs);
+      assertEquals("ServiceReferenceMetadata size", 3, serviceRefs.size());
+   }
+
+   @Test
+   public void getBeanComponentsMetadata() throws Exception
+   {
+      Collection<BeanMetadata> beans = blueprint.getBeanComponentsMetadata();
+      assertNotNull("BeanMetadata not null", beans);
+      assertEquals("BeanMetadata size", 3, beans.size());
+   }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml	2009-06-17 10:51:02 UTC (rev 90315)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/parser/blueprint-all-elements.xml	2009-06-17 11:48:08 UTC (rev 90316)
@@ -47,9 +47,6 @@
   </ref-list>
   -->
 
-  <bean id="beanA" class="foo.Bean" depends-on="beanDependency" init-method="initMethod" destroy-method="destroyMethod" factory-method="factoryMethod"
-    factory-component="factoryComponent" scope="singleton" lazy-init="lazy" />
-
   <reference component-name="referenceCompName" interface="foo.referenceInterf" filter="referenceFilter" availablitity="optional">
     <description>reference description</description>
     <interfaces>
@@ -60,4 +57,7 @@
     <listener ref="referenceListenerB" />
   </reference>
 
+  <bean id="beanA" class="foo.Bean" depends-on="beanDependency" init-method="initMethod" destroy-method="destroyMethod" factory-method="factoryMethod"
+    factory-component="factoryComponent" scope="singleton" lazy-init="lazy" />
+
 </blueprint>