diff --git a/core/ormcaselog.class.inc.php b/core/ormcaselog.class.inc.php
index ab0ff03fa..11b58bc0c 100644
--- a/core/ormcaselog.class.inc.php
+++ b/core/ormcaselog.class.inc.php
@@ -168,7 +168,6 @@ class ormCaseLog {
 		return $aEntries;
 	}
 
-
 	/**
 	 * Returns a "plain text" version of the log (equivalent to $this->m_sLog) where all the HTML markup from the 'html' entries have been removed
 	 * @return string
@@ -201,6 +200,15 @@ class ormCaseLog {
     {
         return ($this->m_sLog === null);
     }
+
+	/**
+	 * @return int The number of entries in this log
+	 * @since 3.0.0
+	 */
+    public function GetEntryCount(): int
+    {
+    	return count($this->m_aIndex);
+    }
 	
 	public function ClearModifiedFlag()
 	{
@@ -570,7 +578,6 @@ class ormCaseLog {
 		$this->m_bModified = true;
 	}
 
-
 	public function AddLogEntryFromJSON($oJson, $bCheckUserId = true)
 	{
 		if (isset($oJson->user_id))
@@ -647,7 +654,6 @@ class ormCaseLog {
 		$this->m_bModified = true;
 	}
 
-
 	public function GetModifiedEntry($sFormat = 'text')
 	{
 		$sModifiedEntry = '';
@@ -726,4 +732,3 @@ class ormCaseLog {
 		return $sText;
 	}
 }
-?>
\ No newline at end of file
diff --git a/test/core/ormCaseLogTest.php b/test/core/ormCaseLogTest.php
new file mode 100644
index 000000000..60b7141e5
--- /dev/null
+++ b/test/core/ormCaseLogTest.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use ormCaseLog;
+
+
+/**
+ * Tests of the ormCaseLog class
+ *
+ * @covers \ormCaseLog
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class ormCaseLogTest extends ItopDataTestCase
+{
+	/**
+	 * @covers \ormCaseLog::GetEntryCount()
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \OQLException
+	 */
+	public function testGetEntryCount()
+	{
+		// New log, with no entry
+		$oLog = new ormCaseLog();
+		$this->assertEquals($oLog->GetEntryCount(), 0, 'Should be no entry yet, returned '.$oLog->GetEntryCount());
+
+		// Add an entry
+		$oLog->AddLogEntry('First entry');
+		$this->assertEquals($oLog->GetEntryCount(), 1, 'Should be 1 entry, returned '.$oLog->GetEntryCount());
+	}
+}