Ignore:
Timestamp:
Apr 30, 2016, 7:38:20 PM (9 years ago)
Author:
RBRi
Message:

move the unit test to a more central place

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/unittests/FileUtilsUnitTests.pas

    r352 r384  
    11Unit FileUtilsUnitTests;
    2 
    3 // NewView - a new OS/2 Help Viewer
    4 // Copyright 2006-2009 Ronald Brill (rbri at rbri dot de)
    5 // This software is released under the GNU Public License - see readme.txt
    6 
    7 // UnitTests for FileUtilsUnit
    82
    93Interface
    … …  
    148  FileUtilsUnit;
    159
    16 const
    17   // TODO read environment var
    18   TEST_PATH = 'P:\newview_dev';
    1910
    2011  FUNCTION getFileUtilsUnitTests : TList;
    … …  
    465456
    466457    assertTrue('testSearchHelpPaths_FoundInAppDir', tmpResult);
    467     assertEqualsString('testSearchHelpPaths_FoundInAppDir', TEST_PATH + '\build\unittest\NewViewTests.EXE', tmpResultFilename);
     458    assertEqualsString('testSearchHelpPaths_FoundInAppDir', 'P:\newview_dev\build\unittest\NewViewTests.EXE', tmpResultFilename);
    468459  end;
    469460
    … …  
    488479    tmpResult := FindDefaultLanguageHelpFile('NewView', '');
    489480
    490     assertEqualsString('testFindDefaultLanguageHelpFile', 'C:\ecs\help\NewView.hlp', tmpResult);
     481    assertEqualsIgnoreCaseString('testFindDefaultLanguageHelpFile', 'C:\ecs\help\NewView.hlp', tmpResult);
    491482  end;
    492483
    … …  
    497488    tmpResult := FindDefaultLanguageHelpFile('NewView', 'it');
    498489
    499     assertEqualsString('testFindDefaultLanguageHelpFile_it', 'C:\ecs\help\NewView_it.hlp', tmpResult);
     490    assertEqualsIgnoreCaseString('testFindDefaultLanguageHelpFile_it', 'C:\ecs\help\NewView_it.hlp', tmpResult);
    500491  end;
    501492
    … …  
    506497    tmpResult := FindDefaultLanguageHelpFile('NewView', 'IT');
    507498
    508     assertEqualsString('testFindDefaultLanguageHelpFile_it_UpperCase', 'C:\ecs\help\NewView_IT.hlp', tmpResult);
     499    assertEqualsIgnoreCaseString('testFindDefaultLanguageHelpFile_it_UpperCase', 'C:\ecs\help\NewView_IT.hlp', tmpResult);
    509500  end;
    510501
    … …  
    537528    GetDirsInPath('HELP', tmpResult);
    538529
    539     assertEqualsInt('testGetDirsInPath_Help', 8, tmpResult.count);
    540     assertEqualsString('testGetDirsInPath_Help', 'D:\progs\develop\watcom_18\BINP\HELP', tmpResult[0]);
    541     assertEqualsString('testGetDirsInPath_Help', 'C:\MMOS2\HELP', tmpResult[7]);
     530    assertEqualsInt('testGetDirsInPath_Help', 11, tmpResult.count);
     531    assertEqualsString('testGetDirsInPath_Help', 'D:\progs\watcom\BINP\HELP', tmpResult[0]);
     532    assertEqualsString('testGetDirsInPath_Help', 'C:\PROGRAMS\4OS2', tmpResult[10]);
    542533
    543534    tmpResult.Destroy;
    … …  
    552543    tmpResult := TStringList.Create;
    553544
    554     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.jonas', false, tmpResult);
     545    ListFilesInDirectory('P:\newview_dev', '*.jonas', false, tmpResult);
    555546
    556547    assertEqualsInt('testListFilesInDirectory_NoFiles', 0, tmpResult.count);
    … …  
    564555    tmpResult := TStringList.Create;
    565556
    566     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '', false, tmpResult);
     557    ListFilesInDirectory('P:\newview_dev', '', false, tmpResult);
    567558
    568559    assertEqualsInt('testListFilesInDirectory_EmptyFilter', 0, tmpResult.count);
    … …  
    578569    tmpResult := TStringList.Create;
    579570
    580     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.txt', false, tmpResult);
     571    ListFilesInDirectory('P:\newview_dev', '*.txt', false, tmpResult);
    581572
    582573    assertEqualsInt('testListFilesInDirectory_OneFile', 1, tmpResult.count);
    583     assertEqualsString('testListFilesInDirectory_OneFile', 'readme.txt', tmpResult[0]);
     574    assertEqualsIgnoreCaseString('testListFilesInDirectory_OneFile', 'howto.txt', tmpResult[0]);
    584575
    585576    tmpResult.Destroy;
    … …  
    593584    tmpResult := TStringList.Create;
    594585
    595     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.*', false, tmpResult);
    596 
    597     assertEqualsInt('testListFilesInDirectory_ManyFiles', 6, tmpResult.count);
    598     assertEqualsString('testListFilesInDirectory_ManyFiles', 'file0', tmpResult[0]);
    599     assertEqualsString('testListFilesInDirectory_ManyFiles', 'file1.ex1', tmpResult[1]);
    600     assertEqualsString('testListFilesInDirectory_ManyFiles', 'file2.ex1', tmpResult[2]);
    601     assertEqualsString('testListFilesInDirectory_ManyFiles', 'file3.ex3', tmpResult[3]);
    602     assertEqualsString('testListFilesInDirectory_ManyFiles', 'file4.ext4', tmpResult[4]);
     586    ListFilesInDirectory('P:\newview_dev', '*.*', false, tmpResult);
     587
     588    assertEqualsInt('testListFilesInDirectory_ManyFiles', 2, tmpResult.count);
     589    assertEqualsIgnoreCaseString('testListFilesInDirectory_ManyFiles', 'env.cmd', tmpResult[0]);
     590    assertEqualsIgnoreCaseString('testListFilesInDirectory_ManyFiles', 'howto.txt', tmpResult[1]);
    603591
    604592    tmpResult.Destroy;
    … …  
    612600    tmpResult := TStringList.Create;
    613601
    614     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.txt;f*.ex1', false, tmpResult);
    615 
    616     assertEqualsInt('testListFilesInDirectory_ManyFilter', 3, tmpResult.count);
    617     assertEqualsString('testListFilesInDirectory_ManyFilter', 'readme.txt', tmpResult[0]);
    618     assertEqualsString('testListFilesInDirectory_ManyFiles', 'file1.ex1', tmpResult[1]);
    619     assertEqualsString('testListFilesInDirectory_ManyFiles', 'file2.ex1', tmpResult[2]);
     602    ListFilesInDirectory('P:\newview_dev', '*.txt;*v.cmd', false, tmpResult);
     603
     604    assertEqualsInt('testListFilesInDirectory_ManyFilter', 2, tmpResult.count);
     605    assertEqualsString('testListFilesInDirectory_ManyFilter', 'howto.txt', tmpResult[0]);
     606    assertEqualsString('testListFilesInDirectory_ManyFilter', 'env.cmd', tmpResult[1]);
    620607
    621608    tmpResult.Destroy;
    … …  
    632619    tmpResult := TStringList.Create;
    633620
    634     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.jonas', true, tmpResult);
     621    ListFilesInDirectory('P:\newview_dev', '*.jonas', true, tmpResult);
    635622
    636623    assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_NoFiles', 0, tmpResult.count);
    … …  
    644631    tmpResult := TStringList.Create;
    645632
    646     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '', true, tmpResult);
     633    ListFilesInDirectory('P:\newview_dev', '', true, tmpResult);
    647634
    648635    assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_EmptyFilter', 0, tmpResult.count);
    … …  
    658645    tmpResult := TStringList.Create;
    659646
    660     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.txt', true, tmpResult);
     647    ListFilesInDirectory('P:\newview_dev', '*.txt', true, tmpResult);
    661648
    662649    assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_OneFile', 1, tmpResult.count);
    663     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_OneFile', TEST_PATH + '\unittests\testdir' + '\readme.txt', tmpResult[0]);
     650    assertEqualsIgnoreCaseString('testListFilesInDirectoryWithDirectoryInResult_OneFile', 'P:\newview_dev\howto.txt', tmpResult[0]);
    664651
    665652    tmpResult.Destroy;
    … …  
    673660    tmpResult := TStringList.Create;
    674661
    675     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.*', true, tmpResult);
    676 
    677     assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', 6, tmpResult.count);
    678     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', TEST_PATH + '\unittests\testdir' + '\file0', tmpResult[0]);
    679     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', TEST_PATH + '\unittests\testdir' + '\file1.ex1', tmpResult[1]);
    680     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', TEST_PATH + '\unittests\testdir' + '\file2.ex1', tmpResult[2]);
    681     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', TEST_PATH + '\unittests\testdir' + '\file3.ex3', tmpResult[3]);
    682     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', TEST_PATH + '\unittests\testdir' + '\file4.ext4', tmpResult[4]);
    683     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', TEST_PATH + '\unittests\testdir' + '\readme.txt', tmpResult[5]);
     662    ListFilesInDirectory('P:\newview_dev', '*.*', true, tmpResult);
     663
     664    assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', 2, tmpResult.count);
     665    assertEqualsIgnoreCaseString('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', 'P:\newview_dev\env.cmd', tmpResult[0]);
     666    assertEqualsIgnoreCaseString('testListFilesInDirectoryWithDirectoryInResult_ManyFiles', 'P:\newview_dev\howto.txt', tmpResult[1]);
    684667
    685668    tmpResult.Destroy;
    … …  
    693676    tmpResult := TStringList.Create;
    694677
    695     ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.txt;f*.ex1', true, tmpResult);
    696 
    697     assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_ManyFilter', 3, tmpResult.count);
    698     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFilter', TEST_PATH + '\unittests\testdir' + '\readme.txt', tmpResult[0]);
    699     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFilter', TEST_PATH + '\unittests\testdir' + '\file1.ex1', tmpResult[1]);
    700     assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_ManyFilter', TEST_PATH + '\unittests\testdir' + '\file2.ex1', tmpResult[2]);
     678    ListFilesInDirectory('P:\newview_dev', '*.txt;*v.cmd', true, tmpResult);
     679
     680    assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_ManyFilter', 2, tmpResult.count);
     681    assertEqualsIgnoreCaseString('testListFilesInDirectoryWithDirectoryInResult_ManyFilter', 'P:\newview_dev\howto.txt', tmpResult[0]);
     682    assertEqualsIgnoreCaseString('testListFilesInDirectoryWithDirectoryInResult_ManyFilter', 'P:\newview_dev\env.cmd', tmpResult[1]);
    701683
    702684    tmpResult.Destroy;
    … …  
    711693    tmpResult := TStringList.Create;
    712694
    713     ListSubDirectories(TEST_PATH + '\unittests\testdir\subdir1', false, tmpResult);
     695    ListSubDirectories('P:\newview_dev\dll', tmpResult);
    714696
    715697    assertEqualsInt('testListSubDirectories_None', 0, tmpResult.count);
    … …  
    719701
    720702
    721   Procedure testListSubDirectories_NoneWithHidden;
    722   var
    723     tmpResult : TStringList;
    724   begin
    725     tmpResult := TStringList.Create;
    726 
    727     ListSubDirectories(TEST_PATH + '\unittests\testdir\subdir1', true, tmpResult);
    728 
    729     assertEqualsInt('testListSubDirectories_NoneWithHidden', 1, tmpResult.count);
    730     assertEqualsString('testListSubDirectories_NoneWithHidden', TEST_PATH + '\unittests\testdir\subdir1\.svn', tmpResult[0]);
    731 
    732     tmpResult.Destroy;
    733   end;
    734 
    735 
    736703  Procedure testListSubDirectories_Many;
    737704  var
    … …  
    740707    tmpResult := TStringList.Create;
    741708
    742     ListSubDirectories(TEST_PATH + '\unittests\testdir', false, tmpResult);
    743 
    744     assertEqualsInt('testListSubDirectories_Many', 3, tmpResult.count);
    745     assertEqualsString('testListSubDirectories_Many', TEST_PATH + '\unittests\testdir\dir_archived', tmpResult[0]);
    746     assertEqualsString('testListSubDirectories_Many', TEST_PATH + '\unittests\testdir\dir_readonly', tmpResult[1]);
    747     assertEqualsString('testListSubDirectories_Many', TEST_PATH + '\unittests\testdir\subdir1', tmpResult[2]);
    748 
    749     tmpResult.Destroy;
    750   end;
    751 
    752 
    753   Procedure testListSubDirectories_ManyWithHidden;
    754   var
    755     tmpResult : TStringList;
    756   begin
    757     tmpResult := TStringList.Create;
    758 
    759     ListSubDirectories(TEST_PATH + '\unittests\testdir', true, tmpResult);
    760 
    761     assertEqualsInt('testListSubDirectories_ManyWithHidden', 6, tmpResult.count);
    762     assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\.svn', tmpResult[0]);
    763     assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\dir_archived', tmpResult[1]);
    764     assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\dir_hidden', tmpResult[2]);
    765     assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\dir_readonly', tmpResult[3]);
    766     assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\dir_system', tmpResult[4]);
    767     assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\subdir1', tmpResult[5]);
     709    ListSubDirectories('P:\newview_dev\i18n', tmpResult);
     710
     711    assertEqualsInt('testListSubDirectories_Many', 6, tmpResult.count);
     712    assertEqualsString('testListSubDirectories_Many', 'P:\newview_dev\i18n\de', tmpResult[0]);
     713    assertEqualsString('testListSubDirectories_Many', 'P:\newview_dev\i18n\fr', tmpResult[1]);
     714    assertEqualsString('testListSubDirectories_Many', 'P:\newview_dev\i18n\images', tmpResult[2]);
     715    assertEqualsString('testListSubDirectories_Many', 'P:\newview_dev\i18n\ja', tmpResult[3]);
     716
     717    tmpResult.Destroy;
     718  end;
     719
     720
     721  // ----------------------------------------------------------
     722
     723
     724  Procedure testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult;
     725  var
     726    tmpResult : TStringList;
     727  begin
     728    tmpResult := TStringList.Create;
     729
     730    ListFilesInDirectoryRecursiveWithTermination('P:\newview_dev\i18n', '*.ipf;*.lng', true, tmpResult, nil, false);
     731
     732    assertEqualsInt('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', 10, tmpResult.count);
     733    assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', 'P:\newview_dev\i18n\NewView.ipf', tmpResult[0]);
     734    assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', 'P:\newview_dev\i18n\sv\newview_sv.lng', tmpResult[9]);
    768735
    769736    tmpResult.Destroy;
    … …  
    780747    tmpResult := TStringList.Create;
    781748
    782     ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2;file_in_*', false, false, tmpResult, nil, false);
    783 
    784     assertEqualsInt('testListFilesInDirectoryRecursiveWithTermination', 5, tmpResult.count);
    785     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 0', 'file1.ex1', tmpResult[0]);
    786     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 1', 'file2.ex1', tmpResult[1]);
    787     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 2', 'file_in_archived', tmpResult[2]);
    788     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 3', 'file_in_readonly', tmpResult[3]);
    789     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 4', 'file1.ex1', tmpResult[4]);
    790 
    791     tmpResult.Destroy;
    792   end;
    793 
    794 
    795   Procedure testListFilesInDirectoryRecursiveWithTermination_WithHidden;
    796   var
    797     tmpResult : TStringList;
    798   begin
    799     tmpResult := TStringList.Create;
    800 
    801     ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2;file_in_*', false, true, tmpResult, nil, false);
    802 
    803     assertEqualsInt('testListFilesInDirectoryRecursiveWithTermination_WithHidden', 15, tmpResult.count);
    804     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 0', 'file1.ex1', tmpResult[0]);
    805     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 1', 'file2.ex1', tmpResult[1]);
    806     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 2', 'file_in_archived', tmpResult[2]);
    807     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 3', 'file_in_archived.svn-base', tmpResult[3]);
    808     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 4', 'file_in_archived.svn-base', tmpResult[4]);
    809     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 5', 'file_in_hidden', tmpResult[5]);
    810     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 6', 'file_in_hidden.svn-base', tmpResult[6]);
    811     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 7', 'file_in_hidden.svn-base', tmpResult[7]);
    812     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 8', 'file_in_readonly', tmpResult[8]);
    813     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 9', 'file_in_readonly.svn-base', tmpResult[9]);
    814     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 10', 'file_in_readonly.svn-base', tmpResult[10]);
    815     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 11', 'file_in_system', tmpResult[11]);
    816     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 12', 'file_in_system.svn-base', tmpResult[12]);
    817     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 13', 'file_in_system.svn-base', tmpResult[13]);
    818     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 14', 'file1.ex1', tmpResult[14]);
    819 
    820     tmpResult.Destroy;
    821   end;
    822 
    823 
    824   Procedure testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden;
    825   var
    826     tmpResult : TStringList;
    827   begin
    828     tmpResult := TStringList.Create;
    829 
    830     ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2;file_in_*', true, true, tmpResult, nil, false);
    831 
    832     assertEqualsInt('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden', 15, tmpResult.count);
    833     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 0', TEST_PATH + '\unittests\testdir\' + 'file1.ex1', tmpResult[0]);
    834     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 1', TEST_PATH + '\unittests\testdir\' + 'file2.ex1', tmpResult[1]);
    835     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 2', TEST_PATH + '\unittests\testdir\dir_archived\' + 'file_in_archived', tmpResult[2]);
    836     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 3', TEST_PATH + '\unittests\testdir\dir_archived\.svn\prop-base\' + 'file_in_archived.svn-base', tmpResult[3]);
    837     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 4', TEST_PATH + '\unittests\testdir\dir_archived\.svn\text-base\' + 'file_in_archived.svn-base', tmpResult[4]);
    838     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 5', TEST_PATH + '\unittests\testdir\dir_hidden\' + 'file_in_hidden', tmpResult[5]);
    839     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 6', TEST_PATH + '\unittests\testdir\dir_hidden\.svn\prop-base\' + 'file_in_hidden.svn-base', tmpResult[6]);
    840     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 7', TEST_PATH + '\unittests\testdir\dir_hidden\.svn\text-base\' + 'file_in_hidden.svn-base', tmpResult[7]);
    841     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 8', TEST_PATH + '\unittests\testdir\dir_readonly\' + 'file_in_readonly', tmpResult[8]);
    842     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 9', TEST_PATH + '\unittests\testdir\dir_readonly\.svn\prop-base\' + 'file_in_readonly.svn-base', tmpResult[9]);
    843     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 10', TEST_PATH + '\unittests\testdir\dir_readonly\.svn\text-base\' + 'file_in_readonly.svn-base', tmpResult[10]);
    844     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 11', TEST_PATH + '\unittests\testdir\dir_system\' + 'file_in_system', tmpResult[11]);
    845     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 12', TEST_PATH + '\unittests\testdir\dir_system\.svn\prop-base\' + 'file_in_system.svn-base', tmpResult[12]);
    846     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 13', TEST_PATH + '\unittests\testdir\dir_system\.svn\text-base\' + 'file_in_system.svn-base', tmpResult[13]);
    847     assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 14', TEST_PATH + '\unittests\testdir\subdir1\' + 'file1.ex1', tmpResult[14]);
    848 
    849     tmpResult.Destroy;
    850   end;
    851 
    852 
    853   Procedure testListFilesInDirectoryRecursiveWithTermination_WithDirectoryInResult;
    854   var
    855     tmpResult : TStringList;
    856   begin
    857     tmpResult := TStringList.Create;
    858 
    859     ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2', true, false, tmpResult, nil, false);
    860 
    861     assertEqualsInt('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', 3, tmpResult.count);
    862     assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', TEST_PATH + '\unittests\testdir' + '\file1.ex1', tmpResult[0]);
    863     assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', TEST_PATH + '\unittests\testdir' + '\file2.ex1', tmpResult[1]);
    864     assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', TEST_PATH + '\unittests\testdir' + '\subdir1\file1.ex1', tmpResult[2]);
    865 
    866     tmpResult.Destroy;
    867   end;
    868 
    869 
    870   Procedure testListFilesInDirectoryRecursiveWithTermination_1WithDirectoryInResultWithHidden;
    871   var
    872     tmpResult : TStringList;
    873   begin
    874     tmpResult := TStringList.Create;
    875 
    876     ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2', true, true, tmpResult, nil, false);
    877 
    878     assertEqualsInt('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResultWithHidden', 3, tmpResult.count);
    879     assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResultWithHidden', TEST_PATH + '\unittests\testdir' + '\file1.ex1', tmpResult[0]);
    880     assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResultWithHidden', TEST_PATH + '\unittests\testdir' + '\file2.ex1', tmpResult[1]);
    881     assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResultWithHidden', TEST_PATH + '\unittests\testdir' + '\subdir1\file1.ex1', tmpResult[2]);
     749    ListFilesInDirectoryRecursiveWithTermination('P:\newview_dev\i18n', '*.ipf;*.lng', false, tmpResult, nil, false);
     750
     751    assertEqualsInt('testListFilesInDirectoryRecursiveWithTermination', 10, tmpResult.count);
     752    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination', 'NewView.ipf', tmpResult[0]);
     753    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination', 'newview_sv.lng', tmpResult[9]);
    882754
    883755    tmpResult.Destroy;
    … …  
    981853
    982854
    983   Procedure testMakeDirs_Empty;
    984   var
    985     tmpResult : String;
    986   begin
    987     tmpResult := MakeDirs('');
    988 
    989     assertEqualsString('testMakeDirs_Empty', '', tmpResult);
    990   end;
    991 
    992 
    993   Procedure testMakeDirs_Slash;
    994   var
    995     tmpResult : String;
    996   begin
    997     tmpResult := MakeDirs('\');
    998 
    999     assertEqualsString('testMakeDirs_Slash', '', tmpResult);
    1000   end;
    1001 
    1002 
    1003   Procedure testMakeDirs_Simple;
    1004   var
    1005     tmpResult : String;
    1006   begin
    1007     RmDir(TEST_PATH + '\unittests\testdir\makedirs');
    1008 
    1009     tmpResult := MakeDirs(TEST_PATH + '\unittests\testdir' + '\makedirs');
    1010 
    1011     RmDir(TEST_PATH + '\unittests\testdir\makedirs');
    1012 
    1013     assertEqualsString('testMakeDirs_Simple', TEST_PATH + '\unittests\testdir\makedirs', tmpResult);
    1014   end;
    1015 
    1016 
    1017   Procedure testMakeDirs_Complex;
    1018   var
    1019     tmpResult : String;
    1020   begin
    1021     RmDir(TEST_PATH + '\unittests\testdir\makedirs\subdir\test');
    1022     RmDir(TEST_PATH + '\unittests\testdir\makedirs\subdir');
    1023     RmDir(TEST_PATH + '\unittests\testdir\makedirs');
    1024 
    1025     tmpResult := MakeDirs(TEST_PATH + '\unittests\testdir' + '\makedirs\subdir\test');
    1026 
    1027     RmDir(TEST_PATH + '\unittests\testdir\makedirs\subdir\test');
    1028     RmDir(TEST_PATH + '\unittests\testdir\makedirs\subdir');
    1029     RmDir(TEST_PATH + '\unittests\testdir\makedirs');
    1030 
    1031     assertEqualsString('testMakeDirs_Simple', TEST_PATH + '\unittests\testdir\makedirs\subdir\test', tmpResult);
    1032   end;
    1033 
    1034 
    1035   // ----------------------------------------------------------
    1036 
    1037 
    1038855  Procedure testDirectoryExists_Empty;
    1039856  var
    … …  
    1125942  end;
    1126943
    1127 
    1128   Procedure testDirectoryExists_Archived;
    1129   var
    1130     tmpResult : Boolean;
    1131   begin
    1132     tmpResult := DirectoryExists(TEST_PATH + '\unittests\testdir\dir_archived');
    1133 
    1134     assertTrue('testDirectoryExists_Archived', tmpResult);
    1135   end;
    1136 
    1137 
    1138   Procedure testDirectoryExists_Hidden;
    1139   var
    1140     tmpResult : Boolean;
    1141   begin
    1142     tmpResult := DirectoryExists(TEST_PATH + '\unittests\testdir\dir_hidden');
    1143 
    1144     assertTrue('testDirectoryExists_Hidden', tmpResult);
    1145   end;
    1146 
    1147 
    1148   Procedure testDirectoryExists_Readonly;
    1149   var
    1150     tmpResult : Boolean;
    1151   begin
    1152     tmpResult := DirectoryExists(TEST_PATH + '\unittests\testdir\dir_readonly');
    1153 
    1154     assertTrue('testDirectoryExists_Readonly', tmpResult);
    1155   end;
    1156 
    1157 
    1158   Procedure testDirectoryExists_System;
    1159   var
    1160     tmpResult : Boolean;
    1161   begin
    1162     tmpResult := DirectoryExists(TEST_PATH + '\unittests\testdir\dir_system');
    1163 
    1164     assertTrue('testDirectoryExists_System', tmpResult);
    1165   end;
    1166 
    1167 
    1168   // ----------------------------------------------------------
    1169 
    1170 
    1171   Procedure testDriveLetterToDriveNumber;
    1172   var
    1173     tmpResult : longint;
    1174   begin
    1175     tmpResult := DriveLetterToDriveNumber('A');
    1176 
    1177     assertEqualsInt('testDriveLetterToDriveNumber', 1, tmpResult);
    1178   end;
    1179 
    1180 
    1181   Procedure testDriveLetterToDriveNumber_LowerCase;
    1182   var
    1183     tmpResult : longint;
    1184   begin
    1185     tmpResult := DriveLetterToDriveNumber('a');
    1186 
    1187     assertEqualsInt('testDriveLetterToDriveNumber_LowerCase', 1, tmpResult);
    1188   end;
    1189 
    1190 
    1191   Procedure testDriveLetterToDriveNumber_Unknown;
    1192   var
    1193     tmpResult : longint;
    1194   begin
    1195     tmpResult := DriveLetterToDriveNumber('Ž');
    1196 
    1197     assertEqualsInt('testDriveLetterToDriveNumber_Unknown', 0, tmpResult);
    1198   end;
    1199 
    1200 
    1201   // ----------------------------------------------------------
    1202 
    1203 
    1204   Procedure testDriveNumberToDriveLetter;
    1205   begin
    1206     assertEqualsString('testDriveNumberToDriveLetter 1', 'A', DriveNumberToDriveLetter(1));
    1207     assertEqualsString('testDriveNumberToDriveLetter 2', 'B', DriveNumberToDriveLetter(2));
    1208   end;
    1209 
    1210 
    1211   // ----------------------------------------------------------
    1212 
    1213 
    1214   Procedure testGetBootDriveLetter;
    1215   var
    1216     tmpResult : char;
    1217   begin
    1218     tmpResult := GetBootDriveLetter;
    1219 
    1220     assertEqualsString('testGetBootDriveLetter', 'C', tmpResult);
    1221   end;
    1222 
    1223 
    1224   // ----------------------------------------------------------
    1225 
    1226 
    1227   Procedure testFileIsReadOnly_False;
    1228   var
    1229     tmpResult : boolean;
    1230   begin
    1231     tmpResult := FileIsReadOnly(GetBootDriveLetter + ':\config.sys');
    1232 
    1233     assertFalse('testFileIsReadOnly_False', tmpResult);
    1234   end;
    1235 
    1236 
    1237   Procedure testFileIsReadOnly_True;
    1238   var
    1239     tmpResult : boolean;
    1240   begin
    1241     tmpResult := FileIsReadOnly(GetBootDriveLetter + ':\os2ldr');
    1242 
    1243     assertTrue('testFileIsReadOnly_True', tmpResult);
    1244   end;
    1245944
    1246945
    … …  
    13211020
    13221021    result.add(@testListSubDirectories_None);
    1323     result.add(@testListSubDirectories_NoneWithHidden);
    13241022    result.add(@testListSubDirectories_Many);
    1325     result.add(@testListSubDirectories_ManyWithHidden);
    13261023
    13271024    result.add(@testListFilesInDirectoryRecursiveWithTermination);
    1328     result.add(@testListFilesInDirectoryRecursiveWithTermination_WithHidden);
    1329     result.add(@testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden);
    1330     result.add(@testListFilesInDirectoryRecursiveWithTermination_WithDirectoryInResult);
    1331     result.add(@testListFilesInDirectoryRecursiveWithTermination_1WithDirectoryInResultWithHidden);
     1025    result.add(@testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult);
    13321026
    13331027    result.add(@testParentDir_Empty);
    … …  
    13411035    result.add(@testParentDir_GoToRootDrive);
    13421036
    1343     result.add(@testMakeDirs_Empty);
    1344     result.add(@testMakeDirs_Slash);
    1345     result.add(@testMakeDirs_Simple);
    1346     result.add(@testMakeDirs_Complex);
    1347 
    13481037    result.add(@testDirectoryExists_Empty);
    13491038    result.add(@testDirectoryExists_DriveOnlyLowercase);
    … …  
    13551044    result.add(@testDirectoryExists_InvalidDriveAndPath);
    13561045    result.add(@testDirectoryExists_NotExistent);
    1357 
    1358     result.add(@testDriveLetterToDriveNumber);
    1359     result.add(@testDriveLetterToDriveNumber_LowerCase);
    1360     result.add(@testDriveLetterToDriveNumber_Unknown);
    1361 
    1362     result.add(@testDriveNumberToDriveLetter);
    1363 
    1364     result.add(@testGetBootDriveLetter);
    1365 
    1366     result.add(@testFileIsReadOnly_False);
    1367     result.add(@testFileIsReadOnly_True);
    1368 
    13691046  end;
    13701047
Note: See TracChangeset for help on using the changeset viewer.