|
From: Marko L. <la...@us...> - 2007-12-01 20:37:24
|
Update of /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24781/Scheduling/Quartz Modified Files: CronTriggerObjectTest.cs JobDetailObjectTest.cs MethodInvokingJobTest.cs SimpleTriggerObjectTest.cs TriggerObjectTest.cs Log Message: Upgraded to Quartz 0.9 Index: JobDetailObjectTest.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/JobDetailObjectTest.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JobDetailObjectTest.cs 14 Sep 2007 12:56:10 -0000 1.2 --- JobDetailObjectTest.cs 1 Dec 2007 20:37:21 -0000 1.3 *************** *** 91,95 **** jobDetail.Group = null; jobDetail.AfterPropertiesSet(); ! Assert.AreEqual(SchedulerConstants.DEFAULT_GROUP, jobDetail.Group, "Groups differ"); Assert.AreEqual(objectName, jobDetail.Name, "Names differ"); } --- 91,95 ---- jobDetail.Group = null; jobDetail.AfterPropertiesSet(); ! Assert.AreEqual(SchedulerConstants.DefaultGroup, jobDetail.Group, "Groups differ"); Assert.AreEqual(objectName, jobDetail.Name, "Names differ"); } *************** *** 114,120 **** const string objectName = "springJobDetailObject"; jobDetail.ObjectName = objectName; ! jobDetail.ApplicationContext = new XmlApplicationContext(); ! jobDetail.ApplicationContextJobDataKey = "applicationContextJobDataKey"; jobDetail.AfterPropertiesSet(); } --- 114,124 ---- const string objectName = "springJobDetailObject"; jobDetail.ObjectName = objectName; ! XmlApplicationContext ctx = new XmlApplicationContext(); ! jobDetail.ApplicationContext = ctx; ! string key = "applicationContextJobDataKey"; ! jobDetail.ApplicationContextJobDataKey = key; jobDetail.AfterPropertiesSet(); + Assert.AreSame(ctx, jobDetail.ApplicationContext, "ApplicationContext was not set correctly"); + Assert.AreSame(ctx, jobDetail.JobDataMap[key], "ApplicationContext was not set to job data map"); } Index: SimpleTriggerObjectTest.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleTriggerObjectTest.cs 12 Sep 2007 18:39:33 -0000 1.1 --- SimpleTriggerObjectTest.cs 1 Dec 2007 20:37:21 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- using System; + using System.Collections; using NUnit.Framework; *************** *** 93,96 **** --- 94,107 ---- } + [Test] + public void TestJobDataAsMap() + { + Hashtable data = new Hashtable(); + data["foo"] = "bar"; + data["number"] = 123; + simpleTrigger.JobDataAsMap = data; + CollectionAssert.AreEqual(data, simpleTrigger.JobDataMap, "Data differed"); + } + } Index: CronTriggerObjectTest.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CronTriggerObjectTest.cs 12 Sep 2007 18:39:33 -0000 1.1 --- CronTriggerObjectTest.cs 1 Dec 2007 20:37:21 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- using System; + using System.Collections; using NUnit.Framework; *************** *** 87,90 **** --- 88,100 ---- } + [Test] + public void TestJobDataAsMap() + { + Hashtable data = new Hashtable(); + data["foo"] = "bar"; + data["number"] = 123; + cronTrigger.JobDataAsMap = data; + CollectionAssert.AreEqual(data, cronTrigger.JobDataMap, "Data differed"); + } } Index: MethodInvokingJobTest.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MethodInvokingJobTest.cs 12 Sep 2007 18:39:33 -0000 1.1 --- MethodInvokingJobTest.cs 1 Dec 2007 20:37:21 -0000 1.2 *************** *** 93,96 **** --- 93,107 ---- } + [Test] + public void TestMethodInvoker_PrivateMethod() + { + InvocationCountingJob job = new InvocationCountingJob(); + MethodInvoker mi = new MethodInvoker(); + mi.TargetObject = job; + mi.TargetMethod = "PrivateMethod"; + mi.Prepare(); + methodInvokingJob.MethodInvoker = mi; + methodInvokingJob.Execute(CreateMinimalJobExecutionContext()); + } private static JobExecutionContext CreateMinimalJobExecutionContext() *************** *** 131,134 **** --- 142,148 ---- } + private void PrivateMethod() + { + } public int CounterValue Index: TriggerObjectTest.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/TriggerObjectTest.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TriggerObjectTest.cs 12 Sep 2007 18:39:34 -0000 1.1 --- TriggerObjectTest.cs 1 Dec 2007 20:37:21 -0000 1.2 *************** *** 42,49 **** { Assert.AreEqual(TRIGGER_NAME, trigger.Name, "trigger name mismatch"); ! Assert.AreEqual(SchedulerConstants.DEFAULT_GROUP, trigger.Group, "trigger group name mismatch"); AssertDateTimesEqualityWithAllowedDelta(DateTime.UtcNow, trigger.StartTimeUtc, 1000); Assert.IsNull(trigger.JobName, "trigger job name not null"); ! Assert.AreEqual(SchedulerConstants.DEFAULT_GROUP, trigger.JobGroup, "trigger job group was not default"); } --- 42,49 ---- { Assert.AreEqual(TRIGGER_NAME, trigger.Name, "trigger name mismatch"); ! Assert.AreEqual(SchedulerConstants.DefaultGroup, trigger.Group, "trigger group name mismatch"); AssertDateTimesEqualityWithAllowedDelta(DateTime.UtcNow, trigger.StartTimeUtc, 1000); Assert.IsNull(trigger.JobName, "trigger job name not null"); ! Assert.AreEqual(SchedulerConstants.DefaultGroup, trigger.JobGroup, "trigger job group was not default"); } |
