From: Michael C. T. <mi...@us...> - 2002-10-25 17:34:03
|
Update of /cvsroot/nant/nant/src/NAnt.Core.Tests/Util In directory usw-pr-cvs1:/tmp/cvs-serv30872/src/NAnt.Core.Tests/Util Modified Files: TempDir.cs TempDirTest.cs TempFile.cs TempFileTest.cs XmlLoggerTest.cs Log Message: nunit 2 support Index: TempDir.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core.Tests/Util/TempDir.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TempDir.cs 14 Aug 2002 23:21:52 -0000 1.1 --- TempDir.cs 25 Oct 2002 10:18:09 -0000 1.2 *************** *** 43,47 **** Directory.CreateDirectory(path); if (!Directory.Exists(path)) { ! throw new AssertionFailedError("TempDir: " + path + " does not exists."); } return path; --- 43,47 ---- Directory.CreateDirectory(path); if (!Directory.Exists(path)) { ! throw new AssertionException("TempDir: " + path + " does not exists."); } return path; *************** *** 58,62 **** finally { if (Directory.Exists(path)) { ! throw new AssertionFailedError("TempDir: "+ path + " exists."); } } --- 58,62 ---- finally { if (Directory.Exists(path)) { ! throw new AssertionException("TempDir: "+ path + " exists."); } } Index: TempDirTest.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core.Tests/Util/TempDirTest.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TempDirTest.cs 14 Aug 2002 23:21:52 -0000 1.1 --- TempDirTest.cs 25 Oct 2002 10:18:09 -0000 1.2 *************** *** 26,40 **** namespace SourceForge.NAnt.Tests { ! public class TempDirTest : TestCase { - public TempDirTest(String name) : base(name) { - } public void Test_CreateAndDestroy() { string path = TempDir.Create("foobar"); ! Assert(path + " does not exists.", Directory.Exists(path)); ! Assert(path + " does not end with 'foobar'.", path.EndsWith("foobar")); TempDir.Delete(path); ! Assert(path + " exists.", !Directory.Exists(path)); } } --- 26,40 ---- namespace SourceForge.NAnt.Tests { ! [TestFixture] ! public class TempDirTest { + [Test] public void Test_CreateAndDestroy() { string path = TempDir.Create("foobar"); ! Assertion.Assert(path + " does not exists.", Directory.Exists(path)); ! Assertion.Assert(path + " does not end with 'foobar'.", path.EndsWith("foobar")); TempDir.Delete(path); ! Assertion.Assert(path + " exists.", !Directory.Exists(path)); } } Index: TempFile.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core.Tests/Util/TempFile.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TempFile.cs 14 Aug 2002 23:21:52 -0000 1.1 --- TempFile.cs 25 Oct 2002 10:18:09 -0000 1.2 *************** *** 51,55 **** if (!File.Exists(fileName)) { ! throw new AssertionFailedError("TempFile: " + fileName + " wasn't created."); } --- 51,55 ---- if (!File.Exists(fileName)) { ! throw new AssertionException("TempFile: " + fileName + " wasn't created."); } Index: TempFileTest.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core.Tests/Util/TempFileTest.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TempFileTest.cs 14 Aug 2002 23:21:52 -0000 1.1 --- TempFileTest.cs 25 Oct 2002 10:18:09 -0000 1.2 *************** *** 26,68 **** namespace SourceForge.NAnt.Tests { ! public class TempFileTest : TestCase { ! ! public TempFileTest(String name) : base(name) { ! } ! ! protected override void SetUp() { ! } ! ! protected override void TearDown() { ! } public void Test_Create() { string fileName = TempFile.Create(); ! Assert(fileName + " does not exists.", File.Exists(fileName)); TimeSpan diff = DateTime.Now - File.GetCreationTime(fileName); ! Assert("Creation time should be less than 10 seconds ago.", diff.TotalSeconds < 10.0); File.Delete(fileName); ! Assert(fileName + " exists.", !File.Exists(fileName)); } public void Test_Create_NullArgument() { try { TempFile.Create(null); ! Fail("Exception not thrown."); } catch { } } public void Test_Create_WithContents() { string expected = "Line 1\nLine Two\n\nLine Three"; string fileName = TempFile.CreateWithContents(expected); string actual = TempFile.Read(fileName); ! AssertEquals(expected, actual); // delete the temp file File.Delete(fileName); ! Assert(fileName + " exists.", !File.Exists(fileName)); } } --- 26,63 ---- namespace SourceForge.NAnt.Tests { ! [TestFixture] ! public class TempFileTest { + [Test] public void Test_Create() { string fileName = TempFile.Create(); ! Assertion.Assert(fileName + " does not exists.", File.Exists(fileName)); TimeSpan diff = DateTime.Now - File.GetCreationTime(fileName); ! Assertion.Assert("Creation time should be less than 10 seconds ago.", diff.TotalSeconds < 10.0); File.Delete(fileName); ! Assertion.Assert(fileName + " exists.", !File.Exists(fileName)); } + [Test] public void Test_Create_NullArgument() { try { TempFile.Create(null); ! Assertion.Fail("Exception not thrown."); } catch { } } + [Test] public void Test_Create_WithContents() { string expected = "Line 1\nLine Two\n\nLine Three"; string fileName = TempFile.CreateWithContents(expected); string actual = TempFile.Read(fileName); ! Assertion.AssertEquals(expected, actual); // delete the temp file File.Delete(fileName); ! Assertion.Assert(fileName + " exists.", !File.Exists(fileName)); } } Index: XmlLoggerTest.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core.Tests/Util/XmlLoggerTest.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XmlLoggerTest.cs 9 Oct 2002 10:51:57 -0000 1.3 --- XmlLoggerTest.cs 25 Oct 2002 10:18:09 -0000 1.4 *************** *** 27,39 **** namespace SourceForge.NAnt.Tests { ! public class XmlLoggerTest : TestCase { XmlLogger _log; ! public XmlLoggerTest(string name) : base(name) { } ! ! protected override void SetUp() { _log = CreateXmlLogger(); } public void Test_StripFormatting() { string baseMessage = "this is a typical message."; --- 27,41 ---- namespace SourceForge.NAnt.Tests { ! [TestFixture] ! public class XmlLoggerTest { XmlLogger _log; ! ! [SetUp] ! protected void SetUp() { _log = CreateXmlLogger(); } + [Test] public void Test_StripFormatting() { string baseMessage = "this is a typical message."; *************** *** 53,56 **** --- 55,59 ---- } + [Test] public void Test_StripFormattingMultiline() { string baseMessage = "this is a typical message.\nMultiline message that is."; *************** *** 59,63 **** Assertion.AssertEquals(baseMessage, _log.StripFormatting(formattedMessage)); } ! public void Test_IsJustWhiteSpace() { string message = ""; --- 62,67 ---- Assertion.AssertEquals(baseMessage, _log.StripFormatting(formattedMessage)); } ! ! [Test] public void Test_IsJustWhiteSpace() { string message = ""; *************** *** 85,89 **** Assertion.Assert(String.Format("check should not have failed for: {0}", message), !_log.IsJustWhiteSpace(message)); } ! public void Test_WriteLine() { string baseMessage = "this is a typical message."; --- 89,94 ---- Assertion.Assert(String.Format("check should not have failed for: {0}", message), !_log.IsJustWhiteSpace(message)); } ! ! [Test] public void Test_WriteLine() { string baseMessage = "this is a typical message."; *************** *** 96,100 **** } ! public void Test_Write() { string baseMessage = "this is a typical message."; --- 101,106 ---- } ! ! [Test] public void Test_Write() { string baseMessage = "this is a typical message."; *************** *** 123,127 **** Assertion.AssertEquals(expected, _log.ToString()); } ! public void Test_WriteStrangeCharacters() { string baseMessage = "this message has !@!)$)(&^%^%$$##@@}{[]\"';:<<>/+=-_. in it."; --- 129,134 ---- Assertion.AssertEquals(expected, _log.ToString()); } ! ! [Test] public void Test_WriteStrangeCharacters() { string baseMessage = "this message has !@!)$)(&^%^%$$##@@}{[]\"';:<<>/+=-_. in it."; *************** *** 134,137 **** --- 141,145 ---- } + [Test] public void Test_WriteEmbeddedMathFormulas() { string baseMessage = "this message has: x < 20 = y in it."; *************** *** 144,147 **** --- 152,156 ---- } + [Test] public void Test_WriteTextWithEmbeddedCDATATag() { string message = @"some stuff with <xml> <![CDATA[more stuff]]> and more <![CDATA[cdata]]>"; *************** *** 152,155 **** --- 161,165 ---- } + [Test] public void Test_WriteXmlWithDeclaration() { string message = @"<?xml version=""1.0"" encoding=""utf-16""?><test><a></a></test>"; *************** *** 160,163 **** --- 170,174 ---- } + [Test] public void Test_WriteXmlWithLeadingWhitespace() { string message = @" <?xml version=""1.0"" encoding=""utf-16""?><testsuite name=""tw.ccnet.acceptance Tests"" tests=""14"" time=""19.367"" errors=""0"" failures=""0""/>"; *************** *** 167,171 **** Assertion.AssertEquals(expected, _log.ToString()); } ! public void Test_WriteEmbeddedXml() { string baseMessage = "<a><b><![CDATA[message]]></b></a>"; --- 178,183 ---- Assertion.AssertEquals(expected, _log.ToString()); } ! ! [Test] public void Test_WriteEmbeddedXml() { string baseMessage = "<a><b><![CDATA[message]]></b></a>"; *************** *** 176,179 **** --- 188,192 ---- } + [Test] public void Test_WriteEmbeddedMalformedXml() { string baseMessage = "<a>malformed<b>"; *************** *** 183,187 **** Assertion.AssertEquals(expected, _log.ToString()); } ! public void Test_BuildStartedAndBuildFinished() { string name = "foo"; --- 196,201 ---- Assertion.AssertEquals(expected, _log.ToString()); } ! ! [Test] public void Test_BuildStartedAndBuildFinished() { string name = "foo"; *************** *** 193,197 **** Assertion.AssertEquals(expected, _log.ToString()); } ! public void Test_TargetStartedAndTargetFinished() { string name = "foo"; --- 207,212 ---- Assertion.AssertEquals(expected, _log.ToString()); } ! ! [Test] public void Test_TargetStartedAndTargetFinished() { string name = "foo"; *************** *** 203,207 **** Assertion.AssertEquals(expected, _log.ToString()); } ! public void Test_TaskStartedAndTaskFinished() { string name = "foo"; --- 218,223 ---- Assertion.AssertEquals(expected, _log.ToString()); } ! ! [Test] public void Test_TaskStartedAndTaskFinished() { string name = "foo"; |