Merge pull request #9 from lucee/LDEV-5594-migrate-tests2

zspitzer · web-flow · commit c58b5462fc6f · 2025-08-27T15:41:59.000+02:00
Ldev 5594 migrate tests2
diff --git a/custom/rest/express-tests/LDEV5323/Application.cfc b/custom/rest/express-tests/LDEV5323/Application.cfc
@@ -0,0 +1,4 @@
+component {
+    this.name="ldev5323"
+    
+}
diff --git a/custom/rest/express-tests/LDEV5323/ldev5323-rest.cfc b/custom/rest/express-tests/LDEV5323/ldev5323-rest.cfc
@@ -0,0 +1,7 @@
+component restpath="/ldev5323root" rest="true" {
+
+	remote function getApplicationName() restpath="getApplicationName" httpmethod="GET" {
+		return "applicationName:" & getApplicationSettings().name;
+	}
+
+}
diff --git a/custom/rest/express-tests/LDEV5323/ldev5323-setup.cfm b/custom/rest/express-tests/LDEV5323/ldev5323-setup.cfm
@@ -0,0 +1,7 @@
+<cfscript>
+	new "../restUtils"().clearRestMappings();
+	dir = getDirectoryFromPath(getCurrentTemplatePath());
+	RestInitApplication( dir,            '/ldev5323root', false, "webweb" );
+	RestInitApplication( dir & "subdir", '/ldev5323sub',  false, "webweb" );
+	new "../restUtils"().dumpRestConfig();
+</cfscript>
diff --git a/custom/rest/express-tests/LDEV5323/subdir/ldev5323-rest-subdir.cfc b/custom/rest/express-tests/LDEV5323/subdir/ldev5323-rest-subdir.cfc
@@ -0,0 +1,7 @@
+component restpath="/ldev5323sub" rest="true" {
+
+	remote function getApplicationName() restpath="getApplicationName" httpmethod="GET" {
+		return "applicationName:" & getApplicationSettings().name;
+	}
+
+}
diff --git a/custom/rest/express-tests/LDEV5324/Application.cfc b/custom/rest/express-tests/LDEV5324/Application.cfc
@@ -0,0 +1,3 @@
+component {
+	this.name="ldev5324";
+}
diff --git a/custom/rest/express-tests/LDEV5324/ldev5324-multiple.cfc b/custom/rest/express-tests/LDEV5324/ldev5324-multiple.cfc
@@ -0,0 +1,16 @@
+component restpath="/ldev5324multiple" rest="true" {
+		// not used, only to check REST endpoint matching
+		remote function abc() restPath="abc" httpMethod="POST,DELETE" {
+			return CGI.REQUEST_METHOD;
+		}
+		
+		// not used, only to check REST endpoint matching
+		remote function lala() restPath="multiple" httpMethod="POST,DELETE" {
+			return CGI.REQUEST_METHOD;
+		}
+
+		remote function multipleMethods() restPath="multipleMethods" httpMethod="POST,DELETE" {
+			return CGI.REQUEST_METHOD;
+		}
+
+}
diff --git a/custom/rest/express-tests/LDEV5324/ldev5324-rest-nosrl.cfc b/custom/rest/express-tests/LDEV5324/ldev5324-rest-nosrl.cfc
@@ -0,0 +1,11 @@
+component restpath="/ldev5324nosrl" rest="true" {
+
+	remote function getApplicationName() restPath="getApplicationName" httpMethod="GET" {
+		return "applicationName:" & getApplicationSettings().name;
+	}
+
+	remote function getNoMethod() restPath="noMethod" {
+		return "no method!";
+	}
+
+}
diff --git a/custom/rest/express-tests/LDEV5324/ldev5324-rest.cfc b/custom/rest/express-tests/LDEV5324/ldev5324-rest.cfc
@@ -0,0 +1,27 @@
+component restpath="/ldev5324" rest="true" {
+
+	remote function getApplicationName() restPath="getApplicationName" httpMethod="GET" {
+		return "applicationName:" & getApplicationSettings().name;
+	}
+
+	remote function getNoMethod() restPath="noMethod" {
+		return "no method!";
+	}
+
+	remote function wrongMethod() restPath="wrongMethod" httpMethod="GET" {
+		return "wrongMethod";
+	}
+
+	remote function multipleMethods() restPath="multipleMethods" httpMethod="GET,POST" {
+		return CGI.REQUEST_METHOD;
+	}
+
+	remote function getStudent (
+			required string name restArgSource="Path",
+			required numeric age restArgSource="Path"
+		) returnType="student" restPath="{name}-{age}" {
+		var studentObj = createObject("component", "student").init(arguments.name, arguments.age);
+		return studentObj;
+	}
+
+}
diff --git a/custom/rest/express-tests/LDEV5324/ldev5324-setup.cfm b/custom/rest/express-tests/LDEV5324/ldev5324-setup.cfm
@@ -0,0 +1,6 @@
+<cfscript>
+	new "../restUtils"().clearRestMappings();
+	dir = getDirectoryFromPath(getCurrentTemplatePath());
+	RestInitApplication( dir, '/ldev5324', false, "webweb" );
+	new "../restUtils"().dumpRestConfig();
+</cfscript>
diff --git a/custom/rest/express-tests/LDEV5324/student.cfc b/custom/rest/express-tests/LDEV5324/student.cfc
@@ -0,0 +1,33 @@
+component {
+
+	property name="name" type="string";
+	property name="age" type="numeric";
+
+	function init(name, age){
+		this.name = arguments.name;
+		this.age = arguments.age;
+		_debug("init()", arguments );
+		return this;
+	}
+
+	remote function getStudent() returntype="any" httpmethod="GET" produces="application/json" {
+		_debug("getStudent()", arguments );
+		return this;
+	}
+
+	remote function updateStudent() returntype="void" httpmethod="PUT" {
+		_debug("updateStudent()", arguments );
+	}
+
+	remote function deleteStudent() returntype="boolean" httpmethod="DELETE" {
+		_debug("deleteStudent()", arguments );
+		return true;
+	}
+
+	private function _debug(method, args){
+		return;
+		systemOutput(method, true);
+		systemOutput(args.toJson(), true);
+	}
+
+}
diff --git a/custom/rest/express-tests/restUtils.cfc b/custom/rest/express-tests/restUtils.cfc
@@ -26,4 +26,15 @@ component {
 		else
 			echo (serializeJSON(mess) & chr(10));
 	}
+
+	function clearRestMappings (){
+		cfadmin(action="getRestMappings",
+			type="server",
+			password="webweb",
+			returnVariable="local.rest");
+		logger( "---------------deleteing mappings------------" );
+		for (var r in rest){
+			RestDeleteApplication( dirPath=r.strphysical, password="webweb" );
+		}
+	}
 }
diff --git a/custom/rest/express-tests/simpleRest/setupSimpleRestTest.cfm b/custom/rest/express-tests/simpleRest/setupSimpleRestTest.cfm
@@ -1,4 +1,5 @@
 <cfscript>
+	new "../restUtils"().clearRestMappings();
 	restPath = expandPath( getDirectoryFromPath( getCurrentTemplatePath() ) );
 	
 	cfadmin(action="updateRestMapping",
@@ -14,5 +15,5 @@
 		password="webweb",
 		list="true"
 	);
-	new "../dumpRestConfig"().dumpRestConfig();
+	new "../restUtils"().dumpRestConfig();
 </cfscript>
diff --git a/custom/rest/express-tests/simpleRest/setupSimpleRestTestInit.cfm b/custom/rest/express-tests/simpleRest/setupSimpleRestTestInit.cfm
@@ -1,5 +1,6 @@
 <cfscript>
+	new "../restUtils"().clearRestMappings();
 	restPath = expandPath( getDirectoryFromPath( getCurrentTemplatePath() ) );
 	RestInitApplication( restPath, '/simpleRestInit', true, "webweb" );
-	new "../dumpRestConfig"().dumpRestConfig();
+	new "../restUtils"().dumpRestConfig();
 </cfscript>
diff --git a/custom/rest/tests/LDEV5323.cfc b/custom/rest/tests/LDEV5323.cfc
@@ -0,0 +1,56 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="rest" {
+
+	variables.localhost = "http://127.0.0.1:8888";
+
+	function beforeAll(){
+		systemOutput("---------remote express server---------", true);
+		// this performs the same config on the express server
+		http url="#localhost#/restTest/express-tests/LDEV5323/ldev5323-setup.cfm" result="local.result";
+		systemOutput( "", true );
+		systemOutput( result.filecontent, true ); // returns the path
+		debug( result.filecontent );
+		if (result.error) throw "Error: #result.filecontent#";
+	}
+
+	function run( testResults, testBox ){
+		describe( "LDEV-5323", function(){
+
+			it( "check rest component has the correct application scope", function(){
+				var result = test(path="/rest/ldev5323root/ldev5323root/getApplicationName");
+				expect( trim( result.filecontent ) ).toBe( '"applicationName:ldev5323"' );
+			});
+
+			it( "check rest component has the correct application scope, sub dir", function(){
+				var result = test(path="/rest/ldev5323sub/ldev5323sub/getApplicationName");
+				expect( trim( result.filecontent ) ).toBe( '"applicationName:ldev5323"' );
+			});
+
+		} );
+	}
+
+	private function test(path, method="GET", args={}){
+		var webUrl = localhost & arguments.path;
+		systemOutput("could do http! testing via [#webUrl#]", true);
+	
+		var httpResult = "";
+		http method="#arguments.method#" url="#webUrl#" result="httpResult"{
+			structEach(arguments.args, function(k,v){
+				httpparam name="#k#" value="#v#" type="url";
+			});
+		}
+
+		// force cfhttp result to be like internalRequest result;
+		httpResult.cookies = queryToStruct(httpResult.cookies, "name");
+		httpResult.headers = httpResult.responseHeader;
+		debug(httpResult,"cfhttp");
+		systemOutput("REST endpoint [#method#] [#path#] returned [#httpResult.statuscode#] [#httpResult.filecontent#]", true)
+		systemOutput("", true);
+		return httpResult;
+	}
+
+	private string function createURI(string calledName, boolean contract=false){
+		var base = getDirectoryFromPath( getCurrentTemplatePath() );
+		var baseURI = contract ? contractPath( base ) : "/test/#listLast(base,"\/")#";
+		return baseURI & "/" & calledName;
+	}
+}
diff --git a/custom/rest/tests/LDEV5324.cfc b/custom/rest/tests/LDEV5324.cfc
@@ -0,0 +1,153 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="rest" {
+
+	variables.localhost = "http://127.0.0.1:8888";
+
+	function beforeAll(){
+		systemOutput("---------remote express server---------", true);
+		// this performs the same config on the express server
+		http url="#localhost#/restTest/express-tests/LDEV5324/ldev5324-setup.cfm" result="local.result";
+		systemOutput( "", true );
+		systemOutput( result.filecontent, true ); // returns the path
+		debug( result.filecontent );
+		if (result.error) throw "Error: #result.filecontent#";
+	}
+
+	function run( testResults, testBox ){
+		describe( "LDEV-5324 invalid combinations", function(){
+
+			it( "check rest component has the correct application scope", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/getApplicationName", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( '"applicationName:ldev5324"' ); // see LDEV5323
+			});
+
+			it( "check rest method with wrong httpmethod (GET)", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/wrongMethod/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( '"WrongMethod"' );
+			});
+
+			xit( "check rest method with wrong httpmethod (POST instead of GET)", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/wrongMethod/", args={}, method="POST");
+				expect( trim( result.fileContent ) ).toBe( 'REST endpoint [/ldev5324/wrongMethod/] only supports [GET]' );
+			});
+
+			it( "check rest method which doesn't exist", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/missingMethod/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( 'no rest service for [/ldev5324/missingMethod/] found' );
+			});
+		});
+
+		xdescribe( "LDEV-5324 endpoint which shouldn't return Subresource locator error.", function(){
+
+			// as this endpoint has no http method or component return type, it should not attempt sub resource type
+			it( "check rest method with no httpmethod or return type", function(){
+				var result = test(path="/rest/ldev5324/ldev5324nosrl/noMethod/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( 'REST endpoint [/ldev5324nosrl/noMethod/] only supports []' );
+			});
+
+			it( "check rest method with no httpmethod", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/noMethod/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( 'REST endpoint [/ldev5324/noMethod/] only supports []' );
+			});
+
+			
+		});
+
+		describe( "LDEV-5324 subresource", function(){
+			it( "check sub resource locator GET", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/Name-1/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( '{"Name":"Name","AGE":"1"}' );
+			});
+
+			it( "check sub resource locator PUT", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/Name-1/", args={}, method="PUT");
+				expect( trim( result.fileContent ) ).toBe( "" );
+			});
+
+			it( "check sub resource locator DELETE", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/Name-1/", args={}, method="DELETE");
+				expect( trim( result.fileContent ) ).toBe( true );
+			});
+
+			it( "check sub resource locator GET invalid rest path", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/Name/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( 'no rest service for [/ldev5324/Name/] found' );
+			});
+
+		});
+
+		describe( "LDEV-5324 multiple methods", function(){
+
+			it( "check rest method supporting multiple methods (GET)", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/multipleMethods/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( '"GET"' );
+			});
+
+			it( "check rest method supporting multiple methods (POST)", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/multipleMethods/", args={}, method="POST");
+				expect( trim( result.fileContent ) ).toBe( '"POST"' );
+			});
+
+			xit( "check rest method supporting multiple methods (DELETE)", function(){
+				var result = test(path="/rest/ldev5324/ldev5324/multipleMethods/", args={}, method="DELETE");
+				expect( trim( result.fileContent ) ).toBe( 'REST endpoint [/ldev5324/multipleMethods/] only supports [GET,POST]' );
+			});
+
+		});
+
+		describe( "LDEV-5324 multiple methods - single rest method", function(){
+
+			it( "check rest method supporting multiple methods (DELETE)", function(){
+				var result = test(path="/rest/ldev5324/ldev5324multiple/multipleMethods/", args={}, method="DELETE");
+				expect( trim( result.fileContent ) ).toBe( '"DELETE"' );
+			});
+
+			it( "check rest method supporting multiple methods (POST)", function(){
+				var result = test(path="/rest/ldev5324/ldev5324multiple/multipleMethods/", args={}, method="POST");
+				expect( trim( result.fileContent ) ).toBe( '"POST"' );
+			});
+
+			xit( "check rest method supporting multiple methods, unsupported method (GET)", function(){
+				var result = test(path="/rest/ldev5324/ldev5324multiple/multipleMethods/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( 'REST endpoint [/ldev5324multiple/multipleMethods/] only supports [DELETE,POST]' );
+			});
+
+		});
+
+		describe( "LDEV-5324 multiple methods - no matching rest cfc", function(){
+
+			it( "check non existant rest services", function(){
+				var result = test(path="/rest/ldev5324/ldev5324missing/notExists/", args={}, method="GET");
+				expect( trim( result.fileContent ) ).toBe( 'no REST service for [/ldev5324missing/notExists/] found' );
+			});
+
+		});
+
+	}
+
+	private function test(path, method, args={}){
+	
+		var webUrl = localhost & arguments.path;
+		systemOutput("could do http! testing via [#webUrl#]", true);
+	
+		var httpResult = "";
+		http method="#arguments.method#" url="#webUrl#" result="httpResult"{
+			structEach(arguments.args, function(k,v){
+				httpparam name="#k#" value="#v#" type="url";
+			});
+		}
+
+		// force cfhttp result to be like internalRequest result;
+		httpResult.cookies = queryToStruct(httpResult.cookies, "name");
+		httpResult.headers = httpResult.responseHeader;
+		debug(httpResult,"cfhttp");
+		systemOutput("REST endpoint [#method#] [#path#] returned [#httpResult.statuscode#] [#httpResult.filecontent#]", true)
+		systemOutput("", true);
+		return httpResult;
+	}
+
+	private string function createURI(string calledName, boolean contract=false){
+		var base = getDirectoryFromPath( getCurrentTemplatePath() );
+		var baseURI = contract ? contractPath( base ) : "/test/#listLast(base,"\/")#";
+		return baseURI & "/" & calledName;
+	}
+}
diff --git a/custom/rest/tests/simpleRestTest.cfc b/custom/rest/tests/simpleRestTest.cfc
diff --git a/custom/rest/tests/simpleRestTestInit.cfc b/custom/rest/tests/simpleRestTestInit.cfc

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +component {
 +    this.name="ldev5323"
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+component {`
	`2`	`+ this.name="ldev5324";`
	`3`	`+}`