[JEDI.NET-commits] nunit/source Jedi.IO.Paths.Nunit.pas,1.3,1.4 Jedi.System.CommandLine.NUnit.pas,1.
Status: Pre-Alpha
Brought to you by:
jedi_mbe
Menu
▾
▴
[JEDI.NET-commits] nunit/source Jedi.IO.Paths.Nunit.pas,1.3,1.4 Jedi.System.CommandLine.NUnit.pas,1.2,1.3 Jedi.System.Strings.NUnit.pas,1.3,1.4 Jedi.Timers.Schedules.Generic.pas,1.1,1.2
|
From: Marcel B. <jed...@us...> - 2005-12-24 12:29:58
|
Update of /cvsroot/jedidotnet/nunit/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18074/nunit/source Modified Files: Jedi.IO.Paths.Nunit.pas Jedi.System.CommandLine.NUnit.pas Jedi.System.Strings.NUnit.pas Jedi.Timers.Schedules.Generic.pas Log Message: Adapted to new assembly structure Index: Jedi.IO.Paths.Nunit.pas =================================================================== RCS file: /cvsroot/jedidotnet/nunit/source/Jedi.IO.Paths.Nunit.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jedi.IO.Paths.Nunit.pas 29 Mar 2005 10:49:12 -0000 1.3 --- Jedi.IO.Paths.Nunit.pas 24 Dec 2005 12:29:49 -0000 1.4 *************** *** 305,309 **** begin Assert.AreEqual('myvolume#:folder1:folder2:folder3', ! Path.Normalize('myvolume#:folder1:folder2;folder3', Path.PathConfig.Create(':', ';', '#', ['$']))); end; {$ENDREGION} --- 305,309 ---- begin Assert.AreEqual('myvolume#:folder1:folder2:folder3', ! Path.Normalize('myvolume#:folder1:folder2;folder3', PathConfig.Create(':', ';', '#', ['$']))); end; {$ENDREGION} Index: Jedi.System.CommandLine.NUnit.pas =================================================================== RCS file: /cvsroot/jedidotnet/nunit/source/Jedi.System.CommandLine.NUnit.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jedi.System.CommandLine.NUnit.pas 16 Jun 2005 13:20:53 -0000 1.2 --- Jedi.System.CommandLine.NUnit.pas 24 Dec 2005 12:29:49 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- uses Jedi.System.CommandLine, + Jedi.System.Resources, NUnit.Framework, System.Drawing, *************** *** 143,154 **** Errors = class public ! [Test, ! ExpectedException(TypeOf(CommandLineException), 'Duplicate command line argument (-o) specified by ' + ! '''Jedi.System.CommandLine.DoubleOptionSettings.Dummy''. The argument has already been assigned to '+ ! '''Jedi.System.CommandLine.CompilerSettings.Optimization''')] procedure DoubleOptions; ! [Test, ExpectedException(TypeOf(CommandLineException), 'Unknown argument: -o')] procedure NoCompilerSettings; ! [Test, ExpectedException(TypeOf(CommandLineException), 'Unknown argument: -z+')] procedure UnknownArgument; end; --- 144,152 ---- Errors = class public ! [Test] procedure DoubleOptions; ! [Test] procedure NoCompilerSettings; ! [Test] procedure UnknownArgument; end; *************** *** 234,238 **** [Test] procedure NoValueIgnores; [Test] procedure NoValueResets; - [ExpectedException(TypeOf(CommandLineException), 'Missing value. Argument: -throw')] [Test] procedure NoValueThrowsException; [Test] procedure NoValueToggles; --- 232,235 ---- *************** *** 241,244 **** --- 238,242 ---- {$ENDREGION} + {$REGION 'Enumeration cases'} type EnumType = (None, FirstValue, SecondValue, ThirdValue); *************** *** 264,267 **** --- 262,266 ---- [Test] procedure Value3; end; + {$ENDREGION} implementation *************** *** 410,418 **** files: array of string; begin ! files := CommandLine.Parse( ! 'process -throw', ! [TypeOf(SettingsBoolean)]); ! Assert.AreEqual(0, &Array(files).Length, 'wrong number of files returned.'); ! Assert.IsFalse(SettingsBoolean.NoValueThrowsException, '-throw without value should toggle (1).'); end; --- 409,426 ---- files: array of string; begin ! try ! files := CommandLine.Parse( ! 'process -throw', ! [TypeOf(SettingsBoolean)]); ! Assert.AreEqual(0, &Array(files).Length, 'wrong number of files returned.'); ! Assert.IsFalse(SettingsBoolean.NoValueThrowsException, '-throw without value should toggle (1).'); ! Assert.Fail('Exception Jedi.System.CommandLineException expected'); ! except ! on e: CommandLineException do ! if System.String.Compare(e.Message, Resources.CommandLine.ValueRequired('-throw')) <> 0 then ! Assert.Fail('Jedi.System.CommandLineException exception raised with wrong message. Actual message: {0}', [e.Message]); ! on e: System.Object do ! Assert.Fail('{0} exception raised; expected Jedi.System.CommandLineException', [e.GetType.FullName]); ! end; end; *************** *** 548,566 **** procedure Errors.DoubleOptions; begin ! CommandLine.Parse('process -o123 -ou..\Lib', [TypeOf(CompilerSettings), TypeOf(DirectorySettings), TypeOf(DoubleOptionSettings)]); end; procedure Errors.NoCompilerSettings; begin ! CommandLine.Parse( ! 'process -o -sSomePath;NextPath -oa..\Bin -ou"..\Temp Units" file_to_compile.dpk', ! [TypeOf(DirectorySettings)]); end; procedure Errors.UnknownArgument; begin ! CommandLine.Parse( ! 'process /o -z+ "some file.dpk"', ! [TypeOf(CompilerSettings), TypeOf(DirectorySettings)]); end; {$ENDREGION} --- 556,604 ---- procedure Errors.DoubleOptions; begin ! try ! CommandLine.Parse('process -o123 -ou..\Lib', [TypeOf(CompilerSettings), TypeOf(DirectorySettings), TypeOf(DoubleOptionSettings)]); ! Assert.Fail('Exception Jedi.System.CommandLineException expected'); ! except ! on e: CommandLineException do ! if System.String.Compare(e.Message, Resources.CommandLine.DuplicateSwitch( ! '-o', ! TypeOf(DoubleOptionSettings).GetProperty('Dummy'), ! TypeOf(CompilerSettings).GetProperty('Optimization'))) <> 0 then ! Assert.Fail('Jedi.System.CommandLineException exception raised with wrong message. Actual message: {0}', [e.Message]); ! on e: System.Object do ! Assert.Fail('{0} exception raised; expected Jedi.System.CommandLineException', [e.GetType.FullName]); ! end; end; procedure Errors.NoCompilerSettings; begin ! try ! CommandLine.Parse( ! 'process -o -sSomePath;NextPath -oa..\Bin -ou"..\Temp Units" file_to_compile.dpk', ! [TypeOf(DirectorySettings)]); ! Assert.Fail('Exception Jedi.System.CommandLineException expected'); ! except ! on e: CommandLineException do ! if System.String.Compare(e.Message, Resources.CommandLine.UnknownSwitch('-o')) <> 0 then ! Assert.Fail('Jedi.System.CommandLineException exception raised with wrong message. Actual message: {0}', [e.Message]); ! on e: System.Object do ! Assert.Fail('{0} exception raised; expected Jedi.System.CommandLineException', [e.GetType.FullName]); ! end; end; procedure Errors.UnknownArgument; begin ! try ! CommandLine.Parse( ! 'process /o -z+ "some file.dpk"', ! [TypeOf(CompilerSettings), TypeOf(DirectorySettings)]); ! Assert.Fail('Exception Jedi.System.CommandLineException expected'); ! except ! on e: CommandLineException do ! if System.String.Compare(e.Message, Resources.CommandLine.UnknownSwitch('-z+')) <> 0 then ! Assert.Fail('Jedi.System.CommandLineException exception raised with wrong message. Actual message: {0}', [e.Message]); ! on e: System.Object do ! Assert.Fail('{0} exception raised; expected Jedi.System.CommandLineException', [e.GetType.FullName]); ! end; end; {$ENDREGION} Index: Jedi.Timers.Schedules.Generic.pas =================================================================== RCS file: /cvsroot/jedidotnet/nunit/source/Jedi.Timers.Schedules.Generic.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Timers.Schedules.Generic.pas 16 Jun 2005 13:19:44 -0000 1.1 --- Jedi.Timers.Schedules.Generic.pas 24 Dec 2005 12:29:49 -0000 1.2 *************** *** 78,82 **** public constructor Create(schedules: array of Schedule); - strict protected {$ENDREGION} {$REGION 'Overrides'} --- 78,81 ---- Index: Jedi.System.Strings.NUnit.pas =================================================================== RCS file: /cvsroot/jedidotnet/nunit/source/Jedi.System.Strings.NUnit.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jedi.System.Strings.NUnit.pas 4 Mar 2005 14:48:38 -0000 1.3 --- Jedi.System.Strings.NUnit.pas 24 Dec 2005 12:29:49 -0000 1.4 *************** *** 4,18 **** uses ! Jedi.System, NUnit.Framework; type [TestFixture] ! TabSet = class {$REGION 'Test data'} strict protected ! TabSet1: StringUtils.TabSet; ! TabSet2: StringUtils.TabSet; ! TabSet3: StringUtils.TabSet; {$ENDREGION} {$REGION 'SetUp/TearDown methods'} --- 4,19 ---- uses ! Jedi.Core.Resources, ! Jedi.System.Strings, NUnit.Framework; type [TestFixture] ! TabSets = class {$REGION 'Test data'} strict protected ! TabSet1: TabSet; ! TabSet2: TabSet; ! TabSet3: TabSet; {$ENDREGION} {$REGION 'SetUp/TearDown methods'} *************** *** 65,71 **** [Test] procedure RoundtripComplexString; [Test] procedure RoundtripComplexStringWithAlternateQuoting; - [ExpectedException(TypeOf(FormatException), 'String ends in garbage.')] [Test] procedure DequoteStringWithGarbage; - [ExpectedException(TypeOf(FormatException), 'End quote missing.')] [Test] procedure DequoteStringWithoutEndQuote; [Test] procedure DequoteStringWithAllowedGarbage; --- 66,70 ---- *************** *** 132,135 **** --- 131,135 ---- const sTabTest1 = 'Abc'#9'Def Ghi'#9'Jkl'#9#9'Mno'#9#9#9'Pqr'; const sTabTest2 = #9'Abc'#9'Def Ghi'#9'Jkl'#9#9'Mno'#9#9#9'Pqr'; + const sTabTest3 = 'Abc'#9#9'Def'#10#9'Ghi'#13#10#13#10#9#9'Jkl'; // 1 2 3 4 5 6 7 // 01234567890123456789012345678901234567890123456789012345678901234567890123456789 *************** *** 140,143 **** --- 140,175 ---- const sTabTest2Output2 = ' Abc Def Ghi Jkl Mno Pqr'; const sTabTest2Output3 = ' Abc Def Ghi Jkl Mno Pqr'; + const sTabTest3Output1 = 'Abc Def'#10 + + ' Ghi'#13#10#13#10 + + ' Jkl'; + const sTabTest3Output2 = 'Abc Def'#10 + + ' Ghi'#13#10#13#10+ + ' Jkl'; + const sTabTest3Output3 = 'Abc Def'#10 + + ' Ghi'#13#10#13#10+ + ' Jkl'; + {$ENDREGION} + {$REGION 'Tabify test constants'} + strict protected + // 1 2 3 4 5 6 7 + // 01234567890123456789012345678901234567890123456789012345678901234567890123456789 + const sTabifyTest1 = ' Abc def ghi jkl mnop qr stu vwx'; + const sTabifyTest2 = 'Dummy LD A, (HL) ; First line'#13#10+ + ' INC HL '#9#9'; Second line'#13#10+ + ' '#9'LD C, (HL)'; + + const sTabifyTest1Out1 = #9#9' Abc'#9#9#9#9#9#9#9#9' def'#9#9' ghi'#9'jkl'#9#9#9' mnop qr'#9'stu'#9#9'vwx'; + const sTabifyTest1Out2 = ' Abc'#9#9 + + ' def ghi jkl'#9 + + ' mnop qr'#9'stu'#9' vwx'; + const sTabifyTest1Out3 = ' Abc'#9#9 + + ' def ghi jkl'#9#9 + + ' mnop qr'#9'stu'#9#9'vwx'; + const sTabifyTest2Out1 = 'Dummy'#9#9#9#9#9' LD'#9#9'A, (HL)'#9#9#9#9#9#9#9#9#9'; First line'#13#10+ + #9#9#9#9#9#9#9' INC'#9'HL'#9#9#9#9'; Second line'#13#10+ + #9#9'LD'#9' C, (HL)'; + const sTabifyTest2Out2 = 'Dummy'#9'LD'#9'A, (HL)'#9#9'; First line'#13#10+ + #9'INC'#9'HL'#9#9'; Second line'#13#10+ + #9'LD'#9'C, (HL)'; {$ENDREGION} {$REGION 'Duplicate removal test constants'} *************** *** 157,160 **** --- 189,193 ---- [Test] procedure RemoveDuplicates; [Test] procedure &Repeat; + [Test] procedure Tabify; end; *************** *** 263,282 **** procedure Manipulations.ExpandTabs; var ! tabSet1: StringUtils.TabSet; ! tabSet2: StringUtils.TabSet; ! tabSet3: StringUtils.TabSet; begin ! tabSet1 := StringUtils.TabSet.Create(2); ! tabSet2 := StringUtils.TabSet.Create([15, 20, 40, 44]); ! tabSet3 := StringUtils.TabSet.Create([15, 20, 40, 44], 2); Assert.AreEqual(sTabTest1Output1, StringUtils.ExpandTabs(sTabTest1, tabSet1), 'sTabTest1Output1'); Assert.AreEqual(sTabTest2Output1, StringUtils.ExpandTabs(sTabTest2, tabSet1), 'sTabTest2Output1'); Assert.AreEqual(sTabTest1Output2, StringUtils.ExpandTabs(sTabTest1, tabSet2), 'sTabTest1Output2'); Assert.AreEqual(sTabTest2Output2, StringUtils.ExpandTabs(sTabTest2, tabSet2), 'sTabTest2Output2'); Assert.AreEqual(sTabTest1Output3, StringUtils.ExpandTabs(sTabTest1, tabSet3), 'sTabTest1Output3'); Assert.AreEqual(sTabTest2Output3, StringUtils.ExpandTabs(sTabTest2, tabSet3), 'sTabTest2Output3'); end; --- 296,318 ---- procedure Manipulations.ExpandTabs; var ! tabSet1: TabSet; ! tabSet2: TabSet; ! tabSet3: TabSet; begin ! tabSet1 := TabSet.Create(2); ! tabSet2 := TabSet.Create([15, 20, 40, 44]); ! tabSet3 := TabSet.Create([15, 20, 40, 44], 2); Assert.AreEqual(sTabTest1Output1, StringUtils.ExpandTabs(sTabTest1, tabSet1), 'sTabTest1Output1'); Assert.AreEqual(sTabTest2Output1, StringUtils.ExpandTabs(sTabTest2, tabSet1), 'sTabTest2Output1'); + Assert.AreEqual(sTabTest3Output1, StringUtils.ExpandTabs(sTabTest3, tabSet1), 'sTabTest3Output1'); Assert.AreEqual(sTabTest1Output2, StringUtils.ExpandTabs(sTabTest1, tabSet2), 'sTabTest1Output2'); Assert.AreEqual(sTabTest2Output2, StringUtils.ExpandTabs(sTabTest2, tabSet2), 'sTabTest2Output2'); + Assert.AreEqual(sTabTest3Output2, StringUtils.ExpandTabs(sTabTest3, tabSet2), 'sTabTest3Output2'); Assert.AreEqual(sTabTest1Output3, StringUtils.ExpandTabs(sTabTest1, tabSet3), 'sTabTest1Output3'); Assert.AreEqual(sTabTest2Output3, StringUtils.ExpandTabs(sTabTest2, tabSet3), 'sTabTest2Output3'); + Assert.AreEqual(sTabTest3Output3, StringUtils.ExpandTabs(sTabTest3, tabSet3), 'sTabTest3Output3'); end; *************** *** 292,295 **** --- 328,349 ---- Assert.AreEqual(sRepeatOutput10, StringUtils.&Repeat(sRepeatInput, 10), 'Count=10'); end; + + procedure Manipulations.Tabify; + var + tabSet1: TabSet; + tabSet2: TabSet; + tabSet3: TabSet; + begin + tabSet1 := TabSet.Create(2); + tabSet2 := TabSet.Create([15, 20, 40, 44]); + tabSet3 := TabSet.Create([15, 20, 40, 44], 2); + + Assert.AreEqual(sTabifyTest1Out1, StringUtils.Tabify(sTabifyTest1, tabSet1), 'sTabifyTest1Out1'); + Assert.AreEqual(sTabifyTest1Out2, StringUtils.Tabify(sTabifyTest1, tabSet2), 'sTabifyTest1Out2'); + Assert.AreEqual(sTabifyTest1Out3, StringUtils.Tabify(sTabifyTest1, tabSet3), 'sTabifyTest1Out3'); + + Assert.AreEqual(sTabifyTest2Out1, StringUtils.Tabify(sTabifyTest2, tabSet1), 'sTabifyTest2Out1'); + Assert.AreEqual(sTabifyTest2Out2, StringUtils.Tabify(sTabifyTest2, tabSet2), 'sTabifyTest2Out2'); + end; {$ENDREGION} *************** *** 555,560 **** s: string; begin ! s := StringUtils.ExtractQuotedString(sSimpleTestWithGarbageQuoted); ! Assert.Fail('Should result in an exception. Resulting string={0}', [s]); end; --- 609,622 ---- s: string; begin ! try ! s := StringUtils.ExtractQuotedString(sSimpleTestWithGarbageQuoted); ! Assert.Fail('System.FormatException expected, but none raised. Resulting string={0}', [s]); ! except ! on e: FormatException do ! if System.String.Compare(e.Message, Resources.StringUtils.QuotedStringEndsInGarbage) <> 0 then ! Assert.Fail('System.FormatException raised with wrong message. Message raised: {0}', [e.Message]); ! on e: System.Object do ! Assert.Fail('System.FormatException expected, but {0} raised.', [e.GetType.FullName]); ! end; end; *************** *** 563,568 **** s: string; begin ! s := StringUtils.ExtractQuotedString(sSimpleTestMissingEndQuote); ! Assert.Fail('Should result in an exception. Resulting string={0}', [s]); end; --- 625,638 ---- s: string; begin ! try ! s := StringUtils.ExtractQuotedString(sSimpleTestMissingEndQuote); ! Assert.Fail('System.FormatException expected, but none raised. Resulting string={0}', [s]); ! except ! on e: FormatException do ! if System.String.Compare(e.Message, Resources.StringUtils.QuotedStringIsMissingEndQuote) <> 0 then ! Assert.Fail('System.FormatException raised with wrong message. Message raised: {0}', [e.Message]); ! on e: System.Object do ! Assert.Fail('System.FormatException expected, but {0} raised.', [e.GetType.FullName]); ! end; end; *************** *** 766,790 **** {$ENDREGION} ! {$REGION 'TabSet'} ! procedure TabSet.ConvertToString; begin Assert.AreEqual('[] and every 2', TabSet1.ToString, 'TabSet1.ToString'); Assert.AreEqual('[15,20,40,44] and every 4 (automatic)', TabSet2.ToString, 'TabSet2.ToString'); Assert.AreEqual('[15,20,40,44] and every 2', TabSet3.ToString, 'TabSet3.ToString'); ! Assert.AreEqual('[] and every 2 (automatic)', StringUtils.TabSet.Create.ToString, 'StringUtils.TabSet.Create.ToString'); ! Assert.AreEqual('every 2 (automatic)', StringUtils.TabSet.Create.ToString(True, False, True), ! 'StringUtils.TabSet.Create.ToString(true, false, true)'); ! Assert.AreEqual('15,20,40,44', TabSet2.ToString(False, False, False), 'TabSet2.ToString(false, false, false)'); end; ! procedure TabSet.Init; begin ! TabSet1 := StringUtils.TabSet.Create(2); ! TabSet2 := StringUtils.TabSet.Create([15, 20, 40, 44]); ! TabSet3 := StringUtils.TabSet.Create([15, 20, 40, 44], 2); end; ! procedure TabSet.SimpleTabulation; begin // TabSet1 should always tabulate to even positions --- 836,861 ---- {$ENDREGION} ! {$REGION 'TabSets'} ! procedure TabSets.ConvertToString; begin Assert.AreEqual('[] and every 2', TabSet1.ToString, 'TabSet1.ToString'); Assert.AreEqual('[15,20,40,44] and every 4 (automatic)', TabSet2.ToString, 'TabSet2.ToString'); Assert.AreEqual('[15,20,40,44] and every 2', TabSet3.ToString, 'TabSet3.ToString'); ! Assert.AreEqual('[] and every 2 (automatic)', TabSet.Create.ToString, 'StringUtils.TabSet.Create.ToString'); ! Assert.AreEqual('every 2 (automatic)', TabSet.Create.ToString(TabSetStringFormattingOptions.DefaultWidthOnly), ! 'TabSet.Create.ToString(TabSetStringFormattingOptions.DefaultWidthOnly)'); ! Assert.AreEqual('15,20,40,44', TabSet2.ToString(TabSetStringFormattingOptions.StopsOnly), ! 'TabSet2.ToString(TabSetStringFormattingOptions.StopsOnly)'); end; ! procedure TabSets.Init; begin ! TabSet1 := TabSet.Create(2); ! TabSet2 := TabSet.Create([15, 20, 40, 44]); ! TabSet3 := TabSet.Create([15, 20, 40, 44], 2); end; ! procedure TabSets.SimpleTabulation; begin // TabSet1 should always tabulate to even positions *************** *** 796,800 **** end; ! procedure TabSet.SpecifiedTabsWithAutoDefault; var i: Integer; --- 867,871 ---- end; ! procedure TabSets.SpecifiedTabsWithAutoDefault; var i: Integer; *************** *** 815,819 **** end; ! procedure TabSet.SpecifiedTabsWithDefault; var i: Integer; --- 886,890 ---- end; ! procedure TabSets.SpecifiedTabsWithDefault; var i: Integer; *************** *** 838,846 **** end; ! procedure TabSet.CloneAndEqual; var ! tempSet: StringUtils.TabSet; begin ! tempSet := StringUtils.TabSet(TabSet1.Clone); Assert.AreNotSame(TabSet1, tempSet); Assert.AreEqual(TabSet1, tempSet, 'Cloned'); --- 909,917 ---- end; ! procedure TabSets.CloneAndEqual; var ! tempSet: TabSet; begin ! tempSet := TabSet(TabSet1.Clone); Assert.AreNotSame(TabSet1, tempSet); Assert.AreEqual(TabSet1, tempSet, 'Cloned'); *************** *** 855,864 **** end; ! procedure TabSet.RemovingTabs; var ! tempSet: StringUtils.TabSet; i: Integer; begin ! tempSet := StringUtils.TabSet(TabSet2.Clone); tempSet.Remove(20); for i := 0 to 14 do --- 926,935 ---- end; ! procedure TabSets.RemovingTabs; var ! tempSet: TabSet; i: Integer; begin ! tempSet := TabSet(TabSet2.Clone); tempSet.Remove(20); for i := 0 to 14 do *************** *** 877,881 **** Assert.AreEqual(tempSet.TabFrom(i), 60, 'Removed 20; Tabulate from {0}', [i]); ! tempSet := StringUtils.TabSet(TabSet2.Clone); tempSet.Remove(40); for i := 0 to 14 do --- 948,952 ---- Assert.AreEqual(tempSet.TabFrom(i), 60, 'Removed 20; Tabulate from {0}', [i]); ! tempSet := TabSet(TabSet2.Clone); tempSet.Remove(40); for i := 0 to 14 do *************** *** 894,898 **** Assert.AreEqual(tempSet.TabFrom(i), 140, 'Removed 40; Tabulate from {0}', [i]); ! tempSet := StringUtils.TabSet(TabSet2.Clone); tempSet.Remove(40, True); for i := 0 to 14 do --- 965,969 ---- Assert.AreEqual(tempSet.TabFrom(i), 140, 'Removed 40; Tabulate from {0}', [i]); ! tempSet := TabSet(TabSet2.Clone); tempSet.Remove(40, True); for i := 0 to 14 do *************** *** 912,922 **** end; ! procedure TabSet.AddingTabs; var ! tempSet: StringUtils.TabSet; ! tempSet2: StringUtils.TabSet; i: Integer; begin ! tempSet := StringUtils.TabSet(TabSet2.Clone); tempSet.Add(42); for i := 0 to 14 do --- 983,993 ---- end; ! procedure TabSets.AddingTabs; var ! tempSet: TabSet; ! tempSet2: TabSet; i: Integer; begin ! tempSet := TabSet(TabSet2.Clone); tempSet.Add(42); for i := 0 to 14 do *************** *** 938,942 **** for i := 50 to 51 do Assert.AreEqual(tempSet.TabFrom(i), 52, 'Added 42; Tabulate from {0}', [i]); ! tempSet2 := StringUtils.TabSet.Create([40, 20, 15], 2); Assert.AreEqual(tempSet2, tempSet); end; --- 1009,1013 ---- for i := 50 to 51 do Assert.AreEqual(tempSet.TabFrom(i), 52, 'Added 42; Tabulate from {0}', [i]); ! tempSet2 := TabSet.Create([40, 20, 15], 2); Assert.AreEqual(tempSet2, tempSet); end; |
