Remove name property from TestContext to avoid collision

askimed · Aug 31, 2023 · f99f330 · f99f330
1 parent f77ad8a
commit f99f330
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/src/main/java/com/askimed/nf/test/lang/TestContext.java b/src/main/java/com/askimed/nf/test/lang/TestContext.java
@@ -33,8 +33,6 @@ public class TestContext {
 
 	public ITest test;
 
-	private String name;
-
 	private WorkflowMeta workflow = new WorkflowMeta();
 
 	public TestContext(ITest test) {
@@ -49,10 +47,10 @@ public void init(AbstractTest test) {
 		this.launchDir = test.launchDir.getAbsolutePath();
 		this.workDir = test.workDir.getAbsolutePath();
 		this.outputDir = test.outputDir.getAbsolutePath();
-		if (moduleDir != null) {
+		if (test.moduleDir != null) {
 			this.moduleDir = test.moduleDir.getAbsolutePath();
 		}
-		if (moduleTestDir != null) {
+		if (test.moduleTestDir != null) {
 			this.moduleTestDir = test.moduleTestDir.getAbsolutePath();
 		}
 	}
@@ -70,6 +68,7 @@ public void params(Closure closure) {
 	}
 
 	public void evaluateParamsClosure() {
+
 		if (paramsClosure == null) {
 			return;
 		}
@@ -95,12 +94,4 @@ public void loadParams(String filename) throws CompilationFailedException, Class
 		params.load(filename);
 	}
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
 }
diff --git a/src/main/java/com/askimed/nf/test/lang/WorkflowMeta.java b/src/main/java/com/askimed/nf/test/lang/WorkflowMeta.java
@@ -141,4 +141,9 @@ public String getName() {
 		return name;
 	}
 
+	@Override
+	public String toString() {
+		return name;
+	}
+
 }
diff --git a/src/main/java/com/askimed/nf/test/lang/function/FunctionTest.java b/src/main/java/com/askimed/nf/test/lang/function/FunctionTest.java
@@ -40,7 +40,6 @@ public FunctionTest(FunctionTestSuite parent) {
 		super(parent);
 		this.parent = parent;
 		context = new FunctionContext(this);
-		context.setName(parent.getFunction());
 	}
 
 	public void name(String name) {

diff --git a/src/main/java/com/askimed/nf/test/lang/pipeline/PipelineTest.java b/src/main/java/com/askimed/nf/test/lang/pipeline/PipelineTest.java
@@ -29,7 +29,6 @@ public PipelineTest(PipelineTestSuite parent) {
 		super(parent);
 		this.parent = parent;
 		context = new PipelineContext(this);
-		context.setName(parent.getName());
 	}
 
 	public void name(String name) {

diff --git a/src/main/java/com/askimed/nf/test/lang/workflow/WorkflowTest.java b/src/main/java/com/askimed/nf/test/lang/workflow/WorkflowTest.java
@@ -45,7 +45,6 @@ public WorkflowTest(WorkflowTestSuite parent) {
 		this.parent = parent;
 		this.autoSort = parent.isAutoSort();
 		context = new WorkflowContext(this);
-		context.setName(parent.getWorkflow());
 	}
 
 	public void name(String name) {