From 4d0c35ef91d0b45d5b92880569aad6a1f15e5c17 Mon Sep 17 00:00:00 2001 From: Thomas Weise Date: Tue, 20 Oct 2015 14:50:02 -0700 Subject: [PATCH] APEX-198 Modify test to create user directory under target. --- .../com/datatorrent/stram/cli/DTCliTest.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java b/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java index f8e1789f8a..dfd1996da1 100644 --- a/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java +++ b/engine/src/test/java/com/datatorrent/stram/cli/DTCliTest.java @@ -24,12 +24,15 @@ import com.datatorrent.stram.client.DTConfiguration; import com.datatorrent.stram.support.StramTestSupport; import com.datatorrent.stram.support.StramTestSupport.TestHomeDirectory; +import com.datatorrent.stram.support.StramTestSupport.TestMeta; + import static com.datatorrent.stram.support.StramTestSupport.setEnv; import java.util.HashMap; import java.util.Map; import org.apache.commons.io.FileUtils; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; @@ -56,17 +59,20 @@ public class DTCliTest static TemporaryFolder testFolder = new TemporaryFolder(); static DTCli cli = new DTCli(); - static Map env = new HashMap(); - static String userHome; + Map env = new HashMap(); + + @Rule + public TestMeta testMeta = new TestMeta(); - @BeforeClass - public static void starting() + @Before + public void beforeTest() { try { - userHome = System.getProperty("user.home"); - env.put("HOME", System.getProperty("user.dir") + "/src/test/resources/testAppPackage"); + File userHome = new File(testMeta.getPath()); + env.put("HOME", userHome.getAbsolutePath()); setEnv(env); - + FileUtils.copyDirectory(new File("src/test/resources/testAppPackage/.dt"), new File(userHome, ".dt")); +System.out.println("**"+userHome); cli.init(); // Set up jar file to use with constructor testFolder.create(); @@ -78,7 +84,7 @@ public static void starting() throw new RuntimeException(e); } } - +/* @AfterClass public static void finished() { @@ -93,7 +99,7 @@ public static void finished() throw new RuntimeException(e); } } - +*/ @Test public void testLaunchAppPackagePropertyPrecedence() throws Exception {