build: update tests with hasOrm skips

Author: zspitzer

test/tickets/LDEV3430.cfc

@@ -4,42 +4,42 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
     }
     function run( testResults, testBox ) {
         describe("Testcase for LDEV-3430", function() {
-            it( title="ORMExecuteQuery() with positional argument(hql)", body=function( currentSpec ){
+            it( title="ORMExecuteQuery() with positional argument(hql)", skip=noOrm(), body=function( currentSpec ){
                 local.result = _InternalRequest(
                     template : "#uri#\test.cfm",
                     forms : { Scene = 1 }
                 );
                 expect(trim(result.filecontent)).toBeTrue();
             });
-            it( title="ORMExecuteQuery() with positional arguments(hql, params, unique, queryOptions)", body=function( currentSpec ){
+            it( title="ORMExecuteQuery() with positional arguments(hql, params, unique, queryOptions)", skip=noOrm(), body=function( currentSpec ){
                 local.result = _InternalRequest(
                     template : "#uri#\test.cfm",
                     forms : { Scene = 2 }
                 );
                 expect(trim(result.filecontent)).toBeTrue();
             });
-            it( title="ORMExecuteQuery() with named arguments(hql, params, unique, queryOptions)", body=function( currentSpec ){
+            it( title="ORMExecuteQuery() with named arguments(hql, params, unique, queryOptions)", skip=noOrm(), body=function( currentSpec ){
                 local.result = _InternalRequest(
                     template : "#uri#\test.cfm",
                     forms : { Scene = 3 }
                 );
                 expect(trim(result.filecontent)).toBeTrue();
             });
-            it( title="ORMExecuteQuery() with named argument(hql)", body=function( currentSpec ){
+            it( title="ORMExecuteQuery() with named argument(hql)", skip=noOrm(), body=function( currentSpec ){
                 local.result = _InternalRequest(
                     template : "#uri#\test.cfm",
                     forms : { Scene = 4 }
                 );
                 expect(trim(result.filecontent)).toBeTrue();
             });
-            it( title="ORMExecuteQuery() with named arguments(hql, params)", body=function( currentSpec ){
+            it( title="ORMExecuteQuery() with named arguments(hql, params)", skip=noOrm(), body=function( currentSpec ){
                 local.result = _InternalRequest(
                     template : "#uri#\test.cfm",
                     forms : { Scene = 5 }
                 );
                 expect(trim(result.filecontent)).toBeTrue();
             });
-            it( title="ORMExecuteQuery() with named arguments(hql, params, unique)", body=function( currentSpec ){
+            it( title="ORMExecuteQuery() with named arguments(hql, params, unique)", skip=noOrm(), body=function( currentSpec ){
                 local.result = _InternalRequest(
                     template : "#uri#\test.cfm",
                     forms : { Scene = 6 }
@@ -48,6 +48,10 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
             });
         });
     }
+    private function noOrm() {
+        return ( structCount( server.getTestService("orm") ) eq 0 );
+    }
+
     private string function createURI(string calledName){
         var baseURI = "/test/#listLast(getDirectoryFromPath(getCurrenttemplatepath()),"\/")#/";
         return baseURI&""&calledName;

test/tickets/LDEV3860.cfc

@@ -83,7 +83,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="sas" {
     }
 
     private boolean function isDatasourceNotConfigured(){
-        return !structCount(server.getDatasource("mssql"));
+        return !structCount(server.getDatasource("mssql")) || !structCount( server.getTestService("orm") );
     } 
 
     private string function createURI(string calledName) {

test/tickets/LDEV5459.cfc

@@ -4,8 +4,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
 
 		describe( title='LDEV-5459' , body=function(){
 
-			// this test case can be removed in case the class get missing in the future 
-			it( title='missing object', body=function() {
+			// this test case can be removed in case the class get missing in the future
+			it( title='missing object', skip=noOrm(), body=function() {
 				var type = "org.hibernate.criterion.Restrictions";// must be a class with no empty constructor
 				var obj = createObject( "java", type );
 				expect( obj.getClass().getName() ).toBe( type );
@@ -101,5 +101,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
 
 	}
 
+	private function noOrm() {
+		return ( structCount( server.getTestService( "orm" ) ) eq 0 );
+	}
 
 }

test/tickets/LDEV6003.cfc

@@ -36,7 +36,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="orm" {
 	}
 
 	private function notHasMssql() {
-		return structCount( server.getDatasource( "mssql" ) ) == 0;
+		return structCount( server.getDatasource( "mssql" ) ) == 0 || structCount( server.getTestService( "orm" ) ) == 0;
 	}
 
 	private string function createURI( string calledName ) {