codetools: moved tests

git-svn-id: trunk@53152 -

.gitattributes

@@ -1041,8 +1041,16 @@ components/codetools/tests/pt_thlp1.pas svneol=native#text/plain
 components/codetools/tests/pt_thlp2.pas svneol=native#text/plain
 components/codetools/tests/refactoringtests.pas svneol=native#text/plain
 components/codetools/tests/rt_explodewith.pas svneol=native#text/plain
+components/codetools/tests/testbasiccodetools.pas svneol=native#text/plain
+components/codetools/tests/testcfgscript.pas svneol=native#text/plain
 components/codetools/tests/testcodetools.lpi svneol=native#text/plain
 components/codetools/tests/testcodetools.lpr svneol=native#text/plain
+components/codetools/tests/testcompleteblock.pas svneol=native#text/plain
+components/codetools/tests/testcth2pas.pas svneol=native#text/pascal
+components/codetools/tests/testctrangescan.pas svneol=native#text/plain
+components/codetools/tests/testctxmlfixfragments.pas svneol=native#text/pascal
+components/codetools/tests/testmethodjumptool.pas svneol=native#text/plain
+components/codetools/tests/teststdcodetools.pas svneol=native#text/plain
 components/codetools/unitdictionary.pas svneol=native#text/plain
 components/compilers/c/examples/test.c svneol=native#text/plain
 components/compilers/c/languages/lazcstrconsts.de.po svneol=native#text/plain
@@ -8047,14 +8055,6 @@ 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/codetoolstests/testbasiccodetools.pas svneol=native#text/plain
-test/codetoolstests/testcfgscript.pas svneol=native#text/plain
-test/codetoolstests/testcompleteblock.pas svneol=native#text/plain
-test/codetoolstests/testcth2pas.pas svneol=native#text/pascal
-test/codetoolstests/testctrangescan.pas svneol=native#text/plain
-test/codetoolstests/testctxmlfixfragments.pas svneol=native#text/pascal
-test/codetoolstests/testmethodjumptool.pas svneol=native#text/plain
-test/codetoolstests/teststdcodetools.pas svneol=native#text/plain
 test/customdrawn/cd_test_all.ico -text
 test/customdrawn/cd_test_all.lpi svneol=native#text/plain
 test/customdrawn/cd_test_all.lpr svneol=native#text/plain

components/codetools/tests/finddeclarationtests.pas

@@ -32,7 +32,7 @@ uses
   Classes, SysUtils, CodeToolManager, ExprEval, CodeCache, BasicCodeTools,
   CustomCodeTool, CodeTree, FindDeclarationTool, KeywordFuncLists,
   IdentCompletionTool, FileProcs, LazLogger, LazFileUtils, fpcunit,
-  testregistry;
+  testregistry, TestGlobals;
 
 type
 
@@ -322,12 +322,6 @@ begin
 end;
 
 initialization
-  GetTestRegistry.TestName := 'All tests';
+  AddToFindDeclarationTestSuite(TTestFindDeclaration);
-  BugsTestSuite := TTestSuite.Create('Bugs');
-  GetTestRegistry.AddTest(BugsTestSuite);
-  FindDeclarationTestSuite := TTestSuite.Create('FindDeclaration');
-  GetTestRegistry.AddTest(FindDeclarationTestSuite);
-
-  FindDeclarationTestSuite.AddTestSuiteFromClass(TTestFindDeclaration);
 end.
 

components/codetools/tests/fpctests/tudots.dot.pp

@@ -9,6 +9,8 @@ procedure t;
 
 implementation
 
+(*
+
 uses
   tudots{declaration:tudots}, tudots.dot.next{ todo declaration:tudots.dot.next};
 
@@ -22,5 +24,6 @@ begin
   tudots.dot.test{declaration:tudots.dot.test} := 'c';
 end;
 
+*)
 end.
 

components/codetools/tests/testbasiccodetools.pas

@@ -460,7 +460,7 @@ begin
 end;
 
 initialization
-  AddToCodetoolsTestSuite(TTestBasicCodeTools);
+  AddToBasicTestSuite(TTestBasicCodeTools);
 
 end.
 

components/codetools/tests/testcfgscript.pas

@@ -135,7 +135,7 @@ begin
 end;
 
 initialization
-  AddToCodetoolsTestSuite(TTestCodetoolsCfgScript);
+  AddToNonPascalTestSuite(TTestCodetoolsCfgScript);
 
 end.
 

components/codetools/tests/testcodetools.lpi

@@ -16,9 +16,6 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
@@ -40,7 +37,7 @@
         <PackageName Value="fpcunitconsolerunner"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="12">
+    <Units Count="13">
       <Unit0>
         <Filename Value="testcodetools.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -91,6 +88,11 @@
         <Filename Value="fdt_generics.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit11>
+      <Unit12>
+        <Filename Value="testglobals.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="TestGlobals"/>
+      </Unit12>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

components/codetools/tests/testcodetools.lpr

@@ -20,8 +20,14 @@ program testcodetools;
 {$mode objfpc}{$H+}
 
 uses
-  Classes, sysutils, consoletestrunner, dom, fpcunit, CodeToolManager,
+  Classes, sysutils, consoletestrunner, dom, fpcunit, LazLogger,
-  CodeToolsConfig, LazLogger, finddeclarationtests, RefactoringTests,
+  CodeToolManager, CodeToolsConfig,
+  testglobals,
+  TestBasicCodetools, TestCTRangeScan, TestMethodJumpTool, TestStdCodetools,
+  FindDeclarationTests, TestCompleteBlock, RefactoringTests,
+  // non Pascal
+  TestCfgScript, TestCTH2Pas, TestCTXMLFixFragments,
+  // compile test files to make sure they are valid Pascal
   fdt_classhelper,
   {$IF FPC_FULLVERSION >= 30101}
   fdt_typehelper,

components/codetools/tests/testcompleteblock.pas

@@ -418,7 +418,7 @@ begin
 end;
 
 initialization
-  AddToCodetoolsTestSuite(TTestCodetoolsCompleteBlock);
+  AddToRefactoringTestSuite(TTestCodetoolsCompleteBlock);
 
 end.
 

components/codetools/tests/testcth2pas.pas

@@ -277,7 +277,7 @@ begin
 end;
 
 initialization
-  AddToCodetoolsTestSuite(TTestCodetoolsH2Pas);
+  AddToNonPascalTestSuite(TTestCodetoolsH2Pas);
 
 end.
 

components/codetools/tests/testctrangescan.pas

@@ -392,7 +392,7 @@ begin
 end;
 
 initialization
-  AddToCodetoolsTestSuite(TTestCodetoolsRangeScan);
+  AddToFindDeclarationTestSuite(TTestCodetoolsRangeScan);
 
 end.
 

components/codetools/tests/testctxmlfixfragments.pas

@@ -123,7 +123,7 @@ begin
 end;
 
 initialization
-  AddToCodetoolsTestSuite(TTestCTXMLFixFragment);
+  AddToNonPascalTestSuite(TTestCTXMLFixFragment);
 
 end.
 

components/codetools/tests/testmethodjumptool.pas

@@ -120,7 +120,7 @@ begin
 end;
 
 initialization
-  AddToCodetoolsTestSuite(TTestCTMethodJumpTool);
+  AddToStdToolsTestSuite(TTestCTMethodJumpTool);
 
 end.
 

components/codetools/tests/teststdcodetools.pas

@@ -197,7 +197,7 @@ begin
 end;
 
 initialization
-  AddToCodetoolsTestSuite(TTestCTStdCodetools);
+  AddToStdToolsTestSuite(TTestCTStdCodetools);
 
 end.
 

test/runtests.lpr

@@ -25,7 +25,7 @@ uses
   testglobals, testunits, dom,
   {Unit needed to set the LCL version and widget set name}
   LCLVersion, InterfaceBase, Interfaces, TestLazXML, TestAvgLvlTree,
-  TestMethodJumpTool, TestLConvEncoding;
+  TestLConvEncoding;
   
 type
 

test/testglobals.pas

@@ -30,7 +30,6 @@ var
   PrimaryConfigPath: string;
   BugsTestSuite: TTestSuite;
   LazUtilsTestSuite: TTestSuite;
-  CodetoolsTestSuite: TTestSuite;
   LCLTestSuite: TTestSuite;
   IDEIntfTestSuite: TTestSuite;
   SemiAutoTestSuite: TTestSuite;
@@ -40,7 +39,6 @@ function ReadOutput(AProcess:TProcess): TStringList;
 
 procedure AddToBugsTestSuite(ATest: TTest);
 procedure AddToLazUtilsTestSuite(ATestClass: TClass);
-procedure AddToCodetoolsTestSuite(ATestClass: TClass);
 procedure AddToLCLTestSuite(ATestClass: TClass);
 procedure AddToIDEIntfTestSuite(ATestClass: TClass);
 procedure AddToSemiAutoTestSuite(ATestClass: TClass);
@@ -106,11 +104,6 @@ begin
   LazUtilsTestSuite.AddTestSuiteFromClass(ATestClass);
 end;
 
-procedure AddToCodetoolsTestSuite(ATestClass: TClass);
-begin
-  CodetoolsTestSuite.AddTestSuiteFromClass(ATestClass);
-end;
-
 procedure AddToLCLTestSuite(ATestClass: TClass);
 begin
   LCLTestSuite.AddTestSuiteFromClass(ATestClass);
@@ -132,8 +125,6 @@ initialization
   GetTestRegistry.AddTest(BugsTestSuite);
   LazUtilsTestSuite := TTestSuite.Create('LazUtils tests');
   GetTestRegistry.AddTest(LazUtilsTestSuite);
-  CodetoolsTestSuite := TTestSuite.Create('Codetools tests');
-  GetTestRegistry.AddTest(CodetoolsTestSuite);
   LCLTestSuite := TTestSuite.Create('LCL tests');
   GetTestRegistry.AddTest(LCLTestSuite);
   IDEIntfTestSuite := TTestSuite.Create('IDEIntf tests');

test/testunits.pas

@@ -31,9 +31,6 @@ uses
   bug8432, testfileutil, testfileproc,
   // lazutils
   TestLazUtils, TestLazUTF8, TestLConvEncoding, TestAvgLvlTree,
-  // codetools
-  TestBasicCodetools, TestCTXMLFixFragments, TestCTRangeScan, TestCTH2Pas,
-  TestCompleteBlock, TestStdCodetools, TestMethodJumpTool, TestCfgScript,
   // lcltests
   testunicode, testpen, TestPreferredSize, TestTextStrings
   {$IFNDEF NoSemiAutomatedTests}