From: Owen R. <exo...@us...> - 2004-08-23 12:39:08
|
Update of /cvsroot/ccnet/ccnet/project/core/publishers/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4990/project/core/publishers/test Modified Files: EmailPublisherTest.cs HtmlDetailsMessageBuilderTest.cs MockPublisher.cs RSSPublisherTest.cs XmlIntegrationResultWriterTest.cs XmlLogPublisherTest.cs Log Message: introduced IIntegrationResult interface removed Project from the ITask interface various small refactoring/reformattings and using optimisations Index: XmlLogPublisherTest.cs =================================================================== RCS file: /cvsroot/ccnet/ccnet/project/core/publishers/test/XmlLogPublisherTest.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** XmlLogPublisherTest.cs 17 Aug 2004 14:50:48 -0000 1.17 --- XmlLogPublisherTest.cs 23 Aug 2004 12:38:16 -0000 1.18 *************** *** 1,11 **** using System; - using System.Collections; using System.IO; using System.Xml; using NMock; using NUnit.Framework; - using Exortech.NetReflector; - using ThoughtWorks.CruiseControl.Core.Util; using ThoughtWorks.CruiseControl.Core.Test; using ThoughtWorks.CruiseControl.Remote; --- 1,10 ---- using System; using System.IO; using System.Xml; + using Exortech.NetReflector; using NMock; using NUnit.Framework; using ThoughtWorks.CruiseControl.Core.Test; + using ThoughtWorks.CruiseControl.Core.Util; using ThoughtWorks.CruiseControl.Remote; *************** *** 68,72 **** public void GetFilenameForFailedBuild() { ! IntegrationResult result = CreateIntegrationResult(IntegrationStatus.Failure, true); string expected = "log19800101000000.xml"; Assert.AreEqual(expected, _publisher.GetFilename(result)); --- 67,71 ---- public void GetFilenameForFailedBuild() { ! IntegrationResult result = CreateIntegrationResult(IntegrationStatus.Failure, true); string expected = "log19800101000000.xml"; Assert.AreEqual(expected, _publisher.GetFilename(result)); *************** *** 161,165 **** private void CheckForXml(string path) { ! XmlDocument doc = new XmlDocument(); doc.Load(path); } --- 160,164 ---- private void CheckForXml(string path) { ! XmlDocument doc = new XmlDocument(); doc.Load(path); } *************** *** 185,189 **** private IntegrationResult CreateIntegrationResult(IntegrationStatus status, bool addModifications) { ! IntegrationResult result = new IntegrationResult("proj"); result.StartTime = new DateTime(1980, 1, 1); result.Label = "1"; --- 184,189 ---- private IntegrationResult CreateIntegrationResult(IntegrationStatus status, bool addModifications) { ! IntegrationResult result = IntegrationResultMother.Create(status, new DateTime(1980, 1, 1)); ! result.ProjectName = "proj"; result.StartTime = new DateTime(1980, 1, 1); result.Label = "1"; *************** *** 191,197 **** if (addModifications) { ! result.Modifications = new Modification[1]; ! result.Modifications[0] = new Modification(); ! result.Modifications[0].ModifiedTime = new DateTime(2002, 2, 3); } return result; --- 191,198 ---- if (addModifications) { ! Modification[] modifications = new Modification[1]; ! modifications[0] = new Modification(); ! modifications[0].ModifiedTime = new DateTime(2002, 2, 3); ! result.Modifications = modifications; } return result; Index: RSSPublisherTest.cs =================================================================== RCS file: /cvsroot/ccnet/ccnet/project/core/publishers/test/RSSPublisherTest.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RSSPublisherTest.cs 16 Aug 2004 10:13:27 -0000 1.2 --- RSSPublisherTest.cs 23 Aug 2004 12:38:15 -0000 1.3 *************** *** 1,6 **** - using System; using NUnit.Framework; - using NMock; - using ThoughtWorks.CruiseControl.Core.Publishers; using ThoughtWorks.CruiseControl.Remote; --- 1,3 ---- *************** *** 20,24 **** project.Name = "myProject"; project.WebURL = "http://somewhere/someplace.html"; ! result = new IntegrationResult("myProject"); publisher = new RssPublisher(); } --- 17,21 ---- project.Name = "myProject"; project.WebURL = "http://somewhere/someplace.html"; ! result = new IntegrationResult("myProject", @"c:\temp"); publisher = new RssPublisher(); } *************** *** 28,32 **** { /// Execute ! Document document = publisher.GenarateDocument(project, result); /// Verify --- 25,29 ---- { /// Execute ! Document document = publisher.GenerateDocument(project, result); /// Verify *************** *** 41,45 **** result.Status = IntegrationStatus.Success; /// Execute ! Document document = publisher.GenarateDocument(project, result); Item firstItem = (Item) document.Channel.Items[0]; --- 38,42 ---- result.Status = IntegrationStatus.Success; /// Execute ! Document document = publisher.GenerateDocument(project, result); Item firstItem = (Item) document.Channel.Items[0]; Index: EmailPublisherTest.cs =================================================================== RCS file: /cvsroot/ccnet/ccnet/project/core/publishers/test/EmailPublisherTest.cs,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** EmailPublisherTest.cs 16 Aug 2004 10:13:27 -0000 1.16 --- EmailPublisherTest.cs 23 Aug 2004 12:38:15 -0000 1.17 *************** *** 2,13 **** using System.Collections; using System.Web.Mail; ! using System.Xml; using NUnit.Framework; using ThoughtWorks.CruiseControl.Core.Test; - using ThoughtWorks.CruiseControl.Core.Util; - using Exortech.NetReflector; using ThoughtWorks.CruiseControl.Remote; - using ThoughtWorks.CruiseControl.Core.Publishers; - using NMock; namespace ThoughtWorks.CruiseControl.Core.Publishers.Test --- 2,9 ---- using System.Collections; using System.Web.Mail; ! using NMock; using NUnit.Framework; using ThoughtWorks.CruiseControl.Core.Test; using ThoughtWorks.CruiseControl.Remote; namespace ThoughtWorks.CruiseControl.Core.Publishers.Test Index: MockPublisher.cs =================================================================== RCS file: /cvsroot/ccnet/ccnet/project/core/publishers/test/MockPublisher.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MockPublisher.cs 31 Jul 2004 15:39:54 -0000 1.5 --- MockPublisher.cs 23 Aug 2004 12:38:15 -0000 1.6 *************** *** 7,11 **** { private bool _published = false; ! private IntegrationResult _result; public bool Published --- 7,11 ---- { private bool _published = false; ! private IIntegrationResult _result; public bool Published *************** *** 14,23 **** } ! public IntegrationResult Result { get { return _result; } } ! public override void PublishIntegrationResults(IProject project, IntegrationResult result) { _published = true; --- 14,23 ---- } ! public IIntegrationResult Result { get { return _result; } } ! public override void PublishIntegrationResults(IProject project, IIntegrationResult result) { _published = true; Index: HtmlDetailsMessageBuilderTest.cs =================================================================== RCS file: /cvsroot/ccnet/ccnet/project/core/publishers/test/HtmlDetailsMessageBuilderTest.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HtmlDetailsMessageBuilderTest.cs 16 Aug 2004 10:13:27 -0000 1.2 --- HtmlDetailsMessageBuilderTest.cs 23 Aug 2004 12:38:15 -0000 1.3 *************** *** 1,5 **** - using System; using NUnit.Framework; - using ThoughtWorks.CruiseControl.Core.Publishers; using ThoughtWorks.CruiseControl.Core.Test; using ThoughtWorks.CruiseControl.Core.Util; --- 1,3 ---- *************** *** 10,17 **** public class HtmlDetailsMessageBuilderTest : CustomAssertion { - public HtmlDetailsMessageBuilderTest() - { - } - [Test] public void ShouldCreateStyleElementsInTheMailMessage() --- 8,11 ---- Index: XmlIntegrationResultWriterTest.cs =================================================================== RCS file: /cvsroot/ccnet/ccnet/project/core/publishers/test/XmlIntegrationResultWriterTest.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XmlIntegrationResultWriterTest.cs 16 Aug 2004 10:13:27 -0000 1.3 --- XmlIntegrationResultWriterTest.cs 23 Aug 2004 12:38:16 -0000 1.4 *************** *** 1,10 **** using System; - using NUnit.Framework; - using System.Xml; using System.IO; ! using ThoughtWorks.CruiseControl.Remote; ! using ThoughtWorks.CruiseControl.Core.Util; using ThoughtWorks.CruiseControl.Core.Test; ! using ThoughtWorks.CruiseControl.Core.Publishers; namespace ThoughtWorks.CruiseControl.Core.Publishers.Test --- 1,8 ---- using System; using System.IO; ! using System.Xml; ! using NUnit.Framework; using ThoughtWorks.CruiseControl.Core.Test; ! using ThoughtWorks.CruiseControl.Remote; namespace ThoughtWorks.CruiseControl.Core.Publishers.Test *************** *** 175,179 **** private IntegrationResult CreateIntegrationResult(IntegrationStatus status, bool addModifications) { ! IntegrationResult result = new IntegrationResult("proj"); result.Label = "1"; result.Status = status; --- 173,178 ---- private IntegrationResult CreateIntegrationResult(IntegrationStatus status, bool addModifications) { ! IntegrationResult result = IntegrationResultMother.Create(status); ! result.ProjectName = "proj"; result.Label = "1"; result.Status = status; |