From 7cf306ea058d6210de98770f9c0042ba6689b190 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 4 Jun 2010 21:53:33 +0000 Subject: [PATCH] [releng] rationalize terminal automated tests --- releng/org.eclipse.rse.build/maps/terminal.map | 2 +- releng/org.eclipse.tm.releng/maps/terminal.map | 2 +- releng/org.eclipse.tm.releng/testing.properties | 5 +++-- .../tm/terminal/test/AutomatedPluginTests.java | 7 ++++++- .../eclipse/tm/terminal/test/AutomatedTests.java | 4 +++- .../teamConfig/Terminal AutomatedTests.launch | 16 ++++++++++++++++ 6 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map index a51de3bdf85..20a6c62f05d 100644 --- a/releng/org.eclipse.rse.build/maps/terminal.map +++ b/releng/org.eclipse.rse.build/maps/terminal.map @@ -12,5 +12,5 @@ plugin@org.eclipse.tm.terminal.local=v201006041322,:pserver:anonymous:none@dev.e plugin@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial plugin@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh plugin@org.eclipse.tm.terminal.telnet=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet -plugin@org.eclipse.tm.terminal.test=v201006042100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test +plugin@org.eclipse.tm.terminal.test=v201006042150,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test plugin@org.eclipse.tm.terminal.view=v201006041240,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view \ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/maps/terminal.map b/releng/org.eclipse.tm.releng/maps/terminal.map index a51de3bdf85..20a6c62f05d 100644 --- a/releng/org.eclipse.tm.releng/maps/terminal.map +++ b/releng/org.eclipse.tm.releng/maps/terminal.map @@ -12,5 +12,5 @@ plugin@org.eclipse.tm.terminal.local=v201006041322,:pserver:anonymous:none@dev.e plugin@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial plugin@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh plugin@org.eclipse.tm.terminal.telnet=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet -plugin@org.eclipse.tm.terminal.test=v201006042100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test +plugin@org.eclipse.tm.terminal.test=v201006042150,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test plugin@org.eclipse.tm.terminal.view=v201006041240,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view \ No newline at end of file diff --git a/releng/org.eclipse.tm.releng/testing.properties b/releng/org.eclipse.tm.releng/testing.properties index 0bbff2234ac..cc6e49e1ac0 100644 --- a/releng/org.eclipse.tm.releng/testing.properties +++ b/releng/org.eclipse.tm.releng/testing.properties @@ -9,13 +9,14 @@ # Anna Dushistova (Mentor Graphics) - initial API and implementation ############################################################################### -extraVMargs=-Dorg.eclipse.swt.browser.XULRunnerPath=/shared/common/mozilla-xulrunner181-1.8.1.4-30.ppc +extraVMargs=-ea -Dorg.eclipse.swt.browser.XULRunnerPath=/shared/common/mozilla-xulrunner181-1.8.1.4-30.ppc #extraVMargs=-Dorg.eclipse.swt.browser.XULRunnerPath=/dev/null #name of runtime to install and test #runtime=${zipPrefix}-ALL${incubation}-${buildAlias}.zip #csv list of test plugins to run -testPluginsToRun=org.eclipse.rse.tests +testPluginsToRun=org.eclipse.rse.tests,org.eclipse.tm.terminal.test #map name of test plugin to testsuite class to run org.eclipse.rse.tests.suite=org.eclipse.rse.tests.RSECombinedTestSuite +org.eclipse.tm.terminal.test.suite=org.eclipse.tm.terminal.test.AutomatedPluginTests \ No newline at end of file diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java b/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java index 4921b764fd4..e78c4b21b85 100644 --- a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java +++ b/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedPluginTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Wind River Systems, Inc. and others. + * Copyright (c) 2008, 2010 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 @@ -24,8 +24,13 @@ public class AutomatedPluginTests extends TestCase { */ public static Test suite() { TestSuite suite = new TestSuite(AutomatedPluginTests.class.getName()); + //These tests require Eclipse Platform to be up suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalConnectorPluginTest.class); suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalConnectorFactoryTest.class); + + //These tests must run as plain JUnit because they require access + //to "package" protected methods + //suite.addTest(AutomatedTests.suite()); return suite; } diff --git a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTests.java b/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTests.java index 5b8ca6bb91a..0306efd9867 100644 --- a/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTests.java +++ b/terminal/org.eclipse.tm.terminal.test/src/org/eclipse/tm/terminal/test/AutomatedTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2008, 2010 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 @@ -37,6 +37,8 @@ public class AutomatedTests extends TestCase { suite.addTest(org.eclipse.tm.internal.terminal.emulator.AllTests.suite()); suite.addTest(org.eclipse.tm.internal.terminal.model.AllTests.suite()); suite.addTest(org.eclipse.tm.terminal.model.AllTests.suite()); + suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalConnectorTest.class); + suite.addTestSuite(org.eclipse.tm.internal.terminal.connector.TerminalToRemoteInjectionOutputStreamTest.class); return suite; } } diff --git a/terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch b/terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch new file mode 100644 index 00000000000..a8d7a4e206d --- /dev/null +++ b/terminal/org.eclipse.tm.terminal.test/teamConfig/Terminal AutomatedTests.launch @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +