Added ability to get the current test name in a test

Author: vincentparrett

Source/DUnitX.DUnitCompatibility.pas

@@ -45,6 +45,7 @@   TTestCase = class
   protected
     procedure SetUp; virtual;
     procedure TearDown; virtual;
+    function TestName : string;
   public
     procedure Check(const condition: Boolean; const msg: string = '');deprecated  'Use DUnitX.Assert class';
     procedure CheckTrue(const condition: Boolean; const msg: string = '');deprecated  'Use DUnitX.Assert class';
@@ -153,6 +154,11 @@ procedure TTestCase.CheckTrue(const condition: Boolean; const msg: string);
   Assert.IsTrue(condition,msg);
 end;
 
+function TTestCase.TestName: string;
+begin
+  result := TDUnitXTestRunner.GetCurrentTestName;
+end;
+
 procedure TTestCase.SetUp;
 begin
 

Source/DUnitX.TestFramework.pas

@@ -490,6 +490,8 @@   TTestFixtureInfoList = class(TDUnitXList<ITestFixtureInfo>, ITestFixtureInfoLi
     function GetFailsOnNoAsserts : boolean;
     procedure SetFailsOnNoAsserts(const value : boolean);
 
+    function CurrentTestName : string;
+
     //This is exposed for the GUI Runner cast as ITestFixtureList.
     function BuildFixtures : IInterface;
 
@@ -503,7 +505,6 @@   TTestFixtureInfoList = class(TDUnitXList<ITestFixtureInfo>, ITestFixtureInfoLi
     procedure WriteLn(const msg : string);overload;
     procedure WriteLn;overload;
 
-
     ///	<summary>
     ///	  When true, test fixtures will be found by using RTTI to search for
     ///	  classes decorated as TestFixtures.  Note for this to work you may

Source/DUnitX.TestRunner.pas

@@ -68,7 +68,7 @@   TDUnitXTestRunner = class(TWeakReferencedObject, ITestRunner)
     FLogMessagesEx    : TLogMessageArray;
 
     FFailsOnNoAsserts : boolean;
-
+    FCurrentTestName  : string;
   protected
     procedure CountAndFilterTests(const fixtureList: ITestFixtureList; var count, active: Cardinal);
     //Logger calls - sequence ordered
@@ -142,6 +142,7 @@   TDUnitXTestRunner = class(TWeakReferencedObject, ITestRunner)
     //redirects WriteLn to our loggers.
     procedure WriteLn(const msg: string); overload;
     procedure WriteLn; overload;
+    function CurrentTestName : string;
 
     //internals
     procedure RTTIDiscoverFixtureClasses;
@@ -162,6 +163,7 @@   TDUnitXTestRunner = class(TWeakReferencedObject, ITestRunner)
     constructor Create(const AListeners: array of ITestLogger); overload;
     destructor Destroy; override;
     class function GetActiveRunner: ITestRunner;
+    class function GetCurrentTestName : string;
   end;
 
 implementation
@@ -378,6 +380,11 @@ function TDUnitXTestRunner.CreateFixture(const AInstance : TObject;const AFixtur
 end;
 
 
+function TDUnitXTestRunner.CurrentTestName: string;
+begin
+  result := FCurrentTestName;
+end;
+
 destructor TDUnitXTestRunner.Destroy;
 var
   tId: TThreadID;
@@ -632,6 +639,15 @@ class function TDUnitXTestRunner.GetActiveRunner: ITestRunner;
     result := ref.Data;
 end;
 
+class function TDUnitXTestRunner.GetCurrentTestName: string;
+var
+  runner : ITestRunner;
+begin
+  runner := GetActiveRunner;
+  if runner <> nil then
+    result := runner.CurrentTestName;
+end;
+
 function TDUnitXTestRunner.GetFailsOnNoAsserts: boolean;
 begin
   Result := FFailsOnNoAsserts;
@@ -745,27 +761,32 @@ function TDUnitXTestRunner.ExecuteTest(const context: ITestExecuteContext; const
   begin
     FLogMessages.Clear;
     SetLength(FLogMessagesEx, 0);
-    Self.Loggers_ExecuteTest(threadId, test as ITestInfo);
-    assertBeforeCount := 0;//to shut the compiler up;
-    if FFailsOnNoAsserts then
-      assertBeforeCount := TDUnitX.GetAssertCount(threadId);
-    memoryAllocationProvider.PreTest;
+    FCurrentTestName := test.Name;
     try
-      testExecute.Execute(context);
-    finally
-      memoryAllocationProvider.PostTest;
-    end;
+      Self.Loggers_ExecuteTest(threadId, test as ITestInfo);
+      assertBeforeCount := 0;//to shut the compiler up;
+      if FFailsOnNoAsserts then
+        assertBeforeCount := TDUnitX.GetAssertCount(threadId);
+      memoryAllocationProvider.PreTest;
+      try
+        testExecute.Execute(context);
+      finally
+        memoryAllocationProvider.PostTest;
+      end;
 
-    if FFailsOnNoAsserts then
-    begin
-      assertAfterCount := TDUnitX.GetAssertCount(threadId);
-      if (assertBeforeCount = assertAfterCount)  then
-        raise ENoAssertionsMade.Create(SNoAssertions);
-    end;
+      if FFailsOnNoAsserts then
+      begin
+        assertAfterCount := TDUnitX.GetAssertCount(threadId);
+        if (assertBeforeCount = assertAfterCount)  then
+          raise ENoAssertionsMade.Create(SNoAssertions);
+      end;
 
-    Result := ExecuteSuccessfulResult(context, threadId, test, FLogMessages.Text, FLogMessagesEx);
-    FLogMessages.Clear;
-    SetLength(FLogMessagesEx, 0);
+      Result := ExecuteSuccessfulResult(context, threadId, test, FLogMessages.Text, FLogMessagesEx);
+      FLogMessages.Clear;
+      SetLength(FLogMessagesEx, 0);
+    finally
+      FCurrentTestName := '';
+    end;
   end
   else
   begin

Tests/DUnitX.Tests.DUnitCompatibility.pas

@@ -48,6 +48,7 @@   TMyDUnitTestSetup = class(TTestCase)
     procedure TearDown; override;
   published
     procedure ATest;
+    procedure Test_TestName;
   end;
 
 
@@ -84,6 +85,12 @@ procedure TMyDUnitTestSetup.TearDown;
   inherited;
 end;
 
+procedure TMyDUnitTestSetup.Test_TestName;
+begin
+  Status('The Test Name is : ' + Self.TestName);
+  CheckEqualsString('Test_TestName', Self.TestName,'TestName not working');
+end;
+
 initialization
   TDUnitX.RegisterTestFixture(TMyDUnitTest);
   TDUnitX.RegisterTestFixture(TMyDUnitTestSetup);