diff --git a/.gitattributes b/.gitattributes index 698d6fbc90..cc815f66fd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3522,6 +3522,8 @@ components/lazutils/test/TestLazStorageMem.lpi svneol=native#text/plain components/lazutils/test/TestLazStorageMem.lpr svneol=native#text/plain components/lazutils/test/testconfigmemstorage.pas svneol=native#text/pascal components/lazutils/test/testlazstoragememcase1.pas svneol=native#text/plain +components/lazutils/test/testmasks.lpi svneol=native#text/plain +components/lazutils/test/testmasks.lpr svneol=native#text/pascal components/lazutils/textstrings.pas svneol=native#text/pascal components/lazutils/translations.pas svneol=native#text/pascal components/lazutils/uitypes.pas svneol=native#text/pascal @@ -11206,8 +11208,6 @@ lcl/tests/test4_3listview.lpr svneol=native#text/plain lcl/tests/test5_1asyncprocess.lpi svneol=native#text/plain lcl/tests/test5_1asyncprocess.lpr svneol=native#text/plain lcl/tests/test5_1worker.pas svneol=native#text/plain -lcl/tests/test6_1masks.lpi svneol=native#text/plain -lcl/tests/test6_1masks.lpr svneol=native#text/plain lcl/themes.pas svneol=native#text/pascal lcl/tmschema.pas svneol=native#text/pascal lcl/toolwin.pp svneol=native#text/pascal diff --git a/components/lazutils/test/testmasks.lpi b/components/lazutils/test/testmasks.lpi new file mode 100644 index 0000000000..17623057ce --- /dev/null +++ b/components/lazutils/test/testmasks.lpi @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + </General> + <VersionInfo> + <Language Value=""/> + <CharSet Value=""/> + </VersionInfo> + <BuildModes Count="1"> + <Item1 Name="default" Default="True"/> + </BuildModes> + <PublishOptions> + <Version Value="2"/> + </PublishOptions> + <RunParams> + <local> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> + </local> + <FormatVersion Value="2"/> + <Modes Count="1"> + <Mode0 Name="default"> + <local> + <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/> + </local> + </Mode0> + </Modes> + </RunParams> + <RequiredPackages Count="3"> + <Item1> + <PackageName Value="LazUtils"/> + </Item1> + <Item2> + <PackageName Value="FPCUnitTestRunner"/> + </Item2> + <Item3> + <PackageName Value="FCL"/> + </Item3> + </RequiredPackages> + <Units Count="1"> + <Unit0> + <Filename Value="testmasks.lpr"/> + <IsPartOfProject Value="True"/> + <UnitName Value="TestMasks"/> + </Unit0> + </Units> + </ProjectOptions> + <CompilerOptions> + <Version Value="11"/> + <PathDelim Value="\"/> + </CompilerOptions> + <Debugging> + <Exceptions Count="3"> + <Item1> + <Name Value="ECodetoolError"/> + </Item1> + <Item2> + <Name Value="EFOpenError"/> + </Item2> + <Item3> + <Name Value="EConvertError"/> + </Item3> + </Exceptions> + </Debugging> +</CONFIG> diff --git a/lcl/tests/test6_1masks.lpr b/components/lazutils/test/testmasks.lpr similarity index 95% rename from lcl/tests/test6_1masks.lpr rename to components/lazutils/test/testmasks.lpr index cbe9faa215..b40706476b 100644 --- a/lcl/tests/test6_1masks.lpr +++ b/components/lazutils/test/testmasks.lpr @@ -1,7 +1,7 @@ { ***************************************************************************** * * - * This file is part of the Lazarus Component Library (LCL) * + * This file is part of the LazUtils * * * * See the file COPYING.LCL, included in this distribution, * * for details about the copyright. * @@ -12,17 +12,18 @@ * * ***************************************************************************** - LCL Test 6_1 - + LazUtils Test Mask creating and matching test. } -program test6_1masks; +program TestMasks; {$mode objfpc}{$H+} uses - Interfaces, Forms, GuiTestRunner, Masks, - Classes, SysUtils, fpcunit, testutils, testregistry; + Classes, SysUtils, fpcunit, testutils, testregistry, + Interfaces, Forms, + GuiTestRunner, + Masks; type diff --git a/lcl/tests/test6_1masks.lpi b/lcl/tests/test6_1masks.lpi deleted file mode 100644 index cffdd2a4c4..0000000000 --- a/lcl/tests/test6_1masks.lpi +++ /dev/null @@ -1,122 +0,0 @@ -<?xml version="1.0"?> -<CONFIG> - <ProjectOptions> - <PathDelim Value="\"/> - <Version Value="5"/> - <General> - <MainUnit Value="0"/> - <IconPath Value="./"/> - <TargetFileExt Value=".exe"/> - <Title Value="fpcunitproject1"/> - <ActiveEditorIndexAtStart Value="0"/> - </General> - <VersionInfo> - <ProjectVersion Value=""/> - <Language Value=""/> - <CharSet Value=""/> - </VersionInfo> - <PublishOptions> - <Version Value="2"/> - <IgnoreBinaries Value="False"/> - <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> - <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> - </PublishOptions> - <RunParams> - <local> - <FormatVersion Value="1"/> - <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> - </local> - </RunParams> - <RequiredPackages Count="3"> - <Item1> - <PackageName Value="LCL"/> - </Item1> - <Item2> - <PackageName Value="FPCUnitTestRunner"/> - </Item2> - <Item3> - <PackageName Value="FCL"/> - </Item3> - </RequiredPackages> - <Units Count="7"> - <Unit0> - <Filename Value="test6_1masks.lpr"/> - <IsPartOfProject Value="True"/> - <UnitName Value="test6_1masks"/> - <CursorPos X="21" Y="1"/> - <TopLine Value="1"/> - <EditorIndex Value="0"/> - <UsageCount Value="20"/> - <Loaded Value="True"/> - </Unit0> - <Unit1> - <Filename Value="..\..\..\test\TMask\testcase1.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="TestCase1"/> - <CursorPos X="1" Y="7"/> - <TopLine Value="1"/> - <UsageCount Value="20"/> - </Unit1> - <Unit2> - <Filename Value="..\..\..\test\TMask\masks.pas"/> - <IsPartOfProject Value="True"/> - <UnitName Value="Masks"/> - <CursorPos X="1" Y="67"/> - <TopLine Value="83"/> - <UsageCount Value="20"/> - </Unit2> - <Unit3> - <Filename Value="..\..\..\fpcbeta\fpcsrc\packages\fcl-fpcunit\src\fpcunit.pp"/> - <UnitName Value="fpcunit"/> - <CursorPos X="3" Y="57"/> - <TopLine Value="43"/> - <UsageCount Value="10"/> - </Unit3> - <Unit4> - <Filename Value="..\..\..\fpcbeta\fpcsrc\rtl\objpas\sysutils\sysutilh.inc"/> - <CursorPos X="48" Y="132"/> - <TopLine Value="122"/> - <UsageCount Value="10"/> - </Unit4> - <Unit5> - <Filename Value="..\..\components\fpcunit\guitestrunner.pas"/> - <ComponentName Value="GUITestRunner"/> - <HasResources Value="True"/> - <UnitName Value="GuiTestRunner"/> - <CursorPos X="8" Y="39"/> - <TopLine Value="25"/> - <UsageCount Value="10"/> - </Unit5> - <Unit6> - <Filename Value="..\masks.pas"/> - <UnitName Value="Masks"/> - <CursorPos X="1" Y="83"/> - <TopLine Value="69"/> - <EditorIndex Value="1"/> - <UsageCount Value="10"/> - <Loaded Value="True"/> - </Unit6> - </Units> - <JumpHistory Count="0" HistoryIndex="-1"/> - </ProjectOptions> - <CompilerOptions> - <Version Value="5"/> - <PathDelim Value="\"/> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> - <Other> - <CompilerPath Value="$(CompPath)"/> - </Other> - </CompilerOptions> - <Debugging> - <Exceptions Count="2"> - <Item1> - <Name Value="ECodetoolError"/> - </Item1> - <Item2> - <Name Value="EFOpenError"/> - </Item2> - </Exceptions> - </Debugging> -</CONFIG>