paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 13:38:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: moved old fileprocs tests to lazfileutils

Browse Source 
git-svn-id: trunk@56403 -
This commit is contained in:
mattias 2017-11-14 11:15:07 +00:00
parent 5b052ebd36
commit 77785eec5b
5 changed files with 100 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -9943,7 +9943,6 @@ test/bugs/8450/project1.lpr svneol=native#text/plain
test/bugs/8450/unit1.lfm svneol=native#text/plain
test/bugs/8450/unit1.pas svneol=native#text/plain
test/bugs/bug8432.pas svneol=native#text/plain
test/bugs/testfileproc.pas svneol=native#text/plain
test/bugs/testfileutil.pas svneol=native#text/plain
test/bugtestcase.pas svneol=native#text/plain
test/customdrawn/cd_test_all.ico -text

116
test/bugs/testfileproc.pas
View File

@ -1,116 +0,0 @@
{
Test all with:
./runtests --format=plain --suite=TTestFileProc
Test specific with:
./runtests --format=plain --suite=TestFileIsExecutable
./runtests --format=plain --suite=TestTrimFileName
./runtests --format=plain --suite=TestCreateRelativePath
}
unit TestFileProc;
{$mode objfpc}{$H+}
interface
uses
Classes, SysUtils, fpcunit, testglobals, LazFileUtils, LazUTF8;
type
{ TTestFileProc }
TTestFileProc= class(TTestCase)
published
procedure TestFileIsExecutable;
procedure TestTrimFileName;
procedure TestCreateRelativePath;
end;
implementation
{ TTestFileProc }
procedure TTestFileProc.TestFileIsExecutable;
procedure DoTest(const AFileName: string; Expected: boolean);
begin
AssertEquals(AFileName, Expected, FileIsExecutable(AFileName));
end;
begin
DoTest(ParamStrUTF8(0),true);
// a directory is not an executable file
DoTest(ExtractFileDir(ParamStrUTF8(0)), false);
end;
procedure TTestFileProc.TestTrimFileName;
procedure DoTest(AFileName, Expected: string);
begin
ForcePathDelims(AFileName);
ForcePathDelims(Expected);
AssertEquals(AFileName, Expected, TrimFilename(AFileName));
end;
begin
{$ifdef windows}
DoTest('c:\LazarusDir\..\dir\','c:\dir\');
{$endif}
DoTest('$(LazarusDir)\..\dir\','$(LazarusDir)\..\dir\');
DoTest(' a ','a');
DoTest('a ','a');
DoTest('.','.');
DoTest('a/','a/');
DoTest('a/.','a/');
DoTest('./a','a');
DoTest('././a','a');
DoTest('a/..','.');
DoTest('a/b/..','a/');
DoTest('a/../b','b');
DoTest('a/b/../c','a/c');
DoTest('a/b/../../c','c');
DoTest('a/./b','a/b');
DoTest('a/.//b','a/b');
DoTest('a//b','a/b');
DoTest('a//./b','a/b');
end;
procedure TTestFileProc.TestCreateRelativePath;
procedure DoTest(Filename, BaseDirectory, Expected: string;
UsePointDirectory: boolean = false);
begin
ForcePathDelims(Filename);
ForcePathDelims(BaseDirectory);
ForcePathDelims(Expected);
AssertEquals('CreateRelativePath(File='+Filename+',Base='+BaseDirectory+')',
Expected,
CreateRelativePath(Filename,BaseDirectory,UsePointDirectory));
end;
begin
DoTest('/a','/a','');
DoTest('/a','/a','.',true);
DoTest('/a','/a/','');
DoTest('/a/b','/a/b','');
DoTest('/a/b','/a/b/','');
DoTest('/a','/a/','');
DoTest('/a','','/a');
DoTest('/a/b','/a','b');
DoTest('/a/b','/a/','b');
DoTest('/a/b','/a//','b');
DoTest('/a','/a/b','..');
DoTest('/a','/a/b/','..');
DoTest('/a','/a/b//','..');
DoTest('/a/','/a/b','..');
DoTest('/a','/a/b/c','../..');
DoTest('/a','/a/b//c','../..');
DoTest('/a','/a//b/c','../..');
DoTest('/a','/a//b/c/','../..');
DoTest('/a','/b','/a');
DoTest('~/bin','/','~/bin');
DoTest('$(HOME)/bin','/','$(HOME)/bin');
end;
initialization
// TODO: Maybe this test case should be moved to another testsuite, e.g. codetools test
AddToBugsTestSuite(TTestSuite.Create(TTestFileProc, 'TestFileProc'));
end.

90
test/lazutils/testlazfileutils.pas
View File

@ -1,3 +1,10 @@
{
Test all with:
./runtests --format=plain --suite=TTestLazFileUtils
Test specific with:
./runtests --format=plain --suite=TTestLazFileUtils.TestResolveDots
}
unit TestLazFileUtils;
{$mode objfpc}{$H+}
@ -5,7 +12,7 @@ unit TestLazFileUtils;
interface
uses
Classes, SysUtils, fpcunit, testglobals, LazLogger, LazFileUtils;
Classes, SysUtils, fpcunit, testglobals, LazLogger, LazFileUtils, LazUTF8;
type
@ -14,6 +21,9 @@ type
TTestLazFileUtils = class(TTestCase)
published
procedure TestResolveDots;
procedure TestFileIsExecutable;
procedure TestTrimFileName;
procedure TestCreateRelativePath;
end;
implementation
@ -71,6 +81,84 @@ begin
{$ENDIF}
end;
procedure TTestLazFileUtils.TestFileIsExecutable;
procedure DoTest(const AFileName: string; Expected: boolean);
begin
AssertEquals(AFileName, Expected, FileIsExecutable(AFileName));
end;
begin
DoTest(ParamStrUTF8(0),true);
// a directory is not an executable file
DoTest(ExtractFileDir(ParamStrUTF8(0)), false);
end;
procedure TTestLazFileUtils.TestTrimFileName;
procedure DoTest(AFileName, Expected: string);
begin
ForcePathDelims(AFileName);
ForcePathDelims(Expected);
AssertEquals(AFileName, Expected, TrimFilename(AFileName));
end;
begin
{$ifdef windows}
DoTest('c:\LazarusDir\..\dir\','c:\dir\');
{$endif}
DoTest('$(LazarusDir)\..\dir\','$(LazarusDir)\..\dir\');
DoTest(' a ','a');
DoTest('a ','a');
DoTest('.','.');
DoTest('a/','a/');
DoTest('a/.','a/');
DoTest('./a','a');
DoTest('././a','a');
DoTest('a/..','.');
DoTest('a/b/..','a/');
DoTest('a/../b','b');
DoTest('a/b/../c','a/c');
DoTest('a/b/../../c','c');
DoTest('a/./b','a/b');
DoTest('a/.//b','a/b');
DoTest('a//b','a/b');
DoTest('a//./b','a/b');
end;
procedure TTestLazFileUtils.TestCreateRelativePath;
procedure DoTest(Filename, BaseDirectory, Expected: string;
UsePointDirectory: boolean = false);
begin
ForcePathDelims(Filename);
ForcePathDelims(BaseDirectory);
ForcePathDelims(Expected);
AssertEquals('CreateRelativePath(File='+Filename+',Base='+BaseDirectory+')',
Expected,
CreateRelativePath(Filename,BaseDirectory,UsePointDirectory));
end;
begin
DoTest('/a','/a','');
DoTest('/a','/a','.',true);
DoTest('/a','/a/','');
DoTest('/a/b','/a/b','');
DoTest('/a/b','/a/b/','');
DoTest('/a','/a/','');
DoTest('/a','','/a');
DoTest('/a/b','/a','b');
DoTest('/a/b','/a/','b');
DoTest('/a/b','/a//','b');
DoTest('/a','/a/b','..');
DoTest('/a','/a/b/','..');
DoTest('/a','/a/b//','..');
DoTest('/a/','/a/b','..');
DoTest('/a','/a/b/c','../..');
DoTest('/a','/a/b//c','../..');
DoTest('/a','/a//b/c','../..');
DoTest('/a','/a//b/c/','../..');
DoTest('/a','/b','/a');
DoTest('~/bin','/','~/bin');
DoTest('$(HOME)/bin','/','$(HOME)/bin');
end;
initialization
AddToLazUtilsTestSuite(TTestLazFileUtils);
end.

24
test/runtestsgui.lpi
View File

@ -46,7 +46,7 @@
<PackageName Value="CodeTools"/>
</Item6>
</RequiredPackages>
<Units Count="15">
<Units Count="14">
<Unit0>
<Filename Value="runtestsgui.lpr"/>
<IsPartOfProject Value="True"/>
@ -72,46 +72,42 @@
<IsPartOfProject Value="True"/>
</Unit5>
<Unit6>
<Filename Value="bugs\testfileproc.pas"/>
<Filename Value="bugtestcase.pas"/>
<IsPartOfProject Value="True"/>
</Unit6>
<Unit7>
<Filename Value="bugtestcase.pas"/>
<Filename Value="lcltests\testpen.pas"/>
<IsPartOfProject Value="True"/>
</Unit7>
<Unit8>
<Filename Value="lcltests\testpen.pas"/>
<Filename Value="semiauto\semiautotest.pas"/>
<IsPartOfProject Value="True"/>
</Unit8>
<Unit9>
<Filename Value="semiauto\semiautotest.pas"/>
<Filename Value="semiauto\idesemiautotests.pas"/>
<IsPartOfProject Value="True"/>
</Unit9>
<Unit10>
<Filename Value="semiauto\idesemiautotests.pas"/>
<Filename Value="semiauto\lclsemiautotests.pas"/>
<IsPartOfProject Value="True"/>
</Unit10>
<Unit11>
<Filename Value="semiauto\lclsemiautotests.pas"/>
<Filename Value="lazutils\testlazutils.pas"/>
<IsPartOfProject Value="True"/>
</Unit11>
<Unit12>
<Filename Value="lazutils\testlazutils.pas"/>
<IsPartOfProject Value="True"/>
</Unit12>
<Unit13>
<Filename Value="lcltests\testpagecontrol.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="TestPageControl"/>
</Unit13>
<Unit14>
</Unit12>
<Unit13>
<Filename Value="ideintf\testmenuintf.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="TestMenuIntfDlg"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="TestMenuIntf"/>
</Unit14>
</Unit13>
</Units>
</ProjectOptions>
<CompilerOptions>

2
test/testunits.pas
View File

@ -28,7 +28,7 @@ interface
uses
TestLpi, BugTestCase,
bug8432, testfileutil, testfileproc,
bug8432, testfileutil,
// lazutils
TestLazUtils, TestLazUTF8, TestLazUTF16, TestLConvEncoding, TestAvgLvlTree,
// lcltests