misc updates.

test/Spring/CommonAssemblyInfo.cs

@@ -24,7 +24,7 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the

test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs

@@ -36,6 +36,7 @@ using System.Web.Services;
 using antlr;
 using antlr.collections;
 using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
 using Spring.Collections;
 using Spring.Context;
 using Spring.Context.Support;
@@ -271,6 +272,12 @@ namespace Spring.Expressions
 
         #endregion Serialization Tests
 
+        [Test]
+        public void TestMixedAddition()
+        {
+            object value = ExpressionEvaluator.GetValue(null, "'123' + 1");
+            Console.WriteLine(value);
+        }
         
         [Test(Description="SPRNET-944")]
         public void DateTests()
@@ -279,6 +286,15 @@ namespace Spring.Expressions
             Assert.AreEqual("date", dateLiteral);
         }
 
+        [Test(Description = "http://jira.springframework.org/browse/SPRNET-1155")]
+        public void TestDateVariableExpression()
+        {
+            Hashtable vars = new Hashtable();
+            vars["Date"] = "2008-05-15";
+            object value = ExpressionEvaluator.GetValue(null, "#Date", vars);
+            Assert.That(value, Is.EqualTo("2008-05-15"));
+        }
+
         [Test]
         public void ThrowsSyntaxErrorException()
         {
@@ -721,6 +737,13 @@ namespace Spring.Expressions
             Assert.AreEqual(typeof(System.Collections.Generic.Dictionary<string, bool>), ExpressionEvaluator.GetValue(null, "T(System.Collections.Generic.Dictionary`2[System.String,System.Boolean],mscorlib)"));
         }
 
+        [Test]
+        public void TestGenericDictionary()
+        {
+            ExpressionEvaluator.GetValue(null,
+                                         "T(System.Collections.Generic.Dictionary`2[System.String,System.Boolean],mscorlib)");
+        }
+
         /// <summary>
         /// Tests type node
         /// </summary>

test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs

@@ -141,8 +141,6 @@ namespace Spring.Data
         [Test]
         public void UnwantedPromotion()
         {
-            TransactionOptions transactionoptions = new TransactionOptions();
-            transactionoptions.IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted;
             using (TransactionScope ts = new TransactionScope())
             {
                 InnerMethod();
@@ -154,6 +152,7 @@ namespace Spring.Data
         private void InnerMethod()
         {
             string updateSql2 = "insert into Debits (DebitAmount) VALUES (222)";
+
             using (SqlConnection cn2005 = new SqlConnection())
             {
                 cn2005.ConnectionString = @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa";

test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml

@@ -4,7 +4,7 @@
 
 
   <db:provider id="DbProvider" 
-                provider="SqlServer-2.0" 
+              
                 connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"/>
   
 

test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs

@@ -15,6 +15,13 @@ namespace Spring.Messaging.Listener
 
         private int messageCount;
 
+        private string stateVariable;
+
+        public SimpleHandler(string stateVariable)
+        {
+            this.stateVariable = stateVariable;
+        }
+
 
         public int MessageCount
         {
@@ -25,6 +32,7 @@ namespace Spring.Messaging.Listener
         public string HandleMessage(string msgTxt)
         {
             LOG.Debug("Received text = [" + msgTxt + "]");
+            LOG.Debug("constructor set state string  = " + stateVariable);
             if (msgTxt.Contains("Goodbye"))
             {
                 throw new ArgumentException("Don't like saying goodbye!");

test/Spring/Spring.Messaging.Tests/Messaging/Listener/TransactionalMessageListenerContainerTests.xml

@@ -44,12 +44,12 @@
   </object>
 
   <object id="queueTemplate" type="Spring.Messaging.Core.MessageQueueTemplate, Spring.Messaging">
-    <property name="MessageQueueObjectName" value="msmqtxqueue"/>
+    <property name="DefaultMessageQueueObjectName" value="msmqtxqueue"/>
     <property name="MessageConverterObjectName" value="messageConverter"/>
   </object>
 
   <object id="retryQueueTemplate" type="Spring.Messaging.Core.MessageQueueTemplate, Spring.Messaging">
-    <property name="MessageQueueObjectName" value="msmqtxretryqueue"/>
+    <property name="DefaultMessageQueueObjectName" value="msmqtxretryqueue"/>
     <property name="MessageConverterObjectName" value="messageConverter"/>
   </object>
   
@@ -75,14 +75,16 @@
   </object>
 
   <object id="simpleHandler" type="Spring.Messaging.Listener.SimpleHandler, Spring.Messaging.Tests">
-    
+    <constructor-arg value="HelloWorld!"/>
   </object>
 
   <object id="messageTransactionExceptionHandler" type="Spring.Messaging.Listener.SendToQueueExceptionHandler, Spring.Messaging">
     <property name="MaxRetry" value="2"/>
     <property name="MessageQueueObjectName" value="msmqtxretryqueue"/>
   </object>
-  
-  <object id="simpleMessageListener" type="Spring.Messaging.Listener.SimpleMessageListener, Spring.Messaging.Tests"/>
+
+  <object id="simpleMessageListener" type="Spring.Messaging.Listener.SimpleMessageListener, Spring.Messaging.Tests">
+    
+  </object>
   
 </objects>