Merge pull request lucee#1912 from zspitzer/LDEV-4334-update-mappings-bug

LDEV-4334  application action="update" mappings=mappings fails

Author: michaeloffner

test/_testRunner.cfc

@@ -86,6 +86,8 @@ component {
 {
 	 onBundleStart = function( cfc, testResults ){
 		var meta = getComponentMetadata( cfc );
+		systemOutput( "" , true );
+		systemOutput(structKeyList(getApplicationSettings().mappings), true );
 		SystemOut.setOut( out );
 		//SystemOut.setErr(err);
 		//"============================================================="

test/functions/ContractPath.cfc

@@ -31,8 +31,13 @@ component extends="org.lucee.cfml.test.LuceeTestCase" {
         finally {
             // remove mapping /susi
             mappings = GetApplicationSettings().mappings
+            systemOutput(mappings, true );
             structDelete( mappings, "/susi", false );
+            systemOutput(mappings, true );
             application action="update" mappings=mappings;
+            mappings = GetApplicationSettings().mappings
+            systemOutput(mappings, true );
+            expect( getApplicationSettings().mappings ).notToHaveKey( "/susi" );
         }
     }
 }

test/functions/ExpandPath.cfc

@@ -17,7 +17,7 @@
  * 
  ---><cfscript>
 
-component extends="org.lucee.cfml.test.LuceeTestCase"   {
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="mappings" {
     /*try{
         dir=getDirectoryFromPath(GetBaseTemplatePath());
         dir=mid(dir,1,len(dir)-1);

test/tickets/LDEV4334.cfc

@@ -0,0 +1,57 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="mappings" {
+
+	function afterAll(){
+		application action="update" name="LDEV4334-reset-#CreateUniqueID()#";
+	}
+
+	function run( testResults, testBox ) {
+		describe("Testcase for LDEV4334 mappings, contractPath / ExpandPath", function() {
+
+			it( title="check mappings", body=function( currentSpec ) {
+				application action="update" name="LDEV4334-#CreateUniqueID()#";
+				res = mappingsTest( "LDEV4334/index.cfm", "with no mapping" );
+				debug(res);
+			});
+
+			it( title="check mappings", body=function( currentSpec ) localmode=true {
+				application action="update" name="LDEV4334-#CreateUniqueID()#";
+				curr = getDirectoryFromPath( getCurrentTemplatePath() );
+				mappings[ "/susi"]=curr;
+				application action="update" mappings=mappings;
+				res = mappingsTest( "LDEV4334/index.cfm", "with single mapping" );
+				debug(res);
+			});
+
+		});
+	};
+	
+	private function mappingsTest ( required string base, required string desc  ){
+		var paths = structNew("ordered");
+		paths['desc'] = arguments.desc;
+		paths['base'] = arguments.base;
+		paths['applicationMappings'] =			serializeJson(GetApplicationSettings().mappings);
+		paths['getCurrentTemplatePath()']=					getCurrentTemplatePath();
+		paths['currentFolder*getDirectoryFromPath(getCurrentTemplatePath())']=					getDirectoryFromPath(getCurrentTemplatePath() );
+		paths['getContextRoot()'] =					getContextRoot();
+		paths['expandPath(#paths.base#)'] =					expandPath(paths.base);
+		paths['expandPath( "." )'] =				expandPath( "." );
+		paths['expandPath( ".." )'] =				expandPath( ".." );
+		paths['expandPath( "./" )'] =			expandPath( "./" );
+		paths['expandPath( "../" )'] =		expandPath( "../" );
+		paths['expandPath( "./" & #paths.base# )'] =			expandPath( "./" & paths.base );
+		paths['expandPath( "/" & #paths.base# )'] =				expandPath( "/" & paths.base );
+		paths['contractPath( #paths.base# )'] =					contractPath( paths.base );
+		paths['contractPath( "." )'] =					contractPath( "." );
+		paths['contractPath( "./" )'] =					contractPath( "./" );
+		paths['contractPath( ".." )'] =					contractPath( ".." );
+		paths['contractPath( "../" )'] =					contractPath( "../" );
+		paths['contractPath( expandPath(#paths.base#) )'] =		contractPath( expandPath(paths.base) ) ;
+		paths['contractPath( expandPath( "./" & #paths.base #) )'] =	contractPath( expandPath( "./" & paths.base ) );
+		paths['contractPath( expandPath( "/" & #paths.base# ) )'] = 	contractPath( expandPath( "/" & paths.base ) );
+		systemOutput("", true);
+		loop collection=paths key="local.key" value="local.value"{
+			systemOutput(key & chr(9) & value, true);
+		}
+		return paths;
+	}
+}

test/tickets/LDEV4334/index.cfm

@@ -0,0 +1 @@
+<!--- empty --->