Ignore:
Timestamp:
Apr 30, 2016, 8:19:42 PM (9 years ago)
Author:
RBRi
Message:

update FileUtilsUnit (merged from old 2.20)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/unittests/FileUtilsUnitTests.pas

    r384 r392  
    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
    28
    39Interface
    … …  
    814  FileUtilsUnit;
    915
     16const
     17  // TODO read environment var
     18  TEST_PATH = 'P:\newview_dev';
    1019
    1120  FUNCTION getFileUtilsUnitTests : TList;
    … …  
    456465
    457466    assertTrue('testSearchHelpPaths_FoundInAppDir', tmpResult);
    458     assertEqualsString('testSearchHelpPaths_FoundInAppDir', 'P:\newview_dev\build\unittest\NewViewTests.EXE', tmpResultFilename);
     467    assertEqualsString('testSearchHelpPaths_FoundInAppDir', TEST_PATH + '\build\unittest\NewViewTests.EXE', tmpResultFilename);
    459468  end;
    460469
    … …  
    543552    tmpResult := TStringList.Create;
    544553
    545     ListFilesInDirectory('P:\newview_dev', '*.jonas', false, tmpResult);
     554    ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.jonas', false, tmpResult);
    546555
    547556    assertEqualsInt('testListFilesInDirectory_NoFiles', 0, tmpResult.count);
    … …  
    555564    tmpResult := TStringList.Create;
    556565
    557     ListFilesInDirectory('P:\newview_dev', '', false, tmpResult);
     566    ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '', false, tmpResult);
    558567
    559568    assertEqualsInt('testListFilesInDirectory_EmptyFilter', 0, tmpResult.count);
    … …  
    569578    tmpResult := TStringList.Create;
    570579
    571     ListFilesInDirectory('P:\newview_dev', '*.txt', false, tmpResult);
     580    ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.txt', false, tmpResult);
    572581
    573582    assertEqualsInt('testListFilesInDirectory_OneFile', 1, tmpResult.count);
    574     assertEqualsIgnoreCaseString('testListFilesInDirectory_OneFile', 'howto.txt', tmpResult[0]);
     583    assertEqualsString('testListFilesInDirectory_OneFile', 'readme.txt', tmpResult[0]);
    575584
    576585    tmpResult.Destroy;
    … …  
    584593    tmpResult := TStringList.Create;
    585594
    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]);
     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]);
    591603
    592604    tmpResult.Destroy;
    … …  
    600612    tmpResult := TStringList.Create;
    601613
    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]);
     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]);
    607620
    608621    tmpResult.Destroy;
    … …  
    619632    tmpResult := TStringList.Create;
    620633
    621     ListFilesInDirectory('P:\newview_dev', '*.jonas', true, tmpResult);
     634    ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.jonas', true, tmpResult);
    622635
    623636    assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_NoFiles', 0, tmpResult.count);
    … …  
    631644    tmpResult := TStringList.Create;
    632645
    633     ListFilesInDirectory('P:\newview_dev', '', true, tmpResult);
     646    ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '', true, tmpResult);
    634647
    635648    assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_EmptyFilter', 0, tmpResult.count);
    … …  
    645658    tmpResult := TStringList.Create;
    646659
    647     ListFilesInDirectory('P:\newview_dev', '*.txt', true, tmpResult);
     660    ListFilesInDirectory(TEST_PATH + '\unittests\testdir', '*.txt', true, tmpResult);
    648661
    649662    assertEqualsInt('testListFilesInDirectoryWithDirectoryInResult_OneFile', 1, tmpResult.count);
    650     assertEqualsIgnoreCaseString('testListFilesInDirectoryWithDirectoryInResult_OneFile', 'P:\newview_dev\howto.txt', tmpResult[0]);
     663    assertEqualsString('testListFilesInDirectoryWithDirectoryInResult_OneFile', TEST_PATH + '\unittests\testdir' + '\readme.txt', tmpResult[0]);
    651664
    652665    tmpResult.Destroy;
    … …  
    660673    tmpResult := TStringList.Create;
    661674
    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]);
     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]);
    667684
    668685    tmpResult.Destroy;
    … …  
    676693    tmpResult := TStringList.Create;
    677694
    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]);
     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]);
    683701
    684702    tmpResult.Destroy;
    … …  
    693711    tmpResult := TStringList.Create;
    694712
    695     ListSubDirectories('P:\newview_dev\dll', tmpResult);
     713    ListSubDirectories(TEST_PATH + '\unittests\testdir\subdir1', false, tmpResult);
    696714
    697715    assertEqualsInt('testListSubDirectories_None', 0, tmpResult.count);
    … …  
    701719
    702720
     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', 0, tmpResult.count);
     730
     731    tmpResult.Destroy;
     732  end;
     733
     734
    703735  Procedure testListSubDirectories_Many;
    704736  var
    … …  
    707739    tmpResult := TStringList.Create;
    708740
    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]);
     741    ListSubDirectories(TEST_PATH + '\unittests\testdir', false, tmpResult);
     742
     743    assertEqualsInt('testListSubDirectories_Many', 3, tmpResult.count);
     744    assertEqualsString('testListSubDirectories_Many', TEST_PATH + '\unittests\testdir\dir_archived', tmpResult[0]);
     745    assertEqualsString('testListSubDirectories_Many', TEST_PATH + '\unittests\testdir\dir_readonly', tmpResult[1]);
     746    assertEqualsString('testListSubDirectories_Many', TEST_PATH + '\unittests\testdir\subdir1', tmpResult[2]);
     747
     748    tmpResult.Destroy;
     749  end;
     750
     751
     752  Procedure testListSubDirectories_ManyWithHidden;
     753  var
     754    tmpResult : TStringList;
     755  begin
     756    tmpResult := TStringList.Create;
     757
     758    ListSubDirectories(TEST_PATH + '\unittests\testdir', true, tmpResult);
     759
     760    assertEqualsInt('testListSubDirectories_ManyWithHidden', 5, tmpResult.count);
     761    assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\dir_archived', tmpResult[0]);
     762    assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\dir_hidden', tmpResult[1]);
     763    assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\dir_readonly', tmpResult[2]);
     764    assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\dir_system', tmpResult[3]);
     765    assertEqualsString('testListSubDirectories_ManyWithHidden', TEST_PATH + '\unittests\testdir\subdir1', tmpResult[4]);
    735766
    736767    tmpResult.Destroy;
    … …  
    747778    tmpResult := TStringList.Create;
    748779
    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]);
     780    ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2;file_in_*', false, false, tmpResult, nil, false);
     781
     782    assertEqualsInt('testListFilesInDirectoryRecursiveWithTermination', 5, tmpResult.count);
     783    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 0', 'file1.ex1', tmpResult[0]);
     784    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 1', 'file2.ex1', tmpResult[1]);
     785    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 2', 'file_in_archived', tmpResult[2]);
     786    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 3', 'file_in_readonly', tmpResult[3]);
     787    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination 4', 'file1.ex1', tmpResult[4]);
     788
     789    tmpResult.Destroy;
     790  end;
     791
     792
     793  Procedure testListFilesInDirectoryRecursiveWithTermination_WithHidden;
     794  var
     795    tmpResult : TStringList;
     796  begin
     797    tmpResult := TStringList.Create;
     798
     799    ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2;file_in_*', false, true, tmpResult, nil, false);
     800
     801    assertEqualsInt('testListFilesInDirectoryRecursiveWithTermination_WithHidden', 7, tmpResult.count);
     802    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 0', 'file1.ex1', tmpResult[0]);
     803    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 1', 'file2.ex1', tmpResult[1]);
     804    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 2', 'file_in_archived', tmpResult[2]);
     805    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 5', 'file_in_hidden', tmpResult[3]);
     806    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 8', 'file_in_readonly', tmpResult[4]);
     807    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 11', 'file_in_system', tmpResult[5]);
     808    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithHidden 14', 'file1.ex1', tmpResult[6]);
     809
     810    tmpResult.Destroy;
     811  end;
     812
     813
     814  Procedure testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden;
     815  var
     816    tmpResult : TStringList;
     817  begin
     818    tmpResult := TStringList.Create;
     819
     820    ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2;file_in_*', true, true, tmpResult, nil, false);
     821
     822    assertEqualsInt('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden', 7, tmpResult.count);
     823    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 0', TEST_PATH + '\unittests\testdir\' + 'file1.ex1', tmpResult[0]);
     824    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 1', TEST_PATH + '\unittests\testdir\' + 'file2.ex1', tmpResult[1]);
     825    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 2', TEST_PATH + '\unittests\testdir\dir_archived\' + 'file_in_archived', tmpResult[2]);
     826    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 5', TEST_PATH + '\unittests\testdir\dir_hidden\' + 'file_in_hidden', tmpResult[3]);
     827    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 8', TEST_PATH + '\unittests\testdir\dir_readonly\' + 'file_in_readonly', tmpResult[4]);
     828    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 11', TEST_PATH + '\unittests\testdir\dir_system\' + 'file_in_system', tmpResult[5]);
     829    assertEqualsString('testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden 14', TEST_PATH + '\unittests\testdir\subdir1\' + 'file1.ex1', tmpResult[6]);
     830
     831    tmpResult.Destroy;
     832  end;
     833
     834
     835  Procedure testListFilesInDirectoryRecursiveWithTermination_WithDirectoryInResult;
     836  var
     837    tmpResult : TStringList;
     838  begin
     839    tmpResult := TStringList.Create;
     840
     841    ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2', true, false, tmpResult, nil, false);
     842
     843    assertEqualsInt('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', 3, tmpResult.count);
     844    assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', TEST_PATH + '\unittests\testdir' + '\file1.ex1', tmpResult[0]);
     845    assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', TEST_PATH + '\unittests\testdir' + '\file2.ex1', tmpResult[1]);
     846    assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult', TEST_PATH + '\unittests\testdir' + '\subdir1\file1.ex1', tmpResult[2]);
     847
     848    tmpResult.Destroy;
     849  end;
     850
     851
     852  Procedure testListFilesInDirectoryRecursiveWithTermination_1WithDirectoryInResultWithHidden;
     853  var
     854    tmpResult : TStringList;
     855  begin
     856    tmpResult := TStringList.Create;
     857
     858    ListFilesInDirectoryRecursiveWithTermination(TEST_PATH + '\unittests\testdir', '*.ex1;ex2', true, true, tmpResult, nil, false);
     859
     860    assertEqualsInt('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResultWithHidden', 3, tmpResult.count);
     861    assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResultWithHidden', TEST_PATH + '\unittests\testdir' + '\file1.ex1', tmpResult[0]);
     862    assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResultWithHidden', TEST_PATH + '\unittests\testdir' + '\file2.ex1', tmpResult[1]);
     863    assertEqualsString('testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResultWithHidden', TEST_PATH + '\unittests\testdir' + '\subdir1\file1.ex1', tmpResult[2]);
    754864
    755865    tmpResult.Destroy;
    … …  
    853963
    854964
     965  Procedure testMakeDirs_Empty;
     966  var
     967    tmpResult : String;
     968  begin
     969    tmpResult := MakeDirs('');
     970
     971    assertEqualsString('testMakeDirs_Empty', '', tmpResult);
     972  end;
     973
     974
     975  Procedure testMakeDirs_Slash;
     976  var
     977    tmpResult : String;
     978  begin
     979    tmpResult := MakeDirs('\');
     980
     981    assertEqualsString('testMakeDirs_Slash', '', tmpResult);
     982  end;
     983
     984
     985  Procedure testMakeDirs_Simple;
     986  var
     987    tmpResult : String;
     988  begin
     989    RmDir(TEST_PATH + '\unittests\testdir\makedirs');
     990
     991    tmpResult := MakeDirs(TEST_PATH + '\unittests\testdir' + '\makedirs');
     992
     993    RmDir(TEST_PATH + '\unittests\testdir\makedirs');
     994
     995    assertEqualsString('testMakeDirs_Simple', TEST_PATH + '\unittests\testdir\makedirs', tmpResult);
     996  end;
     997
     998
     999  Procedure testMakeDirs_Complex;
     1000  var
     1001    tmpResult : String;
     1002  begin
     1003    RmDir(TEST_PATH + '\unittests\testdir\makedirs\subdir\test');
     1004    RmDir(TEST_PATH + '\unittests\testdir\makedirs\subdir');
     1005    RmDir(TEST_PATH + '\unittests\testdir\makedirs');
     1006
     1007    tmpResult := MakeDirs(TEST_PATH + '\unittests\testdir' + '\makedirs\subdir\test');
     1008
     1009    RmDir(TEST_PATH + '\unittests\testdir\makedirs\subdir\test');
     1010    RmDir(TEST_PATH + '\unittests\testdir\makedirs\subdir');
     1011    RmDir(TEST_PATH + '\unittests\testdir\makedirs');
     1012
     1013    assertEqualsString('testMakeDirs_Simple', TEST_PATH + '\unittests\testdir\makedirs\subdir\test', tmpResult);
     1014  end;
     1015
     1016
     1017  // ----------------------------------------------------------
     1018
     1019
    8551020  Procedure testDirectoryExists_Empty;
    8561021  var
    … …  
    9421107  end;
    9431108
     1109
     1110  Procedure testDirectoryExists_Archived;
     1111  var
     1112    tmpResult : Boolean;
     1113  begin
     1114    tmpResult := DirectoryExists(TEST_PATH + '\unittests\testdir\dir_archived');
     1115
     1116    assertTrue('testDirectoryExists_Archived', tmpResult);
     1117  end;
     1118
     1119
     1120  Procedure testDirectoryExists_Hidden;
     1121  var
     1122    tmpResult : Boolean;
     1123  begin
     1124    tmpResult := DirectoryExists(TEST_PATH + '\unittests\testdir\dir_hidden');
     1125
     1126    assertTrue('testDirectoryExists_Hidden', tmpResult);
     1127  end;
     1128
     1129
     1130  Procedure testDirectoryExists_Readonly;
     1131  var
     1132    tmpResult : Boolean;
     1133  begin
     1134    tmpResult := DirectoryExists(TEST_PATH + '\unittests\testdir\dir_readonly');
     1135
     1136    assertTrue('testDirectoryExists_Readonly', tmpResult);
     1137  end;
     1138
     1139
     1140  Procedure testDirectoryExists_System;
     1141  var
     1142    tmpResult : Boolean;
     1143  begin
     1144    tmpResult := DirectoryExists(TEST_PATH + '\unittests\testdir\dir_system');
     1145
     1146    assertTrue('testDirectoryExists_System', tmpResult);
     1147  end;
     1148
     1149
     1150  // ----------------------------------------------------------
     1151
     1152
     1153  Procedure testDriveLetterToDriveNumber;
     1154  var
     1155    tmpResult : longint;
     1156  begin
     1157    tmpResult := DriveLetterToDriveNumber('A');
     1158
     1159    assertEqualsInt('testDriveLetterToDriveNumber', 1, tmpResult);
     1160  end;
     1161
     1162
     1163  Procedure testDriveLetterToDriveNumber_LowerCase;
     1164  var
     1165    tmpResult : longint;
     1166  begin
     1167    tmpResult := DriveLetterToDriveNumber('a');
     1168
     1169    assertEqualsInt('testDriveLetterToDriveNumber_LowerCase', 1, tmpResult);
     1170  end;
     1171
     1172
     1173  Procedure testDriveLetterToDriveNumber_Unknown;
     1174  var
     1175    tmpResult : longint;
     1176  begin
     1177    tmpResult := DriveLetterToDriveNumber('Ž');
     1178
     1179    assertEqualsInt('testDriveLetterToDriveNumber_Unknown', 0, tmpResult);
     1180  end;
     1181
     1182
     1183  // ----------------------------------------------------------
     1184
     1185
     1186  Procedure testDriveNumberToDriveLetter;
     1187  begin
     1188    assertEqualsString('testDriveNumberToDriveLetter 1', 'A', DriveNumberToDriveLetter(1));
     1189    assertEqualsString('testDriveNumberToDriveLetter 2', 'B', DriveNumberToDriveLetter(2));
     1190  end;
     1191
     1192
     1193  // ----------------------------------------------------------
     1194
     1195
     1196  Procedure testGetBootDriveLetter;
     1197  var
     1198    tmpResult : char;
     1199  begin
     1200    tmpResult := GetBootDriveLetter;
     1201
     1202    assertEqualsString('testGetBootDriveLetter', 'C', tmpResult);
     1203  end;
     1204
     1205
     1206  // ----------------------------------------------------------
     1207
     1208
     1209  Procedure testFileIsReadOnly_False;
     1210  var
     1211    tmpResult : boolean;
     1212  begin
     1213    tmpResult := FileIsReadOnly(GetBootDriveLetter + ':\config.sys');
     1214
     1215    assertFalse('testFileIsReadOnly_False', tmpResult);
     1216  end;
     1217
     1218
     1219  Procedure testFileIsReadOnly_True;
     1220  var
     1221    tmpResult : boolean;
     1222  begin
     1223    tmpResult := FileIsReadOnly(GetBootDriveLetter + ':\os2ldr');
     1224
     1225    assertTrue('testFileIsReadOnly_True', tmpResult);
     1226  end;
    9441227
    9451228
    … …  
    10201303
    10211304    result.add(@testListSubDirectories_None);
     1305    result.add(@testListSubDirectories_NoneWithHidden);
    10221306    result.add(@testListSubDirectories_Many);
     1307    result.add(@testListSubDirectories_ManyWithHidden);
    10231308
    10241309    result.add(@testListFilesInDirectoryRecursiveWithTermination);
    1025     result.add(@testListFilesInDirectoryRecursiveWithTerminationWithDirectoryInResult);
     1310    result.add(@testListFilesInDirectoryRecursiveWithTermination_WithHidden);
     1311    result.add(@testListFilesInDirectoryRecursiveWithTermination_WithDirAndHidden);
     1312    result.add(@testListFilesInDirectoryRecursiveWithTermination_WithDirectoryInResult);
     1313    result.add(@testListFilesInDirectoryRecursiveWithTermination_1WithDirectoryInResultWithHidden);
    10261314
    10271315    result.add(@testParentDir_Empty);
    … …  
    10351323    result.add(@testParentDir_GoToRootDrive);
    10361324
     1325    result.add(@testMakeDirs_Empty);
     1326    result.add(@testMakeDirs_Slash);
     1327    result.add(@testMakeDirs_Simple);
     1328    result.add(@testMakeDirs_Complex);
     1329
    10371330    result.add(@testDirectoryExists_Empty);
    10381331    result.add(@testDirectoryExists_DriveOnlyLowercase);
    … …  
    10441337    result.add(@testDirectoryExists_InvalidDriveAndPath);
    10451338    result.add(@testDirectoryExists_NotExistent);
     1339
     1340    result.add(@testDriveLetterToDriveNumber);
     1341    result.add(@testDriveLetterToDriveNumber_LowerCase);
     1342    result.add(@testDriveLetterToDriveNumber_Unknown);
     1343
     1344    result.add(@testDriveNumberToDriveLetter);
     1345
     1346    result.add(@testGetBootDriveLetter);
     1347
     1348    result.add(@testFileIsReadOnly_False);
     1349    result.add(@testFileIsReadOnly_True);
     1350
    10461351  end;
    10471352
Note: See TracChangeset for help on using the changeset viewer.