From a4ce9b1dd1b88e3396d321ee7467713cabbafcc2 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 13 Feb 2008 20:10:41 +0000 Subject: [PATCH] organize, enable and tag test cases --- .../rse/tests/RSECombinedTestSuite.java | 26 +++++------ .../org/eclipse/rse/tests/core/AllTests.java | 44 +++++++++++++++++++ .../eclipse/rse/tests/core/HostMoveTest.java | 10 ++++- .../connection/RSEConnectionTestCase.java | 7 ++- .../SubSystemConfigurationProxyTestCase.java | 4 +- .../RSEInternalFrameworkTestCase.java | 7 ++- .../internal/RSETestsPluginTestCase.java | 4 +- .../tests/persistence/PersistenceTest.java | 4 ++ .../tests/preferences/PreferencesTest.java | 7 ++- .../subsystems/files/CreateFileTestCase.java | 10 ++++- .../files/FTPFileSubsystemTestCase.java | 4 +- .../files/FileOutputStreamTestCase.java | 25 ++++++++++- .../files/FileServiceArchiveTest.java | 37 ++++++++++++++++ .../files/FileServiceArchiveTestDStore.java | 16 +++++++ .../subsystems/files/FileServiceTest.java | 6 ++- .../FileSubsystemConsistencyTestCase.java | 6 +++ .../files/RSEFileSubsystemTestSuite.java | 14 +++--- .../testsubsystem/TestSubsystemTestCase.java | 6 ++- .../rse/tests/ui/mnemonics/MnemonicsTest.java | 5 ++- .../tests/ui/preferences/PreferencesTest.java | 4 +- 20 files changed, 213 insertions(+), 33 deletions(-) create mode 100644 rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/AllTests.java diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSECombinedTestSuite.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSECombinedTestSuite.java index 82eed43a2c5..9b770adbf92 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSECombinedTestSuite.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSECombinedTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 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 @@ -7,19 +7,14 @@ * * Contributors: * Uwe Stieber (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.rse.tests.core.connection.RSEConnectionTestSuite; -import org.eclipse.rse.tests.core.registries.RSERegistriesTestSuite; import org.eclipse.rse.tests.framework.DelegatingTestSuiteHolder; -import org.eclipse.rse.tests.internal.RSEInternalFrameworkTestSuite; -import org.eclipse.rse.tests.preferences.RSEPreferencesTestSuite; -import org.eclipse.rse.tests.subsystems.files.RSEFileSubsystemTestSuite; -import org.eclipse.rse.tests.subsystems.testsubsystem.RSETestSubsystemTestSuite; /** * Main class bundling all single specialized test suites into a @@ -52,13 +47,16 @@ public class RSECombinedTestSuite extends DelegatingTestSuiteHolder { TestSuite suite = new TestSuite("RSE Combined Test Suite"); //$NON-NLS-1$ // add the single test suites to the overall one here. - suite.addTest(RSEInternalFrameworkTestSuite.suite()); - suite.addTest(RSERegistriesTestSuite.suite()); - suite.addTest(RSEConnectionTestSuite.suite()); - suite.addTest(RSEFileSubsystemTestSuite.suite()); - suite.addTest(RSETestSubsystemTestSuite.suite()); - suite.addTest(RSEPreferencesTestSuite.suite()); - + suite.addTest(org.eclipse.rse.tests.core.AllTests.suite()); + suite.addTest(org.eclipse.rse.tests.core.connection.RSEConnectionTestSuite.suite()); + suite.addTest(org.eclipse.rse.tests.core.registries.RSERegistriesTestSuite.suite()); + suite.addTest(org.eclipse.rse.tests.internal.RSEInternalFrameworkTestSuite.suite()); + suite.addTest(org.eclipse.rse.tests.persistence.PersistenceTestSuite.suite()); + suite.addTest(org.eclipse.rse.tests.preferences.RSEPreferencesTestSuite.suite()); + suite.addTest(org.eclipse.rse.tests.subsystems.files.RSEFileSubsystemTestSuite.suite()); + suite.addTest(org.eclipse.rse.tests.subsystems.testsubsystem.RSETestSubsystemTestSuite.suite()); + suite.addTest(org.eclipse.rse.tests.ui.mnemonics.MnemonicsTestSuite.suite()); + suite.addTest(org.eclipse.rse.tests.ui.preferences.PreferencesTestSuite.suite()); return suite; } diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/AllTests.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/AllTests.java new file mode 100644 index 00000000000..8adab96195f --- /dev/null +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/AllTests.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * 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.rse.tests.core; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.rse.tests.core.connection.RSEConnectionTestSuite; +import org.eclipse.rse.tests.framework.DelegatingTestSuiteHolder; + +/** + * Suite for RSE Core Model test cases. + */ +public class AllTests extends DelegatingTestSuiteHolder { + + /** Run this test suite stand-alone. Only makes sense if no plugin test */ + public static void main(String[] args) { + junit.textui.TestRunner.run(suite()); + } + + public static Test suite() { + TestSuite suite = new TestSuite(AllTests.class.getName()); + // add the single test suites to the overall one here. + suite.addTestSuite(HostMoveTest.class); + + return suite; + } + + /* (non-Javadoc) + * @see org.eclipse.rse.tests.framework.AbstractTestSuiteHolder#getTestSuite() + */ + public TestSuite getTestSuite() { + return (TestSuite)RSEConnectionTestSuite.suite(); + } +} diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/HostMoveTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/HostMoveTest.java index aa4eec273b7..8200297051f 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/HostMoveTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/HostMoveTest.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2007 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2008 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 @@ -9,6 +9,7 @@ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Martin Oberhuber (Wind River) - organize, enable and tag test cases ********************************************************************************/ package org.eclipse.rse.tests.core; @@ -50,6 +51,7 @@ public class HostMoveTest extends RSEBaseConnectionTestCase { } public void testMoveOneUp() { + //-test-author-:DavidDykstal checkPrecondition(); IHost host = hostArray[NUMBER_OF_HOSTS - 1]; IHost[] hosts = new IHost[] {host}; @@ -60,6 +62,7 @@ public class HostMoveTest extends RSEBaseConnectionTestCase { } public void testMoveManyUp() { + //-test-author-:DavidDykstal checkPrecondition(); IHost[] hosts = new IHost[] {hostArray[NUMBER_OF_HOSTS - 1], hostArray[NUMBER_OF_HOSTS - 2]}; registry.moveHosts("TestProfile", hosts, -2); @@ -71,6 +74,7 @@ public class HostMoveTest extends RSEBaseConnectionTestCase { } public void testMoveFirstUp() { + //-test-author-:DavidDykstal checkPrecondition(); IHost host = hostArray[0]; assertEquals(0, registry.getHostPosition(host)); @@ -80,6 +84,7 @@ public class HostMoveTest extends RSEBaseConnectionTestCase { } public void testMoveOneDown() { + //-test-author-:DavidDykstal checkPrecondition(); IHost host = hostArray[1]; // second in the list assertEquals(1, registry.getHostPosition(host)); @@ -91,6 +96,7 @@ public class HostMoveTest extends RSEBaseConnectionTestCase { } public void testMoveManyDown() { + //-test-author-:DavidDykstal checkPrecondition(); IHost[] hosts = new IHost[] {hostArray[0], hostArray[2], hostArray[4]}; assertEquals(0, registry.getHostPosition(hostArray[0])); @@ -107,6 +113,7 @@ public class HostMoveTest extends RSEBaseConnectionTestCase { } public void testMoveLastDown() { + //-test-author-:DavidDykstal checkPrecondition(); IHost host = hostArray[NUMBER_OF_HOSTS - 1]; assertEquals(NUMBER_OF_HOSTS - 1, registry.getHostPosition(host)); @@ -116,6 +123,7 @@ public class HostMoveTest extends RSEBaseConnectionTestCase { } public void testNoHost() { + //-test-author-:DavidDykstal checkPrecondition(); IHost[] hosts = new IHost[] {}; registry.moveHosts("TestProfile", hosts, -1); // should not fail diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestCase.java index 845f5506980..0613c551489 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2008 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 @@ -10,6 +10,7 @@ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * David McKnight (IBM) - [186363] get rid of obsolete calls to SubSystem.connect() + * Martin Oberhuber (Wind River) - organize, enable and tag test cases ********************************************************************************/ package org.eclipse.rse.tests.core.connection; @@ -35,6 +36,7 @@ public class RSEConnectionTestCase extends RSEBaseConnectionTestCase { * Test creation of connections. */ public void testConnectionCreation() { + //-test-author-:DavidDykstal if (!RSETestsPlugin.isTestCaseEnabled("RSEConnectionTestCase.testConnectionCreation")) return; //$NON-NLS-1$ Properties properties = new Properties(); @@ -79,6 +81,7 @@ public class RSEConnectionTestCase extends RSEBaseConnectionTestCase { * Test removal of connections */ public void testConnectionRemoval() { + //-test-author-:DavidDykstal if (!RSETestsPlugin.isTestCaseEnabled("RSEConnectionTestCase.testConnectionRemoval")) return; //$NON-NLS-1$ String profileName = "TestProfile"; //$NON-NLS-1$ @@ -96,6 +99,7 @@ public class RSEConnectionTestCase extends RSEBaseConnectionTestCase { * Test the connect and disconnect methods */ public void testConnect() { + //-test-author-:DavidDykstal if (!RSETestsPlugin.isTestCaseEnabled("RSEConnectionTestCase.testConnect")) return; //$NON-NLS-1$ Exception exception = null; @@ -145,6 +149,7 @@ public class RSEConnectionTestCase extends RSEBaseConnectionTestCase { * Test resolving a filter string. */ public void testResolveFilterString() { + //-test-author-:DavidDykstal if (!RSETestsPlugin.isTestCaseEnabled("RSEConnectionTestCase.testResolveFilterString")) return; //$NON-NLS-1$ Exception exception = null; diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/registries/SubSystemConfigurationProxyTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/registries/SubSystemConfigurationProxyTestCase.java index 4f2377a8479..485f2545385 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/registries/SubSystemConfigurationProxyTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/registries/SubSystemConfigurationProxyTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 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 @@ -10,6 +10,7 @@ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.core.registries; @@ -28,6 +29,7 @@ import org.eclipse.rse.tests.core.RSECoreTestCase; public class SubSystemConfigurationProxyTestCase extends RSECoreTestCase { public void testSubSystemConfigurationProxy() { + //-test-author-:UweStieber ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry(); assertNotNull("Failed to fetch RSE system registry instance!", systemRegistry); //$NON-NLS-1$ diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEInternalFrameworkTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEInternalFrameworkTestCase.java index 654d8f29400..377a2d9ff29 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEInternalFrameworkTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEInternalFrameworkTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 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 @@ -8,6 +8,7 @@ * Contributors: * Uwe Stieber (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.internal; @@ -41,6 +42,7 @@ public class RSEInternalFrameworkTestCase extends RSEBaseConnectionTestCase { * RSECoreTestCase implementation. */ public void testCoreTestPropertiesHandling() { + //-test-author-:UweStieber if (!RSETestsPlugin.isTestCaseEnabled("RSEInternalFrameworkTestCase.testCoreTestPropertiesHandling")) return; //$NON-NLS-1$ // test for our defaults @@ -100,6 +102,7 @@ public class RSEInternalFrameworkTestCase extends RSEBaseConnectionTestCase { * Test the RSEWaitAndDispatchUtil wait methods. */ public void testWaitAndDispatch() { + //-test-author-:UweStieber if (!RSETestsPlugin.isTestCaseEnabled("RSEInternalFrameworkTestCase.testWaitAndDispatch")) return; //$NON-NLS-1$ // the simple wait and dispatch is time out based @@ -132,6 +135,7 @@ public class RSEInternalFrameworkTestCase extends RSEBaseConnectionTestCase { * Test accessing the test data location. */ public void testTestDataLocationManagement() { + //-test-author-:UweStieber if (!RSETestsPlugin.isTestCaseEnabled("RSEInternalFrameworkTestCase.testTestDataLocationManagement")) return; //$NON-NLS-1$ // get the pure test data location root path. @@ -167,6 +171,7 @@ public class RSEInternalFrameworkTestCase extends RSEBaseConnectionTestCase { * Test RSE connection manager and related functionality. */ public void testConnectionManager() { + //-test-author-:UweStieber if (!RSETestsPlugin.isTestCaseEnabled("RSEInternalFrameworkTestCase.testConnectionManager")) return; //$NON-NLS-1$ // get the pure test data location root path. diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSETestsPluginTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSETestsPluginTestCase.java index 16acf65b4c8..4d3c0663c2f 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSETestsPluginTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSETestsPluginTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 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 @@ -7,6 +7,7 @@ * * Contributors: * Uwe Stieber (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.internal; @@ -26,6 +27,7 @@ public class RSETestsPluginTestCase extends RSECoreTestCase { * resource bundle functionality. */ public void testPluginResourceBundle() { + //-test-author-:UweStieber if (!RSETestsPlugin.isTestCaseEnabled("RSETestsPluginTestCase.testPluginResourceBundle")) return; //$NON-NLS-1$ ResourceBundle bundle = RSETestsPlugin.getDefault().getResourceBundle(); diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/persistence/PersistenceTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/persistence/PersistenceTest.java index b57e116ceb4..bc5715f54d7 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/persistence/PersistenceTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/persistence/PersistenceTest.java @@ -11,6 +11,7 @@ * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * David McKnight (IBM) - [217715] [api] RSE property sets should support nested property sets + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.persistence; @@ -53,6 +54,7 @@ public class PersistenceTest extends RSECoreTestCase { } public void testPersistenceManagerStartup() { + //-test-author-:DavidDykstal IRSEPersistenceManager m = RSECorePlugin.getThePersistenceManager(); for (int i = 0; i < 5; i++) { if (m.isRestoreComplete()) break; @@ -66,6 +68,7 @@ public class PersistenceTest extends RSECoreTestCase { } public void testProfilePersistence() { + //-test-author-:DavidDykstal /* * Set up this particular test. */ @@ -182,6 +185,7 @@ public class PersistenceTest extends RSECoreTestCase { } public void testHostPersistence() { + //-test-author-:DavidDykstal /* * Set up this particular test. */ diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/preferences/PreferencesTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/preferences/PreferencesTest.java index ec312875aef..612bb99f99d 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/preferences/PreferencesTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/preferences/PreferencesTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2008 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 @@ -12,6 +12,7 @@ * - created and used RSEPreferencesManager * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.preferences; @@ -43,6 +44,7 @@ public class PreferencesTest extends RSECoreTestCase { } public void testActiveProfiles() { + //-test-author-:DavidDykstal RSEPreferencesManager.addActiveProfile("bogus01"); //$NON-NLS-1$ RSEPreferencesManager.addActiveProfile("bogus02"); //$NON-NLS-1$ String[] profiles = RSEPreferencesManager.getActiveProfiles(); @@ -60,6 +62,7 @@ public class PreferencesTest extends RSECoreTestCase { } public void testUserIds() { + //-test-author-:DavidDykstal RSEPreferencesManager.setUserId("a.b.c", "bogusUser"); //$NON-NLS-1$ //$NON-NLS-2$ assertEquals("bogusUser", RSEPreferencesManager.getUserId("a.b.c")); //$NON-NLS-1$ //$NON-NLS-2$ RSEPreferencesManager.clearUserId("a.b.c"); //$NON-NLS-1$ @@ -67,6 +70,7 @@ public class PreferencesTest extends RSECoreTestCase { } public void testDefaultUserIds() { + //-test-author-:DavidDykstal IRSECoreRegistry registry = RSECorePlugin.getTheCoreRegistry(); //TODO should we test deprecated methods as well? Probably yes... IRSESystemType systemTypeDeprecated = registry.getSystemType("Local"); //$NON-NLS-1$ @@ -83,6 +87,7 @@ public class PreferencesTest extends RSECoreTestCase { } public void testShowLocalConnection() { + //-test-author-:DavidDykstal assertTrue(SystemPreferencesManager.getShowLocalConnection()); } diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/CreateFileTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/CreateFileTestCase.java index 03b7acbe050..d1d166bf98e 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/CreateFileTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/CreateFileTestCase.java @@ -10,6 +10,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [cleanup] Avoid using SystemStartHere in production code + * Martin Oberhuber (Wind River) - organize, enable and tag test cases ********************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -101,13 +102,20 @@ public class CreateFileTestCase extends FileServiceBaseTest { return dstoreHost; } - public void testCreateFile() throws Exception { + public void testCreateFileFTP() throws Exception { + //-test-author-:KevinDoyle host = getFTPHost(); createFileAndAssertProperties(); + } + public void testCreateFileDStore() throws Exception { + //-test-author-:KevinDoyle host = getDStoreHost(); createFileAndAssertProperties(); + } + public void testCreateFileSSH() throws Exception { + //-test-author-:KevinDoyle host = getSSHHost(); createFileAndAssertProperties(); } diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java index e1517c57649..26e4f0dce3c 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 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 @@ -9,6 +9,7 @@ * Uwe Stieber (Wind River) - initial API and implementation. * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry * David McKnight (IBM) - [186363] get rid of obsolete calls to SubSystem.connect() + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -63,6 +64,7 @@ public class FTPFileSubsystemTestCase extends RSEBaseConnectionTestCase { * Test the FTP read access to a real remote FTP host. */ public void testFTPReadAccessToRemoteHost() { + //-test-author-:UweStieber if (!RSETestsPlugin.isTestCaseEnabled("FTPFileSubsystemTestCase.testFTPReadAccessToRemoteHost")) return; //$NON-NLS-1$ ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry(); diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileOutputStreamTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileOutputStreamTestCase.java index 00bf4f5cb87..6eb311c6d06 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileOutputStreamTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileOutputStreamTestCase.java @@ -10,6 +10,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - [cleanup] Avoid using SystemStartHere in production code + * Martin Oberhuber (Wind River) - organize, enable and tag test cases ********************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -115,30 +116,50 @@ public class FileOutputStreamTestCase extends FileServiceBaseTest { return dstoreHost; } - public void testRSEFileStoreAppendOutputStream() throws Exception { + public void testRSEFileStoreAppendOutputStreamLocal() throws Exception { + //-test-author-:KevinDoyle host = getLocalHost(); outputStreamFileWriting(EFS.APPEND); + } + public void testRSEFileStoreAppendOutputStreamFTP() throws Exception { + //-test-author-:KevinDoyle host = getFTPHost(); outputStreamFileWriting(EFS.APPEND); + } + public void testRSEFileStoreAppendOutputStreamDStore() throws Exception { + //-test-author-:KevinDoyle host = getDStoreHost(); outputStreamFileWriting(EFS.APPEND); + } + public void testRSEFileStoreAppendOutputStreamSSH() throws Exception { + //-test-author-:KevinDoyle host = getSSHHost(); outputStreamFileWriting(EFS.APPEND); } - public void testRSEFileStoreOverwriteOutputStream() throws Exception { + public void testRSEFileStoreOverwriteOutputStreamLocal() throws Exception { + //-test-author-:KevinDoyle host = getLocalHost(); outputStreamFileWriting(EFS.NONE); + } + public void testRSEFileStoreOverwriteOutputStreamFTP() throws Exception { + //-test-author-:KevinDoyle host = getFTPHost(); outputStreamFileWriting(EFS.NONE); + } + public void testRSEFileStoreOverwriteOutputStreamDStore() throws Exception { + //-test-author-:KevinDoyle host = getDStoreHost(); outputStreamFileWriting(EFS.NONE); + } + public void testRSEFileStoreOverwriteOutputStreamSSH() throws Exception { + //-test-author-:KevinDoyle host = getSSHHost(); outputStreamFileWriting(EFS.NONE); } diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTest.java index 5640366131b..13d4120ca79 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTest.java @@ -8,6 +8,7 @@ * Contributors: * Xuan Chen (IBM) - initial API and implementation * Martin Oberhuber (Wind River) - Fix Javadoc warnings + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -587,6 +588,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { public void testCreateZipFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip file first. @@ -642,6 +644,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testRenameVirtualFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip file first. @@ -713,6 +716,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveVirtualFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the source data needed for testing @@ -747,6 +751,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveVirtualFileLevelTwo() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -783,6 +788,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveToArchiveFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -816,6 +822,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveToVirtualFileLevelOne() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -851,6 +858,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveToVirtualFileLevelTwo() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -887,6 +895,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { public void testCopyVirtualFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -914,6 +923,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyVirtualFileLevelTwo() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -945,6 +955,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { public void testCopyToArchiveFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -975,6 +986,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { public void testCopyToVirtualFileLevelOne() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1007,6 +1019,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { public void testCopyToVirtualFileLevelTwo() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1038,6 +1051,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyBatchToArchiveFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1092,6 +1106,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyBatchToVirtualFileLevelOne() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1124,6 +1139,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyBatchToVirtualFileLevelTwo() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1183,6 +1199,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyBatchVirtualFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1228,6 +1245,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyBatchVirtualFileLevelTwo() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1260,6 +1278,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyVirtualBatchToArchiveFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1291,6 +1310,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyVirtualBatchToVirtualFileLevelOne() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1347,6 +1367,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyVirtualBatchToVirtualFileLevelTwo() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -1546,6 +1567,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCreateTarFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip file first. @@ -1599,6 +1621,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyToTarArchiveFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1628,6 +1651,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyToTarVirtualFileLevelOne() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1660,6 +1684,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyToTarVirtualFileLevelFour() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1697,6 +1722,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyTarVirtualFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1726,6 +1752,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testCopyTarVirtualFileLevelFour() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1773,6 +1800,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveToTarArchiveFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1805,6 +1833,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveToTarVirtualFileLevelOne() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1841,6 +1870,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveToVirtualFileLevelFour() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1883,6 +1913,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveTarVirtualFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1918,6 +1949,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testMoveTarVirtualFileLevelFour() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -1961,6 +1993,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testRenameTarVirtualFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip file first. @@ -2029,6 +2062,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { } public void testDeleteTarVirtualFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //create the source for testing first @@ -2099,6 +2133,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { public void testCopyBatchToTarArchiveFile() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceTarFiles(); @@ -2155,6 +2190,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { public void testCopyBatchToTarVirtualFileLevelFour() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceTarFiles(); @@ -2221,6 +2257,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest { public void testCopyBatchTarVirtualFileLevelFive() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceTarFiles(); diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java index e7bd07d55a1..9afbb377251 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java @@ -8,6 +8,7 @@ * Contributors: * Xuan Chen (IBM) - initial API and implementation * Martin Oberhuber (Wind River) - Fix Javadoc warnings + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -202,6 +203,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testSuperTransferLocalToRemote() throws Exception { + //-test-author-:XuanChen String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString(); IFileStore temp = createDir(tempPath, true); @@ -243,6 +245,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testSuperTransferDStoreWindowsAndDStore() throws Exception { + //-test-author-:XuanChen String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString(); IFileStore temp = createDir(tempPath, true); @@ -339,6 +342,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testSuperTransferDStoreToLocal() throws Exception { + //-test-author-:XuanChen String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString(); IFileStore temp = createDir(tempPath, true); @@ -413,6 +417,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVirtualFileFromDStoreToLocal() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -471,6 +476,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { public void testCopyVirtualFileLevelTwoFromDStoreToLocal() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ createSourceZipFiles(); @@ -530,6 +536,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVirtualFileFromLocalToDStore() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ IRemoteFile sourceZipLocation = createSourceZipFiles(localFss); @@ -570,6 +577,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVirtualFileLevelTwoFromLocalToDStore() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ IRemoteFile sourceZipLocation = createSourceZipFiles(localFss); @@ -615,6 +623,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVFToArchiveFromDStoreToLocal() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip files in dstore connection. @@ -659,6 +668,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVFLevelTwoToArchiveFromDStoreToLocal() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip files in dstore connection. @@ -709,6 +719,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVFToArchiveFromLocalToDStore() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip files in dstore connection. @@ -757,6 +768,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVFLevelTwoToArchiveFromLocalToDStore() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip files in dstore connection. @@ -809,6 +821,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVFToVFFromDStoreToLocal() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip files in dstore connection. @@ -853,6 +866,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVFToVFLevelTwoFromDStoreToLocal() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip files in dstore connection. @@ -902,6 +916,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVFToVFFromLocalToDStore() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip files in dstore connection. @@ -950,6 +965,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest { } public void testCopyVFToVFLevelTwoFromLocalToDStore() throws Exception { + //-test-author-:XuanChen if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ //Create the zip files in dstore connection. diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceTest.java index c975fbbd688..dc723697d3f 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 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 @@ -10,6 +10,7 @@ * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -83,6 +84,7 @@ public class FileServiceTest extends RSEBaseConnectionTestCase { } public void testCaseSensitive() { + //-test-author-:MartinOberhuber if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCaseSensitive")) return; //$NON-NLS-1$ if (isWindows()) { @@ -97,6 +99,7 @@ public class FileServiceTest extends RSEBaseConnectionTestCase { } public void testCreateFile() throws SystemMessageException { + //-test-author-:MartinOberhuber if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$ String testName = getTestFileName(); @@ -116,6 +119,7 @@ public class FileServiceTest extends RSEBaseConnectionTestCase { } public void testCreateCaseSensitive() throws SystemMessageException { + //-test-author-:MartinOberhuber if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateCaseSensitive")) return; //$NON-NLS-1$ String testName = getTestFileName(); diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java index 93b6c515be7..ec700b48b00 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileSubsystemConsistencyTestCase.java @@ -9,6 +9,7 @@ * David McKnight (IBM) - [162195] new APIs for upload multi and download multi * David McKnight (IBM) - [209552] API changes to use multiple and getting rid of deprecated * David McKnight (IBM) - [210109] store constants in IFileService rather than IFileServiceConstants + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -181,6 +182,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase * Test the implicit connect of each connection when calling getRemoteFileObject(). */ public void testImplicitConnectViaFileSubSystem() { + //-test-author-:DaveMcKnight if (!RSETestsPlugin.isTestCaseEnabled("FileSubsystemConsistencyTestCase.testImplicitConnectViaFileSubSystem")) return; //$NON-NLS-1$ setupConnections(); @@ -221,6 +223,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase } } public void testSingleFileQuery() { + //-test-author-:DaveMcKnight if (!RSETestsPlugin.isTestCaseEnabled("FileSubsystemConsistencyTestCase.testSingleFileQuery")) return; //$NON-NLS-1$ setupConnections(); @@ -310,6 +313,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase * Test the multi file query */ public void testMultiFileQuery() { + //-test-author-:DaveMcKnight if (!RSETestsPlugin.isTestCaseEnabled("FileSubsystemConsistencyTestCase.testMultiFileQuery")) return; //$NON-NLS-1$ setupConnections(); @@ -379,6 +383,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase * Test the single file download */ public void testSingleFileDownload() { + //-test-author-:DaveMcKnight if (!RSETestsPlugin.isTestCaseEnabled("FileSubsystemConsistencyTestCase.testSingleFileDownload")) return; //$NON-NLS-1$ setupConnections(); internalFileDownload(false); @@ -388,6 +393,7 @@ public class FileSubsystemConsistencyTestCase extends RSEBaseConnectionTestCase * Test the multi file download */ public void testMultiFileDownload() { + //-test-author-:DaveMcKnight if (!RSETestsPlugin.isTestCaseEnabled("FileSubsystemConsistencyTestCase.testMultiFileDownload")) return; //$NON-NLS-1$ setupConnections(); internalFileDownload(true); diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/RSEFileSubsystemTestSuite.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/RSEFileSubsystemTestSuite.java index de5a9f72154..4d8d84d712e 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/RSEFileSubsystemTestSuite.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/RSEFileSubsystemTestSuite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 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 @@ -7,6 +7,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.subsystems.files; @@ -40,16 +41,19 @@ public class RSEFileSubsystemTestSuite extends DelegatingTestSuiteHolder { public static Test suite() { TestSuite suite = new TestSuite("RSE File Subsystem Test Suite"); //$NON-NLS-1$ // add the single test suites to the overall one here. + //-test-disabled-//suite.addTestSuite(CreateFileTestCase.class); + suite.addTestSuite(FileOutputStreamTestCase.class); + suite.addTestSuite(FileServiceArchiveTest.class); + //-test-disabled-//suite.addTest(FileServiceArchiveTestDStore.suite()); + //-test-disabled-//suite.addTest(FileServiceArchiveTestDStoreWindows.suite()); suite.addTestSuite(FileServiceTest.class); + //-test-disabled-//suite.addTestSuite(FileSubsystemConsistencyTestCase.class); // Do not include the ftp sub system test case within the automated tests. // Most server seems to limit the amount of connections per IP-address, so // we run in problems with that. The test needs to be executed manually with // the ftp server to use possibly changed to whatever host will do. - // suite.addTestSuite(FTPFileSubsystemTestCase.class); - - - //suite.addTestSuite(FileSubsystemConsistencyTestCase.class); + suite.addTestSuite(FTPFileSubsystemTestCase.class); return suite; } diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java index d4d97a54720..5fd1cf582b2 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/testsubsystem/TestSubsystemTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 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 @@ -9,6 +9,7 @@ * Tobias Schwarz (Wind River) - initial API and implementation. * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Martin Oberhuber (Wind River) - organize, enable and tag test cases *******************************************************************************/ package org.eclipse.rse.tests.subsystems.testsubsystem; @@ -68,6 +69,7 @@ public class TestSubsystemTestCase extends RSEBaseConnectionTestCase { } public void testAddAndDeleteDeepNodes() { + //-test-author-:TobiasSchwarz if (!RSETestsPlugin.isTestCaseEnabled("TestSubsystemTestCase.testAddAndDeleteDeepNodes")) return; //$NON-NLS-1$ // these test _must_ run in UI thread PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { @@ -78,6 +80,7 @@ public class TestSubsystemTestCase extends RSEBaseConnectionTestCase { } public void testAddAndDeleteFlatNodes() { + //-test-author-:TobiasSchwarz if (!RSETestsPlugin.isTestCaseEnabled("TestSubsystemTestCase.testAddAndDeleteFlatNodes")) return; //$NON-NLS-1$ // these test _must_ run in UI thread PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { @@ -138,6 +141,7 @@ public class TestSubsystemTestCase extends RSEBaseConnectionTestCase { } public void testBugzilla170728() { + //-test-author-:TobiasSchwarz if (!RSETestsPlugin.isTestCaseEnabled("TestSubsystemTestCase.testBugzilla170728")) return; //$NON-NLS-1$ // these test _must_ run in UI thread PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/mnemonics/MnemonicsTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/mnemonics/MnemonicsTest.java index 03c85442125..ba2a40c9731 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/mnemonics/MnemonicsTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/mnemonics/MnemonicsTest.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2007 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2008 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 @@ -9,6 +9,7 @@ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Martin Oberhuber (Wind River) - organize, enable and tag test cases ********************************************************************************/ package org.eclipse.rse.tests.ui.mnemonics; @@ -39,6 +40,7 @@ public class MnemonicsTest extends RSECoreTestCase { } public void testDefaultGeneration() { + //-test-author-:DavidDykstal Mnemonics mn = new Mnemonics(); mn.clear("abcde"); String result = mn.setUniqueMnemonic("A..."); @@ -48,6 +50,7 @@ public class MnemonicsTest extends RSECoreTestCase { } public void testAppendPolicies() { + //-test-author-:DavidDykstal setLocalePattern(".*"); // match all locales Mnemonics mn = new Mnemonics(); mn.clear("abcde"); diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/preferences/PreferencesTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/preferences/PreferencesTest.java index 56464c16564..b69330a009c 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/preferences/PreferencesTest.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/ui/preferences/PreferencesTest.java @@ -1,11 +1,12 @@ /******************************************************************************** - * Copyright (c) 2007 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2008 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: * David Dykstal (IBM) - initial API and implementation. + * Martin Oberhuber (Wind River) - organize, enable and tag test cases ********************************************************************************/ package org.eclipse.rse.tests.ui.preferences; @@ -37,6 +38,7 @@ public class PreferencesTest extends RSECoreTestCase { } public void testShowLists() { + //-test-author-:DavidDykstal Preferences store = RSEUIPlugin.getDefault().getPluginPreferences(); boolean showLists = store.getBoolean(ISystemPreferencesConstants.SHOW_EMPTY_LISTS); assertTrue(showLists);