Added test for ServiceUtils.logAndRethrow

framework/default/ortoo-core/default/classes/utils/ServiceUtils.cls

@@ -3,25 +3,39 @@
  *
  * @group Utils
  */
- // TODO: test
 public class ServiceUtils
 {
 	/**
 	 * Logs the given exception using the LoggerService, strips the context (if it's an Ortoo Exception)
-	 * and then rethrows the exception
+	 * and then rethrows the exception.
+	 *
+	 * Note: will not log Exceptions.ValidationException
 	 *
 	 * @param	Exception	The exception to log
 	 */
 	public static void logAndRethrow( Exception exceptionToLog )
 	{
 		Contract.requires( exceptionToLog != null, 'logAndRethrow called with a null exceptionToLog' );
 
-		LoggerService.log( exceptionToLog );
+		if ( shouldBeLogged( exceptionToLog ) )
+		{
+			LoggerService.log( exceptionToLog );
+		}
+
+		stripContexts( exceptionToLog );
+		throw exceptionToLog;
+	}
 
+	private static Boolean shouldBeLogged( Exception exceptionToLog )
+	{
+		return ! (exceptionToLog instanceOf Exceptions.ValidationException);
+	}
+
+	private static void stripContexts( Exception exceptionToLog )
+	{
 		if ( exceptionToLog instanceOf ortoo_Exception )
 		{
 			((ortoo_Exception)exceptionToLog).stripContexts();
 		}
-		throw exceptionToLog;
 	}
 }

framework/default/ortoo-core/default/classes/utils/tests/ServiceUtilsTest.cls

@@ -0,0 +1,81 @@
+@isTest
+private without sharing class ServiceUtilsTest
+{
+	@isTest
+	private static void logAndRethrow_whenGivenAStandardException_logsItAndRethrowsIt() // NOPMD: Test method name format
+	{
+		TestLoggerUtils.switchLoggingOn();
+		TestLoggerService logger = TestLoggerUtils.registerTestLoggerService();
+
+		DmlException exceptionToLog = new DmlException( 'The exception to log' );
+		Exception exceptionCaught;
+
+		Test.startTest();
+			try
+			{
+				ServiceUtils.logAndRethrow( exceptionToLog );
+			}
+			catch( Exception e )
+			{
+				exceptionCaught = e;
+			}
+		Test.stopTest();
+
+		logger.assertNumberOfLogCalls( 1, 'logAndRethrow, when given an exception, will log it with the logger service' );
+		System.assertEquals( exceptionCaught, exceptionToLog, 'logAndRethrow, when given an exception, will rethrow it' );
+	}
+
+	@isTest
+	private static void logAndRethrow_whenGivenAnOrtooException_logsItStripsItAndRethrowsIt() // NOPMD: Test method name format
+	{
+		TestLoggerUtils.switchLoggingOn();
+		TestLoggerService logger = TestLoggerUtils.registerTestLoggerService();
+
+		Amoss_Instance exceptionController = new Amoss_Instance( ortoo_Exception.class );
+		exceptionController
+			.expects( 'stripContexts' );
+
+		Exception exceptionToLog = (Exception)exceptionController.getDouble();
+		Exception exceptionCaught;
+
+		Test.startTest();
+			try
+			{
+				ServiceUtils.logAndRethrow( exceptionToLog );
+			}
+			catch( Exception e )
+			{
+				exceptionCaught = e;
+			}
+		Test.stopTest();
+
+		logger.assertNumberOfLogCalls( 1, 'logAndRethrow, when given an ortoo exception, will log it with the logger service' );
+		System.assertEquals( String.valueOf( exceptionCaught ), String.valueOf( exceptionToLog ), 'logAndRethrow, when given an ortoo exception, will rethrow it' );
+
+		exceptionController.verify();
+	}
+
+	@isTest
+	private static void logAndRethrow_whenGivenAValidationException_willNotLogIt() // NOPMD: Test method name format
+	{
+		TestLoggerUtils.switchLoggingOn();
+		TestLoggerService logger = TestLoggerUtils.registerTestLoggerService();
+
+		Exception exceptionToLog = new Exceptions.ValidationException( 'ValidationFailed' );
+		Exception exceptionCaught;
+
+		Test.startTest();
+			try
+			{
+				ServiceUtils.logAndRethrow( exceptionToLog );
+			}
+			catch( Exception e )
+			{
+				exceptionCaught = e;
+			}
+		Test.stopTest();
+
+		logger.assertNumberOfLogCalls( 0, 'logAndRethrow, when given an ortoo validation exception, will not log it' );
+		System.assertEquals( String.valueOf( exceptionCaught ), String.valueOf( exceptionToLog ), 'logAndRethrow, when given an ortoo validation exception, will rethrow it' );
+	}
+}

framework/default/ortoo-core/default/classes/utils/tests/ServiceUtilsTest.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>52.0</apiVersion>
+    <status>Active</status>
+</ApexClass>