[Springnet-commits] Spring.Net/test/Spring/Spring.Data.Tests/Transaction/Config TxNamespaceParserTests.cs, 1.3, 1.4 TxNamespaceParserTests.xml, 1.3, 1.4

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Tests/Transaction/Config
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28849

Modified Files:
	TxNamespaceParserTests.cs TxNamespaceParserTests.xml 
Log Message:
SPRNET-485 - Add logging of transaction definition name and description when creating new transaction.

Index: TxNamespaceParserTests.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TxNamespaceParserTests.xml	7 Aug 2007 23:58:28 -0000	1.3
--- TxNamespaceParserTests.xml	7 Sep 2007 04:47:09 -0000	1.4
***************
*** 3,9 ****
  	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xmlns:tx="http://www.springframework.net/tx"
           xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/schema/objects/spring-objects.xsd
!          http://www.springframework.net/tx http://www.springframework.net/schema/tx/spring-tx-1.1.xsd"> 
  
    <tx:advice id="txAdvice">
      <tx:attributes>
--- 3,14 ----
  	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xmlns:tx="http://www.springframework.net/tx"
+          xmlns:aop="http://www.springframework.net/aop"
           xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/schema/objects/spring-objects.xsd
!          http://www.springframework.net/tx http://www.springframework.net/schema/tx/spring-tx-1.1.xsd">
  
+   <object id="testObjectOperation" type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop">
+     <property name="pattern" value="Spring.Objects.TestObject.*"/>
+   </object>
+   
    <tx:advice id="txAdvice">
      <tx:attributes>
***************
*** 13,16 ****
--- 18,22 ----
    </tx:advice>
  
+   <!-- this advice is not applied, just testing advice definition itself. -->
    <tx:advice id="txRollbackAdvice">
      <tx:attributes>
***************
*** 20,26 ****
    </tx:advice>
    
!   
    <tx:attribute-driven/>  
  
    <object name="transactionManager" type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests"/>
  
--- 26,40 ----
    </tx:advice>
    
!   <!-- this will not match any object in the context, just used to check internal registration -->
    <tx:attribute-driven/>  
  
+ 
+   <aop:config>
+ 
+     <aop:advisor pointcut-ref="testObjectOperation" advice-ref="txAdvice"/>
+ 
+   </aop:config>
+ 
+ 
    <object name="transactionManager" type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests"/>
  

Index: TxNamespaceParserTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TxNamespaceParserTests.cs	7 Aug 2007 23:58:28 -0000	1.3
--- TxNamespaceParserTests.cs	7 Sep 2007 04:47:09 -0000	1.4
***************
*** 46,49 ****
--- 46,50 ----
          {
              NamespaceParserRegistry.RegisterParser(typeof(TxNamespaceParser));
+             NamespaceParserRegistry.RegisterParser(typeof(AopNamespaceParser));
              ctx = new XmlApplicationContext("assembly://Spring.Data.Tests/Spring.Transaction.Config/TxNamespaceParserTests.xml");
          }
***************
*** 59,63 ****
  
          [Test]
-         [Ignore("wait for aop schema support")]
          public void InvokeTransactional()
          {
--- 60,63 ----
***************
*** 77,81 ****
  
              // try with exceptional
! 
          }
  
--- 77,89 ----
  
              // try with exceptional
!             try
!             {
!                 testObject.Exceptional(new ArgumentNullException());
!                 Assert.Fail("Should not get here");
!             } catch (Exception)
!             {
!                 Assert.AreEqual(2, ptm.begun, "Should have another started transaction");
!                 Assert.AreEqual(1, ptm.rollbacks, "Should have 1 rolled back transaction");
!             }
          }