Changeset 128
- Timestamp:
- Apr 28, 2007, 9:12:56 PM (18 years ago)
- Location:
- trunk/NewView
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NewView/CmdLineParameterUnit.pas
r122 r128 2 2 3 3 // NewView - a new OS/2 Help Viewer 4 // Copyright 2006 Ronald Brill (rbri at rbri dot de)4 // Copyright 2006, 2007 Ronald Brill (rbri at rbri dot de) 5 5 // This software is released under the GNU Public License - see readme.txt 6 6 … … 72 72 PROPERTY getOwnerWindow : integer read ownerWindow; 73 73 PROPERTY getWindowTitle : AnsiString read windowTitle; 74 PROPERTY getFileNames : AnsiString read fileNames;75 74 PROPERTY getSearchText : AnsiString read searchText; 75 76 FUNCTION getFileNames(const aShowNewViewHelpIfNoFileSpecifiedFlag : Boolean) : AnsiString; 76 77 77 78 PROCEDURE writeDetailsTo(aStrings : TStrings); … … 97 98 aStrings.Add('''' + commandLine + ''''); 98 99 aStrings.Add('isDebugEnabled: ' + boolToStr(isDebugEnabled)); 100 99 101 aStrings.Add('parsed infos:'); 100 101 102 aStrings.Add(' showUsageFlag: ' + boolToStr(getShowUsageFlag)); 102 103 aStrings.Add(' searchFlag: ' + boolToStr(getSearchFlag)); 103 aStrings.Add(' fileNames: ' + getFileNames); 104 aStrings.Add(' fileNames(true): ' + getFileNames(true)); 105 aStrings.Add(' fileNames(false): ' + getFileNames(false)); 104 106 aStrings.Add(' parsedFileNames: ' + getParsedFileNames); 105 107 aStrings.Add(' searchText: ' + getSearchText); … … 133 135 LogEvent(LogStartup, ' showUsageFlag: ' + boolToStr(getShowUsageFlag)); 134 136 LogEvent(LogStartup, ' searchFlag: ' + boolToStr(getSearchFlag)); 135 LogEvent(LogStartup, ' fileNames: ' + getFileNames); 137 LogEvent(LogStartup, ' fileNames(true): ' + getFileNames(true)); 138 LogEvent(LogStartup, ' fileNames(false): ' + getFileNames(false)); 136 139 LogEvent(LogStartup, ' parsedFileNames: ' + getParsedFileNames); 137 140 LogEvent(LogStartup, ' searchText: ' + getSearchText); … … 171 174 tmpQuote : AnsiString; 172 175 tmpSwitch : AnsiString; 173 tmpOwnHelpFileName : AnsiString;174 176 tmpEnvDebug : String; 175 177 begin … … 420 422 fileNames := ''; 421 423 searchText := parsedRawFileNames; 422 end423 else424 begin425 if fileNames = '' then426 begin427 tmpOwnHelpFileName := getOwnHelpFileName;428 if FileExists(tmpOwnHelpFileName)429 then430 fileNames := tmpOwnHelpFileName;431 end;432 424 end; 433 425 … … 601 593 end; 602 594 end; 595 end; 596 597 598 FUNCTION TCmdLineParameters.getFileNames(const aShowNewViewHelpIfNoFileSpecifiedFlag : Boolean) : AnsiString; 599 var 600 tmpOwnHelpFileName : String; 601 begin 602 // user hasn't requested any particular file 603 // at startup, so if the option is set, 604 // load the NewView help file 605 if aShowNewViewHelpIfNoFileSpecifiedFlag 606 AND (fileNames = '') 607 AND not getGlobalSearchFlag then 608 begin 609 tmpOwnHelpFileName := getOwnHelpFileName; 610 if FileExists(tmpOwnHelpFileName) then 611 begin 612 result := tmpOwnHelpFileName; 613 end; 614 end 615 else 616 begin 617 result := fileNames; 618 end; 603 619 end; 604 620 -
trunk/NewView/unittests/CmdLineParameterUnitTests.pas
r109 r128 30 30 assertEqualsInt('testParseCmdLine_Empty', 0, tmpCmdLineParameters.getOwnerWindow); 31 31 assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getWindowTitle); 32 assertEqualsString('testParseCmdLine_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 32 assertEqualsString('testParseCmdLine_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 33 assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getFileNames(false)); 33 34 assertEqualsString('testParseCmdLine_Empty', '', tmpCmdLineParameters.getSearchText); 34 35 END; … … 52 53 assertEqualsInt('testParseCmdLine_QuestionMark', 0, tmpCmdLineParameters.getOwnerWindow); 53 54 assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getWindowTitle); 54 assertEqualsString('testParseCmdLine_QuestionMark', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 55 assertEqualsString('testParseCmdLine_QuestionMark', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 56 assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getFileNames(false)); 55 57 assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getSearchText); 56 58 END; … … 66 68 tmpCmdLineParameters.parseCmdLine(tmpCmdLineString); 67 69 68 assertTrue('testParseCmdLine_QuestionMark', tmpCmdLineParameters.getShowUsageFlag); 69 assertFalse('testParseCmdLine_QuestionMark', tmpCmdLineParameters.getSearchFlag); 70 assertFalse('testParseCmdLine_QuestionMark', tmpCmdLineParameters.getGlobalSearchFlag); 71 assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getLanguage); 72 assertFalse('testParseCmdLine_QuestionMark', tmpCmdLineParameters.getHelpManagerFlag); 73 assertEqualsInt('testParseCmdLine_QuestionMark', 0, tmpCmdLineParameters.getHelpManagerWindow); 74 assertEqualsInt('testParseCmdLine_QuestionMark', 0, tmpCmdLineParameters.getOwnerWindow); 75 assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getWindowTitle); 76 assertEqualsString('testParseCmdLine_QuestionMark', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 77 assertEqualsString('testParseCmdLine_QuestionMark', '', tmpCmdLineParameters.getSearchText); 70 assertTrue('testParseCmdLine_QuotedQuestionMark', tmpCmdLineParameters.getShowUsageFlag); 71 assertFalse('testParseCmdLine_QuotedQuestionMark', tmpCmdLineParameters.getSearchFlag); 72 assertFalse('testParseCmdLine_QuotedQuestionMark', tmpCmdLineParameters.getGlobalSearchFlag); 73 assertEqualsString('testParseCmdLine_QuotedQuestionMark', '', tmpCmdLineParameters.getLanguage); 74 assertFalse('testParseCmdLine_QuotedQuestionMark', tmpCmdLineParameters.getHelpManagerFlag); 75 assertEqualsInt('testParseCmdLine_QuotedQuestionMark', 0, tmpCmdLineParameters.getHelpManagerWindow); 76 assertEqualsInt('testParseCmdLine_QuotedQuestionMark', 0, tmpCmdLineParameters.getOwnerWindow); 77 assertEqualsString('testParseCmdLine_QuotedQuestionMark', '', tmpCmdLineParameters.getWindowTitle); 78 assertEqualsString('testParseCmdLine_QuotedQuestionMark', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 79 assertEqualsString('testParseCmdLine_QuotedQuestionMark', '', tmpCmdLineParameters.getFileNames(false)); 80 assertEqualsString('testParseCmdLine_QuotedQuestionMark', '', tmpCmdLineParameters.getSearchText); 78 81 END; 79 82 … … 96 99 assertEqualsInt('testParseCmdLine_lowerH', 0, tmpCmdLineParameters.getOwnerWindow); 97 100 assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getWindowTitle); 98 assertEqualsString('testParseCmdLine_lowerH', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 101 assertEqualsString('testParseCmdLine_lowerH', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 102 assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getFileNames(false)); 99 103 assertEqualsString('testParseCmdLine_lowerH', '', tmpCmdLineParameters.getSearchText); 100 104 END; … … 118 122 assertEqualsInt('testParseCmdLine_upperH', 0, tmpCmdLineParameters.getOwnerWindow); 119 123 assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getWindowTitle); 120 assertEqualsString('testParseCmdLine_upperH', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 124 assertEqualsString('testParseCmdLine_upperH', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 125 assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getFileNames(false)); 121 126 assertEqualsString('testParseCmdLine_upperH', '', tmpCmdLineParameters.getSearchText); 122 127 END; … … 140 145 assertEqualsInt('testParseCmdLine_lowerHelp', 0, tmpCmdLineParameters.getOwnerWindow); 141 146 assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getWindowTitle); 142 assertEqualsString('testParseCmdLine_lowerHelp', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 147 assertEqualsString('testParseCmdLine_lowerHelp', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 148 assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getFileNames(false)); 143 149 assertEqualsString('testParseCmdLine_lowerHelp', '', tmpCmdLineParameters.getSearchText); 144 150 END; … … 162 168 assertEqualsInt('testParseCmdLine_upperHELP', 0, tmpCmdLineParameters.getOwnerWindow); 163 169 assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getWindowTitle); 164 assertEqualsString('testParseCmdLine_upperHELP', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 170 assertEqualsString('testParseCmdLine_upperHELP', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 171 assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getFileNames(false)); 165 172 assertEqualsString('testParseCmdLine_upperHELP', '', tmpCmdLineParameters.getSearchText); 166 173 END; … … 184 191 assertEqualsInt('testParseCmdLine_upperHE', 0, tmpCmdLineParameters.getOwnerWindow); 185 192 assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getWindowTitle); 186 assertEqualsString('testParseCmdLine_upperHE', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 193 assertEqualsString('testParseCmdLine_upperHE', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 194 assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getFileNames(false)); 187 195 assertEqualsString('testParseCmdLine_upperHE', '', tmpCmdLineParameters.getSearchText); 188 196 END; … … 206 214 assertEqualsInt('testParseCmdLine_h_between', 0, tmpCmdLineParameters.getOwnerWindow); 207 215 assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getWindowTitle); 208 assertEqualsString('testParseCmdLine_h_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 216 assertEqualsString('testParseCmdLine_h_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 217 assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getFileNames(false)); 209 218 assertEqualsString('testParseCmdLine_h_between', '', tmpCmdLineParameters.getSearchText); 210 219 END; … … 228 237 assertEqualsInt('testParseCmdLine_h_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow); 229 238 assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getWindowTitle); 230 assertEqualsString('testParseCmdLine_h_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 239 assertEqualsString('testParseCmdLine_h_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 240 assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getFileNames(false)); 231 241 assertEqualsString('testParseCmdLine_h_between_withSpace', '', tmpCmdLineParameters.getSearchText); 232 242 END; … … 250 260 assertEqualsInt('testParseCmdLine_lowerS', 0, tmpCmdLineParameters.getOwnerWindow); 251 261 assertEqualsString('testParseCmdLine_lowerS', '', tmpCmdLineParameters.getWindowTitle); 252 assertEqualsString('testParseCmdLine_lowerS', 'file', tmpCmdLineParameters.getFileNames); 262 assertEqualsString('testParseCmdLine_lowerS', 'file', tmpCmdLineParameters.getFileNames(true)); 263 assertEqualsString('testParseCmdLine_lowerS', 'file', tmpCmdLineParameters.getFileNames(false)); 253 264 assertEqualsString('testParseCmdLine_lowerS', 'search', tmpCmdLineParameters.getSearchText); 254 265 END; … … 272 283 assertEqualsInt('testParseCmdLine_upperS', 0, tmpCmdLineParameters.getOwnerWindow); 273 284 assertEqualsString('testParseCmdLine_upperS', '', tmpCmdLineParameters.getWindowTitle); 274 assertEqualsString('testParseCmdLine_upperS', 'file', tmpCmdLineParameters.getFileNames); 285 assertEqualsString('testParseCmdLine_upperS', 'file', tmpCmdLineParameters.getFileNames(true)); 286 assertEqualsString('testParseCmdLine_upperS', 'file', tmpCmdLineParameters.getFileNames(false)); 275 287 assertEqualsString('testParseCmdLine_upperS', 'seArch', tmpCmdLineParameters.getSearchText); 276 288 END; … … 295 307 assertEqualsInt('testParseCmdLine_upperS_withBlank', 0, tmpCmdLineParameters.getOwnerWindow); 296 308 assertEqualsString('testParseCmdLine_upperS_withBlank', '', tmpCmdLineParameters.getWindowTitle); 297 assertEqualsString('testParseCmdLine_upperS_withBlank', 'FilE', tmpCmdLineParameters.getFileNames); 309 assertEqualsString('testParseCmdLine_upperS_withBlank', 'FilE', tmpCmdLineParameters.getFileNames(true)); 310 assertEqualsString('testParseCmdLine_upperS_withBlank', 'FilE', tmpCmdLineParameters.getFileNames(false)); 298 311 assertEqualsString('testParseCmdLine_upperS_withBlank', 'seArch', tmpCmdLineParameters.getSearchText); 299 312 END; … … 317 330 assertEqualsInt('testParseCmdLine_QuotedS', 0, tmpCmdLineParameters.getOwnerWindow); 318 331 assertEqualsString('testParseCmdLine_QuotedS', '', tmpCmdLineParameters.getWindowTitle); 319 assertEqualsString('testParseCmdLine_QuotedS', 'FilE', tmpCmdLineParameters.getFileNames); 332 assertEqualsString('testParseCmdLine_QuotedS', 'FilE', tmpCmdLineParameters.getFileNames(true)); 333 assertEqualsString('testParseCmdLine_QuotedS', 'FilE', tmpCmdLineParameters.getFileNames(false)); 320 334 assertEqualsString('testParseCmdLine_QuotedS', 'seArch', tmpCmdLineParameters.getSearchText); 321 335 END; … … 339 353 assertEqualsInt('testParseCmdLine_emptyS', 0, tmpCmdLineParameters.getOwnerWindow); 340 354 assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getWindowTitle); 341 assertEqualsString('testParseCmdLine_emptyS', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 355 assertEqualsString('testParseCmdLine_emptyS', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 356 assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getFileNames(false)); 342 357 assertEqualsString('testParseCmdLine_emptyS', '', tmpCmdLineParameters.getSearchText); 343 358 END; … … 361 376 assertEqualsInt('testParseCmdLine_s_between', 0, tmpCmdLineParameters.getOwnerWindow); 362 377 assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getWindowTitle); 363 assertEqualsString('testParseCmdLine_s_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 378 assertEqualsString('testParseCmdLine_s_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 379 assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getFileNames(false)); 364 380 assertEqualsString('testParseCmdLine_s_between', '', tmpCmdLineParameters.getSearchText); 365 381 END; … … 383 399 assertEqualsInt('testParseCmdLine_s_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow); 384 400 assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getWindowTitle); 385 assertEqualsString('testParseCmdLine_s_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 401 assertEqualsString('testParseCmdLine_s_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 402 assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getFileNames(false)); 386 403 assertEqualsString('testParseCmdLine_s_between_withSpace', '', tmpCmdLineParameters.getSearchText); 387 404 END; … … 405 422 assertEqualsInt('testParseCmdLine_help_and_s', 0, tmpCmdLineParameters.getOwnerWindow); 406 423 assertEqualsString('testParseCmdLine_help_and_s', '', tmpCmdLineParameters.getWindowTitle); 407 assertEqualsString('testParseCmdLine_help_and_s', 'file', tmpCmdLineParameters.getFileNames); 424 assertEqualsString('testParseCmdLine_help_and_s', 'file', tmpCmdLineParameters.getFileNames(true)); 425 assertEqualsString('testParseCmdLine_help_and_s', 'file', tmpCmdLineParameters.getFileNames(false)); 408 426 assertEqualsString('testParseCmdLine_help_and_s', '', tmpCmdLineParameters.getSearchText); 409 427 END; … … 427 445 assertEqualsInt('testParseCmdLine_s_and_help', 0, tmpCmdLineParameters.getOwnerWindow); 428 446 assertEqualsString('testParseCmdLine_s_and_help', '', tmpCmdLineParameters.getWindowTitle); 429 assertEqualsString('testParseCmdLine_s_and_help', 'file', tmpCmdLineParameters.getFileNames); 447 assertEqualsString('testParseCmdLine_s_and_help', 'file', tmpCmdLineParameters.getFileNames(true)); 448 assertEqualsString('testParseCmdLine_s_and_help', 'file', tmpCmdLineParameters.getFileNames(false)); 430 449 assertEqualsString('testParseCmdLine_s_and_help', '', tmpCmdLineParameters.getSearchText); 431 450 END; … … 449 468 assertEqualsInt('testParseCmdLine_help_and_s_without_blank', 0, tmpCmdLineParameters.getOwnerWindow); 450 469 assertEqualsString('testParseCmdLine_help_and_s_without_blank', '', tmpCmdLineParameters.getWindowTitle); 451 assertEqualsString('testParseCmdLine_help_and_s_without_blank', 'file', tmpCmdLineParameters.getFileNames); 470 assertEqualsString('testParseCmdLine_help_and_s_without_blank', 'file', tmpCmdLineParameters.getFileNames(true)); 471 assertEqualsString('testParseCmdLine_help_and_s_without_blank', 'file', tmpCmdLineParameters.getFileNames(false)); 452 472 assertEqualsString('testParseCmdLine_help_and_s_without_blank', '', tmpCmdLineParameters.getSearchText); 453 473 END; … … 472 492 assertEqualsInt('testParseCmdLine_lowerG', 0, tmpCmdLineParameters.getOwnerWindow); 473 493 assertEqualsString('testParseCmdLine_lowerG', '', tmpCmdLineParameters.getWindowTitle); 474 assertEqualsString('testParseCmdLine_lowerG', 'file', tmpCmdLineParameters.getFileNames); 494 assertEqualsString('testParseCmdLine_lowerG', 'file', tmpCmdLineParameters.getFileNames(true)); 495 assertEqualsString('testParseCmdLine_lowerG', 'file', tmpCmdLineParameters.getFileNames(false)); 475 496 assertEqualsString('testParseCmdLine_lowerG', 'search', tmpCmdLineParameters.getSearchText); 476 497 END; … … 494 515 assertEqualsInt('testParseCmdLine_upperG', 0, tmpCmdLineParameters.getOwnerWindow); 495 516 assertEqualsString('testParseCmdLine_upperG', '', tmpCmdLineParameters.getWindowTitle); 496 assertEqualsString('testParseCmdLine_upperG', 'fiLe', tmpCmdLineParameters.getFileNames); 517 assertEqualsString('testParseCmdLine_upperG', 'fiLe', tmpCmdLineParameters.getFileNames(true)); 518 assertEqualsString('testParseCmdLine_upperG', 'fiLe', tmpCmdLineParameters.getFileNames(false)); 497 519 assertEqualsString('testParseCmdLine_upperG', 'seArch', tmpCmdLineParameters.getSearchText); 498 520 END; … … 504 526 tmpCmdLineParameters : TCmdLineParameters; 505 527 BEGIN 506 tmpCmdLineString := ' -G';528 tmpCmdLineString := '"-G" seArch'; 507 529 tmpCmdLineParameters := TCmdLineParameters.Create; 508 530 tmpCmdLineParameters.parseCmdLine(tmpCmdLineString); … … 516 538 assertEqualsInt('testParseCmdLine_QuotedG', 0, tmpCmdLineParameters.getOwnerWindow); 517 539 assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getWindowTitle); 518 assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getFileNames); 519 assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getSearchText); 540 assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getFileNames(true)); 541 assertEqualsString('testParseCmdLine_QuotedG', '', tmpCmdLineParameters.getFileNames(false)); 542 assertEqualsString('testParseCmdLine_QuotedG', 'seArch', tmpCmdLineParameters.getSearchText); 520 543 END; 521 544 … … 538 561 assertEqualsInt('testParseCmdLine_emptyG', 0, tmpCmdLineParameters.getOwnerWindow); 539 562 assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getWindowTitle); 540 assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getFileNames); 563 assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getFileNames(true)); 564 assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getFileNames(false)); 541 565 assertEqualsString('testParseCmdLine_emptyG', '', tmpCmdLineParameters.getSearchText); 542 566 END; … … 560 584 assertEqualsInt('testParseCmdLine_g_between', 0, tmpCmdLineParameters.getOwnerWindow); 561 585 assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getWindowTitle); 562 assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getFileNames); 586 assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getFileNames(true)); 587 assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getFileNames(false)); 563 588 assertEqualsString('testParseCmdLine_g_between', '', tmpCmdLineParameters.getSearchText); 564 589 END; … … 582 607 assertEqualsInt('testParseCmdLine_g_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow); 583 608 assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getWindowTitle); 584 assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getFileNames); 609 assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getFileNames(true)); 610 assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getFileNames(false)); 585 611 assertEqualsString('testParseCmdLine_g_between_withSpace', '', tmpCmdLineParameters.getSearchText); 586 612 END; … … 604 630 assertEqualsInt('testParseCmdLine_Language', 0, tmpCmdLineParameters.getOwnerWindow); 605 631 assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getWindowTitle); 606 assertEqualsString('testParseCmdLine_Language', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 632 assertEqualsString('testParseCmdLine_Language', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 633 assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getFileNames(false)); 607 634 assertEqualsString('testParseCmdLine_Language', '', tmpCmdLineParameters.getSearchText); 608 635 END; … … 626 653 assertEqualsInt('testParseCmdLine_Language_Empty', 0, tmpCmdLineParameters.getOwnerWindow); 627 654 assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getWindowTitle); 628 assertEqualsString('testParseCmdLine_Language_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 655 assertEqualsString('testParseCmdLine_Language_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 656 assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getFileNames(false)); 629 657 assertEqualsString('testParseCmdLine_Language_Empty', '', tmpCmdLineParameters.getSearchText); 630 658 END; … … 648 676 assertEqualsInt('testParseCmdLine_Language_Empty_WithColon', 0, tmpCmdLineParameters.getOwnerWindow); 649 677 assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getWindowTitle); 650 assertEqualsString('testParseCmdLine_Language_Empty_WithColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 678 assertEqualsString('testParseCmdLine_Language_Empty_WithColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 679 assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getFileNames(false)); 651 680 assertEqualsString('testParseCmdLine_Language_Empty_WithColon', '', tmpCmdLineParameters.getSearchText); 652 681 END; … … 670 699 assertEqualsInt('testParseCmdLine_Language_WithFile', 0, tmpCmdLineParameters.getOwnerWindow); 671 700 assertEqualsString('testParseCmdLine_Language_WithFile', '', tmpCmdLineParameters.getWindowTitle); 672 assertEqualsString('testParseCmdLine_Language_WithFile', 'filE', tmpCmdLineParameters.getFileNames); 701 assertEqualsString('testParseCmdLine_Language_WithFile', 'filE', tmpCmdLineParameters.getFileNames(true)); 702 assertEqualsString('testParseCmdLine_Language_WithFile', 'filE', tmpCmdLineParameters.getFileNames(false)); 673 703 assertEqualsString('testParseCmdLine_Language_WithFile', '', tmpCmdLineParameters.getSearchText); 674 704 END; … … 692 722 assertEqualsInt('testParseCmdLine_QuotedLanguage', 0, tmpCmdLineParameters.getOwnerWindow); 693 723 assertEqualsString('testParseCmdLine_QuotedLanguage', '', tmpCmdLineParameters.getWindowTitle); 694 assertEqualsString('testParseCmdLine_QuotedLanguage', 'filE', tmpCmdLineParameters.getFileNames); 724 assertEqualsString('testParseCmdLine_QuotedLanguage', 'filE', tmpCmdLineParameters.getFileNames(true)); 725 assertEqualsString('testParseCmdLine_QuotedLanguage', 'filE', tmpCmdLineParameters.getFileNames(false)); 695 726 assertEqualsString('testParseCmdLine_QuotedLanguage', '', tmpCmdLineParameters.getSearchText); 696 727 END; … … 714 745 assertEqualsInt('testParseCmdLine_QuotedLanguage2', 0, tmpCmdLineParameters.getOwnerWindow); 715 746 assertEqualsString('testParseCmdLine_QuotedLanguage2', '', tmpCmdLineParameters.getWindowTitle); 716 assertEqualsString('testParseCmdLine_QuotedLanguage2', 'filE', tmpCmdLineParameters.getFileNames); 747 assertEqualsString('testParseCmdLine_QuotedLanguage2', 'filE', tmpCmdLineParameters.getFileNames(true)); 748 assertEqualsString('testParseCmdLine_QuotedLanguage2', 'filE', tmpCmdLineParameters.getFileNames(false)); 717 749 assertEqualsString('testParseCmdLine_QuotedLanguage2', '', tmpCmdLineParameters.getSearchText); 718 750 END; … … 736 768 assertEqualsInt('testParseCmdLine_Language_between', 0, tmpCmdLineParameters.getOwnerWindow); 737 769 assertEqualsString('testParseCmdLine_Language_between', '', tmpCmdLineParameters.getWindowTitle); 738 assertEqualsString('testParseCmdLine_Language_between', 'filE', tmpCmdLineParameters.getFileNames); 770 assertEqualsString('testParseCmdLine_Language_between', 'filE', tmpCmdLineParameters.getFileNames(true)); 771 assertEqualsString('testParseCmdLine_Language_between', 'filE', tmpCmdLineParameters.getFileNames(false)); 739 772 assertEqualsString('testParseCmdLine_Language_between', '', tmpCmdLineParameters.getSearchText); 740 773 END; … … 758 791 assertEqualsInt('testParseCmdLine_Language_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow); 759 792 assertEqualsString('testParseCmdLine_Language_between_withSpace', '', tmpCmdLineParameters.getWindowTitle); 760 assertEqualsString('testParseCmdLine_Language_between_withSpace', 'filE', tmpCmdLineParameters.getFileNames); 793 assertEqualsString('testParseCmdLine_Language_between_withSpace', 'filE', tmpCmdLineParameters.getFileNames(true)); 794 assertEqualsString('testParseCmdLine_Language_between_withSpace', 'filE', tmpCmdLineParameters.getFileNames(false)); 761 795 assertEqualsString('testParseCmdLine_Language_between_withSpace', '', tmpCmdLineParameters.getSearchText); 762 796 END; … … 780 814 assertEqualsInt('testParseCmdLine_HelpManagerNumber', 0, tmpCmdLineParameters.getOwnerWindow); 781 815 assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getWindowTitle); 782 assertEqualsString('testParseCmdLine_HelpManagerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 816 assertEqualsString('testParseCmdLine_HelpManagerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 817 assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getFileNames(false)); 783 818 assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getSearchText); 784 819 END; … … 802 837 assertEqualsInt('testParseCmdLine_HelpManagerBigNumber', 0, tmpCmdLineParameters.getOwnerWindow); 803 838 assertEqualsString('testParseCmdLine_HelpManagerBigNumber', '', tmpCmdLineParameters.getWindowTitle); 804 assertEqualsString('testParseCmdLine_HelpManagerBigNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 839 assertEqualsString('testParseCmdLine_HelpManagerBigNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 840 assertEqualsString('testParseCmdLine_HelpManagerBigNumber', '', tmpCmdLineParameters.getFileNames(false)); 805 841 assertEqualsString('testParseCmdLine_HelpManagerBigNumber', '', tmpCmdLineParameters.getSearchText); 806 842 END; … … 824 860 assertEqualsInt('testParseCmdLine_HelpManagerNumber_WithoutColon', 0, tmpCmdLineParameters.getOwnerWindow); 825 861 assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getWindowTitle); 826 assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 862 assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 863 assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getFileNames(false)); 827 864 assertEqualsString('testParseCmdLine_HelpManagerNumber_WithoutColon', '', tmpCmdLineParameters.getSearchText); 828 865 END; … … 838 875 tmpCmdLineParameters.parseCmdLine(tmpCmdLineString); 839 876 840 assertTrue('testParseCmdLine_HelpManagerNumber', tmpCmdLineParameters.getShowUsageFlag); 841 assertFalse('testParseCmdLine_HelpManagerNumber', tmpCmdLineParameters.getSearchFlag); 842 assertFalse('testParseCmdLine_HelpManagerNumber', tmpCmdLineParameters.getGlobalSearchFlag); 843 assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getLanguage); 844 assertFalse('testParseCmdLine_HelpManagerNumber', tmpCmdLineParameters.getHelpManagerFlag); 845 assertEqualsInt('testParseCmdLine_HelpManagerNumber', 0, tmpCmdLineParameters.getHelpManagerWindow); 846 assertEqualsInt('testParseCmdLine_HelpManagerNumber', 0, tmpCmdLineParameters.getOwnerWindow); 847 assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getWindowTitle); 848 assertEqualsString('testParseCmdLine_HelpManagerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 849 assertEqualsString('testParseCmdLine_HelpManagerNumber', '', tmpCmdLineParameters.getSearchText); 877 assertTrue('testParseCmdLine_HelpManagerNumber_Invalid', tmpCmdLineParameters.getShowUsageFlag); 878 assertFalse('testParseCmdLine_HelpManagerNumber_Invalid', tmpCmdLineParameters.getSearchFlag); 879 assertFalse('testParseCmdLine_HelpManagerNumber_Invalid', tmpCmdLineParameters.getGlobalSearchFlag); 880 assertEqualsString('testParseCmdLine_HelpManagerNumber_Invalid', '', tmpCmdLineParameters.getLanguage); 881 assertFalse('testParseCmdLine_HelpManagerNumber_Invalid', tmpCmdLineParameters.getHelpManagerFlag); 882 assertEqualsInt('testParseCmdLine_HelpManagerNumber_Invalid', 0, tmpCmdLineParameters.getHelpManagerWindow); 883 assertEqualsInt('testParseCmdLine_HelpManagerNumber_Invalid', 0, tmpCmdLineParameters.getOwnerWindow); 884 assertEqualsString('testParseCmdLine_HelpManagerNumber_Invalid', '', tmpCmdLineParameters.getWindowTitle); 885 assertEqualsString('testParseCmdLine_HelpManagerNumber_Invalid', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 886 assertEqualsString('testParseCmdLine_HelpManagerNumber_Invalid', '', tmpCmdLineParameters.getFileNames(false)); 887 assertEqualsString('testParseCmdLine_HelpManagerNumber_Invalid', '', tmpCmdLineParameters.getSearchText); 850 888 END; 851 889 … … 868 906 assertEqualsInt('testParseCmdLine_HelpManagerNumber_between', 0, tmpCmdLineParameters.getOwnerWindow); 869 907 assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getWindowTitle); 870 assertEqualsString('testParseCmdLine_HelpManagerNumber_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 908 assertEqualsString('testParseCmdLine_HelpManagerNumber_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 909 assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getFileNames(false)); 871 910 assertEqualsString('testParseCmdLine_HelpManagerNumber_between', '', tmpCmdLineParameters.getSearchText); 872 911 END; … … 890 929 assertEqualsInt('testParseCmdLine_HelpManagerNumber_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow); 891 930 assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getWindowTitle); 892 assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 931 assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 932 assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNames(false)); 893 933 assertEqualsString('testParseCmdLine_HelpManagerNumber_between_withSpace', '', tmpCmdLineParameters.getSearchText); 894 934 END; … … 912 952 assertEqualsInt('testParseCmdLine_OwnerNumber', 1234, tmpCmdLineParameters.getOwnerWindow); 913 953 assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getWindowTitle); 914 assertEqualsString('testParseCmdLine_OwnerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 954 assertEqualsString('testParseCmdLine_OwnerNumber', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 955 assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getFileNames(false)); 915 956 assertEqualsString('testParseCmdLine_OwnerNumber', '', tmpCmdLineParameters.getSearchText); 916 957 END; … … 934 975 assertEqualsInt('testParseCmdLine_OwnerNumber_WithoutColon', 134, tmpCmdLineParameters.getOwnerWindow); 935 976 assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getWindowTitle); 936 assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 977 assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 978 assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getFileNames(false)); 937 979 assertEqualsString('testParseCmdLine_OwnerNumber_WithoutColon', '', tmpCmdLineParameters.getSearchText); 938 980 END; … … 956 998 assertEqualsInt('testParseCmdLine_OwnerNumber_Invalid', 0, tmpCmdLineParameters.getOwnerWindow); 957 999 assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getWindowTitle); 958 assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1000 assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1001 assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getFileNames(false)); 959 1002 assertEqualsString('testParseCmdLine_OwnerNumber_Invalid', '', tmpCmdLineParameters.getSearchText); 960 1003 END; … … 978 1021 assertEqualsInt('testParseCmdLine_OwnerNumber_between', 14, tmpCmdLineParameters.getOwnerWindow); 979 1022 assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getWindowTitle); 980 assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getFileNames); 1023 assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getFileNames(true)); 1024 assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getFileNames(false)); 981 1025 assertEqualsString('testParseCmdLine_OwnerNumber_between', '', tmpCmdLineParameters.getSearchText); 982 1026 END; … … 1000 1044 assertEqualsInt('testParseCmdLine_OwnerNumber_between_withSpace', 14, tmpCmdLineParameters.getOwnerWindow); 1001 1045 assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getWindowTitle); 1002 assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNames); 1046 assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNames(true)); 1047 assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getFileNames(false)); 1003 1048 assertEqualsString('testParseCmdLine_OwnerNumber_between_withSpace', '', tmpCmdLineParameters.getSearchText); 1004 1049 END; … … 1022 1067 assertEqualsInt('testParseCmdLine_Title', 0, tmpCmdLineParameters.getOwnerWindow); 1023 1068 assertEqualsString('testParseCmdLine_Title', 'Test', tmpCmdLineParameters.getWindowTitle); 1024 assertEqualsString('testParseCmdLine_Title', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1069 assertEqualsString('testParseCmdLine_Title', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1070 assertEqualsString('testParseCmdLine_Title', '', tmpCmdLineParameters.getFileNames(false)); 1025 1071 assertEqualsString('testParseCmdLine_Title', '', tmpCmdLineParameters.getSearchText); 1026 1072 END; … … 1044 1090 assertEqualsInt('testParseCmdLine_Title_WithoutColon', 0, tmpCmdLineParameters.getOwnerWindow); 1045 1091 assertEqualsString('testParseCmdLine_Title_WithoutColon', 'titlE', tmpCmdLineParameters.getWindowTitle); 1046 assertEqualsString('testParseCmdLine_Title_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1092 assertEqualsString('testParseCmdLine_Title_WithoutColon', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1093 assertEqualsString('testParseCmdLine_Title_WithoutColon', '', tmpCmdLineParameters.getFileNames(false)); 1047 1094 assertEqualsString('testParseCmdLine_Title_WithoutColon', '', tmpCmdLineParameters.getSearchText); 1048 1095 END; … … 1066 1113 assertEqualsInt('testParseCmdLine_Title_Empty', 0, tmpCmdLineParameters.getOwnerWindow); 1067 1114 assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getWindowTitle); 1068 assertEqualsString('testParseCmdLine_Title_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1115 assertEqualsString('testParseCmdLine_Title_Empty', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1116 assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getFileNames(false)); 1069 1117 assertEqualsString('testParseCmdLine_Title_Empty', '', tmpCmdLineParameters.getSearchText); 1070 1118 END; … … 1088 1136 assertEqualsInt('testParseCmdLine_QuotedTitle', 0, tmpCmdLineParameters.getOwnerWindow); 1089 1137 assertEqualsString('testParseCmdLine_QuotedTitle', 'Test Title', tmpCmdLineParameters.getWindowTitle); 1090 assertEqualsString('testParseCmdLine_QuotedTitle', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1138 assertEqualsString('testParseCmdLine_QuotedTitle', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1139 assertEqualsString('testParseCmdLine_QuotedTitle', '', tmpCmdLineParameters.getFileNames(false)); 1091 1140 assertEqualsString('testParseCmdLine_QuotedTitle', '', tmpCmdLineParameters.getSearchText); 1092 1141 END; … … 1110 1159 assertEqualsInt('testParseCmdLine_QuotedTitle2', 0, tmpCmdLineParameters.getOwnerWindow); 1111 1160 assertEqualsString('testParseCmdLine_QuotedTitle2', 'Test Title', tmpCmdLineParameters.getWindowTitle); 1112 assertEqualsString('testParseCmdLine_QuotedTitle2', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1161 assertEqualsString('testParseCmdLine_QuotedTitle2', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1162 assertEqualsString('testParseCmdLine_QuotedTitle2', '', tmpCmdLineParameters.getFileNames(false)); 1113 1163 assertEqualsString('testParseCmdLine_QuotedTitle2', '', tmpCmdLineParameters.getSearchText); 1114 1164 END; … … 1132 1182 assertEqualsInt('testParseCmdLine_QuotedTitle_AfterFile', 0, tmpCmdLineParameters.getOwnerWindow); 1133 1183 assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', 'Test Title', tmpCmdLineParameters.getWindowTitle); 1134 assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', 'cmdref', tmpCmdLineParameters.getFileNames); 1184 assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', 'cmdref', tmpCmdLineParameters.getFileNames(true)); 1185 assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', 'cmdref', tmpCmdLineParameters.getFileNames(false)); 1135 1186 assertEqualsString('testParseCmdLine_QuotedTitle_AfterFile', '', tmpCmdLineParameters.getSearchText); 1136 1187 END; … … 1154 1205 assertEqualsInt('testParseCmdLine_Title_between', 0, tmpCmdLineParameters.getOwnerWindow); 1155 1206 assertEqualsString('testParseCmdLine_Title_between', 'tItlE', tmpCmdLineParameters.getWindowTitle); 1156 assertEqualsString('testParseCmdLine_Title_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1207 assertEqualsString('testParseCmdLine_Title_between', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1208 assertEqualsString('testParseCmdLine_Title_between', '', tmpCmdLineParameters.getFileNames(false)); 1157 1209 assertEqualsString('testParseCmdLine_Title_between', '', tmpCmdLineParameters.getSearchText); 1158 1210 END; … … 1176 1228 assertEqualsInt('testParseCmdLine_Title_between_withSpace', 0, tmpCmdLineParameters.getOwnerWindow); 1177 1229 assertEqualsString('testParseCmdLine_Title_between_withSpace', 'tItlE', tmpCmdLineParameters.getWindowTitle); 1178 assertEqualsString('testParseCmdLine_Title_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1230 assertEqualsString('testParseCmdLine_Title_between_withSpace', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1231 assertEqualsString('testParseCmdLine_Title_between_withSpace', '', tmpCmdLineParameters.getFileNames(false)); 1179 1232 assertEqualsString('testParseCmdLine_Title_between_withSpace', '', tmpCmdLineParameters.getSearchText); 1180 1233 END; … … 1201 1254 assertEqualsInt('testParseCmdLine_WindowPos', 0, tmpCmdLineParameters.getOwnerWindow); 1202 1255 assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getWindowTitle); 1203 assertEqualsString('testParseCmdLine_WindowPos', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1256 assertEqualsString('testParseCmdLine_WindowPos', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1257 assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getFileNames(false)); 1204 1258 assertEqualsString('testParseCmdLine_WindowPos', '', tmpCmdLineParameters.getSearchText); 1205 1259 … … 1232 1286 assertEqualsInt('testParseCmdLine_WindowPosPercentage', 0, tmpCmdLineParameters.getOwnerWindow); 1233 1287 assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getWindowTitle); 1234 assertEqualsString('testParseCmdLine_WindowPosPercentage', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames); 1288 assertEqualsString('testParseCmdLine_WindowPosPercentage', 'C:\ecs\help\NewView.hlp', tmpCmdLineParameters.getFileNames(true)); 1289 assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getFileNames(false)); 1235 1290 assertEqualsString('testParseCmdLine_WindowPosPercentage', '', tmpCmdLineParameters.getSearchText); 1236 1291 … … 1261 1316 assertEqualsInt('testParseCmdLine_Topic', 0, tmpCmdLineParameters.getOwnerWindow); 1262 1317 assertEqualsString('testParseCmdLine_Topic', '', tmpCmdLineParameters.getWindowTitle); 1263 assertEqualsString('testParseCmdLine_Topic', 'file', tmpCmdLineParameters.getFileNames); 1318 assertEqualsString('testParseCmdLine_Topic', 'file', tmpCmdLineParameters.getFileNames(true)); 1319 assertEqualsString('testParseCmdLine_Topic', 'file', tmpCmdLineParameters.getFileNames(false)); 1264 1320 assertEqualsString('testParseCmdLine_Topic', 'topi1 topi2', tmpCmdLineParameters.getSearchText); 1265 1321 END; … … 1283 1339 assertEqualsInt('testParseCmdLine_QuotedTopic', 0, tmpCmdLineParameters.getOwnerWindow); 1284 1340 assertEqualsString('testParseCmdLine_QuotedTopic', '', tmpCmdLineParameters.getWindowTitle); 1285 assertEqualsString('testParseCmdLine_QuotedTopic', 'file', tmpCmdLineParameters.getFileNames); 1341 assertEqualsString('testParseCmdLine_QuotedTopic', 'file', tmpCmdLineParameters.getFileNames(true)); 1342 assertEqualsString('testParseCmdLine_QuotedTopic', 'file', tmpCmdLineParameters.getFileNames(false)); 1286 1343 assertEqualsString('testParseCmdLine_QuotedTopic', 'topi1', tmpCmdLineParameters.getSearchText); 1287 1344 END; … … 1305 1362 assertEqualsInt('testParseCmdLine_file', 0, tmpCmdLineParameters.getOwnerWindow); 1306 1363 assertEqualsString('testParseCmdLine_file', '', tmpCmdLineParameters.getWindowTitle); 1307 assertEqualsString('testParseCmdLine_file', 'file', tmpCmdLineParameters.getFileNames); 1364 assertEqualsString('testParseCmdLine_file', 'file', tmpCmdLineParameters.getFileNames(true)); 1365 assertEqualsString('testParseCmdLine_file', 'file', tmpCmdLineParameters.getFileNames(false)); 1308 1366 assertEqualsString('testParseCmdLine_file', '', tmpCmdLineParameters.getSearchText); 1309 1367 END; … … 1327 1385 assertEqualsInt('testParseCmdLine_fileLeadingBlanks', 0, tmpCmdLineParameters.getOwnerWindow); 1328 1386 assertEqualsString('testParseCmdLine_fileLeadingBlanks', '', tmpCmdLineParameters.getWindowTitle); 1329 assertEqualsString('testParseCmdLine_fileLeadingBlanks', 'file', tmpCmdLineParameters.getFileNames); 1387 assertEqualsString('testParseCmdLine_fileLeadingBlanks', 'file', tmpCmdLineParameters.getFileNames(true)); 1388 assertEqualsString('testParseCmdLine_fileLeadingBlanks', 'file', tmpCmdLineParameters.getFileNames(false)); 1330 1389 assertEqualsString('testParseCmdLine_fileLeadingBlanks', '', tmpCmdLineParameters.getSearchText); 1331 1390 END; … … 1349 1408 assertEqualsInt('testParseCmdLine_fileTrailingBlanks', 0, tmpCmdLineParameters.getOwnerWindow); 1350 1409 assertEqualsString('testParseCmdLine_fileTrailingBlanks', '', tmpCmdLineParameters.getWindowTitle); 1351 assertEqualsString('testParseCmdLine_fileTrailingBlanks', 'file', tmpCmdLineParameters.getFileNames); 1410 assertEqualsString('testParseCmdLine_fileTrailingBlanks', 'file', tmpCmdLineParameters.getFileNames(true)); 1411 assertEqualsString('testParseCmdLine_fileTrailingBlanks', 'file', tmpCmdLineParameters.getFileNames(false)); 1352 1412 assertEqualsString('testParseCmdLine_fileTrailingBlanks', '', tmpCmdLineParameters.getSearchText); 1353 1413 END; … … 1371 1431 assertEqualsInt('testParseCmdLine_fileQuoted', 0, tmpCmdLineParameters.getOwnerWindow); 1372 1432 assertEqualsString('testParseCmdLine_fileQuoted', '', tmpCmdLineParameters.getWindowTitle); 1373 assertEqualsString('testParseCmdLine_fileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames); 1433 assertEqualsString('testParseCmdLine_fileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames(true)); 1434 assertEqualsString('testParseCmdLine_fileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames(false)); 1374 1435 assertEqualsString('testParseCmdLine_fileQuoted', '', tmpCmdLineParameters.getSearchText); 1375 1436 END; … … 1393 1454 assertEqualsInt('testParseCmdLine_fileQuotedMissingClosedQuote', 0, tmpCmdLineParameters.getOwnerWindow); 1394 1455 assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '', tmpCmdLineParameters.getWindowTitle); 1395 assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', 'fi -h le', tmpCmdLineParameters.getFileNames); 1456 assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', 'fi -h le', tmpCmdLineParameters.getFileNames(true)); 1457 assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', 'fi -h le', tmpCmdLineParameters.getFileNames(false)); 1396 1458 assertEqualsString('testParseCmdLine_fileQuotedMissingClosedQuote', '', tmpCmdLineParameters.getSearchText); 1397 1459 END; … … 1415 1477 assertEqualsInt('testParseCmdLine_fileQuotedAndText', 0, tmpCmdLineParameters.getOwnerWindow); 1416 1478 assertEqualsString('testParseCmdLine_fileQuotedAndText', '', tmpCmdLineParameters.getWindowTitle); 1417 assertEqualsString('testParseCmdLine_fileQuotedAndText', 'fi -h le', tmpCmdLineParameters.getFileNames); 1479 assertEqualsString('testParseCmdLine_fileQuotedAndText', 'fi -h le', tmpCmdLineParameters.getFileNames(true)); 1480 assertEqualsString('testParseCmdLine_fileQuotedAndText', 'fi -h le', tmpCmdLineParameters.getFileNames(false)); 1418 1481 assertEqualsString('testParseCmdLine_fileQuotedAndText', 'searchText', tmpCmdLineParameters.getSearchText); 1419 1482 END; … … 1437 1500 assertEqualsInt('testParseCmdLine_fileQuotedAndTextManyBlanks', 0, tmpCmdLineParameters.getOwnerWindow); 1438 1501 assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', '', tmpCmdLineParameters.getWindowTitle); 1439 assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'fi -h le', tmpCmdLineParameters.getFileNames); 1502 assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'fi -h le', tmpCmdLineParameters.getFileNames(true)); 1503 assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'fi -h le', tmpCmdLineParameters.getFileNames(false)); 1440 1504 assertEqualsString('testParseCmdLine_fileQuotedAndTextManyBlanks', 'searchText', tmpCmdLineParameters.getSearchText); 1441 1505 END; … … 1459 1523 assertEqualsInt('testParseCmdLine_fileQuotedInside', 0, tmpCmdLineParameters.getOwnerWindow); 1460 1524 assertEqualsString('testParseCmdLine_fileQuotedInside', '', tmpCmdLineParameters.getWindowTitle); 1461 assertEqualsString('testParseCmdLine_fileQuotedInside', 'testfi -h letes', tmpCmdLineParameters.getFileNames); 1525 assertEqualsString('testParseCmdLine_fileQuotedInside', 'testfi -h letes', tmpCmdLineParameters.getFileNames(true)); 1526 assertEqualsString('testParseCmdLine_fileQuotedInside', 'testfi -h letes', tmpCmdLineParameters.getFileNames(false)); 1462 1527 assertEqualsString('testParseCmdLine_fileQuotedInside', 'searchText', tmpCmdLineParameters.getSearchText); 1463 1528 END; … … 1481 1546 assertEqualsInt('testParseCmdLine_SwitchAndFileQuoted', 0, tmpCmdLineParameters.getOwnerWindow); 1482 1547 assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', '', tmpCmdLineParameters.getWindowTitle); 1483 assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames); 1548 assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames(true)); 1549 assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'fi -h le', tmpCmdLineParameters.getFileNames(false)); 1484 1550 assertEqualsString('testParseCmdLine_SwitchAndFileQuoted', 'searchText', tmpCmdLineParameters.getSearchText); 1485 1551 END; … … 1503 1569 assertEqualsInt('testParseCmdLine_SwitchAndFileAndTextQuoted', 0, tmpCmdLineParameters.getOwnerWindow); 1504 1570 assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', '', tmpCmdLineParameters.getWindowTitle); 1505 assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', 'file', tmpCmdLineParameters.getFileNames); 1571 assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', 'file', tmpCmdLineParameters.getFileNames(true)); 1572 assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', 'file', tmpCmdLineParameters.getFileNames(false)); 1506 1573 assertEqualsString('testParseCmdLine_SwitchAndFileAndTextQuoted', '"search text"', tmpCmdLineParameters.getSearchText); 1507 1574 END; … … 1542 1609 assertEqualsString('testParseCmdLine_ReallyLong', '', tmpCmdLineParameters.getWindowTitle); 1543 1610 1544 assertEqualsInt('testParseCmdLine_ReallyLong', 312, Length(tmpCmdLineParameters.getFileNames)); 1611 assertEqualsInt('testParseCmdLine_ReallyLong', 312, Length(tmpCmdLineParameters.getFileNames(true))); 1612 assertEqualsInt('testParseCmdLine_ReallyLong', 312, Length(tmpCmdLineParameters.getFileNames(false))); 1545 1613 assertEqualsInt('testParseCmdLine_ReallyLong', 314, Length(tmpCmdLineParameters.getSearchText)); 1546 1614 END;
Note:
See TracChangeset
for help on using the changeset viewer.