From 3e92eefdd1ab70dea4d63a13ab29dc292147c507 Mon Sep 17 00:00:00 2001 From: Xuan Chen Date: Thu, 26 Jul 2007 14:32:25 +0000 Subject: [PATCH] Some methods added for creating connection in DStore. --- .../connection/RSEBaseConnectionTestCase.java | 34 +++++++++++++++++++ .../tests/internal/RSEConnectionManager.java | 5 +-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEBaseConnectionTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEBaseConnectionTestCase.java index cc581e62af1..db3bb8adbb8 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEBaseConnectionTestCase.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEBaseConnectionTestCase.java @@ -84,4 +84,38 @@ public class RSEBaseConnectionTestCase extends RSECoreTestCase { return connection; } + + /** + * Lookup and return the local system type connection. This connection + * should be usually available on all systems. + * + * @return The local system type connection or null if the lookup fails. + */ + protected IHost getRemoteSystemConnection(String systemTypeID, String systemAddress, String systemName, String userID, String password) { + + Exception exception = null; + String cause = null; + // Pre-create the local system connection properties + Properties properties = new Properties(); + properties.setProperty(IRSEConnectionProperties.ATTR_SYSTEM_TYPE_ID, systemTypeID); + properties.setProperty(IRSEConnectionProperties.ATTR_ADDRESS, systemAddress); //$NON-NLS-1$ + properties.setProperty(IRSEConnectionProperties.ATTR_NAME, systemName); //$NON-NLS-1$ + properties.setProperty(IRSEConnectionProperties.ATTR_USERID, userID); //$NON-NLS-1$ + properties.setProperty(IRSEConnectionProperties.ATTR_PASSWORD, password); //$NON-NLS-1$ + + IRSEConnectionProperties remoteSystemConnectionProperties; + remoteSystemConnectionProperties = getConnectionManager().loadConnectionProperties(properties, false); + + IHost connection = null; + try { + connection = getConnectionManager().findOrCreateConnection(remoteSystemConnectionProperties); + } catch (Exception e) { + exception = e; + cause = exception.getLocalizedMessage(); + } + assertNull("Failed to find and create remote system connection! Possible cause: " + cause, exception); //$NON-NLS-1$ + assertNotNull("Failed to find and create remote system connection! Cause unknown!", connection); //$NON-NLS-1$ + + return connection; + } } \ No newline at end of file diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java index 0003af4547b..4216e4b0b10 100644 --- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java +++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java @@ -199,7 +199,7 @@ public class RSEConnectionManager implements IRSEConnectionManager { // First lookup and create the profile String profileName = properties.getProperty(IRSEConnectionProperties.ATTR_PROFILE_NAME); - Assert.assertNotSame("FAILED(findOrCreateConnection): Invalid system profile name!", "unknown", profileName); //$NON-NLS-1$ //$NON-NLS-2$ + //Assert.assertNotSame("FAILED(findOrCreateConnection): Invalid system profile name!", "unknown", profileName); //$NON-NLS-1$ //$NON-NLS-2$ ISystemProfile profile = profileName == null ? systemRegistry.getSystemProfileManager().getDefaultPrivateSystemProfile() : systemRegistry.getSystemProfile(profileName); if (profile == null) { try { @@ -210,6 +210,7 @@ public class RSEConnectionManager implements IRSEConnectionManager { } Assert.assertNull("FAILED(findOrCreateConnection): Failed to create system profile '" + profileName + "'! Possible cause: " + cause, exception); //$NON-NLS-1$ //$NON-NLS-2$ } + profileName = profile.getName(); Assert.assertNotNull("FAILED(findOrCreateConnection): Failed to find and/or create system profile '" + profileName + "'!", profile); //$NON-NLS-1$ //$NON-NLS-2$ String name = properties.getProperty(IRSEConnectionProperties.ATTR_NAME); @@ -239,7 +240,7 @@ public class RSEConnectionManager implements IRSEConnectionManager { if (userId != null && password != null) { SystemSignonInformation info = new SystemSignonInformation(address, userId, password, systemType); - PasswordPersistenceManager.getInstance().add(info, true); + PasswordPersistenceManager.getInstance().add(info, true, true); } } Assert.assertNotNull("FAILED(findOrCreateConnection): Failed to find and/or create connection IHost object!", connection); //$NON-NLS-1$