cleanup disabled tests

Xcreen · Jul 29, 2024 · bc285ee · bc285ee
1 parent b461f97
commit bc285ee
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 42 deletions.
diff --git a/test/tickets/LDEV1202/Test.lucee b/test/tickets/LDEV1202/Test.lucee
diff --git a/test/tickets/LDEV1323/Application.cfc b/test/tickets/LDEV1323/Application.cfc
@@ -1,5 +1,5 @@
 component {
-	this.name = "test3";
+	this.name = "ldev1323";
 	mySQL= getCredentials();
 	this.datasource = {
 		 type: "mysql"

diff --git a/test/tickets/LDEV1440/Application.cfc b/test/tickets/LDEV1440/Application.cfc
@@ -1,5 +1,5 @@
 component {
-	this.name =	"test";
+	this.name =	"ldev1440";
 	mySQL = getCredentials();
 	this.datasource = mySQL;
 
@@ -10,13 +10,13 @@ component {
 
 	function onApplicationStart(){
 		query{
-			echo("DROP TABLE IF EXISTS usersDetails");
+			echo("DROP TABLE IF EXISTS ldev1440");
 		}
 		query{
-			echo("CREATE TABLE usersDetails( id INT , name VARCHAR(30) )");
+			echo("CREATE TABLE ldev1440( id INT , name VARCHAR(30) )");
 		}
 		query{
-			echo("INSERT INTO usersDetails VALUES(1,'micha'), (2, 'lucee')");
+			echo("INSERT INTO ldev1440 VALUES(1,'micha'), (2, 'lucee')");
 		}
 	}
 

diff --git a/test/tickets/LDEV1440/test.cfm b/test/tickets/LDEV1440/test.cfm
@@ -1,5 +1,5 @@
 <cfquery name="qry">
-	select name, name from usersDetails
+	select name, name from ldev1440
 </cfquery>
 <cfoutput>
    #ListLen(qry.ColumnList)#

diff --git a/test/tickets/_LDEV0153.cfc b/test/tickets/_LDEV0153.cfc
@@ -22,8 +22,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="http" {
 
 	public void function test(){
 		http url="#variables.updateProvider#/rest/update/provider/echoGet?filtername=henk+patat" result="local.res";
-		res=evaluate(res.filecontent);
-		assertEquals("henk patat",res.url.filtername);
+		res=deserializeJSON(res.filecontent);
+		assertEquals("henk patat",res.url.filtername); // comes back as henk+patat ???
 	}
 
 

diff --git a/test/tickets/_LDEV0155.cfc b/test/tickets/_LDEV0155.cfc
@@ -57,8 +57,8 @@
 
 	<!--- private functions --->
 	<cffunction name="maxrow1" access="private">
-		<cfset countofManager = 0>
-		<cfset listofEmployees = 0>
+		<cfset var countofManager = 0>
+		<cfset var listofEmployees = 0>
 		<cfoutput  query="resultQuery" group="Manager" maxrows="1">
 			<cfset countofManager++>
 			<cfoutput>
@@ -68,8 +68,8 @@
 		<cfset expect(countofManager EQ 1 && listofEmployees EQ 2).toBeTrue()>
 	</cffunction>
 	<cffunction name="maxrow2" access="private">
-		<cfset countofManager = 0>
-		<cfset listofEmployees = 0>
+		<cfset var countofManager = 0>
+		<cfset var listofEmployees = 0>
 		<cfoutput  query="resultQuery" group="Manager" maxrows="2">
 			<cfset countofManager++>
 			<cfoutput>
@@ -79,8 +79,8 @@
 		<cfset expect(countofManager EQ 2 && listofEmployees EQ 4).toBeTrue()>
 	</cffunction>
 	<cffunction name="maxrow3" access="private">
-		<cfset countofManager = 0>
-		<cfset listofEmployees = 0>
+		<cfset var countofManager = 0>
+		<cfset var listofEmployees = 0>
 		<cfoutput  query="resultQuery" group="Manager" maxrows="3">
 			<cfset countofManager++>
 			<cfoutput>
@@ -90,8 +90,8 @@
 		<cfset expect(countofManager EQ 3 && listofEmployees EQ 6).toBeTrue()>
 	</cffunction>
 	<cffunction name="maxrow4" access="private">
-		<cfset countofManager = 0>
-		<cfset listofEmployees = 0>
+		<cfset var countofManager = 0>
+		<cfset var listofEmployees = 0>
 		<cfoutput  query="resultQuery" group="Manager" maxrows="4">
 			<cfset countofManager++>
 			<cfoutput>

diff --git a/test/tickets/_LDEV1197.cfc b/test/tickets/_LDEV1197.cfc
@@ -1,7 +1,7 @@
 component extends="org.lucee.cfml.test.LuceeTestCase"{
 	function beforeAll(){
-		variables.serveradmin = "password";
-		variables.Webadmin = "password";
+		variables.serveradmin = server.SERVERADMINPASSWORD;
+		variables.Webadmin = server.WEBADMINPASSWORD;
 		variables.uri = createURI("LDEV1197");
 		createMapping();
 	}
@@ -54,7 +54,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
 	private string function createMapping(){
 		 admin
 			action="updateMapping"
-			type="web"
+			type="server"
 			password="#variables.Webadmin#"
 
 			virtual="/w1197"

diff --git a/test/tickets/_LDEV1202.cfc b/test/tickets/_LDEV1202.cfc
@@ -21,26 +21,16 @@ LDEV-273
 
  ---><cfscript>
 component extends="org.lucee.cfml.test.LuceeTestCase"	{
-
 
 	public void function testCFMLElvis() {
 		var c=new LDEV1202.Test2();
 		assertEquals("",c.elvis());
 	}
 
-	public void function testLuceeElvis() {
-		var c=new LDEV1202.Test();
-		assertEquals("",c.elvis());
-	}
 
 	public void function testCFMLIsNull() {
 		var c=new LDEV1202.Test2();
 		assertTrue(c.isItNull());
 	}
-
-	public void function testLuceeIsNull() {
-		var c=new LDEV1202.Test();
-		assertTrue(c.isItNull());
-	}
 } 
 </cfscript>
diff --git a/test/tickets/_LDEV1440.cfc b/test/tickets/_LDEV1440.cfc
@@ -11,7 +11,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="mysql" {
 
 	function run( testResults , testBox ) {
 		describe( title="Test suite for LDEV-1440", body=function() {
-			it( title='Checking cfquery with duplicate column',skip=isNotSupported(),body=function( currentSpec ) {
+			it( title='Checking cfquery with duplicate column names (WONTFIX)',skip=isNotSupported(),body=function( currentSpec ) {
 				var uri = createURI("LDEV1440");
 				var result = _InternalRequest(
 					template:"#uri#/test.cfm"

diff --git a/test/tickets/_LDEV1445.cfc b/test/tickets/_LDEV1445.cfc
@@ -4,6 +4,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase"  labels="mysql" {
 		variables.mySQL= getCredentials();
 		// Admin password
 		variables.adminPassword = request.WEBADMINPASSWORD;
+
+		systemOutput(variables.mySQL, true);
 
 		return structisEmpty(variables.mySQL);
 	}
@@ -51,6 +53,6 @@ component extends="org.lucee.cfml.test.LuceeTestCase"  labels="mysql" {
 	}
 
 	private struct function getCredentials() {
-		return server.getDatasource("mysql");
+		return server.getDatasource(service="mysql", onlyConfig=true);
 	}
 }