From bed1b52ebb077d9555b4fa119e78eb400a0b7c07 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 28 Sep 2008 13:02:57 +0000 Subject: [PATCH] Move unit test. git-svn-id: https://svn.argeo.org/slc/trunk@1653 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc.autoui/.classpath | 1 - .../autoui/DetachedExecutionServerImpl.java | 8 +++--- .../slc/autoui/SimpleDetachedActivator.java | 5 ---- .../argeo/slc/autoui/drivers/FileDriver.java | 7 +++++- .../org/argeo/slc/detached/DetachedTest.java | 25 ------------------- 5 files changed, 11 insertions(+), 35 deletions(-) delete mode 100644 org.argeo.slc.autoui/src/test/java/org/argeo/slc/detached/DetachedTest.java diff --git a/org.argeo.slc.autoui/.classpath b/org.argeo.slc.autoui/.classpath index 2996c14a0..1aa73cdbf 100644 --- a/org.argeo.slc.autoui/.classpath +++ b/org.argeo.slc.autoui/.classpath @@ -2,7 +2,6 @@ - diff --git a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/DetachedExecutionServerImpl.java b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/DetachedExecutionServerImpl.java index 27fe50a39..5cd4419f5 100644 --- a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/DetachedExecutionServerImpl.java +++ b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/DetachedExecutionServerImpl.java @@ -61,13 +61,15 @@ public class DetachedExecutionServerImpl implements DetachedExecutionServer { DetachedStepRequest request = driver.receiveRequest(); executeStep(request); } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + if (e instanceof RuntimeException) + throw (RuntimeException) e; + else + e.printStackTrace(); } } } - },"driverThread"); + }, "driverThread"); active = true; diff --git a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/SimpleDetachedActivator.java b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/SimpleDetachedActivator.java index 4a7f3e41b..5f6ae560e 100644 --- a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/SimpleDetachedActivator.java +++ b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/SimpleDetachedActivator.java @@ -2,13 +2,9 @@ package org.argeo.slc.autoui; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; public class SimpleDetachedActivator extends AbstractDetachedActivator { - private final Log log = LogFactory.getLog(getClass()); - private DetachedExecutionServerImpl executionServer; protected void startAutoBundle(BundleContext context) throws Exception { @@ -22,7 +18,6 @@ public class SimpleDetachedActivator extends AbstractDetachedActivator { context.registerService(DetachedExecutionServer.class.getName(), executionServer, new Properties()); - log.info("SimpleDetachedActivator started"); } } diff --git a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/drivers/FileDriver.java b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/drivers/FileDriver.java index a2bd7007b..263f63397 100644 --- a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/drivers/FileDriver.java +++ b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/drivers/FileDriver.java @@ -8,6 +8,7 @@ import java.io.ObjectOutputStream; import org.argeo.slc.autoui.DetachedClient; import org.argeo.slc.autoui.DetachedDriver; +import org.argeo.slc.autoui.DetachedException; import org.argeo.slc.autoui.DetachedStepAnswer; import org.argeo.slc.autoui.DetachedStepRequest; @@ -16,6 +17,10 @@ public class FileDriver implements DetachedDriver, DetachedClient { private File answerDir; public synchronized DetachedStepRequest receiveRequest() throws Exception { + if (!requestDir.exists()) + throw new DetachedException("Request dir " + + requestDir.getCanonicalPath() + " does not exist."); + File file = null; while (file == null) { File[] files = requestDir.listFiles(); @@ -28,7 +33,7 @@ public class FileDriver implements DetachedDriver, DetachedClient { ObjectInputStream in = new ObjectInputStream(new FileInputStream(file)); DetachedStepRequest request = (DetachedStepRequest) in.readObject(); in.close(); - + file.delete();// move it to a processed dir instead? return request; } diff --git a/org.argeo.slc.autoui/src/test/java/org/argeo/slc/detached/DetachedTest.java b/org.argeo.slc.autoui/src/test/java/org/argeo/slc/detached/DetachedTest.java deleted file mode 100644 index be8bc8c65..000000000 --- a/org.argeo.slc.autoui/src/test/java/org/argeo/slc/detached/DetachedTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.argeo.slc.detached; - -import java.io.File; -import java.util.UUID; - -import junit.framework.TestCase; - -import org.argeo.slc.autoui.DetachedStepRequest; -import org.argeo.slc.autoui.drivers.FileDriver; - -public class DetachedTest extends TestCase { - public void testSendRequest() throws Exception { - FileDriver client = new FileDriver(); - File requestDir = new File( - "/home/mbaudier/dev/test/SLC/detachedRequests"); - requestDir.mkdirs(); - client.setRequestDir(requestDir); - - DetachedStepRequest request = new DetachedStepRequest(); - request.setUuid(UUID.randomUUID().toString()); - request.setStepRef("jemmyTest"); - - client.sendRequest(request); - } -} -- 2.39.5