Changeset 29 for trunk/NewView/unittests

Timestamp:

Aug 19, 2006, 8:27:44 PM (19 years ago)

Author:

RBRi

Message:

more parser fixes and new unit tests

Location:

trunk/NewView/unittests

Files:

• cmdlineparameterunittests.pas (modified) (5 diffs)
• newviewtests.spr (modified) (5 diffs)

trunk/NewView/unittests/cmdlineparameterunittests.pas

@@ -20 +20 @@
 PROCEDURE testSplitCmdLineParameter_TwoQuotedParts;
 PROCEDURE testSplitCmdLineParameter_TwoQuotesAtStartEnd;
+PROCEDURE testSplitCmdLineParameter_Failure_TwoQuotesAtEnd;
 PROCEDURE testSplitCmdLineParameter_TwoQuotedPartsMissingClosedQuote;
+PROCEDURE testSplitCmdLineParameter_1Quote;
+PROCEDURE testSplitCmdLineParameter_2Quote;
+PROCEDURE testSplitCmdLineParameter_3Quote;
+PROCEDURE testSplitCmdLineParameter_4Quote;
+PROCEDURE testSplitCmdLineParameter_5Quote;
+PROCEDURE testSplitCmdLineParameter_6Quote;
 
 PROCEDURE testParseCmdLine_Empty;
@@ -235 +242 @@
 
 
+  PROCEDURE testSplitCmdLineParameter_Failure_TwoQuotesAtEnd;
+  VAR
+    tmpResult : TStringList;
+    tmpRC : Integer;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpRC := splitCmdLineParameter('"abc def""', tmpResult);
+
+    assertEqualsInt('testSplitCmdLineParameter_Failure_TwoQuotesAtEnd', -1, tmpRC);
+    assertEqualsInt('testSplitCmdLineParameter_Failure_TwoQuotesAtEnd', 1, tmpResult.Count);
+    assertEqualsString('testSplitCmdLineParameter_Failure_TwoQuotesAtEnd', 'abc def"', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
   PROCEDURE testSplitCmdLineParameter_TwoQuotedPartsMissingClosedQuote;
   VAR
@@ -247 +270 @@
     assertEqualsString('testSplitCmdLineParameter_TwoQuotedPartsMissingClosedQuote', 'ababc"def', tmpResult[0]);
     assertEqualsString('testSplitCmdLineParameter_TwoQuotedPartsMissingClosedQuote', 'ghi', tmpResult[1]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testSplitCmdLineParameter_1Quote;
+  VAR
+    tmpResult : TStringList;
+    tmpRC : Integer;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpRC := splitCmdLineParameter('"', tmpResult);
+
+    assertEqualsInt('testSplitCmdLineParameter_1Quote', -1, tmpRC);
+    assertEqualsInt('testSplitCmdLineParameter_1Quote', 0, tmpResult.Count);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testSplitCmdLineParameter_2Quote;
+  VAR
+    tmpResult : TStringList;
+    tmpRC : Integer;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpRC := splitCmdLineParameter('""', tmpResult);
+
+    assertEqualsInt('testSplitCmdLineParameter_2Quote', 0, tmpRC);
+    assertEqualsInt('testSplitCmdLineParameter_2Quote', 0, tmpResult.Count);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testSplitCmdLineParameter_3Quote;
+  VAR
+    tmpResult : TStringList;
+    tmpRC : Integer;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpRC := splitCmdLineParameter('"""', tmpResult);
+
+    assertEqualsInt('testSplitCmdLineParameter_3Quote', -1, tmpRC);
+    assertEqualsInt('', 1, tmpResult.Count);
+    assertEqualsString('testSplitCmdLineParameter_3Quote', '"', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testSplitCmdLineParameter_4Quote;
+  VAR
+    tmpResult : TStringList;
+    tmpRC : Integer;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpRC := splitCmdLineParameter('""""', tmpResult);
+
+    assertEqualsInt('testSplitCmdLineParameter_4Quote', 0, tmpRC);
+    assertEqualsInt('testSplitCmdLineParameter_4Quote', 1, tmpResult.Count);
+    assertEqualsString('testSplitCmdLineParameter_4Quote', '"', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testSplitCmdLineParameter_5Quote;
+  VAR
+    tmpResult : TStringList;
+    tmpRC : Integer;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpRC := splitCmdLineParameter('"""""', tmpResult);
+
+    assertEqualsInt('testSplitCmdLineParameter_5Quote', -1, tmpRC);
+    assertEqualsInt('testSplitCmdLineParameter_5Quote', 1, tmpResult.Count);
+    assertEqualsString('testSplitCmdLineParameter_5Quote', '""', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testSplitCmdLineParameter_6Quote;
+  VAR
+    tmpResult : TStringList;
+    tmpRC : Integer;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpRC := splitCmdLineParameter('""""""', tmpResult);
+
+    assertEqualsInt('testSplitCmdLineParameter_6Quote', 0, tmpRC);
+    assertEqualsInt('testSplitCmdLineParameter_6Quote', 1, tmpResult.Count);
+    assertEqualsString('testSplitCmdLineParameter_6Quote', '""', tmpResult[0]);
 
     tmpResult.Destroy;
@@ -870 +987 @@
   BEGIN
     result := TList.Create;
+
     result.add(@testSplitCmdLineParameter_Empty);
     result.add(@testSplitCmdLineParameter_simpleOne);
@@ -881 +999 @@
     result.add(@testSplitCmdLineParameter_TwoQuotedParts);
     result.add(@testSplitCmdLineParameter_TwoQuotesAtStartEnd);
+    result.add(@testSplitCmdLineParameter_Failure_TwoQuotesAtEnd);
     result.add(@testSplitCmdLineParameter_TwoQuotedPartsMissingClosedQuote);
+    result.add(@testSplitCmdLineParameter_1Quote);
+    result.add(@testSplitCmdLineParameter_2Quote);
+    result.add(@testSplitCmdLineParameter_3Quote);
+    result.add(@testSplitCmdLineParameter_4Quote);
+    result.add(@testSplitCmdLineParameter_5Quote);
+    result.add(@testSplitCmdLineParameter_6Quote);
 
     result.add(@testParseCmdLine_Empty);

trunk/NewView/unittests/newviewtests.spr

@@ -56 +56 @@
 [Directories]
 
-LastDir=P:\NEWVIEW_DEV\BUILD\SIBYL\LIB
+LastDir=P:\NEWVIEW_DEV\NEWVIEW
 OutDir=P:\NEWVIEW_DEV\build
 LibDir=P:\NEWVIEW_DEV\build\library;P:\NEWVIEW_DEV\build\sibyl\lib
-LibSrcDir=D:\PROGS\SIBYL\Source\RTL;D:\PROGS\SIBYL\Source\SPCC
+LibSrcDir=P:\NEWVIEW_DEV\NEWVIEW;D:\PROGS\SIBYL\Source\RTL;D:\PROGS\SIBYL\Source\SPCC
 IncSrcDir=
 CompInstallDir=D:\PROGS\SIBYL\Compnt
@@ -65 +65 @@
 [Find History]
 
-Find0=testParseCmdLine_HelpManagerText
-Find1=tmpCmdLineParameters
-Find2=testParseCmdLine_doubleColonG
-Find3=testParseCmdLine_empty
-Find4=testParseCmdLine_upperHELP
-Find5=testParseCmdLine_h
-Find6=testSplitCmdLineParameter_simpleOne
-Find7=Assert
-Find8=testSplitCmdLineParameter_Empty
-Find9=FUNCTION
-Find10=Exception
-Find11=VAR
-Find12=Pointer
-Find13=xxx
-Find14=split
-Find15=assertTrue
+Find0=missing
+Find1=2
+Find2=testParseCmdLine_HelpManagerText
+Find3=tmpCmdLineParameters
+Find4=testParseCmdLine_doubleColonG
+Find5=testParseCmdLine_empty
+Find6=testParseCmdLine_upperHELP
+Find7=testParseCmdLine_h
+Find8=testSplitCmdLineParameter_simpleOne
+Find9=Assert
+Find10=testSplitCmdLineParameter_Empty
+Find11=FUNCTION
+Find12=Exception
+Find13=VAR
+Find14=Pointer
+Find15=xxx
 
 [General]
@@ -107 +107 @@
 File1.Bottom=-5
 File1.Width=1243
-File1.Height=500
-File1.Column=3
-File1.Line=869
+File1.Height=501
+File1.Column=5
+File1.Line=1010
 File2=.\testassert.pas
 File2.Left=-4
@@ -116 +116 @@
 File2.Height=500
 File2.Column=32
-File2.Line=61
+File2.Line=27
+File3=..\.\CmdLineParameterUnit.pas
+File3.Left=-4
+File3.Bottom=-5
+File3.Width=1243
+File3.Height=501
+File3.Column=68
+File3.Line=422
 
 [Linker Options]
@@ -158 +165 @@
 MainFile0.Dependency14=D:\PROGS\SIBYL\Source\RTL\PMGPI.PAS
 MainFile0.Dependency15=D:\PROGS\SIBYL\Source\RTL\PMDEV.PAS
-MainFile0.Dependency16=.\TESTASSERT.PAS
-MainFile0.Dependency17=.\CMDLINEPARAMETERUNITTESTS.PAS
+MainFile0.Dependency16=..\.\CMDLINEPARAMETERUNIT.PAS
+MainFile0.Dependency17=.\TESTASSERT.PAS
+MainFile0.Dependency18=.\CMDLINEPARAMETERUNITTESTS.PAS
 
 [Replace History]