Fix wrong name in function object

askimed · Aug 31, 2023 · 198260e · 198260e
1 parent 1a443be
commit 198260e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 28 deletions.
diff --git a/src/main/java/com/askimed/nf/test/lang/WorkflowMeta.java b/src/main/java/com/askimed/nf/test/lang/WorkflowMeta.java
@@ -148,5 +148,10 @@ public void setName(String name) {
 	public String getName() {
 		return name;
 	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
 
 }
diff --git a/src/main/java/com/askimed/nf/test/lang/function/Function.java b/src/main/java/com/askimed/nf/test/lang/function/Function.java
@@ -12,12 +12,6 @@ public class Function extends WorkflowMeta {
 
 	private String mapping = "";
 
-	private String name = "function";
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public void setMapping(String mapping) {
 		this.mapping = mapping;
 	}
@@ -34,19 +28,14 @@ public void setResult(Object result) {
 		this.result = result;
 	}
 
-	@Override
-	public String toString() {
-		return name;
-	}
-
 	public void loadResult(File folder) {
 		File file = new File(folder, "function.json");
 
 		if (file.exists()) {
 			JsonSlurper jsonSlurper = new JsonSlurper();
 			result = jsonSlurper.parse(file);
 		}
-		
+
 	}
-	
+
 }
diff --git a/src/main/java/com/askimed/nf/test/lang/function/FunctionContext.java b/src/main/java/com/askimed/nf/test/lang/function/FunctionContext.java
@@ -14,7 +14,7 @@ public class FunctionContext extends TestContext {
 	public FunctionContext(ITest test) {
 		super(test);
 	}
-	
+
 	public Function getFunction() {
 		return function;
 	}
@@ -23,7 +23,10 @@ public void setFunction(Function function) {
 		this.function = function;
 	}
 
-
+	public void setName(String name) {
+		function.setName(name);
+	}
+
 	public void function(Closure<Object> closure) {
 		functionClosure = closure;
 	}
@@ -40,5 +43,5 @@ public void evaluateFunctionClosure() {
 		}
 
 	}
-	
+
 }
diff --git a/src/main/java/com/askimed/nf/test/lang/process/Process.java b/src/main/java/com/askimed/nf/test/lang/process/Process.java
@@ -11,12 +11,6 @@ public class Process extends WorkflowMeta {
 
 	private String mapping = "";
 
-	private String name = "process";
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public void setMapping(String mapping) {
 		this.mapping = mapping;
 	}
@@ -40,9 +34,4 @@ public void viewChannels() {
 		out.view();
 	}
 
-	@Override
-	public String toString() {
-		return name;
-	}
-
 }
diff --git a/test-data/function/default/functions.snapshot.nf.test.snap b/test-data/function/default/functions.snapshot.nf.test.snap
@@ -18,7 +18,7 @@
                     "tasksCount": 0,
                     "tasksSucceeded": 0
                 },
-                "name": "function",
+                "name": "say_hello",
                 "success": true
             }
         ],