Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:SpringSource/spring-gemfire

Browse Source
This commit is contained in:
David Turanski
2012-07-24 10:50:53 -04:00
parent c80f8e4f35 fe23d796b8
commit 6c11201bb4
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/test/java/org/springframework/data/gemfire/ForkUtil.java
View File

@@ -35,27 +35,24 @@ public class ForkUtil {
public static OutputStream cloneJVM(String argument) {
String cp = System.getProperty("java.class.path");
String home = System.getProperty("java.home");
Process proc = null;
String home = System.getProperty("java.home");
String sp = System.getProperty("file.separator");
String java = home + sp + "bin" + sp + "java";
String argCp = " -cp " + cp;
String argClass = argument;
String cmd = java + "-cp " + cp + " " + argClass;
String cmd = java + argCp + " " + argClass;
final Process proc;
try {
//ProcessBuilder builder = new ProcessBuilder(cmd, argCp, argClass);
//builder.redirectErrorStream(true);
proc = Runtime.getRuntime().exec(cmd);
ProcessBuilder builder = new ProcessBuilder(java , "-cp", cp, argClass);
builder.redirectErrorStream(true);
proc = builder.start();
} catch (IOException ioe) {
throw new IllegalStateException("Cannot start command " + cmd, ioe);
}
System.out.println("Started fork from command\n" + cmd);
final Process p = proc;
final BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
final BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
final AtomicBoolean run = new AtomicBoolean(true);
Thread reader = new Thread(new Runnable() {
@@ -83,11 +80,11 @@ public class ForkUtil {
System.out.println("Stopping fork...");
run.set(false);
os = null;
if (p != null)
p.destroy();
if (proc != null)
proc.destroy();
try {
p.waitFor();
proc.waitFor();
} catch (InterruptedException e) {
// ignore
}
@@ -134,17 +131,22 @@ public class ForkUtil {
}
public static boolean deleteControlFile(String name) {
String path = TEMP_DIR + File.separator + name;
String path = getControlFilePath(name);
return new File(path).delete();
}
public static boolean createControlFile(String name) throws IOException {
String path = TEMP_DIR + File.separator + name;
String path = getControlFilePath(name);
System.out.println("creating " + path);
return new File(path).createNewFile();
}
public static boolean controlFileExists(String name) {
String path = TEMP_DIR + File.separator + name;
String path = getControlFilePath(name);
return new File(path).exists();
}
private static String getControlFilePath(String name) {
return TEMP_DIR.endsWith(File.separator)? TEMP_DIR + name : TEMP_DIR + File.separator + name;
}
}

4
src/test/java/org/springframework/data/gemfire/config/DynamicRegionNamespaceTest.java
View File

@@ -21,6 +21,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.File;
import org.junit.Test;
import org.springframework.data.gemfire.RecreatingContextTest;
@@ -47,6 +49,6 @@ public class DynamicRegionNamespaceTest extends RecreatingContextTest {
DynamicRegionFactory.Config config = drf.getConfig();
assertFalse(config.persistBackup);
assertFalse(config.registerInterest);
assertEquals("/foo", config.diskDir.getAbsolutePath());
assertEquals(File.separator + "foo", config.diskDir.getPath());
}
}