You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by li...@apache.org on 2010/08/05 23:20:38 UTC
svn commit: r982790 - in
/incubator/aries/trunk/transaction/transaction-blueprint/src/test:
java/org/apache/aries/transaction/ resources/org/apache/aries/transaction/
Author: linsun
Date: Thu Aug 5 21:20:36 2010
New Revision: 982790
URL: http://svn.apache.org/viewvc?rev=982790&view=rev
Log:
move test in NameSpaceHandlerOptionMethodTest to NameSpaceHandlerTest
Removed:
incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerOptionMethodTest.java
Modified:
incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java
incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java
incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries3.xml
Modified: incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java?rev=982790&r1=982789&r2=982790&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BundleWideNameSpaceHandlerTest.java Thu Aug 5 21:20:36 2010
@@ -165,9 +165,9 @@ public class BundleWideNameSpaceHandlerT
ComponentDefinitionRegistry cdr = new ComponentDefinitionRegistryImpl();
p.populate(nshandlers, cdr);
- BeanMetadata compTop = (BeanMetadata) cdr.getComponentDefinition("top2");
- BeanMetadata compDown = (BeanMetadata) cdr.getComponentDefinition("down2");
- BeanMetadata compMiddle = (BeanMetadata) cdr.getComponentDefinition("middle2");
+ BeanMetadata compTop = (BeanMetadata) cdr.getComponentDefinition("top3");
+ BeanMetadata compDown = (BeanMetadata) cdr.getComponentDefinition("down3");
+ BeanMetadata compMiddle = (BeanMetadata) cdr.getComponentDefinition("middle3");
assertNotNull(compTop);
assertNotNull(compDown);
Modified: incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java?rev=982790&r1=982789&r2=982790&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/NameSpaceHandlerTest.java Thu Aug 5 21:20:36 2010
@@ -38,6 +38,8 @@ import org.apache.aries.blueprint.contai
import org.apache.aries.blueprint.container.NamespaceHandlerRegistry.NamespaceHandlerSet;
import org.apache.aries.blueprint.namespace.ComponentDefinitionRegistryImpl;
import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -51,29 +53,43 @@ import org.apache.aries.unittest.mocks.S
public class NameSpaceHandlerTest {
+ Bundle b;
+ private NamespaceHandlerRegistry nhri;
+ private TxComponentMetaDataHelperImpl txenhancer;
+
+ @Before
+ public void setUp() {
+ b = Skeleton.newMock(new BundleMock("org.apache.aries.tx", new Properties()), Bundle.class);
+ BundleContext ctx = b.getBundleContext();
+ nhri = new NamespaceHandlerRegistryImpl(ctx);
+
+ TransactionManager tm = Skeleton.newMock(TransactionManager.class);
+
+ txenhancer = new TxComponentMetaDataHelperImpl();
+
+ TxInterceptorImpl txinterceptor = new TxInterceptorImpl();
+ txinterceptor.setTransactionManager(tm);
+ txinterceptor.setTxMetaDataHelper(txenhancer);
+
+ TxElementHandler namespaceHandler = new TxElementHandler();
+ namespaceHandler.setTransactionInterceptor(txinterceptor);
+ namespaceHandler.setTxMetaDataHelper(txenhancer);
+
+ Properties props = new Properties();
+ props.put("osgi.service.blueprint.namespace", new String[]{"http://aries.apache.org/xmlns/transactions/v1.0.0", "http://aries.apache.org/xmlns/transactions/v1.1.0"});
+ ctx.registerService(NamespaceHandler.class.getName(), namespaceHandler, props);
+ }
+
+ @After
+ public void tearDown() throws Exception{
+ b = null;
+ nhri = null;
+ txenhancer = null;
+ }
@Test
public void testMultipleElements() throws Exception
{
- Bundle b = Skeleton.newMock(new BundleMock("org.apache.aries.tx", new Properties()), Bundle.class);
- BundleContext ctx = b.getBundleContext();
- NamespaceHandlerRegistry nhri = new NamespaceHandlerRegistryImpl(ctx);
-
- TransactionManager tm = Skeleton.newMock(TransactionManager.class);
-
- TxComponentMetaDataHelperImpl txenhancer = new TxComponentMetaDataHelperImpl();
-
- TxInterceptorImpl txinterceptor = new TxInterceptorImpl();
- txinterceptor.setTransactionManager(tm);
- txinterceptor.setTxMetaDataHelper(txenhancer);
-
- TxElementHandler namespaceHandler = new TxElementHandler();
- namespaceHandler.setTransactionInterceptor(txinterceptor);
- namespaceHandler.setTxMetaDataHelper(txenhancer);
-
- Properties props = new Properties();
- props.put("osgi.service.blueprint.namespace", new String[]{"http://aries.apache.org/xmlns/transactions/v1.0.0", "http://aries.apache.org/xmlns/transactions/v1.1.0"});
- ctx.registerService(NamespaceHandler.class.getName(), namespaceHandler, props);
Parser p = new Parser();
URL bpxml = this.getClass().getResource("aries.xml");
@@ -97,4 +113,31 @@ public class NameSpaceHandlerTest {
assertEquals("Never", txenhancer.getComponentMethodTxAttribute(anonToo, "doSomething"));
}
+
+ @Test
+ public void testOptionalMethodAttribute() throws Exception
+ {
+ Parser p = new Parser();
+
+ URL bpxml = this.getClass().getResource("aries2.xml");
+ List<URL> bpxmlList = new LinkedList<URL>();
+ bpxmlList.add(bpxml);
+
+ p.parse(bpxmlList);
+ Set<URI> nsuris = p.getNamespaces();
+ NamespaceHandlerSet nshandlers = nhri.getNamespaceHandlers(nsuris, b);
+ p.validate(nshandlers.getSchema());
+
+ ComponentDefinitionRegistry cdr = new ComponentDefinitionRegistryImpl();
+ p.populate(nshandlers, cdr);
+
+ BeanMetadata comp = (BeanMetadata) cdr.getComponentDefinition("top");
+
+ BeanMetadata anon = (BeanMetadata) ((BeanProperty) comp.getProperties().get(0)).getValue();
+ BeanMetadata anonToo = (BeanMetadata) ((BeanProperty) comp.getProperties().get(1)).getValue();
+
+ assertEquals("Required", txenhancer.getComponentMethodTxAttribute(anon, "doSomething"));
+ assertEquals("Never", txenhancer.getComponentMethodTxAttribute(anonToo, "doSomething"));
+
+ }
}
Modified: incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries3.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries3.xml?rev=982790&r1=982789&r2=982790&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries3.xml (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/src/test/resources/org/apache/aries/transaction/bundlewide-aries3.xml Thu Aug 5 21:20:36 2010
@@ -22,14 +22,14 @@
<tx:transaction bean="top*" method="*" value="NotSupported"/>
<tx:transaction bean="down* middle*" method="*" value="Required"/>
- <bean id="top2" class="org.apache.aries.transaction.TestBean">
+ <bean id="top3" class="org.apache.aries.transaction.TestBean">
<tx:transaction method="update*" value="Required"/>
<tx:transaction method="update123*" value="RequiresNew"/>
</bean>
- <bean id="down2" class="org.apache.aries.transaction.TestBean2">
+ <bean id="down3" class="org.apache.aries.transaction.TestBean2">
<tx:transaction method="update*" value="NotSupported"/>
</bean>
- <bean id="middle2" class="org.apache.aries.transaction.TestBean3"/>
+ <bean id="middle3" class="org.apache.aries.transaction.TestBean3"/>
</blueprint>
\ No newline at end of file