diff --git a/test/tags/FTP.cfc b/test/tags/FTP.cfc index 4ef108a71d..ddffc539fb 100644 --- a/test/tags/FTP.cfc +++ b/test/tags/FTP.cfc @@ -31,7 +31,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="ftp,sftp" { systemOutput(arguments, true); ftp action = "open" - connection = "conn" + connection="ftpConn" passive = "true" secure = secure username = user @@ -52,10 +52,10 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="ftp,sftp" { var subfile=subdir&fileName; // list the inital state - ftp action="listdir" directory=base connection = "conn" name="local.list1" passive=true; // passive not sticky LDEV-977 + ftp action="listdir" directory=base connection="ftpConn" name="local.list1"; // passive not sticky LDEV-977 // print working directory - ftp action="getcurrentdir" directory=base connection = "conn" result="local.pwd1"; + ftp action="getcurrentdir" directory=base connection="ftpConn" result="local.pwd1"; pwd1=pwd1.returnValue; ///////// TODO does not work with sftp assertTrue(pwd1==base || pwd1&"/"==base); @@ -63,21 +63,19 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="ftp,sftp" { try{ // we create a directory - ftp action="createdir" directory=dir connection = "conn"; - ftp action="listdir" directory=base connection = "conn" name="local.list2"; + ftp action="createdir" directory=dir connection="ftpConn"; + ftp action="listdir" directory=base connection="ftpConn" name="local.list2"; assertEquals(list1.recordcount+1,list2.recordcount); // change working directory - ftp action="changedir" directory=dir connection = "conn"; - ftp action="getcurrentdir" directory=base connection = "conn" result="local.pwd2"; + ftp action="changedir" directory=dir connection="ftpConn"; + ftp action="getcurrentdir" directory=base connection="ftpConn" result="local.pwd2"; pwd2=pwd2.returnValue; assertTrue(pwd2==dir || pwd2&"/"==dir); - - // we add a file ftp action="putFile" localfile=getCurrentTemplatePath() remoteFile=file connection= "conn"; - ftp action="listdir" directory=dir connection = "conn" name="local.list3" passive=true; // passive not sticky LDEV-977; + ftp action="listdir" directory=dir connection="ftpConn" name="local.list3"; // passive not sticky LDEV-977; assertEquals(list3.recordcount,1); assertEquals(list3.name,fileName); assertEquals(list3.isDirectory,false); @@ -100,30 +98,30 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="ftp,sftp" { // we rename the file ftp action="rename" existing=file new=file2 connection= "conn"; - ftp action="listdir" directory=dir connection = "conn" name="local.list4"; + ftp action="listdir" directory=dir connection="ftpConn" name="local.list4"; assertEquals(list4.recordcount,1); assertEquals(list4.name,fileName2); // exists dir - ftp action="existsdir" directory=dir connection = "conn" result="local.exist1"; + ftp action="existsdir" directory=dir connection="ftpConn" result="local.exist1"; assertTrue(exist1.returnValue); - ftp action="existsdir" directory=subdir connection = "conn" result="local.exist2"; + ftp action="existsdir" directory=subdir connection="ftpConn" result="local.exist2"; assertFalse(exist2.returnValue); //exists file - ftp action="existsfile" remotefile=file2 connection = "conn" result="local.exist3"; + ftp action="existsfile" remotefile=file2 connection="ftpConn" result="local.exist3"; assertTrue(exist3.returnValue); - ftp action="existsfile" remotefile=file connection = "conn" result="local.exist4"; + ftp action="existsfile" remotefile=file connection="ftpConn" result="local.exist4"; assertFalse(exist4.returnValue); // we delete the file again ftp action="remove" item=file2 connection= "conn"; - ftp action="listdir" directory=dir connection = "conn" name="local.list4"; + ftp action="listdir" directory=dir connection="ftpConn" name="local.list4"; assertEquals(list4.recordcount,0); // we add again a file and directory to be sure we can delete a folder with content - ftp action="createdir" directory=subdir connection = "conn"; + ftp action="createdir" directory=subdir connection="ftpConn"; ftp action="putFile" localfile=getCurrentTemplatePath() remoteFile=subfile connection="conn"; // LDEV-3528 transferMode=“binary” causes "Connection is not open" error ftp action="putFile" localfile=getCurrentTemplatePath() remoteFile=subfile connection="conn" transferMode="ASCII"; @@ -134,8 +132,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="ftp,sftp" { } finally { // delete the folder we did for testing - ftp action="removedir" directory=dir connection = "conn" recurse=true; - ftp action="listdir" directory=base connection = "conn" name="local.list20"; + ftp action="removedir" directory=dir connection="ftpConn" recurse=true; + ftp action="listdir" directory=base connection="ftpConn" name="local.list20"; assertEquals(list1.recordcount,list20.recordcount); }