From d1da7969595af3895f26d1b7dcd8d0ec79c58cb4 Mon Sep 17 00:00:00 2001
From: Marko Lahma <marko.lahma@gmail.com>
Date: Mon, 13 Feb 2012 11:18:30 +0200
Subject: [PATCH] Fix Quartz integration test issues

---
 .../Scheduling/Quartz/CronTriggerObjectTest.cs   |  4 ++++
 .../Scheduling/Quartz/QuartzSupportTests.cs      |  2 +-
 .../Quartz/SchedulerFactoryObjectTest.cs         | 16 ++++++----------
 .../Scheduling/Quartz/SimpleTriggerObjectTest.cs |  4 ++++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs
index bcb5e038..7735db5e 100644
--- a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs
@@ -83,7 +83,11 @@ namespace Spring.Scheduling.Quartz
         [Test]
         public void TestJobDataAsMap()
         {
+#if QUARTZ_2_0
             IDictionary data = new Dictionary<string, object>();
+#else
+            Hashtable data = new Hashtable();
+#endif
             data["foo"] = "bar";
             data["number"] = 123;
             cronTrigger.JobDataAsMap = data;
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/QuartzSupportTests.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/QuartzSupportTests.cs
index f7dda1f4..715465f6 100644
--- a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/QuartzSupportTests.cs
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/QuartzSupportTests.cs
@@ -875,7 +875,7 @@ namespace Spring.Scheduling.Quartz
             factoryObject.AfterPropertiesSet();
             factoryObject.Start();
 
-            DummyRunnable.runEvent.WaitOne(500);
+            Thread.Sleep(500);
             Assert.AreEqual(10, DummyRunnable.param);
             Assert.IsTrue(DummyRunnable.count > 0);
 
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs
index 80f74f0a..2f89ac31 100644
--- a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs
@@ -107,26 +107,22 @@ namespace Spring.Scheduling.Quartz
             InitForAfterPropertiesSetTest();
             
             factory.SchedulerListeners = new ISchedulerListener[] { MockRepository.GenerateMock<ISchedulerListener>() };
-            TestSchedulerFactory.MockScheduler.AddSchedulerListener(null);
-            LastCall.IgnoreArguments();
 
             factory.GlobalJobListeners = new IJobListener[] { MockRepository.GenerateMock<IJobListener>() };
-            TestSchedulerFactory.MockScheduler.AddGlobalJobListener(null);
-            LastCall.IgnoreArguments();
 
             factory.JobListeners = new IJobListener[] { MockRepository.GenerateMock<IJobListener>() };
-            TestSchedulerFactory.MockScheduler.AddJobListener(null);
-            LastCall.IgnoreArguments();
 
             factory.GlobalTriggerListeners = new ITriggerListener[] { MockRepository.GenerateMock<ITriggerListener>() };
-            TestSchedulerFactory.MockScheduler.AddGlobalTriggerListener(null);
-            LastCall.IgnoreArguments();
 
             factory.TriggerListeners = new ITriggerListener[] { MockRepository.GenerateMock<ITriggerListener>() };
-            TestSchedulerFactory.MockScheduler.AddTriggerListener(null);
-            LastCall.IgnoreArguments();
 
             factory.AfterPropertiesSet();
+
+            TestSchedulerFactory.MockScheduler.AssertWasCalled(x => x.AddSchedulerListener(Arg<ISchedulerListener>.Is.NotNull));
+            TestSchedulerFactory.MockScheduler.AssertWasCalled(x => x.AddGlobalJobListener(Arg<IJobListener>.Is.NotNull));
+            TestSchedulerFactory.MockScheduler.AssertWasCalled(x => x.AddJobListener(Arg<IJobListener>.Is.NotNull));
+            TestSchedulerFactory.MockScheduler.AssertWasCalled(x => x.AddGlobalTriggerListener(Arg<ITriggerListener>.Is.NotNull));
+            TestSchedulerFactory.MockScheduler.AssertWasCalled(x => x.AddTriggerListener(Arg<ITriggerListener>.Is.NotNull));
         }
 #endif
         /// <summary>
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs
index 28de1180..247fca88 100644
--- a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs
@@ -118,7 +118,11 @@ namespace Spring.Scheduling.Quartz
         [Test]
         public void TestJobDataAsMap()
         {
+#if QUARTZ_2_0
             IDictionary data = new Dictionary<string, object>();
+#else
+            Hashtable data = new Hashtable();
+#endif
             data["foo"] = "bar";
             data["number"] = 123;
             simpleTrigger.JobDataAsMap = data;