Enhanced auto generated apex test failure logic

See
#1
22

rolluptool/src/classes/RollupController.cls

@@ -121,6 +121,12 @@ public with sharing class RollupController
 			// Display currently deployed code for confirmation
 			return RollupTriggerTest.Body; 
 		else
+		{
+			// Namespace?
+			Schema.DescribeSObjectResult describe = LookupRollupSummary__c.sObjectType.getDescribe();
+			String name = describe.getName();
+			String localName = describe.getLocalName();
+			String namespace = name.removeEnd(localName).removeEnd('__');					
 			// Deploy generated code
 			return
 			 	'/**\n' +
@@ -131,10 +137,11 @@ public with sharing class RollupController
 				'{\n' + 
 				'    private static testmethod void testTrigger()\n' +
 				'    {\n' + 
-				'        // Code to cover the one line trigger, the method called has been tested separately by the packaged tests.\n' +
-				'        try { insert new ' + RollupSummary.ChildObject__c + '(); } catch(Exception e) { }\n' +
+				'        // Force the ' + RollupTriggerName + ' to be invoked, fails the test if org config or other Apex code prevents this.\n' +
+				'        ' + (namespace.length() > 0 ? namespace + '.' : '') + 'RollupService.testHandler(new ' + RollupSummary.ChildObject__c + '());\n'+
 				'    }\n' +
-				'}';
+				'}';			
+		}
 	}
 
 	public String getTriggerCodeMetadata()

rolluptool/src/classes/RollupControllerTest.cls

@@ -177,8 +177,8 @@ private with sharing class RollupControllerTest
 				'{\n' + 
 				'    private static testmethod void testTrigger()\n' +
 				'    {\n' + 
-				'        // Code to cover the one line trigger, the method called has been tested separately by the packaged tests.\n' +
-				'        try { insert new ' + rollupSummary.ChildObject__c + '(); } catch(Exception e) { }\n' +
+				'        // Force the ' + controller.RollupTriggerName + ' to be invoked, fails the test if org config or other Apex code prevents this.\n' +
+				'        dlrs.RollupService.testHandler(new ' + rollupSummary.ChildObject__c + '());\n' +
 				'    }\n' +
 				'}', controller.getTriggerTestCode());
 		System.assertEquals(

rolluptool/src/classes/RollupService.cls

@@ -211,13 +211,36 @@ global with sharing class RollupService
 		}
 		return masterRecords.values();
 	}
+
+	/**
+	 * Apex Test handler (call from Apex Test only)
+	 **/
+	global static void testHandler(SObject dummyChildRecord) 
+	{
+		try {
+			insert dummyChildRecord;
+		} catch (Exception e) {
+			// If the auto generated trigger was invoked this test served its purpose (code coverage wise) ignore this error
+			if(triggerHandleInvoked)
+				return;
+			// Otherwise fail the test with the underlying exception as it prevented our trigger being invoked
+			throw e;
+		}
+	}
 
+	/**
+	 * Used in a test context to determine if errors from the dummy child insert should fail the test
+	 **/
+	private static boolean triggerHandleInvoked = false;
+
 	/**
 	 * Apex Trigger helper, automatically resolves child records to process via LREngine and lookups described in LookupRollupSummary__c
 	 *    also determines if based on the old trigger records if the rollup processing needs to occur
 	 **/
 	global static void triggerHandler()
 	{
+		triggerHandleInvoked = true;
+
 		// Currently no processing in the before phase
 		if(Trigger.isBefore)
 			return;