Set default staging mode in config file (#172)

* Set default staging mode in config * Fix issue with empty config
askimed · Jan 6, 2024 · 4abe4de · 4abe4de
1 parent b3807b2
commit 4abe4de
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/main/java/com/askimed/nf/test/config/Config.java b/src/main/java/com/askimed/nf/test/config/Config.java
@@ -38,6 +38,8 @@ public class Config {
 
 	private StageBuilder stageBuilder = new StageBuilder();
 
+	private String stageMode = FileStaging.MODE_COPY;
+
 	public void testsDir(String testsDir) {
 		this.testsDir = testsDir;
 	}
@@ -114,6 +116,18 @@ public String getLibDir() {
 		return libDir;
 	}
 
+	public void setStageMode(String stageMode) {
+		this.stageMode = stageMode;
+	}
+
+	public String getStageMode() {
+		return stageMode;
+	}
+
+	public void stageMode(String stageMode) {
+		this.stageMode = stageMode;
+	}
+
 	public void stage(Closure closure) {
 		closure.setDelegate(stageBuilder);
 		closure.setResolveStrategy(Closure.DELEGATE_ONLY);		

diff --git a/src/main/java/com/askimed/nf/test/core/AbstractTest.java b/src/main/java/com/askimed/nf/test/core/AbstractTest.java
@@ -59,9 +59,6 @@ public abstract class AbstractTest implements ITest {
 
 	public boolean skipped = false;
 
-	public static FileStaging[] SHARED_DIRECTORIES = { new FileStaging("bin"), new FileStaging("lib"),
-			new FileStaging("assets") };
-
 	protected File config = null;
 
 	private boolean updateSnapshot = false;
@@ -109,10 +106,14 @@ public void setup(Config config, File testDirectory) throws IOException {
 		metaDir = initDirectory("Meta Directory", launchDir, DIRECTORY_META);
 		outputDir = initDirectory("Output Directory", launchDir, DIRECTORY_OUTPUT);
 		workDir = initDirectory("Working Directory", launchDir, DIRECTORY_WORK);
-
+		FileStaging[] sharedDirectories = new FileStaging[]{
+				new FileStaging("bin", config != null ? config.getStageMode() : FileStaging.MODE_COPY),
+				new FileStaging("lib",  config != null ? config.getStageMode() : FileStaging.MODE_COPY),
+				new FileStaging("assets", config != null ? config.getStageMode() : FileStaging.MODE_COPY)
+		};
 		try {
 			// copy bin, assets and lib to metaDir
-			shareDirectories(SHARED_DIRECTORIES, metaDir);
+			shareDirectories(sharedDirectories, metaDir);
 			if (config != null) {
 				// copy user defined staging directories
 				log.debug("Stage {} user provided files...", config.getStageBuilder().getPaths().size());