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

Merge pull request #37 from dturanski/gemfire

Browse Source 
fixed gemfire test compile problem
  for example, see: https://build.springsource.org/browse/INT-MASTER-20/
This commit is contained in:
Mark Fisher
2011-08-24 20:23:20 -04:00
parent 189d047514 bec0472209
commit a7e4fc104b
6 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/fork/CacheServerProcess.java
View File

@@ -61,7 +61,7 @@ public class CacheServerProcess {
server.setNotifyBySubscription(true);
System.out.println("Starting server");
server.start();
ForkUtil.createControlFile(CacheServerProcess.class.getName());
System.out.println("Waiting for shutdown");
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in));

64
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/fork/ForkUtil.java
View File

@@ -17,12 +17,12 @@
package org.springframework.integration.gemfire.fork;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* Utility for forking Java processes. Modified from the SGF version for SI
*
@@ -33,21 +33,26 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public class ForkUtil {
private static String TEMP_DIR = System.getProperty("java.io.tmpdir");
public static OutputStream cloneJVM(String argument) {
String cp = System.getProperty("java.class.path");
String home = System.getProperty("java.home");
Process proc = null;
String java = home + "/bin/java ".replace("\\","/");;
String java = home + "/bin/java ".replace("\\", "/");
;
String argCp = "-cp " + cp;
String argClass = argument;
String cmd = java + argCp + " " + argClass;
try {
//ProcessBuilder builder = new ProcessBuilder(cmd, argCp, argClass);
//builder.redirectErrorStream(true);
// ProcessBuilder builder = new ProcessBuilder(cmd, argCp,
// argClass);
// builder.redirectErrorStream(true);
proc = Runtime.getRuntime().exec(cmd);
} catch (IOException ioe) {
}
catch (IOException ioe) {
throw new IllegalStateException("Cannot start command " + cmd, ioe);
}
@@ -68,14 +73,15 @@ public class ForkUtil {
}
Thread.sleep(200);
} while (run.get());
} catch (Exception ex) {
}
catch (Exception ex) {
// ignore and exit
}
}
});
reader.start();
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
@@ -86,7 +92,8 @@ public class ForkUtil {
try {
p.waitFor();
} catch (InterruptedException e) {
}
catch (InterruptedException e) {
// ignore
}
System.out.println("Fork stopped");
@@ -97,12 +104,43 @@ public class ForkUtil {
}
public static OutputStream cacheServer() {
OutputStream os = cloneJVM("org.springframework.integration.gemfire.fork.CacheServerProcess");
try {
Thread.sleep(8000);
} catch (InterruptedException ex) {
// ignore and move on
String className = "org.springframework.integration.gemfire.fork.CacheServerProcess";
if (controlFileExists(className)) {
deleteControlFile(className);
}
OutputStream os = cloneJVM(className);
int maxTime = 30000;
int time = 0;
while (!controlFileExists(className) && time < maxTime) {
try {
Thread.sleep(500);
time += 500;
}
catch (InterruptedException ex) {
// ignore and move on
}
}
if (controlFileExists(className)){
System.out.println("Started cache server");
} else {
throw new RuntimeException("could not fork cache server");
}
return os;
}
public static boolean deleteControlFile(String name) {
String path = TEMP_DIR + File.separator + name;
return new File(path).delete();
}
public static boolean createControlFile(String name) throws IOException {
String path = TEMP_DIR + File.separator + name;
return new File(path).createNewFile();
}
public static boolean controlFileExists(String name) {
String path = TEMP_DIR + File.separator + name;
return new File(path).exists();
}
}

9
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CacheListeningMessageProducerTests.java
View File

@@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import org.junit.Test;
import org.springframework.data.gemfire.CacheFactoryBean;
import org.springframework.data.gemfire.RegionFactoryBean;
import org.springframework.integration.Message;
@@ -40,7 +39,7 @@ public class CacheListeningMessageProducerTests {
public void receiveNewValuePayloadForCreateEvent() throws Exception {
CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
cacheFactoryBean.afterPropertiesSet();
Cache cache = cacheFactoryBean.getObject();
Cache cache = (Cache)cacheFactoryBean.getObject();
RegionFactoryBean<String, String> regionFactoryBean = new RegionFactoryBean<String, String>();
regionFactoryBean.setName("test.receiveNewValuePayloadForCreateEvent");
regionFactoryBean.setCache(cache);
@@ -63,7 +62,7 @@ public class CacheListeningMessageProducerTests {
public void receiveNewValuePayloadForUpdateEvent() throws Exception {
CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
cacheFactoryBean.afterPropertiesSet();
Cache cache = cacheFactoryBean.getObject();
Cache cache = (Cache)cacheFactoryBean.getObject();
RegionFactoryBean<String, String> regionFactoryBean = new RegionFactoryBean<String, String>();
regionFactoryBean.setName("test.receiveNewValuePayloadForUpdateEvent");
regionFactoryBean.setCache(cache);
@@ -90,7 +89,7 @@ public class CacheListeningMessageProducerTests {
public void receiveOldValuePayloadForDestroyEvent() throws Exception {
CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
cacheFactoryBean.afterPropertiesSet();
Cache cache = cacheFactoryBean.getObject();
Cache cache = (Cache)cacheFactoryBean.getObject();
RegionFactoryBean<String, String> regionFactoryBean = new RegionFactoryBean<String, String>();
regionFactoryBean.setName("test.receiveOldValuePayloadForDestroyEvent");
regionFactoryBean.setCache(cache);
@@ -116,7 +115,7 @@ public class CacheListeningMessageProducerTests {
public void receiveOldValuePayloadForInvalidateEvent() throws Exception {
CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
cacheFactoryBean.afterPropertiesSet();
Cache cache = cacheFactoryBean.getObject();
Cache cache = (Cache)cacheFactoryBean.getObject();
RegionFactoryBean<String, String> regionFactoryBean = new RegionFactoryBean<String, String>();
regionFactoryBean.setName("test.receiveOldValuePayloadForDestroyEvent");
regionFactoryBean.setCache(cache);

4
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandlerTests.java
View File

@@ -43,7 +43,7 @@ public class CacheWritingMessageHandlerTests {
public void mapPayloadWritesToCache() throws Exception {
CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
cacheFactoryBean.afterPropertiesSet();
Cache cache = cacheFactoryBean.getObject();
Cache cache = (Cache)cacheFactoryBean.getObject();
RegionFactoryBean<String, String> regionFactoryBean = new RegionFactoryBean<String, String>();
regionFactoryBean.setName("test.mapPayloadWritesToCache");
regionFactoryBean.setCache(cache);
@@ -63,7 +63,7 @@ public class CacheWritingMessageHandlerTests {
public void ExpressionsWriteToCache() throws Exception {
CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
cacheFactoryBean.afterPropertiesSet();
Cache cache = cacheFactoryBean.getObject();
Cache cache = (Cache)cacheFactoryBean.getObject();
RegionFactoryBean<String, String> regionFactoryBean = new RegionFactoryBean<String, String>();
regionFactoryBean.setName("test.expressionsWriteToCache");
regionFactoryBean.setCache(cache);

2
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireMessageStoreTests.java
View File

@@ -41,7 +41,7 @@ public class GemfireMessageStoreTests {
public void addAndGetMessage() throws Exception {
CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
cacheFactoryBean.afterPropertiesSet();
Cache cache = cacheFactoryBean.getObject();
Cache cache = (Cache)cacheFactoryBean.getObject();
RegionFactoryBean<UUID, Message<?>> regionFactoryBean = new RegionFactoryBean<UUID, Message<?>>();
regionFactoryBean.setName("test.addAndGetMessage");
regionFactoryBean.setCache(cache);

2
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTestConfiguration.java
View File

@@ -70,7 +70,7 @@ public class GemfireMessageGroupStoreTestConfiguration {
public Cache cache() throws Throwable {
CacheFactoryBean cacheFactoryBean = new CacheFactoryBean();
cacheFactoryBean.afterPropertiesSet();
return cacheFactoryBean.getObject();
return (Cache)cacheFactoryBean.getObject();
}
@Bean