more boxlang prime

Author: lmajano

system/runners/BDDRunner.cfc

@@ -42,7 +42,8 @@ component
 	){
 		// Get target metadata
 		var targetMD   = getMetadata( arguments.target );
-		var bundleName = ( structKeyExists( targetMD, "displayName" ) ? targetMD.displayname : targetMD.name );
+		var tartetAnnotations = targetMD.keyExists( "annotations" ) ? targetMD.annotations : targetMD;
+		var bundleName = ( structKeyExists( tartetAnnotations, "displayName" ) ? tartetAnnotations.displayname : targetMD.name );
 
 		// Execute the suite descriptors
 		arguments.target.run( testResults = arguments.testResults, testbox = variables.testbox );
@@ -71,7 +72,7 @@ component
 				// find any methods annotated 'beforeAll' and execute them
 				var beforeAllAnnotationMethods = variables.testbox
 					.getUtility()
-					.getAnnotatedMethods( annotation = "beforeAll", metadata = getMetadata( arguments.target ) );
+					.getAnnotatedMethods( annotation = "beforeAll", metadata = targetMD );
 
 				for ( var beforeAllMethod in beforeAllAnnotationMethods ) {
 					invoke( arguments.target, "#beforeAllMethod.name#" );
@@ -134,7 +135,7 @@ component
 				// find any methods annotated 'afterAll' and execute them
 				var afterAllAnnotationMethods = variables.testbox
 					.getUtility()
-					.getAnnotatedMethods( annotation = "afterAll", metadata = getMetadata( arguments.target ) );
+					.getAnnotatedMethods( annotation = "afterAll", metadata = targetMD );
 
 				for ( var afterAllMethod in afterAllAnnotationMethods ) {
 					invoke( arguments.target, "#afterAllMethod.name#" );