Skip to content

test cleanup, address unscoped variables #2551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zspitzer wants to merge 2 commits into
base: 7.0
Choose a base branch
from
Open

test cleanup, address unscoped variables #2551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e784ea
test cleanup, address unscoped variables
zspitzer Apr 16, 2025
0825258
Update LDEV3998.cfc
zspitzer Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/java/resource/component/org/lucee/cfml/Administrator.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ component {
if(n EQ "Debug" or n EQ "Field" or n EQ "Group" ){
continue;
}
tmp=createObject('component',fn);
var tmp=createObject('component',fn);
drivers[trim(tmp.getId())]=tmp;
}

Expand Down Expand Up @@ -2299,7 +2299,7 @@ component {
action="getDefaultPassword"
type="#variables.type#"
password="#variables.password#"
returnVariable="defaultPassword";
returnVariable="local.defaultPassword";
return defaultPassword;
}

Expand Down Expand Up @@ -2333,7 +2333,7 @@ component {
action="hashPassword"
type="#variables.type#"
pw="#variables.password#"
returnVariable="hashedPassword";
returnVariable="local.hashedPassword";
return hashedPassword;
}

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/resource/component/org/lucee/cfml/HelperBase.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@
<!--- cfhttp --->
<cfcase value="http">

<cfhttp attributeCollection="#tagAttributes#" result="tagResult">
<cfloop array="#tagParams#" index="param">
<cfhttp attributeCollection="#tagAttributes#" result="local.tagResult">
<cfloop array="#tagParams#" index="local.param">
<cfhttpParam attributeCollection="#param#">
</cfloop>
</cfhttp>
Expand Down
4 changes: 2 additions & 2 deletions test/XmlElemNew.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
function run( testResults , testBox ) {
describe( title = "Testcase for XmlElemNew() function", body = function() {
it( title = "Checking XmlElemNew() function", body = function( currentSpec ) {
xml_document = XmlNew();
xmlelem = XmlElemNew(xml_document,"Lucee");
var xml_document = XmlNew();
var xmlelem = XmlElemNew(xml_document,"Lucee");
expect(isxmldoc(xml_document)).toBeTrue();
expect(IsXmlElem(xmlelem)).toBeTrue();
});
Expand Down
63 changes: 31 additions & 32 deletions test/components/Administrator.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// Regional
describe( title="test-Regional functions", body=function() {
beforeEach(function( currentSpec ){
getRegional = adminweb.getRegional();
variables.getRegional = adminweb.getRegional();
assertEquals(isStruct(getRegional) ,true);
});

Expand Down Expand Up @@ -80,7 +80,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// Charset
describe( title="test-Charset functions", body=function() {
beforeEach(function( currentSpec ){
getCharset = adminWeb.getCharset();
variables.getCharset = adminWeb.getCharset();
assertEquals(isStruct(getCharset) ,true);
});

Expand Down Expand Up @@ -128,7 +128,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// OutputSetting
describe( title="test-Output Setting functions", body=function() {
beforeEach(function( currentSpec ){
getOutputSetting = adminWeb.getOutputSetting();
variables.getOutputSetting = adminWeb.getOutputSetting();
assertEquals(isStruct(getOutputSetting) ,true);
});

Expand Down Expand Up @@ -187,7 +187,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// Datasource Setting
describe( title="test-dataSource setting functions", body=function() {
beforeEach(function( currentSpec ){
getDatasourceSetting = adminWeb.getDatasourceSetting();
variables.getDatasourceSetting = adminWeb.getDatasourceSetting();
assertEquals((isStruct(getDatasourceSetting) && isBoolean(getDatasourceSetting.psq)) , true);
});

Expand Down Expand Up @@ -272,7 +272,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
if(structCount(getCredentials("mysql"))) {
var datasource = adminWeb.getDatasource('TestDSN1');
assertEquals(isstruct(datasource), true);
tmpStrt.name = datasource.name;
var tmpStrt.name = datasource.name;
tmpStrt.dbusername = datasource.username;
tmpStrt.dbpassword = datasource.password;
adminWeb.verifyDatasource(argumentCollection = #tmpStrt#);
Expand Down Expand Up @@ -344,7 +344,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// Mail Setting
describe( title="test-mail setting functions", body=function() {
beforeEach(function( currentSpec ){
getMailSetting = adminWeb.getMailSetting();
variables.getMailSetting = adminWeb.getMailSetting();
assertEquals(isStruct(getMailSetting), true);
});

Expand Down Expand Up @@ -726,7 +726,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
describe( title="test CompilerSettings functions", body=function() {
beforeEach(function( currentSpec ){
if( currentSpec == 'checking getCompilerSettings()' ){
getCompilerSettings = adminWeb.getCompilerSettings();
variables.getCompilerSettings = adminWeb.getCompilerSettings();
assertEquals(isStruct(getCompilerSettings), true);
}
});
Expand Down Expand Up @@ -776,7 +776,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// Performance
describe( title="test performance functions", body=function() {
beforeEach(function( currentSpec ){
getPerformanceSettings = adminWeb.getPerformanceSettings();
variables.getPerformanceSettings = adminWeb.getPerformanceSettings();
assertEquals(isStruct(getPerformanceSettings), true);
});

Expand Down Expand Up @@ -888,14 +888,14 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// Debug
describe( title="test debugging functions", body=function() {
beforeEach(function( currentSpec ){
debugSettingList = "checking getDebugSetting(),checking updateDebugSetting(),checking resetDebugSetting()";
debugList = "checking getDebug(),checking updateDebug(),checking resetDebug()";
variables.debugSettingList = "checking getDebugSetting(),checking updateDebugSetting(),checking resetDebugSetting()";
variables.debugList = "checking getDebug(),checking updateDebug(),checking resetDebug()";
if(listFindNoCase(debugSettingList, currentSpec)){
getDebugSetting = adminWeb.getDebugSetting();
variables.getDebugSetting = adminWeb.getDebugSetting();
assertEquals(isStruct(getDebugSetting), true);
}
if(listFindNoCase(debugList, currentSpec)){
getDebug = adminWeb.getDebug();
variables.getDebug = adminWeb.getDebug();
assertEquals(isStruct(getDebug), true);
}
});
Expand Down Expand Up @@ -1071,9 +1071,9 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{

describe( title="test Tasks functions", body=function() {
beforeEach(function( currentSpec ){
taskSettingsList = "checking getTaskSetting(),checking updateTaskSetting(),checking resetTaskSetting()";
variables.taskSettingsList = "checking getTaskSetting(),checking updateTaskSetting(),checking resetTaskSetting()";
if(listFindNoCase(taskSettingsList, currentSpec)){
getTaskSetting = adminWeb.getTaskSetting();
variables.getTaskSetting = adminWeb.getTaskSetting();
assertEquals(isStruct(getTaskSetting), true);
}
});
Expand Down Expand Up @@ -1168,7 +1168,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{

describe( title="test LoginSettings functions", body=function() {
beforeEach(function( currentSpec ){
getLoginSettings = admin.getLoginSettings();
variables.getLoginSettings = admin.getLoginSettings();
assertEquals(isStruct(getLoginSettings), true);
});

Expand Down Expand Up @@ -1231,7 +1231,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// TODO failing APPLICATIONPATHTIMEOUT
describe( title="test application listener functions", skip=true, body=function() {
beforeEach(function( currentSpec ){
getApplicationListener = adminWeb.getApplicationListener();
variables.getApplicationListener = adminWeb.getApplicationListener();
// systemOutput("getApplicationListener: #getApplicationListener.toJson()#", true);
assertEquals(isStruct(getApplicationListener), true);
});
Expand Down Expand Up @@ -1269,7 +1269,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{

describe( title="test scope functions", body=function() {
beforeEach(function( currentSpec ){
getScope = adminWeb.getScope();
variables.getScope = adminWeb.getScope();
});

afterEach(function( currentSpec ){
Expand Down Expand Up @@ -1343,7 +1343,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{

describe( title="test restSettings functions", body=function() {
beforeEach(function( currentSpec ){
getRestSettings = adminWeb.getRestSettings();
variables.getRestSettings = adminWeb.getRestSettings();
assertEquals(isStruct(getRestSettings), true);
});

Expand Down Expand Up @@ -1411,7 +1411,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{

describe( title="test application functions", body=function() {
beforeEach(function( currentSpec ){
getApplicationSetting = adminWeb.getApplicationSetting();
variables.getApplicationSetting = adminWeb.getApplicationSetting();
assertEquals(isStruct(getApplicationSetting) ,true);
});

Expand Down Expand Up @@ -1459,7 +1459,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{

describe( title="test QueueSetting functions", body=function() {
beforeEach(function( currentSpec ){
getQueueSetting = admin.getQueueSetting();
variables.getQueueSetting = admin.getQueueSetting();
assertEquals(isStruct(getQueueSetting) ,true);
});

Expand Down Expand Up @@ -1526,7 +1526,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
describe( title="test CustomTag functions", body=function() {
beforeEach(function( currentSpec ){
if(currentSpec == 'checking getCustomTagSetting()'){
customTag_Setting = adminWeb.getCustomTagSetting();
variables.customTag_Setting = adminWeb.getCustomTagSetting();
}
});

Expand Down Expand Up @@ -1601,8 +1601,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
describe( title="test error functions", body=function() {
beforeEach(function( currentSpec ){
if(currentSpec == 'checking getError()'){
errorGet=adminWeb.getError();
errorTemplate = {};
variables.errorGet=adminWeb.getError();
variables.errorTemplate = {};
errorTemplate.template404 = errorGet.templates.404;
errorTemplate.template500 = errorGet.templates.500;
}
Expand Down Expand Up @@ -1651,9 +1651,9 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
describe( title="test securityManager functions", skip=true, body=function() {
beforeEach(function( currentSpec ){
if(currentSpec == 'checking createSecurityManager()'){
getConxt=admin.getContexts();
contextsSingle = QueryRowData(getConxt, 1);
getSecManager = admin.getSecurityManager(contextsSingle.id);
variables.getConxt=admin.getContexts();
variables.contextsSingle = QueryRowData(getConxt, 1);
variables.getSecManager = admin.getSecurityManager(contextsSingle.id);
}
});

Expand Down Expand Up @@ -1846,22 +1846,21 @@ component extends="org.lucee.cfml.test.LuceeTestCase"{
// Update
describe( title="test changeVersionTo function", body=function() {
it(title="checking changeVersionTo()", body=function( currentSpec ) {
restBasePath="/rest/update/provider/";
var restBasePath="/rest/update/provider/";
var getUpdate = admin.getUpdate();

http
url="#getUpdate.location##restBasePath#info/#server.lucee.version#"
method="get" resolveurl="no" result="local.http";
http url="#getUpdate.location##restBasePath#info/#server.lucee.version#"
method="get" resolveurl="no" result="local.http";

assertEquals(isJson(http.filecontent), true);
updateAvailable=deserializeJson(http.filecontent);
var updateAvailable=deserializeJson(http.filecontent);

if (arrayIsEmpty(updateAvailable.otherVersions)){
// systemOutput("WARNING: updateAvailable.otherVersions is empty", true, true);
}
else {

LatestVersion = ArrayLast(updateAvailable.otherVersions);
var LatestVersion = ArrayLast(updateAvailable.otherVersions);
}

/*if( ReplaceNocase(replaceNocase(LatestVersion, ".", "", "ALL"), "-SNAPSHOT", "") GT ReplaceNocase(replaceNocase(server.lucee.version, ".", "", "ALL"), "-SNAPSHOT", "") ){
Expand Down
2 changes: 1 addition & 1 deletion test/datasource/MongoDB.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="mongodb" {
systemOutput("XXX#chr(10)#" & ex.toString(), true, true);
} //*/

db = MongoDBConnect(variables.mongoDB.db, uri);
variables.db = MongoDBConnect(variables.mongoDB.db, uri);
}

//public function afterTests(){}
Expand Down
Loading
Loading