diff --git a/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java b/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java
new file mode 100644
index 00000000000..cc0c9ee3a78
--- /dev/null
+++ b/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorPluginTest.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems, Inc. 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:
+ * Martin Oberhuber (Wind River) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.tm.internal.terminal.connector;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.tm.internal.terminal.connector.TerminalConnectorTest.ConnectorMock;
+import org.eclipse.tm.internal.terminal.connector.TerminalConnectorTest.SimpleFactory;
+import org.eclipse.tm.internal.terminal.connector.TerminalConnectorTest.TerminalControlMock;
+
+/**
+ * Testcase for TerminalConnector that must run as a JUnit plug-in test.
+ */
+public class TerminalConnectorPluginTest extends TestCase {
+
+ public void testIsInitialized() {
+ if (!Platform.isRunning())
+ return;
+ TerminalConnector c = new TerminalConnector(new SimpleFactory(new ConnectorMock()), "xID", "xName");
+ assertFalse(c.isInitialized());
+ c.getId();
+ assertFalse(c.isInitialized());
+ c.getName();
+ assertFalse(c.isInitialized());
+ c.getSettingsSummary();
+ assertFalse(c.isInitialized());
+ c.setTerminalSize(10, 10);
+ assertFalse(c.isInitialized());
+ c.load(null);
+ assertFalse(c.isInitialized());
+ c.save(null);
+ assertFalse(c.isInitialized());
+ c.getAdapter(ConnectorMock.class);
+ assertFalse(c.isInitialized());
+ }
+
+ public void testGetAdapter() {
+ if (!Platform.isRunning())
+ return;
+ ConnectorMock mock = new ConnectorMock();
+ TerminalConnector c = new TerminalConnector(new SimpleFactory(mock), "xID", "xName");
+ assertNull(c.getAdapter(ConnectorMock.class));
+ // the load is called after the connect...
+ c.connect(new TerminalControlMock());
+
+ assertSame(mock, c.getAdapter(ConnectorMock.class));
+ }
+
+}
diff --git a/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java b/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java
index c3e23849272..bb0bb64de95 100644
--- a/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java
+++ b/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java
@@ -150,25 +150,6 @@ public class TerminalConnectorTest extends TestCase {
assertEquals("xName", c.getName());
}
- public void testIsInitialized() {
- TerminalConnector c=new TerminalConnector(new SimpleFactory(new ConnectorMock()),"xID","xName");
- assertFalse(c.isInitialized());
- c.getId();
- assertFalse(c.isInitialized());
- c.getName();
- assertFalse(c.isInitialized());
- c.getSettingsSummary();
- assertFalse(c.isInitialized());
- c.setTerminalSize(10,10);
- assertFalse(c.isInitialized());
- c.load(null);
- assertFalse(c.isInitialized());
- c.save(null);
- assertFalse(c.isInitialized());
- c.getAdapter(ConnectorMock.class);
- assertFalse(c.isInitialized());
- }
-
public void testConnect() {
TerminalConnector c=new TerminalConnector(new SimpleFactory(new ConnectorMock()),"xID","xName");
assertFalse(c.isInitialized());
@@ -244,14 +225,4 @@ public class TerminalConnectorTest extends TestCase {
}
- public void testGetAdapter() {
- ConnectorMock mock=new ConnectorMock();
- TerminalConnector c=new TerminalConnector(new SimpleFactory(mock),"xID","xName");
- assertNull(c.getAdapter(ConnectorMock.class));
- // the load is called after the connect...
- c.connect(new TerminalControlMock());
-
- assertSame(mock, c.getAdapter(ConnectorMock.class));
- }
-
}
diff --git a/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java b/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java
new file mode 100644
index 00000000000..9ca272e28ec
--- /dev/null
+++ b/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems, Inc. 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:
+ * Martin Oberhuber (Wind River) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.tm.terminal.test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Master Test Suite to run all Terminal plug-in tests.
+ */
+public class AutomatedPluginTests extends TestCase {
+ /**
+ * Call each AllTests class from each of the test packages.
+ */
+ public static Test suite() {
+ TestSuite suite = new TestSuite(AutomatedPluginTests.class.getName());
+ suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalConnectorPluginTest.class);
+ return suite;
+ }
+
+}
diff --git a/org.eclipse.tm.terminal.test/teamConfig/Terminal All Unit Tests.launch b/org.eclipse.tm.terminal.test/teamConfig/Terminal All Unit Tests.launch
new file mode 100644
index 00000000000..fd2e3ebb9d4
--- /dev/null
+++ b/org.eclipse.tm.terminal.test/teamConfig/Terminal All Unit Tests.launch
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.tm.terminal.test/teamConfig/Terminal Plugin Tests.launch b/org.eclipse.tm.terminal.test/teamConfig/Terminal Plugin Tests.launch
new file mode 100644
index 00000000000..5def4726405
--- /dev/null
+++ b/org.eclipse.tm.terminal.test/teamConfig/Terminal Plugin Tests.launch
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+