Fix regression caused by moving old jsh.shell.jsh tests around

davidpcaldwell · Oct 18, 2024 · 390ef8b · 390ef8b
1 parent bc9c78f
commit 390ef8b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/rhino/shell/test/jdwp.jsh.js → jrunscript/jsh/shell/test/jdwp.jsh.js b/rhino/shell/test/jdwp.jsh.js → jrunscript/jsh/shell/test/jdwp.jsh.js
diff --git a/jrunscript/jsh/shell/test/jsh.shell.jsh.suite.jsh.js b/jrunscript/jsh/shell/test/jsh.shell.jsh.suite.jsh.js
@@ -26,19 +26,20 @@
 				var module = jsh.shell;
 
 				var unforked = module.jsh({
-					script: jsh.script.file.parent.getFile("jsh.jsh.js"),
+					script: jsh.script.file.parent.getFile("test.jsh.js"),
 					arguments: [],
 					evaluate: function(result) {
 						return result;
 					}
 				});
+				debugger;
 				test(unforked.status == 2);
 				test(typeof(unforked.command) == "undefined");
 				test(typeof(unforked.arguments) == "undefined");
 				test(Boolean(unforked.jsh) && Boolean(unforked.jsh.script));
 
 				var forked = module.jsh({
-					script: jsh.script.file.parent.getFile("jsh.jsh.js"),
+					script: jsh.script.file.parent.getFile("test.jsh.js"),
 					arguments: [],
 					evaluate: function(result) {
 						return result;
@@ -52,7 +53,7 @@
 				test(Boolean(forked.jsh) && Boolean(forked.jsh.script));
 
 				var issue82 = module.jsh({
-					script: jsh.script.file.parent.getFile("jsh.jsh.js"),
+					script: jsh.script.file.parent.getFile("test.jsh.js"),
 					evaluate: function(result) {
 						return (result.status == 2) ? "worked" : "did not work";
 					}
@@ -76,7 +77,7 @@
 			name: "http",
 			run: jsh.shell.jsh,
 			fork: true,
-			script: jsh.script.file.parent.getFile("jsh.jsh.js"),
+			script: jsh.script.file.parent.getFile("test.jsh.js"),
 			arguments: ["-scenario","-view","stdio"]
 		}));
 

diff --git a/rhino/shell/test/jsh.jsh.js → jrunscript/jsh/shell/test/test.jsh.js b/rhino/shell/test/jsh.jsh.js → jrunscript/jsh/shell/test/test.jsh.js
@@ -7,9 +7,9 @@
 if (!jsh.test || !jsh.test.integration) {
 	//	TODO	can this be implemented for URL-based launches?
 	if (jsh.script.file) {
-		jsh.loader.plugins(jsh.script.file.parent.parent.parent.parent.getRelativePath("loader/api"));
-		jsh.loader.plugins(jsh.script.file.parent.parent.parent.parent.getRelativePath("jsh/unit"));
-		jsh.loader.plugins(jsh.script.file.parent.parent.parent.parent.getRelativePath("jsh/test"));
+		jsh.loader.plugins(jsh.script.file.parent.parent.parent.parent.parent.getRelativePath("loader/api"));
+		jsh.loader.plugins(jsh.script.file.parent.parent.parent.parent.parent.getRelativePath("jsh/unit"));
+		jsh.loader.plugins(jsh.script.file.parent.parent.parent.parent.parent.getRelativePath("jsh/test"));
 	} else {
 		//	URL-based launch, just mock it, essentially
 		if (!jsh.test) jsh.test = {};
@@ -22,13 +22,13 @@ if (!jsh.test || !jsh.test.integration) {
 jsh.test.integration({
 	scenario: function() {
 		var server = jsh.httpd.Tomcat.serve({ directory: jsh.script.file.parent });
-		var url = "http://127.0.0.1:" + server.port + "/jsh.jsh.js";
+		var url = "http://127.0.0.1:" + server.port + "/test.jsh.js";
 		this.part("1", {
 			name: "HTTP unforked",
 			execute: function(scope,verify) {
 				jsh.shell.jsh({
 					script: jsh.web.Url.parse(
-						"http://127.0.0.1:" + server.port + "/jsh.jsh.js"
+						"http://127.0.0.1:" + server.port + "/test.jsh.js"
 					),
 					stdio: {
 						output: String,