Ignore:
Timestamp:
Feb 15, 2007, 8:24:38 AM (19 years ago)
Author:
RBRi
Message:

one more test

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/NewView/unittests/cmdlineparameterunittests.pas

    r69 r77  
    3030    assertEqualsInt('testParseCmdLine_Empty', 0, tmpCmdLineParameters.getOwnerWindow);
    3131    assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getWindowTitle);
    32     assertEqualsString('testParseCmdLine_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    33     assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getFileNamesRaw);
    34     assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getInterpretedSearchText);
     32    assertEqualsString('testParseCmdLine_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     33    assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getSearchText);
    3534  END;
    3635
    … …  
    5352    assertEqualsInt('testParseCmdLine_QuestionMark', 0, tmpCmdLineParameters.getOwnerWindow);
    5453    assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getWindowTitle);
    55     assertEqualsString('testParseCmdLine_QuestionMark', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    56     assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getFileNamesRaw);
    57     assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getInterpretedSearchText);
     54    assertEqualsString('testParseCmdLine_QuestionMark', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     55    assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getSearchText);
    5856  END;
    5957
    … …  
    7674    assertEqualsInt('testParseCmdLine_QuestionMark', 0, tmpCmdLineParameters.getOwnerWindow);
    7775    assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getWindowTitle);
    78     assertEqualsString('testParseCmdLine_QuestionMark', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    79     assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getFileNamesRaw);
    80     assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getInterpretedSearchText);
     76    assertEqualsString('testParseCmdLine_QuestionMark', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     77    assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getSearchText);
    8178  END;
    8279
    … …  
    9996    assertEqualsInt('testParseCmdLine_lowerH', 0, tmpCmdLineParameters.getOwnerWindow);
    10097    assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getWindowTitle);
    101     assertEqualsString('testParseCmdLine_lowerH', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    102     assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getFileNamesRaw);
    103     assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getInterpretedSearchText);
     98    assertEqualsString('testParseCmdLine_lowerH', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     99    assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getSearchText);
    104100  END;
    105101
    … …  
    122118    assertEqualsInt('testParseCmdLine_upperH', 0, tmpCmdLineParameters.getOwnerWindow);
    123119    assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getWindowTitle);
    124     assertEqualsString('testParseCmdLine_upperH', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    125     assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getFileNamesRaw);
    126     assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getInterpretedSearchText);
     120    assertEqualsString('testParseCmdLine_upperH', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     121    assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getSearchText);
    127122  END;
    128123
    … …  
    145140    assertEqualsInt('testParseCmdLine_lowerHelp', 0, tmpCmdLineParameters.getOwnerWindow);
    146141    assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getWindowTitle);
    147     assertEqualsString('testParseCmdLine_lowerHelp', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    148     assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getFileNamesRaw);
    149     assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getInterpretedSearchText);
     142    assertEqualsString('testParseCmdLine_lowerHelp', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     143    assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getSearchText);
    150144  END;
    151145
    … …  
    168162    assertEqualsInt('testParseCmdLine_upperHELP', 0, tmpCmdLineParameters.getOwnerWindow);
    169163    assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getWindowTitle);
    170     assertEqualsString('testParseCmdLine_upperHELP', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    171     assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getFileNamesRaw);
    172     assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getInterpretedSearchText);
     164    assertEqualsString('testParseCmdLine_upperHELP', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     165    assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getSearchText);
    173166  END;
    174167
    … …  
    191184    assertEqualsInt('testParseCmdLine_upperHE', 0, tmpCmdLineParameters.getOwnerWindow);
    192185    assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getWindowTitle);
    193     assertEqualsString('testParseCmdLine_upperHE', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    194     assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getFileNamesRaw);
    195     assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getInterpretedSearchText);
     186    assertEqualsString('testParseCmdLine_upperHE', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     187    assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getSearchText);
    196188  END;
    197189
    … …  
    214206    assertEqualsInt('testParseCmdLine_h_between', 0, tmpCmdLineParameters.getOwnerWindow);
    215207    assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getWindowTitle);
    216     assertEqualsString('testParseCmdLine_h_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    217     assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getFileNamesRaw);
    218     assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getInterpretedSearchText);
     208    assertEqualsString('testParseCmdLine_h_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     209    assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getSearchText);
    219210  END;
    220211
    … …  
    237228    assertEqualsInt('testParseCmdLine_h_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow);
    238229    assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    239     assertEqualsString('testParseCmdLine_h_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    240     assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    241     assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getInterpretedSearchText);
     230    assertEqualsString('testParseCmdLine_h_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     231    assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    242232  END;
    243233
    … …  
    260250    assertEqualsInt('testParseCmdLine_lowerS', 0, tmpCmdLineParameters.getOwnerWindow);
    261251    assertEqualsString('testParseCmdLine_lowerS', '', tmpCmdLineParameters.getWindowTitle);
    262     assertEqualsString('testParseCmdLine_lowerS', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    263     assertEqualsString('testParseCmdLine_lowerS', 'file', tmpCmdLineParameters.getFileNamesRaw);
    264     assertEqualsString('testParseCmdLine_lowerS', 'search', tmpCmdLineParameters.getInterpretedSearchText);
     252    assertEqualsString('testParseCmdLine_lowerS', 'file', tmpCmdLineParameters.getFileNames);
     253    assertEqualsString('testParseCmdLine_lowerS', 'search', tmpCmdLineParameters.getSearchText);
    265254  END;
    266255
    … …  
    283272    assertEqualsInt('testParseCmdLine_upperS', 0, tmpCmdLineParameters.getOwnerWindow);
    284273    assertEqualsString('testParseCmdLine_upperS', '', tmpCmdLineParameters.getWindowTitle);
    285     assertEqualsString('testParseCmdLine_upperS', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    286     assertEqualsString('testParseCmdLine_upperS', 'file', tmpCmdLineParameters.getFileNamesRaw);
    287     assertEqualsString('testParseCmdLine_upperS', 'seArch', tmpCmdLineParameters.getInterpretedSearchText);
     274    assertEqualsString('testParseCmdLine_upperS', 'file', tmpCmdLineParameters.getFileNames);
     275    assertEqualsString('testParseCmdLine_upperS', 'seArch', tmpCmdLineParameters.getSearchText);
    288276  END;
    289277
    … …  
    307295    assertEqualsInt('testParseCmdLine_upperS_withBlank', 0, tmpCmdLineParameters.getOwnerWindow);
    308296    assertEqualsString('testParseCmdLine_upperS_withBlank', '', tmpCmdLineParameters.getWindowTitle);
    309     assertEqualsString('testParseCmdLine_upperS_withBlank', 'FilE', tmpCmdLineParameters.getInterpretedFileNames);
    310     assertEqualsString('testParseCmdLine_upperS_withBlank', 'FilE', tmpCmdLineParameters.getFileNamesRaw);
    311     assertEqualsString('testParseCmdLine_upperS_withBlank', 'seArch', tmpCmdLineParameters.getInterpretedSearchText);
     297    assertEqualsString('testParseCmdLine_upperS_withBlank', 'FilE', tmpCmdLineParameters.getFileNames);
     298    assertEqualsString('testParseCmdLine_upperS_withBlank', 'seArch', tmpCmdLineParameters.getSearchText);
    312299  END;
    313300
    … …  
    330317    assertEqualsInt('testParseCmdLine_QuotedS', 0, tmpCmdLineParameters.getOwnerWindow);
    331318    assertEqualsString('testParseCmdLine_QuotedS', '', tmpCmdLineParameters.getWindowTitle);
    332     assertEqualsString('testParseCmdLine_QuotedS', 'FilE', tmpCmdLineParameters.getInterpretedFileNames);
    333     assertEqualsString('testParseCmdLine_QuotedS', 'FilE', tmpCmdLineParameters.getFileNamesRaw);
    334     assertEqualsString('testParseCmdLine_QuotedS', 'seArch', tmpCmdLineParameters.getInterpretedSearchText);
     319    assertEqualsString('testParseCmdLine_QuotedS', 'FilE', tmpCmdLineParameters.getFileNames);
     320    assertEqualsString('testParseCmdLine_QuotedS', 'seArch', tmpCmdLineParameters.getSearchText);
    335321  END;
    336322
    … …  
    353339    assertEqualsInt('testParseCmdLine_emptyS', 0, tmpCmdLineParameters.getOwnerWindow);
    354340    assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getWindowTitle);
    355     assertEqualsString('testParseCmdLine_emptyS', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    356     assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getFileNamesRaw);
    357     assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getInterpretedSearchText);
     341    assertEqualsString('testParseCmdLine_emptyS', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     342    assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getSearchText);
    358343  END;
    359344
    … …  
    376361    assertEqualsInt('testParseCmdLine_s_between', 0, tmpCmdLineParameters.getOwnerWindow);
    377362    assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getWindowTitle);
    378     assertEqualsString('testParseCmdLine_s_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    379     assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getFileNamesRaw);
    380     assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getInterpretedSearchText);
     363    assertEqualsString('testParseCmdLine_s_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     364    assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getSearchText);
    381365  END;
    382366
    … …  
    399383    assertEqualsInt('testParseCmdLine_s_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow);
    400384    assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    401     assertEqualsString('testParseCmdLine_s_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    402     assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    403     assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getInterpretedSearchText);
     385    assertEqualsString('testParseCmdLine_s_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     386    assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    404387  END;
    405388
    … …  
    422405    assertEqualsInt('testParseCmdLine_help_and_s', 0, tmpCmdLineParameters.getOwnerWindow);
    423406    assertEqualsString('testParseCmdLine_help_and_s', '', tmpCmdLineParameters.getWindowTitle);
    424     assertEqualsString('testParseCmdLine_help_and_s', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    425     assertEqualsString('testParseCmdLine_help_and_s', 'file', tmpCmdLineParameters.getFileNamesRaw);
    426     assertEqualsString('testParseCmdLine_help_and_s', '', tmpCmdLineParameters.getInterpretedSearchText);
     407    assertEqualsString('testParseCmdLine_help_and_s', 'file', tmpCmdLineParameters.getFileNames);
     408    assertEqualsString('testParseCmdLine_help_and_s', '', tmpCmdLineParameters.getSearchText);
    427409  END;
    428410
    … …  
    445427    assertEqualsInt('testParseCmdLine_s_and_help', 0, tmpCmdLineParameters.getOwnerWindow);
    446428    assertEqualsString('testParseCmdLine_s_and_help', '', tmpCmdLineParameters.getWindowTitle);
    447     assertEqualsString('testParseCmdLine_s_and_help', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    448     assertEqualsString('testParseCmdLine_s_and_help', 'file', tmpCmdLineParameters.getFileNamesRaw);
    449     assertEqualsString('testParseCmdLine_s_and_help', '', tmpCmdLineParameters.getInterpretedSearchText);
     429    assertEqualsString('testParseCmdLine_s_and_help', 'file', tmpCmdLineParameters.getFileNames);
     430    assertEqualsString('testParseCmdLine_s_and_help', '', tmpCmdLineParameters.getSearchText);
    450431  END;
    451432
    … …  
    468449    assertEqualsInt('testParseCmdLine_help_and_s_without_blank', 0, tmpCmdLineParameters.getOwnerWindow);
    469450    assertEqualsString('testParseCmdLine_help_and_s_without_blank', '', tmpCmdLineParameters.getWindowTitle);
    470     assertEqualsString('testParseCmdLine_help_and_s_without_blank', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    471     assertEqualsString('testParseCmdLine_help_and_s_without_blank', 'file', tmpCmdLineParameters.getFileNamesRaw);
    472     assertEqualsString('testParseCmdLine_help_and_s_without_blank', '', tmpCmdLineParameters.getInterpretedSearchText);
     451    assertEqualsString('testParseCmdLine_help_and_s_without_blank', 'file', tmpCmdLineParameters.getFileNames);
     452    assertEqualsString('testParseCmdLine_help_and_s_without_blank', '', tmpCmdLineParameters.getSearchText);
    473453  END;
    474454
    … …  
    492472    assertEqualsInt('testParseCmdLine_lowerG', 0, tmpCmdLineParameters.getOwnerWindow);
    493473    assertEqualsString('testParseCmdLine_lowerG', '', tmpCmdLineParameters.getWindowTitle);
    494     assertEqualsString('testParseCmdLine_lowerG', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    495     assertEqualsString('testParseCmdLine_lowerG', 'file', tmpCmdLineParameters.getFileNamesRaw);
    496     assertEqualsString('testParseCmdLine_lowerG', 'search', tmpCmdLineParameters.getInterpretedSearchText);
     474    assertEqualsString('testParseCmdLine_lowerG', 'file', tmpCmdLineParameters.getFileNames);
     475    assertEqualsString('testParseCmdLine_lowerG', 'search', tmpCmdLineParameters.getSearchText);
    497476  END;
    498477
    … …  
    515494    assertEqualsInt('testParseCmdLine_upperG', 0, tmpCmdLineParameters.getOwnerWindow);
    516495    assertEqualsString('testParseCmdLine_upperG', '', tmpCmdLineParameters.getWindowTitle);
    517     assertEqualsString('testParseCmdLine_upperG', 'fiLe', tmpCmdLineParameters.getInterpretedFileNames);
    518     assertEqualsString('testParseCmdLine_upperG', 'fiLe', tmpCmdLineParameters.getFileNamesRaw);
    519     assertEqualsString('testParseCmdLine_upperG', 'seArch', tmpCmdLineParameters.getInterpretedSearchText);
     496    assertEqualsString('testParseCmdLine_upperG', 'fiLe', tmpCmdLineParameters.getFileNames);
     497    assertEqualsString('testParseCmdLine_upperG', 'seArch', tmpCmdLineParameters.getSearchText);
    520498  END;
    521499
    … …  
    538516    assertEqualsInt('testParseCmdLine_QuotedG', 0, tmpCmdLineParameters.getOwnerWindow);
    539517    assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getWindowTitle);
    540     assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getInterpretedFileNames);
    541     assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getFileNamesRaw);
    542     assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getInterpretedSearchText);
     518    assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getFileNames);
     519    assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getSearchText);
    543520  END;
    544521
    … …  
    561538    assertEqualsInt('testParseCmdLine_emptyG', 0, tmpCmdLineParameters.getOwnerWindow);
    562539    assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getWindowTitle);
    563     assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getInterpretedFileNames);
    564     assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getFileNamesRaw);
    565     assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getInterpretedSearchText);
     540    assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getFileNames);
     541    assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getSearchText);
    566542  END;
    567543
    … …  
    584560    assertEqualsInt('testParseCmdLine_g_between', 0, tmpCmdLineParameters.getOwnerWindow);
    585561    assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getWindowTitle);
    586     assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getInterpretedFileNames);
    587     assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getFileNamesRaw);
    588     assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getInterpretedSearchText);
     562    assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getFileNames);
     563    assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getSearchText);
    589564  END;
    590565
    … …  
    607582    assertEqualsInt('testParseCmdLine_g_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow);
    608583    assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    609     assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getInterpretedFileNames);
    610     assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    611     assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getInterpretedSearchText);
     584    assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getFileNames);
     585    assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    612586  END;
    613587
    … …  
    630604    assertEqualsInt('testParseCmdLine_Language', 0, tmpCmdLineParameters.getOwnerWindow);
    631605    assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getWindowTitle);
    632     assertEqualsString('testParseCmdLine_Language', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    633     assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getFileNamesRaw);
    634     assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getInterpretedSearchText);
     606    assertEqualsString('testParseCmdLine_Language', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     607    assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getSearchText);
    635608  END;
    636609
    … …  
    653626    assertEqualsInt('testParseCmdLine_Language_Empty', 0, tmpCmdLineParameters.getOwnerWindow);
    654627    assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getWindowTitle);
    655     assertEqualsString('testParseCmdLine_Language_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    656     assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getFileNamesRaw);
    657     assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getInterpretedSearchText);
     628    assertEqualsString('testParseCmdLine_Language_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     629    assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getSearchText);
    658630  END;
    659631
    … …  
    676648    assertEqualsInt('testParseCmdLine_Language_Empty_WithColon', 0, tmpCmdLineParameters.getOwnerWindow);
    677649    assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getWindowTitle);
    678     assertEqualsString('testParseCmdLine_Language_Empty_WithColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    679     assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getFileNamesRaw);
    680     assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getInterpretedSearchText);
     650    assertEqualsString('testParseCmdLine_Language_Empty_WithColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     651    assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getSearchText);
    681652  END;
    682653
    … …  
    699670    assertEqualsInt('testParseCmdLine_Language_WithFile', 0, tmpCmdLineParameters.getOwnerWindow);
    700671    assertEqualsString('testParseCmdLine_Language_WithFile', '', tmpCmdLineParameters.getWindowTitle);
    701     assertEqualsString('testParseCmdLine_Language_WithFile', 'filE', tmpCmdLineParameters.getInterpretedFileNames);
    702     assertEqualsString('testParseCmdLine_Language_WithFile', 'filE', tmpCmdLineParameters.getFileNamesRaw);
    703     assertEqualsString('testParseCmdLine_Language_WithFile', '', tmpCmdLineParameters.getInterpretedSearchText);
     672    assertEqualsString('testParseCmdLine_Language_WithFile', 'filE', tmpCmdLineParameters.getFileNames);
     673    assertEqualsString('testParseCmdLine_Language_WithFile', '', tmpCmdLineParameters.getSearchText);
    704674  END;
    705675
    … …  
    722692    assertEqualsInt('testParseCmdLine_QuotedLanguage', 0, tmpCmdLineParameters.getOwnerWindow);
    723693    assertEqualsString('testParseCmdLine_QuotedLanguage', '', tmpCmdLineParameters.getWindowTitle);
    724     assertEqualsString('testParseCmdLine_QuotedLanguage', 'filE', tmpCmdLineParameters.getInterpretedFileNames);
    725     assertEqualsString('testParseCmdLine_QuotedLanguage', 'filE', tmpCmdLineParameters.getFileNamesRaw);
    726     assertEqualsString('testParseCmdLine_QuotedLanguage', '', tmpCmdLineParameters.getInterpretedSearchText);
     694    assertEqualsString('testParseCmdLine_QuotedLanguage', 'filE', tmpCmdLineParameters.getFileNames);
     695    assertEqualsString('testParseCmdLine_QuotedLanguage', '', tmpCmdLineParameters.getSearchText);
    727696  END;
    728697
    … …  
    745714    assertEqualsInt('testParseCmdLine_QuotedLanguage2', 0, tmpCmdLineParameters.getOwnerWindow);
    746715    assertEqualsString('testParseCmdLine_QuotedLanguage2', '', tmpCmdLineParameters.getWindowTitle);
    747     assertEqualsString('testParseCmdLine_QuotedLanguage2', 'filE', tmpCmdLineParameters.getInterpretedFileNames);
    748     assertEqualsString('testParseCmdLine_QuotedLanguage2', 'filE', tmpCmdLineParameters.getFileNamesRaw);
    749     assertEqualsString('testParseCmdLine_QuotedLanguage2', '', tmpCmdLineParameters.getInterpretedSearchText);
     716    assertEqualsString('testParseCmdLine_QuotedLanguage2', 'filE', tmpCmdLineParameters.getFileNames);
     717    assertEqualsString('testParseCmdLine_QuotedLanguage2', '', tmpCmdLineParameters.getSearchText);
    750718  END;
    751719
    … …  
    768736    assertEqualsInt('testParseCmdLine_Language_between', 0, tmpCmdLineParameters.getOwnerWindow);
    769737    assertEqualsString('testParseCmdLine_Language_between', '', tmpCmdLineParameters.getWindowTitle);
    770     assertEqualsString('testParseCmdLine_Language_between', 'filE', tmpCmdLineParameters.getInterpretedFileNames);
    771     assertEqualsString('testParseCmdLine_Language_between', 'filE', tmpCmdLineParameters.getFileNamesRaw);
    772     assertEqualsString('testParseCmdLine_Language_between', '', tmpCmdLineParameters.getInterpretedSearchText);
     738    assertEqualsString('testParseCmdLine_Language_between', 'filE', tmpCmdLineParameters.getFileNames);
     739    assertEqualsString('testParseCmdLine_Language_between', '', tmpCmdLineParameters.getSearchText);
    773740  END;
    774741
    … …  
    791758    assertEqualsInt('testParseCmdLine_Language_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow);
    792759    assertEqualsString('testParseCmdLine_Language_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    793     assertEqualsString('testParseCmdLine_Language_between_withSpace', 'filE', tmpCmdLineParameters.getInterpretedFileNames);
    794     assertEqualsString('testParseCmdLine_Language_between_withSpace', 'filE', tmpCmdLineParameters.getFileNamesRaw);
    795     assertEqualsString('testParseCmdLine_Language_between_withSpace', '', tmpCmdLineParameters.getInterpretedSearchText);
     760    assertEqualsString('testParseCmdLine_Language_between_withSpace', 'filE', tmpCmdLineParameters.getFileNames);
     761    assertEqualsString('testParseCmdLine_Language_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    796762  END;
    797763
    … …  
    814780    assertEqualsInt('testParseCmdLine_HelpManagerNumber', 0, tmpCmdLineParameters.getOwnerWindow);
    815781    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getWindowTitle);
    816     assertEqualsString('testParseCmdLine_HelpManagerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    817     assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getFileNamesRaw);
    818     assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getInterpretedSearchText);
     782    assertEqualsString('testParseCmdLine_HelpManagerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     783    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getSearchText);
    819784  END;
    820785
    … …  
    837802    assertEqualsInt('testParseCmdLine_HelpManagerBigNumber', 0, tmpCmdLineParameters.getOwnerWindow);
    838803    assertEqualsString('testParseCmdLine_HelpManagerBigNumber', '', tmpCmdLineParameters.getWindowTitle);
    839     assertEqualsString('testParseCmdLine_HelpManagerBigNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    840     assertEqualsString('testParseCmdLine_HelpManagerBigNumber', '', tmpCmdLineParameters.getFileNamesRaw);
    841     assertEqualsString('testParseCmdLine_HelpManagerBigNumber', '', tmpCmdLineParameters.getInterpretedSearchText);
     804    assertEqualsString('testParseCmdLine_HelpManagerBigNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     805    assertEqualsString('testParseCmdLine_HelpManagerBigNumber', '', tmpCmdLineParameters.getSearchText);
    842806  END;
    843807
    … …  
    860824    assertEqualsInt('testParseCmdLine_HelpManagerNumber_WithoutColon', 0, tmpCmdLineParameters.getOwnerWindow);
    861825    assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getWindowTitle);
    862     assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    863     assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getFileNamesRaw);
    864     assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getInterpretedSearchText);
     826    assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     827    assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getSearchText);
    865828  END;
    866829
    … …  
    883846    assertEqualsInt('testParseCmdLine_HelpManagerNumber', 0, tmpCmdLineParameters.getOwnerWindow);
    884847    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getWindowTitle);
    885     assertEqualsString('testParseCmdLine_HelpManagerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    886     assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getFileNamesRaw);
    887     assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getInterpretedSearchText);
     848    assertEqualsString('testParseCmdLine_HelpManagerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     849    assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getSearchText);
    888850  END;
    889851
    … …  
    906868    assertEqualsInt('testParseCmdLine_HelpManagerNumber_between', 0, tmpCmdLineParameters.getOwnerWindow);
    907869    assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getWindowTitle);
    908     assertEqualsString('testParseCmdLine_HelpManagerNumber_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    909     assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getFileNamesRaw);
    910     assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getInterpretedSearchText);
     870    assertEqualsString('testParseCmdLine_HelpManagerNumber_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     871    assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getSearchText);
    911872  END;
    912873
    … …  
    929890    assertEqualsInt('testParseCmdLine_HelpManagerNumber_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow);
    930891    assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    931     assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    932     assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    933     assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getInterpretedSearchText);
     892    assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     893    assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    934894  END;
    935895
    … …  
    952912    assertEqualsInt('testParseCmdLine_OwnerNumber', 1234, tmpCmdLineParameters.getOwnerWindow);
    953913    assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getWindowTitle);
    954     assertEqualsString('testParseCmdLine_OwnerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    955     assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getFileNamesRaw);
    956     assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getInterpretedSearchText);
     914    assertEqualsString('testParseCmdLine_OwnerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     915    assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getSearchText);
    957916  END;
    958917
    … …  
    975934    assertEqualsInt('testParseCmdLine_OwnerNumber_WithoutColon', 134, tmpCmdLineParameters.getOwnerWindow);
    976935    assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getWindowTitle);
    977     assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    978     assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getFileNamesRaw);
    979     assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getInterpretedSearchText);
     936    assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     937    assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getSearchText);
    980938  END;
    981939
    … …  
    998956    assertEqualsInt('testParseCmdLine_OwnerNumber_Invalid', 0, tmpCmdLineParameters.getOwnerWindow);
    999957    assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getWindowTitle);
    1000     assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1001     assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getFileNamesRaw);
    1002     assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getInterpretedSearchText);
     958    assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     959    assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getSearchText);
    1003960  END;
    1004961
    … …  
    1021978    assertEqualsInt('testParseCmdLine_OwnerNumber_between', 14, tmpCmdLineParameters.getOwnerWindow);
    1022979    assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getWindowTitle);
    1023     assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getInterpretedFileNames);
    1024     assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getFileNamesRaw);
    1025     assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getInterpretedSearchText);
     980    assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getFileNames);
     981    assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getSearchText);
    1026982  END;
    1027983
    … …  
    10441000    assertEqualsInt('testParseCmdLine_OwnerNumber_between_withSpace', 14, tmpCmdLineParameters.getOwnerWindow);
    10451001    assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getWindowTitle);
    1046     assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getInterpretedFileNames);
    1047     assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    1048     assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getInterpretedSearchText);
     1002    assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNames);
     1003    assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    10491004  END;
    10501005
    … …  
    10671022    assertEqualsInt('testParseCmdLine_Title', 0, tmpCmdLineParameters.getOwnerWindow);
    10681023    assertEqualsString('testParseCmdLine_Title', 'Test', tmpCmdLineParameters.getWindowTitle);
    1069     assertEqualsString('testParseCmdLine_Title', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1070     assertEqualsString('testParseCmdLine_Title', '', tmpCmdLineParameters.getFileNamesRaw);
    1071     assertEqualsString('testParseCmdLine_Title', '', tmpCmdLineParameters.getInterpretedSearchText);
     1024    assertEqualsString('testParseCmdLine_Title', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1025    assertEqualsString('testParseCmdLine_Title', '', tmpCmdLineParameters.getSearchText);
    10721026  END;
    10731027
    … …  
    10901044    assertEqualsInt('testParseCmdLine_Title_WithoutColon', 0, tmpCmdLineParameters.getOwnerWindow);
    10911045    assertEqualsString('testParseCmdLine_Title_WithoutColon', 'titlE', tmpCmdLineParameters.getWindowTitle);
    1092     assertEqualsString('testParseCmdLine_Title_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1093     assertEqualsString('testParseCmdLine_Title_WithoutColon', '', tmpCmdLineParameters.getFileNamesRaw);
    1094     assertEqualsString('testParseCmdLine_Title_WithoutColon', '', tmpCmdLineParameters.getInterpretedSearchText);
     1046    assertEqualsString('testParseCmdLine_Title_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1047    assertEqualsString('testParseCmdLine_Title_WithoutColon', '', tmpCmdLineParameters.getSearchText);
    10951048  END;
    10961049
    … …  
    11131066    assertEqualsInt('testParseCmdLine_Title_Empty', 0, tmpCmdLineParameters.getOwnerWindow);
    11141067    assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getWindowTitle);
    1115     assertEqualsString('testParseCmdLine_Title_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1116     assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getFileNamesRaw);
    1117     assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getInterpretedSearchText);
     1068    assertEqualsString('testParseCmdLine_Title_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1069    assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getSearchText);
    11181070  END;
    11191071
    … …  
    11361088    assertEqualsInt('testParseCmdLine_QuotedTitle', 0, tmpCmdLineParameters.getOwnerWindow);
    11371089    assertEqualsString('testParseCmdLine_QuotedTitle', 'Test Title', tmpCmdLineParameters.getWindowTitle);
    1138     assertEqualsString('testParseCmdLine_QuotedTitle', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1139     assertEqualsString('testParseCmdLine_QuotedTitle', '', tmpCmdLineParameters.getFileNamesRaw);
    1140     assertEqualsString('testParseCmdLine_QuotedTitle', '', tmpCmdLineParameters.getInterpretedSearchText);
     1090    assertEqualsString('testParseCmdLine_QuotedTitle', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1091    assertEqualsString('testParseCmdLine_QuotedTitle', '', tmpCmdLineParameters.getSearchText);
    11411092  END;
    11421093
    … …  
    11591110    assertEqualsInt('testParseCmdLine_QuotedTitle2', 0, tmpCmdLineParameters.getOwnerWindow);
    11601111    assertEqualsString('testParseCmdLine_QuotedTitle2', 'Test Title', tmpCmdLineParameters.getWindowTitle);
    1161     assertEqualsString('testParseCmdLine_QuotedTitle2', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1162     assertEqualsString('testParseCmdLine_QuotedTitle2', '', tmpCmdLineParameters.getFileNamesRaw);
    1163     assertEqualsString('testParseCmdLine_QuotedTitle2', '', tmpCmdLineParameters.getInterpretedSearchText);
     1112    assertEqualsString('testParseCmdLine_QuotedTitle2', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1113    assertEqualsString('testParseCmdLine_QuotedTitle2', '', tmpCmdLineParameters.getSearchText);
    11641114  END;
    11651115
    … …  
    11821132    assertEqualsInt('testParseCmdLine_QuotedTitle_AfterFile', 0, tmpCmdLineParameters.getOwnerWindow);
    11831133    assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', 'Test Title', tmpCmdLineParameters.getWindowTitle);
    1184     assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', 'cmdref', tmpCmdLineParameters.getInterpretedFileNames);
    1185     assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', 'cmdref', tmpCmdLineParameters.getFileNamesRaw);
    1186     assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', '', tmpCmdLineParameters.getInterpretedSearchText);
     1134    assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', 'cmdref', tmpCmdLineParameters.getFileNames);
     1135    assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', '', tmpCmdLineParameters.getSearchText);
    11871136  END;
    11881137
    … …  
    12051154    assertEqualsInt('testParseCmdLine_Title_between', 0, tmpCmdLineParameters.getOwnerWindow);
    12061155    assertEqualsString('testParseCmdLine_Title_between', 'tItlE', tmpCmdLineParameters.getWindowTitle);
    1207     assertEqualsString('testParseCmdLine_Title_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1208     assertEqualsString('testParseCmdLine_Title_between', '', tmpCmdLineParameters.getFileNamesRaw);
    1209     assertEqualsString('testParseCmdLine_Title_between', '', tmpCmdLineParameters.getInterpretedSearchText);
     1156    assertEqualsString('testParseCmdLine_Title_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1157    assertEqualsString('testParseCmdLine_Title_between', '', tmpCmdLineParameters.getSearchText);
    12101158  END;
    12111159
    … …  
    12281176    assertEqualsInt('testParseCmdLine_Title_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow);
    12291177    assertEqualsString('testParseCmdLine_Title_between_withSpace', 'tItlE', tmpCmdLineParameters.getWindowTitle);
    1230     assertEqualsString('testParseCmdLine_Title_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1231     assertEqualsString('testParseCmdLine_Title_between_withSpace', '', tmpCmdLineParameters.getFileNamesRaw);
    1232     assertEqualsString('testParseCmdLine_Title_between_withSpace', '', tmpCmdLineParameters.getInterpretedSearchText);
     1178    assertEqualsString('testParseCmdLine_Title_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1179    assertEqualsString('testParseCmdLine_Title_between_withSpace', '', tmpCmdLineParameters.getSearchText);
    12331180  END;
    12341181
    … …  
    12541201    assertEqualsInt('testParseCmdLine_WindowPos', 0, tmpCmdLineParameters.getOwnerWindow);
    12551202    assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getWindowTitle);
    1256     assertEqualsString('testParseCmdLine_WindowPos', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1257     assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getFileNamesRaw);
    1258     assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getInterpretedSearchText);
     1203    assertEqualsString('testParseCmdLine_WindowPos', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1204    assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getSearchText);
    12591205
    12601206    assertTrue('testParseCmdLine_WindowPos', tmpCmdLineParameters.getWindowPositionFlag);
    … …  
    12861232    assertEqualsInt('testParseCmdLine_WindowPosPercentage', 0, tmpCmdLineParameters.getOwnerWindow);
    12871233    assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getWindowTitle);
    1288     assertEqualsString('testParseCmdLine_WindowPosPercentage', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getInterpretedFileNames);
    1289     assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getFileNamesRaw);
    1290     assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getInterpretedSearchText);
     1234    assertEqualsString('testParseCmdLine_WindowPosPercentage', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames);
     1235    assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getSearchText);
    12911236
    12921237    assertTrue('testParseCmdLine_WindowPosPercentage', tmpCmdLineParameters.getWindowPositionFlag);
    … …  
    13161261    assertEqualsInt('testParseCmdLine_Topic', 0, tmpCmdLineParameters.getOwnerWindow);
    13171262    assertEqualsString('testParseCmdLine_Topic', '', tmpCmdLineParameters.getWindowTitle);
    1318     assertEqualsString('testParseCmdLine_Topic', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    1319     assertEqualsString('testParseCmdLine_Topic', 'file', tmpCmdLineParameters.getFileNamesRaw);
    1320     assertEqualsString('testParseCmdLine_Topic', 'topi1 topi2', tmpCmdLineParameters.getInterpretedSearchText);
     1263    assertEqualsString('testParseCmdLine_Topic', 'file', tmpCmdLineParameters.getFileNames);
     1264    assertEqualsString('testParseCmdLine_Topic', 'topi1 topi2', tmpCmdLineParameters.getSearchText);
    13211265  END;
    13221266
    … …  
    13391283    assertEqualsInt('testParseCmdLine_QuotedTopic', 0, tmpCmdLineParameters.getOwnerWindow);
    13401284    assertEqualsString('testParseCmdLine_QuotedTopic', '', tmpCmdLineParameters.getWindowTitle);
    1341     assertEqualsString('testParseCmdLine_QuotedTopic', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    1342     assertEqualsString('testParseCmdLine_QuotedTopic', 'file', tmpCmdLineParameters.getFileNamesRaw);
    1343     assertEqualsString('testParseCmdLine_QuotedTopic', 'topi1', tmpCmdLineParameters.getInterpretedSearchText);
     1285    assertEqualsString('testParseCmdLine_QuotedTopic', 'file', tmpCmdLineParameters.getFileNames);
     1286    assertEqualsString('testParseCmdLine_QuotedTopic', 'topi1', tmpCmdLineParameters.getSearchText);
    13441287  END;
    13451288
    … …  
    13621305    assertEqualsInt('testParseCmdLine_file', 0, tmpCmdLineParameters.getOwnerWindow);
    13631306    assertEqualsString('testParseCmdLine_file', '', tmpCmdLineParameters.getWindowTitle);
    1364     assertEqualsString('testParseCmdLine_file', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    1365     assertEqualsString('testParseCmdLine_file', 'file', tmpCmdLineParameters.getFileNamesRaw);
    1366     assertEqualsString('testParseCmdLine_file', '', tmpCmdLineParameters.getInterpretedSearchText);
     1307    assertEqualsString('testParseCmdLine_file', 'file', tmpCmdLineParameters.getFileNames);
     1308    assertEqualsString('testParseCmdLine_file', '', tmpCmdLineParameters.getSearchText);
    13671309  END;
    13681310
    … …  
    13851327    assertEqualsInt('testParseCmdLine_fileLeadingBlanks', 0, tmpCmdLineParameters.getOwnerWindow);
    13861328    assertEqualsString('testParseCmdLine_fileLeadingBlanks', '', tmpCmdLineParameters.getWindowTitle);
    1387     assertEqualsString('testParseCmdLine_fileLeadingBlanks', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    1388     assertEqualsString('testParseCmdLine_fileLeadingBlanks', 'file', tmpCmdLineParameters.getFileNamesRaw);
    1389     assertEqualsString('testParseCmdLine_fileLeadingBlanks', '', tmpCmdLineParameters.getInterpretedSearchText);
     1329    assertEqualsString('testParseCmdLine_fileLeadingBlanks', 'file', tmpCmdLineParameters.getFileNames);
     1330    assertEqualsString('testParseCmdLine_fileLeadingBlanks', '', tmpCmdLineParameters.getSearchText);
    13901331  END;
    13911332
    … …  
    14081349    assertEqualsInt('testParseCmdLine_fileTrailingBlanks', 0, tmpCmdLineParameters.getOwnerWindow);
    14091350    assertEqualsString('testParseCmdLine_fileTrailingBlanks', '', tmpCmdLineParameters.getWindowTitle);
    1410     assertEqualsString('testParseCmdLine_fileTrailingBlanks', 'file', tmpCmdLineParameters.getInterpretedFileNames);
    1411     assertEqualsString('testParseCmdLine_fileTrailingBlanks', 'file', tmpCmdLineParameters.getFileNamesRaw);
    1412     assertEqualsString('testParseCmdLine_fileTrailingBlanks', '', tmpCmdLineParameters.getInterpretedSearchText);
     1351    assertEqualsString('testParseCmdLine_fileTrailingBlanks', 'file', tmpCmdLineParameters.getFileNames);
     1352    assertEqualsString('testParseCmdLine_fileTrailingBlanks', '', tmpCmdLineParameters.getSearchText);
    14131353  END;
    14141354
    … …  
    14311371    assertEqualsInt('testParseCmdLine_fileQuoted', 0, tmpCmdLineParameters.getOwnerWindow);
    14321372    assertEqualsString('testParseCmdLine_fileQuoted', '', tmpCmdLineParameters.getWindowTitle);
    1433     assertEqualsString('testParseCmdLine_fileQuoted', 'fi -h le', tmpCmdLineParameters.getInterpretedFileNames);
    1434     assertEqualsString('testParseCmdLine_fileQuoted', '"fi -h le"', tmpCmdLineParameters.getFileNamesRaw);
    1435     assertEqualsString('testParseCmdLine_fileQuoted', '', tmpCmdLineParameters.getInterpretedSearchText);
     1373    assertEqualsString('testParseCmdLine_fileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1374    assertEqualsString('testParseCmdLine_fileQuoted', '', tmpCmdLineParameters.getSearchText);
    14361375  END;
    14371376
    … …  
    14541393    assertEqualsInt('testParseCmdLine_fileQuotedMissingClosedQuote', 0, tmpCmdLineParameters.getOwnerWindow);
    14551394    assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '', tmpCmdLineParameters.getWindowTitle);
    1456     assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', 'fi -h le', tmpCmdLineParameters.getInterpretedFileNames);
    1457     assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '"fi -h le', tmpCmdLineParameters.getFileNamesRaw);
    1458     assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '', tmpCmdLineParameters.getInterpretedSearchText);
     1395    assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1396    assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '', tmpCmdLineParameters.getSearchText);
    14591397  END;
    14601398
    … …  
    14651403    tmpCmdLineParameters : TCmdLineParameters;
    14661404  BEGIN
    1467     tmpCmdLineString := '"fi -h le" serachText';
     1405    tmpCmdLineString := '"fi -h le" searchText';
    14681406    tmpCmdLineParameters := TCmdLineParameters.Create;
    14691407    tmpCmdLineParameters.parseCmdLine(tmpCmdLineString);
    … …  
    14771415    assertEqualsInt('testParseCmdLine_fileQuotedAndText', 0, tmpCmdLineParameters.getOwnerWindow);
    14781416    assertEqualsString('testParseCmdLine_fileQuotedAndText', '', tmpCmdLineParameters.getWindowTitle);
    1479     assertEqualsString('testParseCmdLine_fileQuotedAndText', 'fi -h le', tmpCmdLineParameters.getInterpretedFileNames);
    1480     assertEqualsString('testParseCmdLine_fileQuotedAndText', '"fi -h le"', tmpCmdLineParameters.getFileNamesRaw);
    1481     assertEqualsString('testParseCmdLine_fileQuotedAndText', 'serachText', tmpCmdLineParameters.getInterpretedSearchText);
     1417    assertEqualsString('testParseCmdLine_fileQuotedAndText', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1418    assertEqualsString('testParseCmdLine_fileQuotedAndText', 'searchText', tmpCmdLineParameters.getSearchText);
    14821419  END;
    14831420
    … …  
    14881425    tmpCmdLineParameters : TCmdLineParameters;
    14891426  BEGIN
    1490     tmpCmdLineString := '"fi -h le"    serachText    ';
     1427    tmpCmdLineString := '"fi -h le"    searchText    ';
    14911428    tmpCmdLineParameters := TCmdLineParameters.Create;
    14921429    tmpCmdLineParameters.parseCmdLine(tmpCmdLineString);
    … …  
    15001437    assertEqualsInt('testParseCmdLine_fileQuotedAndTextManyBlanks', 0, tmpCmdLineParameters.getOwnerWindow);
    15011438    assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', '', tmpCmdLineParameters.getWindowTitle);
    1502     assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'fi -h le', tmpCmdLineParameters.getInterpretedFileNames);
    1503     assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', '"fi -h le"', tmpCmdLineParameters.getFileNamesRaw);
    1504     assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'serachText', tmpCmdLineParameters.getInterpretedSearchText);
     1439    assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1440    assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'searchText', tmpCmdLineParameters.getSearchText);
    15051441  END;
    15061442
    … …  
    15111447    tmpCmdLineParameters : TCmdLineParameters;
    15121448  BEGIN
    1513     tmpCmdLineString := 'test"fi -h le"tes serachText';
     1449    tmpCmdLineString := 'test"fi -h le"tes searchText';
    15141450    tmpCmdLineParameters := TCmdLineParameters.Create;
    15151451    tmpCmdLineParameters.parseCmdLine(tmpCmdLineString);
    … …  
    15231459    assertEqualsInt('testParseCmdLine_fileQuotedInside', 0, tmpCmdLineParameters.getOwnerWindow);
    15241460    assertEqualsString('testParseCmdLine_fileQuotedInside', '', tmpCmdLineParameters.getWindowTitle);
    1525     assertEqualsString('testParseCmdLine_fileQuotedInside', 'testfi -h letes', tmpCmdLineParameters.getInterpretedFileNames);
    1526     assertEqualsString('testParseCmdLine_fileQuotedInside', 'test"fi -h le"tes', tmpCmdLineParameters.getFileNamesRaw);
    1527     assertEqualsString('testParseCmdLine_fileQuotedInside', 'serachText', tmpCmdLineParameters.getInterpretedSearchText);
     1461    assertEqualsString('testParseCmdLine_fileQuotedInside', 'testfi -h letes', tmpCmdLineParameters.getFileNames);
     1462    assertEqualsString('testParseCmdLine_fileQuotedInside', 'searchText', tmpCmdLineParameters.getSearchText);
    15281463  END;
    15291464
    … …  
    15341469    tmpCmdLineParameters : TCmdLineParameters;
    15351470  BEGIN
    1536     tmpCmdLineString := '-s "fi -h le" serachText';
     1471    tmpCmdLineString := '-s "fi -h le" searchText';
    15371472    tmpCmdLineParameters := TCmdLineParameters.Create;
    15381473    tmpCmdLineParameters.parseCmdLine(tmpCmdLineString);
    … …  
    15461481    assertEqualsInt('testParseCmdLine_SwitchAndFileQuoted', 0, tmpCmdLineParameters.getOwnerWindow);
    15471482    assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', '', tmpCmdLineParameters.getWindowTitle);
    1548     assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'fi -h le', tmpCmdLineParameters.getInterpretedFileNames);
    1549     assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', '"fi -h le"', tmpCmdLineParameters.getFileNamesRaw);
    1550     assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'serachText', tmpCmdLineParameters.getInterpretedSearchText);
     1483    assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames);
     1484    assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'searchText', tmpCmdLineParameters.getSearchText);
     1485  END;
     1486
     1487
     1488  PROCEDURE testParseCmdLine_SwitchAndFileAndTextQuoted;
     1489  VAR
     1490    tmpCmdLineString : String;
     1491    tmpCmdLineParameters : TCmdLineParameters;
     1492  BEGIN
     1493    tmpCmdLineString := '-s file "search text"';
     1494    tmpCmdLineParameters := TCmdLineParameters.Create;
     1495    tmpCmdLineParameters.parseCmdLine(tmpCmdLineString);
     1496
     1497    assertFalse('testParseCmdLine_SwitchAndFileAndTextQuoted->ShowUsageFlag', tmpCmdLineParameters.getShowUsageFlag);
     1498    assertTrue('testParseCmdLine_SwitchAndFileAndTextQuoted->SearchFlag', tmpCmdLineParameters.getSearchFlag);
     1499    assertFalse('testParseCmdLine_SwitchAndFileAndTextQuoted->GlobalSearchFlag', tmpCmdLineParameters.getGlobalSearchFlag);
     1500    assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', '', tmpCmdLineParameters.getLanguage);
     1501    assertFalse('testParseCmdLine_SwitchAndFileAndTextQuoted', tmpCmdLineParameters.getHelpManagerFlag);
     1502    assertEqualsInt('testParseCmdLine_SwitchAndFileAndTextQuoted', 0, tmpCmdLineParameters.getHelpManagerWindow);
     1503    assertEqualsInt('testParseCmdLine_SwitchAndFileAndTextQuoted', 0, tmpCmdLineParameters.getOwnerWindow);
     1504    assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', '', tmpCmdLineParameters.getWindowTitle);
     1505    assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', 'file', tmpCmdLineParameters.getFileNames);
     1506    assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', '"search text"', tmpCmdLineParameters.getSearchText);
    15511507  END;
    15521508
    … …  
    16341590    result.add(@testParseCmdLine_fileQuotedAndTextManyBlanks);
    16351591    result.add(@testParseCmdLine_fileQuotedInside);
     1592
    16361593    result.add(@testParseCmdLine_SwitchAndFileQuoted);
     1594    result.add(@testParseCmdLine_SwitchAndFileAndTextQuoted);
    16371595  END;
    16381596
Note: See TracChangeset for help on using the changeset viewer.