tests: replaced DoDirSeparators with DoPathDelims

git-svn-id: trunk@42684 -
This commit is contained in:
mattias 2013-09-08 20:33:22 +00:00
parent da7315aa27
commit 1fdae44bb9
2 changed files with 9 additions and 11 deletions

View File

@ -14,8 +14,7 @@ unit TestFileProc;
interface
uses
Classes, SysUtils, fpcunit, testglobals,
FileProcs;
Classes, SysUtils, fpcunit, testglobals, LazFileUtils, FileProcs;
type
@ -46,8 +45,8 @@ end;
procedure TTestFileProc.TestTrimFileName;
procedure DoTest(AFileName, Expected: string);
begin
DoDirSeparators(AFileName);
DoDirSeparators(Expected);
DoPathDelims(AFileName);
DoPathDelims(Expected);
AssertEquals(AFileName, Expected, TrimFilename(AFileName));
end;
begin
@ -63,9 +62,9 @@ procedure TTestFileProc.TestCreateRelativePath;
procedure DoTest(Filename, BaseDirectory, Expected: string;
UsePointDirectory: boolean = false);
begin
DoDirSeparators(Filename);
DoDirSeparators(BaseDirectory);
DoDirSeparators(Expected);
DoPathDelims(Filename);
DoPathDelims(BaseDirectory);
DoPathDelims(Expected);
AssertEquals('CreateRelativePath(File='+Filename+',Base='+BaseDirectory+')',
Expected,
CreateRelativePath(Filename,BaseDirectory,UsePointDirectory));

View File

@ -5,8 +5,7 @@ unit testfileutil;
interface
uses
Classes, SysUtils, fpcunit, testglobals,
FileUtil;
Classes, SysUtils, fpcunit, testglobals, LazFileUtils, FileUtil;
type
@ -53,8 +52,8 @@ end;
procedure TTestFileUtil.TestTrimFileName;
procedure DoTest(AFileName, Expected: string);
begin
DoDirSeparators(AFileName);
DoDirSeparators(Expected);
DoPathDelims(AFileName);
DoPathDelims(Expected);
AssertEquals(AFileName, Expected, TrimFilename(AFileName));
end;
begin