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 index 8adab96195f..5a698b0fdb1 100644 --- 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 @@ -7,6 +7,7 @@ * * Contributors: * Martin Oberhuber (Wind River) - initial API and implementation + * Tom Hochstein (Freescale) - [301075] Host copy doesn't copy contained property sets *******************************************************************************/ package org.eclipse.rse.tests.core; @@ -31,6 +32,7 @@ public class AllTests extends DelegatingTestSuiteHolder { TestSuite suite = new TestSuite(AllTests.class.getName()); // add the single test suites to the overall one here. suite.addTestSuite(HostMoveTest.class); + suite.addTestSuite(HostCopyTest.class); return suite; } diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/HostCopyTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/HostCopyTest.java new file mode 100644 index 00000000000..e916da14473 --- /dev/null +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/HostCopyTest.java @@ -0,0 +1,122 @@ +/******************************************************************************** + * 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) - [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 + * Tom Hochstein (Freescale) - [301075] Host copy doesn't copy contained property sets + ********************************************************************************/ + +package org.eclipse.rse.tests.core; + +import java.util.Properties; + +import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.RSECorePlugin; +import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.core.model.IProperty; +import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.tests.core.connection.IRSEConnectionProperties; +import org.eclipse.rse.tests.core.connection.RSEBaseConnectionTestCase; + +/** + * Tests host copy. + */ +public class HostCopyTest extends RSEBaseConnectionTestCase { + + private IHost host = null; + + /* (non-Javadoc) + * @see org.eclipse.rse.tests.core.RSECoreTestCase#setUp() + */ + protected void setUp() throws Exception { + super.setUp(); + createHosts(); + } + + /* (non-Javadoc) + * @see org.eclipse.rse.tests.core.RSECoreTestCase#tearDown() + */ + protected void tearDown() throws Exception { + deleteHosts(); + super.tearDown(); + } + + /** + * Test copy of connections + */ + public void testCopy() { + //-test-author-:DavidDykstal + if (isTestDisabled()) + return; + + String setName = "Test Property Set Level 1"; //$NON-NLS-1$ + String propertyName = "Test Property Level 1"; //$NON-NLS-1$ + String propertyValue = "Level 1"; //$NON-NLS-1$ + IPropertySet ps = host.createPropertySet(setName); + assertNotNull("Failed to create property set " + setName, ps); //$NON-NLS-1$ + IProperty p = ps.addProperty(propertyName, propertyValue); + assertNotNull("Failed to create property " + propertyName, p); //$NON-NLS-1$ + assertEquals("Failed to set value for property " + propertyName, propertyValue, p.getValue()); //$NON-NLS-1$ + + String setName2 = "Test Property Set Level 2"; //$NON-NLS-1$ + String propertyName2 = "Test Property Level 2"; //$NON-NLS-1$ + String propertyValue2 = "Level 2"; //$NON-NLS-1$ + ps = ps.createPropertySet(setName2); + assertNotNull("Failed to create property set " + setName2, ps); //$NON-NLS-1$ + p = ps.addProperty(propertyName2, propertyValue2); + assertNotNull("Failed to create property " + propertyName2, p); //$NON-NLS-1$ + assertEquals("Failed to set value for property " + propertyName2, propertyValue2, p.getValue()); //$NON-NLS-1$ + + String name = host.getAliasName(); + String copyName = name + "Copy"; //$NON-NLS-1$ + IHost copy = getConnectionManager().copyConnection(host, copyName); + assertNotNull("Failed to copy connection " + name, copy); //$NON-NLS-1$ + + ps = copy.getPropertySet(setName); + assertNotNull("Failed to copy property set " + setName, ps); //$NON-NLS-1$ + p = ps.getProperty(propertyName); + assertNotNull("Failed to copy property " + propertyName, p); //$NON-NLS-1$ + assertEquals("Failed to copy value for property " + propertyName, propertyValue, p.getValue()); //$NON-NLS-1$ + + ps = ps.getPropertySet(setName2); + assertNotNull("Failed to copy property set " + setName2, ps); //$NON-NLS-1$ + p = ps.getProperty(propertyName2); + assertNotNull("Failed to copy property " + propertyName2, p); //$NON-NLS-1$ + assertEquals("Failed to copy value for property " + propertyName2, propertyValue2, p.getValue()); //$NON-NLS-1$ + + getConnectionManager().removeConnection("TestProfile", copyName); + host.removePropertySet(setName); + } + + /** + * Create the test hosts. + */ + private void createHosts() throws Exception { + + /* Common host properties */ + Properties properties = new Properties(); + properties.setProperty(IRSEConnectionProperties.ATTR_PROFILE_NAME, "TestProfile"); //$NON-NLS-1$ + properties.setProperty(IRSEConnectionProperties.ATTR_ADDRESS, "localhost"); //$NON-NLS-1$ + properties.setProperty(IRSEConnectionProperties.ATTR_SYSTEM_TYPE_ID, IRSESystemType.SYSTEMTYPE_UNIX_ID); + properties.setProperty(IRSEConnectionProperties.ATTR_USERID, "userid"); //$NON-NLS-1$ + properties.setProperty(IRSEConnectionProperties.ATTR_PASSWORD, "password"); //$NON-NLS-1$ + IRSEConnectionProperties props = getConnectionManager().loadConnectionProperties(properties, false); + + String hostName = "TestHost"; + properties.setProperty(IRSEConnectionProperties.ATTR_NAME, hostName); + host = getConnectionManager().findOrCreateConnection(props); + assertNotNull("Failed to create connection " + props.getProperty(IRSEConnectionProperties.ATTR_NAME), host); //$NON-NLS-1$ + } + + private void deleteHosts() { + RSECorePlugin.getTheSystemRegistry().deleteHost(host); + } + +} 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 de80f6c09dd..8c0973d64be 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 @@ -12,7 +12,6 @@ * David McKnight (IBM) - [186363] get rid of obsolete calls to SubSystem.connect() * Martin Oberhuber (Wind River) - organize, enable and tag test cases * Martin Oberhuber (Wind River) - [247908] extract testBug255023 - * Tom Hochstein (Freescale) - [301075] Host copy doesn't copy contained property sets ********************************************************************************/ package org.eclipse.rse.tests.core.connection; @@ -21,8 +20,6 @@ import java.util.Properties; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; -import org.eclipse.rse.core.model.IProperty; -import org.eclipse.rse.core.model.IPropertySet; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -106,55 +103,6 @@ public class RSEConnectionTestCase extends RSEBaseConnectionTestCase { } - /** - * Test copy of connections - */ - public void testConnectionCopy() { - //-test-author-:DavidDykstal - if (isTestDisabled()) - return; - - String profileName = "TestProfile"; //$NON-NLS-1$ - - String name = "TestHost1"; //$NON-NLS-1$ - String copyName = "TestHost1Copy"; //$NON-NLS-1$ - IHost connection = getConnectionManager().findConnection(profileName, name); - assertNotNull("Failed to find source connection " + name, connection); //$NON-NLS-1$ - - String setName = "Test Property Set Level 1"; //$NON-NLS-1$ - String propertyName = "Test Property Level 1"; //$NON-NLS-1$ - String propertyValue = "Level 1"; //$NON-NLS-1$ - IPropertySet ps = connection.createPropertySet(setName); - assertNotNull("Failed to create property set " + setName, ps); //$NON-NLS-1$ - IProperty p = ps.addProperty(propertyName, propertyValue); - assertNotNull("Failed to create property " + propertyName, p); //$NON-NLS-1$ - assertEquals("Failed to set value for property " + propertyName, propertyValue, p.getValue()); //$NON-NLS-1$ - - String setName2 = "Test Property Set Level 2"; //$NON-NLS-1$ - String propertyName2 = "Test Property Level 2"; //$NON-NLS-1$ - String propertyValue2 = "Level 2"; //$NON-NLS-1$ - ps = ps.createPropertySet(setName2); - assertNotNull("Failed to create property set " + setName2, ps); //$NON-NLS-1$ - p = ps.addProperty(propertyName2, propertyValue2); - assertNotNull("Failed to create property " + propertyName2, p); //$NON-NLS-1$ - assertEquals("Failed to set value for property " + propertyName2, propertyValue2, p.getValue()); //$NON-NLS-1$ - - IHost copy = getConnectionManager().copyConnection(connection, copyName); - assertNotNull("Failed to copy connection " + name, copy); //$NON-NLS-1$ - - ps = copy.getPropertySet(setName); - assertNotNull("Failed to copy property set " + setName, ps); //$NON-NLS-1$ - p = ps.getProperty(propertyName); - assertNotNull("Failed to copy property " + propertyName, p); //$NON-NLS-1$ - assertEquals("Failed to copy value for property " + propertyName, propertyValue, p.getValue()); //$NON-NLS-1$ - - ps = ps.getPropertySet(setName2); - assertNotNull("Failed to copy property set " + setName2, ps); //$NON-NLS-1$ - p = ps.getProperty(propertyName2); - assertNotNull("Failed to copy property " + propertyName2, p); //$NON-NLS-1$ - assertEquals("Failed to copy value for property " + propertyName2, propertyValue2, p.getValue()); //$NON-NLS-1$ - } - /** * Test removal of connections */