Changeset 45 for trunk/NewView


Ignore:
Timestamp:
Jan 4, 2007, 8:58:09 PM (19 years ago)
Author:
RBRi
Message:

+ store the raw filenames (including quotes) also to allow sime more intelligent parameter handling

Location:
trunk/NewView
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/NewView/CmdLineParameterUnit.pas

    r42 r45  
    4848       windowTitle : string;
    4949       fileNames : string;
     50       fileNamesRaw : string;
    5051       searchText : string;
    5152
    … …  
    6970       PROPERTY getWindowTitle : string read windowTitle;
    7071       PROPERTY getFileNames : string read fileNames;
     72       PROPERTY getFileNamesRaw : string read fileNamesRaw;
    7173       PROPERTY getSearchText : string read searchText;
    7274
    … …  
    111113     windowTitle := '';
    112114     searchText := '';
    113      filenames := '';
     115     fileNames := '';
     116     fileNamesRaw := '';
    114117
    115118     try
    … …  
    140143                 FILENAME_QUOTE :
    141144                 begin
    142                    filenames := filenames + tmpCurrentChar;
     145                   fileNames := fileNames + tmpCurrentChar;
     146                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
    143147                   inc(currentParsePosition);
    144148                 end;
    … …  
    168172                   else
    169173                   begin
    170                      filenames := filenames + tmpCurrentChar;
     174                     fileNames := fileNames + tmpCurrentChar;
     175                     fileNamesRaw := fileNamesRaw + tmpCurrentChar;
    171176                     inc(currentParsePosition);
    172177                   end;
    … …  
    174179                 FILENAME_QUOTE :
    175180                 begin
    176                    filenames := filenames + tmpCurrentChar;
     181                   fileNames := fileNames + tmpCurrentChar;
     182                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
    177183                   inc(currentParsePosition);
    178184                 end;
    … …  
    196202                 begin
    197203                   tmpState := FILENAME_QUOTE;
     204                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
    198205                   inc(currentParsePosition);
    199206                 end;
    … …  
    201208                 begin
    202209                   tmpState := FILENAME;
     210                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
    203211                   inc(currentParsePosition);
    204212                 end;
    … …  
    222230                 begin
    223231                   fileNames := fileNames + tmpCurrentChar;
     232                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
    224233                   inc(currentParsePosition);
    225234                 end;
    226235                 FILENAME_QUOTE :
    227236                 begin
    228                    filenames := filenames + tmpCurrentChar;
     237                   fileNames := fileNames + tmpCurrentChar;
     238                   fileNamesRaw := fileNamesRaw + tmpCurrentChar;
    229239                   inc(currentParsePosition);
    230240                 end;

  • trunk/NewView/unittests/cmdlineparameterunittests.pas

    r41 r45  
    3131    assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getWindowTitle);
    3232    assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getFileNames);
     33    assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getFileNamesRaw);
    3334    assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getSearchText);
    3435  END;
    … …  
    5253    assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getWindowTitle);
    5354    assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getFileNames);
     55    assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getFileNamesRaw);
    5456    assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getSearchText);
    5557  END;
    … …  
    7476    assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getWindowTitle);
    7577    assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getFileNames);
     78    assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getFileNamesRaw);
    7679    assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getSearchText);
    7780  END;
    … …  
    9699    assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getWindowTitle);
    97100    assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getFileNames);
     101    assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getFileNamesRaw);
    98102    assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getSearchText);
    99103  END;
    … …  
    118122    assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getWindowTitle);
    119123    assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getFileNames);
     124    assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getFileNamesRaw);
    120125    assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getSearchText);
    121126  END;
    … …  
    140145    assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getWindowTitle);
    141146    assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getFileNames);
     147    assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getFileNamesRaw);
    142148    assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getSearchText);
    143149  END;
    … …  
    162168    assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getWindowTitle);
    163169    assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getFileNames);
     170    assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getFileNamesRaw);
    164171    assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getSearchText);
    165172  END;
    … …  
    184191    assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getWindowTitle);
    185192    assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getFileNames);
     193    assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getFileNamesRaw);
    186194    assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getSearchText);
    187195  END;
    … …  
    206214    assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    207215    assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getFileNames);
     216    assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    208217    assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    209218  END;
    … …  
    228237    assertEqualsString('testParseCmdLine_lowerS', '', tmpCmdLineParameters.getWindowTitle);
    229238    assertEqualsString('testParseCmdLine_lowerS', 'file', tmpCmdLineParameters.getFileNames);
     239    assertEqualsString('testParseCmdLine_lowerS', 'file', tmpCmdLineParameters.getFileNamesRaw);
    230240    assertEqualsString('testParseCmdLine_lowerS', 'search', tmpCmdLineParameters.getSearchText);
    231241  END;
    … …  
    250260    assertEqualsString('testParseCmdLine_upperS', '', tmpCmdLineParameters.getWindowTitle);
    251261    assertEqualsString('testParseCmdLine_upperS', 'file', tmpCmdLineParameters.getFileNames);
     262    assertEqualsString('testParseCmdLine_upperS', 'file', tmpCmdLineParameters.getFileNamesRaw);
    252263    assertEqualsString('testParseCmdLine_upperS', 'seArch', tmpCmdLineParameters.getSearchText);
    253264  END;
    … …  
    273284    assertEqualsString('testParseCmdLine_upperS_withBlank', '', tmpCmdLineParameters.getWindowTitle);
    274285    assertEqualsString('testParseCmdLine_upperS_withBlank', 'FilE', tmpCmdLineParameters.getFileNames);
     286    assertEqualsString('testParseCmdLine_upperS_withBlank', 'FilE', tmpCmdLineParameters.getFileNamesRaw);
    275287    assertEqualsString('testParseCmdLine_upperS_withBlank', 'seArch', tmpCmdLineParameters.getSearchText);
    276288  END;
    … …  
    295307    assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getWindowTitle);
    296308    assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getFileNames);
     309    assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getFileNamesRaw);
    297310    assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getSearchText);
    298311  END;
    … …  
    317330    assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getWindowTitle);
    318331    assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getFileNames);
     332    assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getFileNamesRaw);
    319333    assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getSearchText);
    320334  END;
    … …  
    339353    assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    340354    assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getFileNames);
     355    assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    341356    assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    342357  END;
    … …  
    361376    assertEqualsString('testParseCmdLine_help_and_s', '', tmpCmdLineParameters.getWindowTitle);
    362377    assertEqualsString('testParseCmdLine_help_and_s', 'file', tmpCmdLineParameters.getFileNames);
     378    assertEqualsString('testParseCmdLine_help_and_s', 'file', tmpCmdLineParameters.getFileNamesRaw);
    363379    assertEqualsString('testParseCmdLine_help_and_s', '', tmpCmdLineParameters.getSearchText);
    364380  END;
    … …  
    383399    assertEqualsString('testParseCmdLine_s_and_help', '', tmpCmdLineParameters.getWindowTitle);
    384400    assertEqualsString('testParseCmdLine_s_and_help', 'file', tmpCmdLineParameters.getFileNames);
     401    assertEqualsString('testParseCmdLine_s_and_help', 'file', tmpCmdLineParameters.getFileNamesRaw);
    385402    assertEqualsString('testParseCmdLine_s_and_help', '', tmpCmdLineParameters.getSearchText);
    386403  END;
    … …  
    405422    assertEqualsString('testParseCmdLine_help_and_s_without_blank', '', tmpCmdLineParameters.getWindowTitle);
    406423    assertEqualsString('testParseCmdLine_help_and_s_without_blank', 'file', tmpCmdLineParameters.getFileNames);
     424    assertEqualsString('testParseCmdLine_help_and_s_without_blank', 'file', tmpCmdLineParameters.getFileNamesRaw);
    407425    assertEqualsString('testParseCmdLine_help_and_s_without_blank', '', tmpCmdLineParameters.getSearchText);
    408426  END;
    … …  
    428446    assertEqualsString('testParseCmdLine_lowerG', '', tmpCmdLineParameters.getWindowTitle);
    429447    assertEqualsString('testParseCmdLine_lowerG', 'file', tmpCmdLineParameters.getFileNames);
     448    assertEqualsString('testParseCmdLine_lowerG', 'file', tmpCmdLineParameters.getFileNamesRaw);
    430449    assertEqualsString('testParseCmdLine_lowerG', 'search', tmpCmdLineParameters.getSearchText);
    431450  END;
    … …  
    450469    assertEqualsString('testParseCmdLine_upperG', '', tmpCmdLineParameters.getWindowTitle);
    451470    assertEqualsString('testParseCmdLine_upperG', 'fiLe', tmpCmdLineParameters.getFileNames);
     471    assertEqualsString('testParseCmdLine_upperG', 'fiLe', tmpCmdLineParameters.getFileNamesRaw);
    452472    assertEqualsString('testParseCmdLine_upperG', 'seArch', tmpCmdLineParameters.getSearchText);
    453473  END;
    … …  
    472492    assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getWindowTitle);
    473493    assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getFileNames);
     494    assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getFileNamesRaw);
    474495    assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getSearchText);
    475496  END;
    … …  
    494515    assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getWindowTitle);
    495516    assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getFileNames);
     517    assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getFileNamesRaw);
    496518    assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getSearchText);
    497519  END;
    … …  
    516538    assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    517539    assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getFileNames);
     540    assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    518541    assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    519542  END;
    … …  
    538561    assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getWindowTitle);
    539562    assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getFileNames);
     563    assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getFileNamesRaw);
    540564    assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getSearchText);
    541565  END;
    … …  
    560584    assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getWindowTitle);
    561585    assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getFileNames);
     586    assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getFileNamesRaw);
    562587    assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getSearchText);
    563588  END;
    … …  
    582607    assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getWindowTitle);
    583608    assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getFileNames);
     609    assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getFileNamesRaw);
    584610    assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getSearchText);
    585611  END;
    … …  
    604630    assertEqualsString('testParseCmdLine_Language_WithFile', '', tmpCmdLineParameters.getWindowTitle);
    605631    assertEqualsString('testParseCmdLine_Language_WithFile', 'filE', tmpCmdLineParameters.getFileNames);
     632    assertEqualsString('testParseCmdLine_Language_WithFile', 'filE', tmpCmdLineParameters.getFileNamesRaw);
    606633    assertEqualsString('testParseCmdLine_Language_WithFile', '', tmpCmdLineParameters.getSearchText);
    607634  END;
    … …  
    626653    assertEqualsString('testParseCmdLine_Language_between', '', tmpCmdLineParameters.getWindowTitle);
    627654    assertEqualsString('testParseCmdLine_Language_between', 'filE', tmpCmdLineParameters.getFileNames);
     655    assertEqualsString('testParseCmdLine_Language_between', 'filE', tmpCmdLineParameters.getFileNamesRaw);
    628656    assertEqualsString('testParseCmdLine_Language_between', '', tmpCmdLineParameters.getSearchText);
    629657  END;
    … …  
    648676    assertEqualsString('testParseCmdLine_Language_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    649677    assertEqualsString('testParseCmdLine_Language_between_withSpace', 'filE', tmpCmdLineParameters.getFileNames);
     678    assertEqualsString('testParseCmdLine_Language_between_withSpace', 'filE', tmpCmdLineParameters.getFileNamesRaw);
    650679    assertEqualsString('testParseCmdLine_Language_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    651680  END;
    … …  
    670699    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getWindowTitle);
    671700    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getFileNames);
     701    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getFileNamesRaw);
    672702    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getSearchText);
    673703  END;
    … …  
    692722    assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getWindowTitle);
    693723    assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getFileNames);
     724    assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getFileNamesRaw);
    694725    assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getSearchText);
    695726  END;
    … …  
    714745    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getWindowTitle);
    715746    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getFileNames);
     747    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getFileNamesRaw);
    716748    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getSearchText);
    717749  END;
    … …  
    736768    assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getWindowTitle);
    737769    assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getFileNames);
     770    assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getFileNamesRaw);
    738771    assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getSearchText);
    739772  END;
    … …  
    758791    assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    759792    assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNames);
     793    assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    760794    assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    761795  END;
    … …  
    780814    assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getWindowTitle);
    781815    assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getFileNames);
     816    assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getFileNamesRaw);
    782817    assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getSearchText);
    783818  END;
    … …  
    801836    assertEqualsInt('testParseCmdLine_OwnerNumber_WithoutColon', 134, tmpCmdLineParameters.getOwnerWindow);
    802837    assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getWindowTitle);
    803     assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getFileNames);
     838    assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getFileNames);
     839    assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getFileNamesRaw);
    804840    assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getSearchText);
    805841  END;
    … …  
    824860    assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getWindowTitle);
    825861    assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getFileNames);
     862    assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getFileNamesRaw);
    826863    assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getSearchText);
    827864  END;
    … …  
    846883    assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getWindowTitle);
    847884    assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getFileNames);
     885    assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getFileNamesRaw);
    848886    assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getSearchText);
    849887  END;
    … …  
    868906    assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    869907    assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNames);
     908    assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    870909    assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    871910  END;
    … …  
    890929    assertEqualsString('testParseCmdLine_Title', 'Test', tmpCmdLineParameters.getWindowTitle);
    891930    assertEqualsString('testParseCmdLine_Title', '', tmpCmdLineParameters.getFileNames);
     931    assertEqualsString('testParseCmdLine_Title', '', tmpCmdLineParameters.getFileNamesRaw);
    892932    assertEqualsString('testParseCmdLine_Title', '', tmpCmdLineParameters.getSearchText);
    893933  END;
    … …  
    912952    assertEqualsString('testParseCmdLine_Title_WithoutColon', 'titlE', tmpCmdLineParameters.getWindowTitle);
    913953    assertEqualsString('testParseCmdLine_Title_WithoutColon', '', tmpCmdLineParameters.getFileNames);
     954    assertEqualsString('testParseCmdLine_Title_WithoutColon', '', tmpCmdLineParameters.getFileNamesRaw);
    914955    assertEqualsString('testParseCmdLine_Title_WithoutColon', '', tmpCmdLineParameters.getSearchText);
    915956  END;
    … …  
    934975    assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getWindowTitle);
    935976    assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getFileNames);
     977    assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getFileNamesRaw);
    936978    assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getSearchText);
    937979  END;
    … …  
    956998    assertEqualsString('testParseCmdLine_Title_between', 'tItlE', tmpCmdLineParameters.getWindowTitle);
    957999    assertEqualsString('testParseCmdLine_Title_between', '', tmpCmdLineParameters.getFileNames);
     1000    assertEqualsString('testParseCmdLine_Title_between', '', tmpCmdLineParameters.getFileNamesRaw);
    9581001    assertEqualsString('testParseCmdLine_Title_between', '', tmpCmdLineParameters.getSearchText);
    9591002  END;
    … …  
    9781021    assertEqualsString('testParseCmdLine_Title_between_withSpace', 'tItlE', tmpCmdLineParameters.getWindowTitle);
    9791022    assertEqualsString('testParseCmdLine_Title_between_withSpace', '', tmpCmdLineParameters.getFileNames);
     1023    assertEqualsString('testParseCmdLine_Title_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    9801024    assertEqualsString('testParseCmdLine_Title_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    9811025  END;
    … …  
    10031047    assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getWindowTitle);
    10041048    assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getFileNames);
     1049    assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getFileNamesRaw);
    10051050    assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getSearchText);
    10061051
    … …  
    10341079    assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getWindowTitle);
    10351080    assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getFileNames);
     1081    assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getFileNamesRaw);
    10361082    assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getSearchText);
    10371083
    … …  
    10631109    assertEqualsString('testParseCmdLine_Topic', '', tmpCmdLineParameters.getWindowTitle);
    10641110    assertEqualsString('testParseCmdLine_Topic', 'file', tmpCmdLineParameters.getFileNames);
     1111    assertEqualsString('testParseCmdLine_Topic', 'file', tmpCmdLineParameters.getFileNamesRaw);
    10651112    assertEqualsString('testParseCmdLine_Topic', 'topi1 topi2', tmpCmdLineParameters.getSearchText);
    10661113  END;
    … …  
    10851132    assertEqualsString('testParseCmdLine_file', '', tmpCmdLineParameters.getWindowTitle);
    10861133    assertEqualsString('testParseCmdLine_file', 'file', tmpCmdLineParameters.getFileNames);
     1134    assertEqualsString('testParseCmdLine_file', 'file', tmpCmdLineParameters.getFileNamesRaw);
    10871135    assertEqualsString('testParseCmdLine_file', '', tmpCmdLineParameters.getSearchText);
    10881136  END;
    … …  
    11071155    assertEqualsString('testParseCmdLine_fileLeadingBlanks', '', tmpCmdLineParameters.getWindowTitle);
    11081156    assertEqualsString('testParseCmdLine_fileLeadingBlanks', 'file', tmpCmdLineParameters.getFileNames);
     1157    assertEqualsString('testParseCmdLine_fileLeadingBlanks', 'file', tmpCmdLineParameters.getFileNamesRaw);
    11091158    assertEqualsString('testParseCmdLine_fileLeadingBlanks', '', tmpCmdLineParameters.getSearchText);
    11101159  END;
    … …  
    11291178    assertEqualsString('testParseCmdLine_fileTrailingBlanks', '', tmpCmdLineParameters.getWindowTitle);
    11301179    assertEqualsString('testParseCmdLine_fileTrailingBlanks', 'file', tmpCmdLineParameters.getFileNames);
     1180    assertEqualsString('testParseCmdLine_fileTrailingBlanks', 'file', tmpCmdLineParameters.getFileNamesRaw);
    11311181    assertEqualsString('testParseCmdLine_fileTrailingBlanks', '', tmpCmdLineParameters.getSearchText);
    11321182  END;
    … …  
    11511201    assertEqualsString('testParseCmdLine_fileQuoted', '', tmpCmdLineParameters.getWindowTitle);
    11521202    assertEqualsString('testParseCmdLine_fileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1203    assertEqualsString('testParseCmdLine_fileQuoted', '"fi -h le"', tmpCmdLineParameters.getFileNamesRaw);
    11531204    assertEqualsString('testParseCmdLine_fileQuoted', '', tmpCmdLineParameters.getSearchText);
    11541205  END;
    … …  
    11731224    assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '', tmpCmdLineParameters.getWindowTitle);
    11741225    assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1226    assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '"fi -h le', tmpCmdLineParameters.getFileNamesRaw);
    11751227    assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '', tmpCmdLineParameters.getSearchText);
    11761228  END;
    … …  
    11951247    assertEqualsString('testParseCmdLine_fileQuotedAndText', '', tmpCmdLineParameters.getWindowTitle);
    11961248    assertEqualsString('testParseCmdLine_fileQuotedAndText', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1249    assertEqualsString('testParseCmdLine_fileQuotedAndText', '"fi -h le"', tmpCmdLineParameters.getFileNamesRaw);
    11971250    assertEqualsString('testParseCmdLine_fileQuotedAndText', 'serachText', tmpCmdLineParameters.getSearchText);
    11981251  END;
    … …  
    12171270    assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', '', tmpCmdLineParameters.getWindowTitle);
    12181271    assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1272    assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', '"fi -h le"', tmpCmdLineParameters.getFileNamesRaw);
    12191273    assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'serachText', tmpCmdLineParameters.getSearchText);
    12201274  END;
    … …  
    12391293    assertEqualsString('testParseCmdLine_fileQuotedInside', '', tmpCmdLineParameters.getWindowTitle);
    12401294    assertEqualsString('testParseCmdLine_fileQuotedInside', 'testfi -h letes', tmpCmdLineParameters.getFileNames);
     1295    assertEqualsString('testParseCmdLine_fileQuotedInside', 'test"fi -h le"tes', tmpCmdLineParameters.getFileNamesRaw);
    12411296    assertEqualsString('testParseCmdLine_fileQuotedInside', 'serachText', tmpCmdLineParameters.getSearchText);
    12421297  END;
    … …  
    12611316    assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', '', tmpCmdLineParameters.getWindowTitle);
    12621317    assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1318    assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', '"fi -h le"', tmpCmdLineParameters.getFileNamesRaw);
    12631319    assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'serachText', tmpCmdLineParameters.getSearchText);
    12641320  END;

  • trunk/NewView/unittests/newviewtests.spr

    r41 r45  
    5858[Find History]
    5959
    60 Find0=result.add(@
    61 Find1=testParseCmdLine_fileTrailingBlanks
    62 Find2=testParseCmdLine_fileLeadingBlanks
    63 Find3=tmpPCharMessage
    64 Find4=abcx
    65 Find5=testStrExtractStrings_EscapedEscapeChar
    66 Find6=testStrExtractStrings_EscapedDelimiter
    67 Find7=testStrExtractStrings_NoDelimiter
    68 Find8=testStrExtractStrings_EmptyPartInside
    69 Find9=testStrExtractStrings_EndWithDelimiter
    70 Find10=testEscapeAllCharsBy_Empty
    71 Find11=UpCase
    72 Find12=StrEnds
    73 Find13=1
    74 Find14=trim
    75 Find15=writeln
     60Find0=testParseCmdLine_fileQuoted
     61Find1=result.add(@
     62Find2=testParseCmdLine_fileTrailingBlanks
     63Find3=testParseCmdLine_fileLeadingBlanks
     64Find4=tmpPCharMessage
     65Find5=abcx
     66Find6=testStrExtractStrings_EscapedEscapeChar
     67Find7=testStrExtractStrings_EscapedDelimiter
     68Find8=testStrExtractStrings_NoDelimiter
     69Find9=testStrExtractStrings_EmptyPartInside
     70Find10=testStrExtractStrings_EndWithDelimiter
     71Find11=testEscapeAllCharsBy_Empty
     72Find12=UpCase
     73Find13=StrEnds
     74Find14=1
     75Find15=trim
    7676
    7777[General]
    … …  
    8989[Last Closed Files]
    9090
    91 File0=D:\PROGS\SIBYL\SOURCE\SPCC\CLASSES.PAS
    92 File1=D:\PROGS\SIBYL\SOURCE\RTL\SYSTEM.PAS
    93 File2=D:\PROGS\SIBYL\SOURCE\SPCC\SYSUTILS.PAS
    94 File3=..\..\.\SIBYL\SPCC\SYSUTILS.PAS
     91File0=.\testassert.pas
     92File1=..\..\.\Library\ACLProfile.pas
     93File2=D:\PROGS\SIBYL\SOURCE\SPCC\CLASSES.PAS
     94File3=D:\PROGS\SIBYL\SOURCE\RTL\SYSTEM.PAS
     95File4=D:\PROGS\SIBYL\SOURCE\SPCC\SYSUTILS.PAS
     96File5=..\..\.\SIBYL\SPCC\SYSUTILS.PAS
    9597
    9698[Last Open Files]
    … …  
    101103File0.Width=1243
    102104File0.Height=481
    103 File0.Column=28
    104 File0.Line=1118
     105File0.Column=62
     106File0.Line=1295
    105107File1=..\.\CmdLineParameterUnit.pas
    106108File1.Left=-4
    … …  
    108110File1.Width=1243
    109111File1.Height=481
    110 File1.Column=63
    111 File1.Line=253
     112File1.Column=38
     113File1.Line=252
    112114File2=.\newviewtests.pas
    113115File2.Left=-4
    … …  
    138140File5.Column=1
    139141File5.Line=1269
    140 File6=.\testassert.pas
     142File6=..\.\DebugUnit.pas
    141143File6.Left=-4
    142144File6.Bottom=-5
    143145File6.Width=1243
    144146File6.Height=481
    145 File6.Column=1
    146 File6.Line=31
    147 File7=..\.\DebugUnit.pas
    148 File7.Left=-4
    149 File7.Bottom=-5
    150 File7.Width=1243
    151 File7.Height=481
    152 File7.Column=21
    153 File7.Line=28
    154 File8=..\..\.\Library\ACLProfile.pas
    155 File8.Left=-4
    156 File8.Bottom=-5
    157 File8.Width=1243
    158 File8.Height=481
    159 File8.Column=1
    160 File8.Line=20
     147File6.Column=21
     148File6.Line=28
    161149
    162150[Linker Options]
Note: See TracChangeset for help on using the changeset viewer.