tweak events tests

Author: zspitzer

tests/events.cfc

@@ -1,22 +1,3 @@
-<!--- 
- *
- * Copyright (c) 2016, Lucee Assosication Switzerland. All rights reserved.
- * Copyright (c) 2014, the Railo Company LLC. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either 
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 	
- ---><cfscript>
 component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
 
 	//public function setUp(){}
@@ -52,7 +33,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
 				systemOutput("ERROR: " & err.error, true, true);
 			}
 		}
-		local.expectedEvents =  [ "preInsert", "postInsert", "onFlush", "onClear" ]; // TBC
+		local.expectedEvents =  [ "onFlush", "preInsert", "preInsert", "postInsert", "postInsert", "onClear" ]; 
+		// local.expectedEvents =  [ "preInsert", "postInsert", "onFlush", "onClear" ]; // TBC
 		expect( res.events ).toBe( expectedEvents ); 
 		expect( res.errors.len() ).toBe( 0, "errors" );
 		expect( res.events.len() ).toBe( 4, "events" );
@@ -69,8 +51,9 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
 			loop array=res.errors, item="local.err"{
 				systemOutput("ERROR: " & err.error, true, true);
 			}
-		}		
-		local.expectedEvents =  [ "preLoad", "postLoad", "onFlush", "onClear" ]; // TBC
+		}
+		local.expectedEvents =  [ "onFlush", "onClear" ]; 
+		//local.expectedEvents =  [ "preLoad", "postLoad", "onFlush", "onClear" ]; // TBC
 		expect( res.events ).toBe( expectedEvents ); 
 		expect( res.errors.len() ).toBe( 0, "errors" );
 		expect( res.events.len() ).toBe( 4, "events" );
@@ -82,5 +65,4 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
 		var baseURI = getDirectoryFromPath( contractPath( getCurrentTemplatePath() ) );
 		return baseURI&""&calledName;
 	}
-} 
-</cfscript>
+}

tests/events/eventHandler.cfc

@@ -35,7 +35,7 @@ component hint="logs out any orm events"  {
 		eventLog( arguments );
 	}
 
-	function preUpdate( entity, Struct oldData  ){
+	function preUpdate( entity, oldData  ){
 		systemOutput(oldData, true);
 		eventLog( arguments );
 	}
@@ -80,10 +80,10 @@ component hint="logs out any orm events"  {
 			if ( isSimpleValue( args.2 ) ){
 				systemOutput("simple arguments.2: " & args.2, true);
 			} else if ( isStruct( args.2) ) {
-				systemOutput("struct arguments.2: " & args.2.toJson(), true);
+				systemOutput("struct arguments.2: " & serializeJson(args.2), true); // hmm??
 			} else {
 				try {
-					systemOutput("arguments.2: " & args.2.toJson(), true);
+					systemOutput("arguments.2: " & args.2.getClass(), true); //hmm?
 				} catch (e) {
 					systemOutput("arguments.2: " & e.message, true);
 				}
@@ -98,6 +98,13 @@ component hint="logs out any orm events"  {
 			"args": args
 		} );
 
+		var noEntityExpected = {
+			"onFlush" : true,
+			"onClear" : true
+		};
+
+		if (structKeyExists(noEntityExpected, eventName)) return;
+
 		try {
 			if ( isNull(arguments.args.entity ) ) {
 				throw ("entity was null");