(Patch submitted by Rupert Smith) dotnet_iop.diff.

Implements interop tests compatable with the existing topic tests. Used to succesfully test the field table changes.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@512700 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 26 insertions, 26 deletions

diff --git a/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
index 1a342f0b15..a59670ef5a 100644
--- a/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
@@ -127,9 +127,9 @@ namespace Qpid.Client
             {
                 throw new ArgumentException("ConnectionInfo must be specified");
             }
-            _log.Info("ConnectionInfo: " + connectionInfo);
+            _log.Debug("ConnectionInfo: " + connectionInfo);
             _connectionInfo = connectionInfo;
-            _log.Info("password = " + _connectionInfo.Password);
+            _log.Debug("password = " + _connectionInfo.Password);
             _failoverPolicy = new FailoverPolicy(connectionInfo);
 
             // We are not currently connected.
@@ -141,7 +141,7 @@ namespace Qpid.Client
                 try
                 {
                     IBrokerInfo brokerInfo = _failoverPolicy.GetNextBrokerInfo();
-                    _log.Info("Connecting to " + brokerInfo);
+                    _log.Debug("Connecting to " + brokerInfo);
                     MakeBrokerConnection(brokerInfo);
                     break;
                 }
@@ -185,7 +185,7 @@ namespace Qpid.Client
 
             foreach (Type type in assembly.GetTypes())
             {
-                _log.Info(String.Format("type = {0}", type));
+                _log.Debug(String.Format("type = {0}", type));
             }
 
             Type transport = assembly.GetType(transportType);
@@ -197,13 +197,13 @@ namespace Qpid.Client
                 
             }
 
-            _log.Info("transport = " + transport);
-            _log.Info("ctors = " + transport.GetConstructors());
+            _log.Debug("transport = " + transport);
+            _log.Debug("ctors = " + transport.GetConstructors());
 
             ConstructorInfo info = transport.GetConstructors()[0];
             ITransport result = (ITransport)info.Invoke(new object[] { host, port, this });
 
-            _log.Info("transport = " + result);
+            _log.Debug("transport = " + result);
 
             return result;
         }*/
@@ -441,11 +441,11 @@ namespace Qpid.Client
         /// </summary>
         private void CloseAllSessions(Exception cause)
         {
-            _log.Info("Closing all session in connection " + this);
+            _log.Debug("Closing all session in connection " + this);
             ICollection sessions = new ArrayList(_sessions.Values);
             foreach (AmqChannel channel in sessions)
             {
-                _log.Info("Closing channel " + channel);
+                _log.Debug("Closing channel " + channel);
                 if (cause != null)
                 {
                     channel.ClosedWithException(cause);
@@ -462,7 +462,7 @@ namespace Qpid.Client
                     }
                 }
             }
-            _log.Info("Done closing all sessions in connection " + this);
+            _log.Debug("Done closing all sessions in connection " + this);
         }
 
         public int MaximumChannelCount
@@ -685,7 +685,7 @@ namespace Qpid.Client
             }
             catch (Exception e)
             {
-                _log.Info("Unable to connect to broker at " + bd, e);
+                _log.Debug("Unable to connect to broker at " + bd, e);
                 AttemptReconnection();
             }
             return false;
@@ -747,11 +747,11 @@ namespace Qpid.Client
                 {
                     if (!(e is AMQException))
                     {
-                        _log.Info("Unable to connect to broker at " + _failoverPolicy.GetCurrentBrokerInfo(), e);
+                        _log.Debug("Unable to connect to broker at " + _failoverPolicy.GetCurrentBrokerInfo(), e);
                     }
                     else
                     {
-                        _log.Info(e.Message + ":Unable to connect to broker at " + _failoverPolicy.GetCurrentBrokerInfo());
+                        _log.Debug(e.Message + ":Unable to connect to broker at " + _failoverPolicy.GetCurrentBrokerInfo());
                     }
                 }
             }
@@ -767,7 +767,7 @@ namespace Qpid.Client
         public void ResubscribeChannels()
         {
             ArrayList channels = new ArrayList(_sessions.Values);
-            _log.Info(String.Format("Resubscribing sessions = {0} sessions.size={1}", channels, channels.Count));
+            _log.Debug(String.Format("Resubscribing sessions = {0} sessions.size={1}", channels, channels.Count));
             foreach (AmqChannel channel in channels)
             {
                 _protocolSession.AddSessionByChannel(channel.ChannelId, channel);
@@ -778,7 +778,7 @@ namespace Qpid.Client
 
         private void ReopenChannel(ushort channelId, ushort prefetch, bool transacted)
         {
-            _log.Info(string.Format("Reopening channel id={0} prefetch={1} transacted={2}",
+            _log.Debug(string.Format("Reopening channel id={0} prefetch={1} transacted={2}",
                 channelId, prefetch, transacted));
             try
             {
@@ -843,7 +843,7 @@ namespace Qpid.Client
                     // TODO: Can we optimise this so that heartbeats are only written when we haven't sent anything recently to the broker?
                     _protocolWriter.Write(HeartbeatBody.FRAME);
                 }
-                _log.Info("Heatbeat thread stopped");
+                _log.Debug("Heatbeat thread stopped");
             }
             
             public void Stop()
@@ -854,7 +854,7 @@ namespace Qpid.Client
         
         public void StartHeartBeatThread(int heartbeatSeconds)
         {
-            _log.Info("Starting new heartbeat thread");
+            _log.Debug("Starting new heartbeat thread");
             _heartBeatRunner = new HeartBeatThread(ProtocolWriter, heartbeatSeconds * 1000);
             _heartBeatThread = new Thread(new ThreadStart(_heartBeatRunner.Run));
             _heartBeatThread.Name = "HeartBeat";
@@ -865,7 +865,7 @@ namespace Qpid.Client
         {
             if (_heartBeatRunner != null)
             {
-                _log.Info("Stopping old heartbeat thread");
+                _log.Debug("Stopping old heartbeat thread");
                 _heartBeatRunner.Stop();
             }
         }
diff --git a/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs b/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
index 9855416db5..07650c170b 100644
--- a/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
+++ b/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
@@ -33,9 +33,9 @@ namespace Qpid.Client
 {
     public class AmqChannel : Closeable, IChannel
     {
-        private const int BASIC_CONTENT_TYPE = 60;
+        private static readonly ILog _logger = LogManager.GetLogger(typeof(AmqChannel));
 
-        private static readonly ILog _logger = LogManager.GetLogger(typeof (AmqChannel));
+        private const int BASIC_CONTENT_TYPE = 60;
 
         private static int _nextSessionNumber = 0;
 
@@ -110,7 +110,7 @@ namespace Qpid.Client
                     DispatchMessage(message);
                 }                
 
-                _logger.Info("Dispatcher thread terminating for channel " + _containingChannel._channelId);
+                _logger.Debug("Dispatcher thread terminating for channel " + _containingChannel._channelId);
             }
 
             private void DispatchMessage(UnprocessedMessage message)
@@ -405,14 +405,14 @@ namespace Qpid.Client
         /// </summary>
         private void CloseProducers()
         {
-            _logger.Info("Closing producers on session " + this);
+            _logger.Debug("Closing producers on session " + this);
             // we need to clone the list of producers since the close() method updates the _producers collection
             // which would result in a concurrent modification exception
             ArrayList clonedProducers = new ArrayList(_producers.Values);
             
             foreach (BasicMessageProducer prod in clonedProducers)
             {
-                _logger.Info("Closing producer " + prod);
+                _logger.Debug("Closing producer " + prod);
                 prod.Close();
             }
             // at this point the _producers map is empty
diff --git a/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
index a93d2db675..759ffd62e3 100644
--- a/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
+++ b/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
@@ -196,7 +196,7 @@ namespace Qpid.Client
 
         public override void Close()
         {
-            _logger.Info("Closing producer " + this);
+            _logger.Debug("Closing producer " + this);
             Interlocked.Exchange(ref _closed, CLOSED);
             _channel.DeregisterProducer(_producerId);
         }
diff --git a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
index 8b276c09e9..41e9d2240c 100644
--- a/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
+++ b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
@@ -42,7 +42,7 @@ namespace Qpid.Client.Handler
                 parameters = new ConnectionTuneParameters();
             }
 
-            _logger.Info(String.Format("ConnectionTune.heartbeat = {0}.", frame.Heartbeat));
+            _logger.Debug(String.Format("ConnectionTune.heartbeat = {0}.", frame.Heartbeat));
 
             parameters.FrameMax = frame.FrameMax;
             parameters.FrameMax = 65535;
diff --git a/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
index 05f673d520..7be17a1080 100644
--- a/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
+++ b/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
@@ -122,7 +122,7 @@ namespace Qpid.Client.State
         {
             if (InfoLoggingHack)
             {
-                _logger.Info("State changing to " + newState + " from old state " + _currentState);
+                _logger.Debug("State changing to " + newState + " from old state " + _currentState);
             }
             _logger.Debug("State changing to " + newState + " from old state " + _currentState);
             AMQState oldState = _currentState;