* verified some tests with Delphi XE

* added another bunch of tests (54-59)

git-svn-id: branches/svenbarth/classhelpers@16949 -

.gitattributes

@@ -9368,6 +9368,12 @@ tests/test/tchlp50.pp svneol=native#text/pascal
 tests/test/tchlp51.pp svneol=native#text/pascal
 tests/test/tchlp52.pp svneol=native#text/pascal
 tests/test/tchlp53.pp svneol=native#text/pascal
+tests/test/tchlp54.pp svneol=native#text/pascal
+tests/test/tchlp55.pp svneol=native#text/pascal
+tests/test/tchlp56.pp svneol=native#text/pascal
+tests/test/tchlp57.pp svneol=native#text/pascal
+tests/test/tchlp58.pp svneol=native#text/pascal
+tests/test/tchlp59.pp svneol=native#text/pascal
 tests/test/tchlp6.pp svneol=native#text/pascal
 tests/test/tchlp7.pp svneol=native#text/pascal
 tests/test/tchlp8.pp svneol=native#text/pascal

tests/test/tchlp22.pp

@@ -1,10 +1,10 @@
 { %FAIL }
 
-{ in mode Delphi overloading isn't enabled by default }
+{ overloading needs to be enabled explicitly }
 program tchlp22;
 
 {$ifdef fpc}
-  {$mode delphi}
+  {$mode objfpc}
 {$endif}
 
 type

tests/test/tchlp23.pp

@@ -1,7 +1,11 @@
-{ in mode ObjFPC overloading is enabled by default }
+{ %NORUN }
+
+{ overloading needs to be enabled explicitly }
 program tchlp23;
 
-{$mode objfpc}
+{$ifdef fpc}
+  {$mode objfpc}
+{$endif}
 
 type
   TFoo = class
@@ -9,7 +13,7 @@ type
   end;
 
   TFooHelper = class helper for TFoo
-    procedure Test;
+    procedure Test; overload;
   end;
 
 procedure TFoo.Test(const aTest: String);

tests/test/tchlp35.pp

@@ -1,6 +1,11 @@
 { tests virtual methods inside class helpers }
 program tchlp35;
 
+{$ifdef fpc}
+  {$mode delphi}
+{$endif}
+{$apptype console}
+
 uses
   uchlp35;
 

tests/test/tchlp36.pp

@@ -20,7 +20,7 @@ type
 
   end;
 
-  TFooHelper = class helper(TFooHelper) for TFoo
+  TFooHelper = class helper(TBarHelper) for TFoo
   end;
 
 procedure TBarHelper.Test;

tests/test/tchlp39.pp

@@ -1,4 +1,4 @@
-{ the parent of a class helper has higher priority than the extended class when
+{ the extended class has higher priority than the parent class when
   searching for symbols }
 program tchlp39;
 
@@ -33,7 +33,7 @@ end;
 function TFooSubHelper.Test(aRecurse: Boolean): Integer;
 begin
   if aRecurse then
-    Result := Test(False)
+    Result := inherited Test(False)
   else
     Result := 3;
 end;
@@ -45,7 +45,7 @@ begin
   f := TFoo.Create;
   res := f.Test(True);
   Writeln('f.Test: ', res);
-  if res <> 2 then
+  if res <> 1 then
     Halt(1);
   Writeln('ok');
 end.

tests/test/tchlp43.pp

@@ -1,3 +1,5 @@
+{ the extended type is searched first for a inherited method even if it's
+  defined as "override" }
 program tchlp43;
 
 {$ifdef fpc}
@@ -38,10 +40,12 @@ end;
 
 var
   f: TFoo;
+  res: Integer;
 begin
   f := TFoo.Create;
   res := f.Test(True);
-  if res <> 2 then
+  Writeln('f.Test: ', res);
+  if res <> 1 then
     Halt(1);
   Writeln('ok');
 end.

tests/test/tchlp45.pp

@@ -1,6 +1,6 @@
 { %FAIL }
 
-{ access to methods must adhere to visibility rules }
+{ access to methods must adhere to visibility rules (here: strict private) }
 program tchlp45;
 
 {$ifdef fpc}

tests/test/tchlp51.pp

@@ -2,6 +2,11 @@
   implementation section overrides the one introduced in the interface section }
 program tchlp51;
 
+{$ifdef fpc}
+  {$mode objfpc}
+{$endif}
+{$apptype console}
+
 uses
   uchlp51a, uchlp51c;
 
@@ -12,7 +17,7 @@ begin
   f := TFoo.Create;
   res := f.AccessTest;
   Writeln('f.AccessTest: ', res);
-  if res <> 2 then
+  if res <> 1 then
     Halt(1);
   Writeln('ok');
 end.

tests/test/tchlp52.pp

@@ -3,7 +3,9 @@
 { class helpers may not be referenced in any way - test 7 }
 program tchlp52;
 
-{$mode objfpc}
+{$ifdef fpc}
+  {$mode objfpc}
+{$endif}
 
 type
   TObjectHelper = class helper for TObject

tests/test/tchlp53.pp

@@ -1,9 +1,10 @@
-{ %NORUN } { or fail? }
+{ %NORUN }
 
+{ method modifiers of the extended class are completly irrelevant }
 program tchlp53;
 
 {$ifdef fpc}
-  {$mode objfpc}
+  {$mode delphi}
 {$endif}
 
 type

tests/test/tchlp54.pp

@@ -0,0 +1,33 @@
+{ tests whether the methods of a parent helper are usable in a derived helper }
+program tchlp54;
+
+{$ifdef fpc}
+  {$mode objfpc}
+{$endif}
+{$apptype console}
+
+type
+  TFoo = class
+
+  end;
+
+  TFooHelper = class helper for TFoo
+    procedure Test;
+  end;
+
+  TFooBarHelper = class helper(TFooHelper) for TFoo
+    procedure AccessTest;
+  end;
+
+procedure TFooHelper.Test;
+begin
+
+end;
+
+procedure TFooBarHelper.AccessTest;
+begin
+  Test;
+end;
+
+begin
+end.

tests/test/tchlp55.pp

@@ -0,0 +1,26 @@
+program tchlp55;
+
+{$ifdef fpc}
+  {$mode objfpc}
+{$endif}
+
+type
+  TTest = class
+  strict private
+    type
+      TFooHelper = class helper for TObject
+        procedure Test;
+      end;
+  end;
+
+procedure TTest.TFooHelper.Test;
+begin
+
+end;
+
+var
+  o: TObject;
+begin
+  o := TObject.Create;
+  o.Test;
+end.

tests/test/tchlp56.pp

@@ -0,0 +1,34 @@
+{ %NORUN }
+
+{ for helpers Self always refers to the extended class }
+program tchlp56;
+
+{$ifdef fpc}
+  {$mode objfpc}
+{$endif}
+
+type
+  TFoo = class
+    procedure DoFoo(aFoo: TFoo);
+  end;
+
+  TFooHelper = class helper for TFoo
+    procedure Test;
+  end;
+
+procedure TFoo.DoFoo(aFoo: TFoo);
+begin
+
+end;
+
+procedure TFooHelper.Test;
+begin
+  DoFoo(Self);
+end;
+
+var
+  f: TFoo;
+begin
+  f := TFoo.Create;
+  f.Test;
+end.

tests/test/tchlp57.pp

@@ -0,0 +1,30 @@
+{ %NORUN }
+
+{ a class helper can already be accessed when implementing a class' methods }
+program tchlp57;
+
+{$ifdef fpc}
+  {$mode objfpc}
+{$endif}
+
+type
+  TFoo = class
+    procedure Test;
+  end;
+
+  TFooHelper = class helper for TFoo
+    procedure Bar;
+  end;
+
+procedure TFoo.Test;
+begin
+  Bar;
+end;
+
+procedure TFooHelper.Bar;
+begin
+
+end;
+
+begin
+end.

tests/test/tchlp58.pp

@@ -0,0 +1,31 @@
+{ %NORUN }
+
+{ tests whether class helpers can introduce properties }
+program tchlp58;
+
+{$ifdef fpc}
+  {$mode delphi}
+{$endif}
+{$apptype console}
+
+type
+  TFoo = class
+    Test: Integer;
+  end;
+
+  TFooHelper = class helper for TFoo
+    function GetAccessTest: Integer;
+    property AccessTest: Integer read GetAccessTest;
+  end;
+
+function TFooHelper.GetAccessTest: Integer;
+begin
+  Result := Test;
+end;
+
+var
+  f: TFoo;
+begin
+  f := TFoo.Create;
+  f.AccessTest;
+end.

tests/test/tchlp59.pp

@@ -0,0 +1,23 @@
+{ %FAIL }
+
+{ inside a helper's declaration the methods/fields of the extended class can't
+  be accessed }
+program tchlp59;
+
+{$ifdef fpc}
+  {$mode delphi}
+{$endif}
+{$apptype console}
+
+type
+  TFoo = class
+    Test: Integer;
+    function GetTest: Integer;
+  end;
+
+  TFooHelper = class helper for TFoo
+    property AccessTest: Integer read Test;
+  end;
+
+begin
+end.

tests/test/uchlp50.pp

@@ -1,6 +1,8 @@
 unit uchlp50; 
 
-{$mode objfpc}{$H+}
+{$ifdef fpc}
+  {$mode objfpc}{$H+}
+{$endif}
 
 interface
 
@@ -23,7 +25,7 @@ begin
   Result := 1;
 end;
 
-function TFooHelper.Test: Integer;
+function TFooHelper2.Test: Integer;
 begin
   Result := 2;
 end;

tests/test/uchlp51a.pp

@@ -1,6 +1,8 @@
 unit uchlp51a;
 
-{$mode objfpc}{$H+}
+{$ifdef fpc}
+  {$mode objfpc}{$H+}
+{$endif}
 
 interface