diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/SessionFactoryUtilsTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/SessionFactoryUtilsTests.cs
index 21be3649..3a63a8c8 100644
--- a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/SessionFactoryUtilsTests.cs
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/SessionFactoryUtilsTests.cs
@@ -47,6 +47,7 @@ namespace Spring.Data.NHibernate
[TestFixture]
public class SessionFactoryUtilsTests
{
+#if !NET_1_1
[Test]
public void SessionFactoryUtilsWithGetDbProvider()
{
@@ -68,7 +69,7 @@ namespace Spring.Data.NHibernate
mockery.VerifyAll();
}
-
+#endif
}
diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
index 2be48805..08255f58 100644
--- a/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
+++ b/test/Spring/Spring.Messaging.Tests/Messaging/Core/MessageQueueTemplateTests.cs
@@ -44,7 +44,7 @@ namespace Spring.Messaging.Core
[TestFixture]
public class MessageQueueTemplateTests : AbstractDependencyInjectionSpringContextTests
{
-
+#if NET_2_0 || NET_3_0
[Test]
public void MessageCreator()
{
@@ -72,7 +72,7 @@ namespace Spring.Messaging.Core
mqt.MessageQueueFactory.RegisterMessageQueue("fooQueueDefinition", sc.CreateQueue );
}
-
+#endif
public class SimpleCreator
{
public MessageQueue CreateQueue()
diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListenerContainerTests.cs
deleted file mode 100644
index 7d608cb0..00000000
--- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListenerContainerTests.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-#region License
-
-/*
- * Copyright © 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-#region Imports
-
-using System;
-using System.Messaging;
-using System.Threading;
-using NUnit.Framework;
-using Spring.Messaging.Core;
-using Spring.Testing.NUnit;
-
-#endregion
-
-namespace Spring.Messaging.Listener
-{
- ///
- /// This class contains tests for SimpleMessageListenerContainer
- ///
- /// Mark Pollack
- /// $Id:$
- [TestFixture]
- public class SimpleMessageListenerContainerTests : AbstractDependencyInjectionSpringContextTests
- {
-
-
- [Test, ExpectedException(typeof(ArgumentException), ExpectedMessage = "Property 'DefaultMessageQueue' is required")]
- public void EnsureMessageQueuePropertyIsSet()
- {
- SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
- container.AfterPropertiesSet();
- container.Start();
- }
-
-
- [Test]
- public void SendAndAsyncReceive()
- {
-
- SimpleMessageListenerContainer container =
- applicationContext["simpleMessageListenerContainer"] as SimpleMessageListenerContainer;
- SimpleMessageListener listener = applicationContext["simpleMessageListener"] as SimpleMessageListener;
- Assert.IsNotNull(container);
- Assert.IsNotNull(listener);
-
- MessageQueueTemplate q = applicationContext["queue"] as MessageQueueTemplate;
- Assert.IsNotNull(q);
- q.ConvertAndSend("Hello World 1");
-
- int waitInMillis = 2000;
- Thread.Sleep(waitInMillis);
- Assert.AreEqual(0, listener.MessageCount);
-
- container.Start();
- //pick up the message that is already in the queue
- Thread.Sleep(waitInMillis);
- Assert.AreEqual(1, listener.MessageCount);
-
- container.Stop();
- q.ConvertAndSend("Hello World 2");
-
- //what happens to this message, we stopped, so no new event is fired.
- Thread.Sleep(waitInMillis);
- Assert.AreEqual(1, listener.MessageCount);
-
- container.Start();
- Thread.Sleep(waitInMillis);
- //did we get hello world 2?
- Assert.AreEqual(2, listener.MessageCount);
-
- /*
- q.ConvertAndSend("Hello World");
-
- Thread.Sleep(waitInMillis);
- Assert.AreEqual(2, listener.MessageCount);
- */
- container.Stop();
- container.Shutdown();
- Thread.Sleep(waitInMillis);
-
- }
-
-
- protected override string[] ConfigLocations
- {
- get { return new string[] { "assembly://Spring.Messaging.Tests/Spring.Messaging.Listener/SimpleMessageListenerContainerTests.xml" }; }
- }
- }
-}
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListenerContainerTests.xml b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListenerContainerTests.xml
deleted file mode 100644
index 08b62103..00000000
--- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListenerContainerTests.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
index 9693ff4a..f8623c19 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2005.csproj
@@ -83,7 +83,6 @@
-
@@ -106,9 +105,6 @@
Code
-
- Code
-
Code
diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj
index c27842a0..fd28387e 100644
--- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj
+++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj
@@ -84,7 +84,6 @@
-
@@ -107,9 +106,6 @@
Code
-
- Code
-
Code