2 files changed, 43 insertions, 0 deletions
diff --git a/testing-client/testsrc/org/aspectj/testing/TestingTests.java b/testing-client/testsrc/org/aspectj/testing/TestingTests.java
index 781ccf995..ea5e7ee14 100644
--- a/testing-client/testsrc/org/aspectj/testing/TestingTests.java
+++ b/testing-client/testsrc/org/aspectj/testing/TestingTests.java
@@ -14,6 +14,8 @@
 
 package org.aspectj.testing;
 
+import org.aspectj.testing.server.TestServerTest;
+
 import junit.framework.*;
 
 public class TestingTests extends TestCase {
@@ -23,6 +25,7 @@ public class TestingTests extends TestCase {
         // for now, do not include SuiteTest because it would take 15 minutes
         //$JUnit-BEGIN$
         suite.addTestSuite(TesterTest.class); 
+        suite.addTestSuite(TestServerTest.class); 
         //$JUnit-END$
         return suite;
     }
diff --git a/testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java b/testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java
new file mode 100644
index 000000000..f0f043e67
--- /dev/null
+++ b/testing-client/testsrc/org/aspectj/testing/server/TestServerTest.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Matthew Webster - initial implementation
+ *******************************************************************************/
+package org.aspectj.testing.server;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+public class TestServerTest extends TestCase {
+
+	private TestServer server;
+	
+	protected void setUp() throws Exception {
+		super.setUp();
+		server = new TestServer();
+		server.setExitOntError(false);
+	}
+
+	public void testInitialize() {
+		try {
+			server.setWorkingDirectory("./testdata");
+			server.initialize();
+		}
+		catch (IOException ex) {
+			fail(ex.toString());
+		}
+	}
+
+	public void testSetWorkingDirectory() {
+		server.setWorkingDirectory("./testdata");
+	}
+}