[jbosstools-commits] JBoss Tools SVN: r34817 - in trunk/as: plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal and 3 other directories.

Author: adietish Date: 2011-09-16 10:55:31 -0400 (Fri, 16 Sep 2011) New Revision: 34817 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java Log: [JBIDE-9510] implementing IOpenshiftService#getUserInfo (integration test is now also successful) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-16 14:39:20 UTC (rev 34816) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftService.java 2011-09-16 14:55:31 UTC (rev 34817) @@ -33,9 +33,9 @@ public String getStatus(String name, Cartridge cartridge) throws OpenshiftException; - public Domain changeDomain(String domainName, SSHKeyPair sshKey) throws OpenshiftException; + public Domain changeDomain(String domainName, ISSHPublicKey sshKey) throws OpenshiftException; - public Domain createDomain(String name, SSHKeyPair sshKey) throws OpenshiftException; + public Domain createDomain(String name, ISSHPublicKey sshKey) throws OpenshiftException; public SSHKeyPair createKey(String passPhrase, String privateKeyPath, String publicKeyPath) throws OpenshiftException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-16 14:39:20 UTC (rev 34816) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-16 14:55:31 UTC (rev 34817) @@ -19,6 +19,7 @@ import org.jboss.ide.eclipse.as.openshift.core.Domain; import org.jboss.ide.eclipse.as.openshift.core.IHttpClient; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService; +import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; import org.jboss.ide.eclipse.as.openshift.core.InvalidCredentialsOpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftEndpointException; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; @@ -119,12 +120,12 @@ } @Override - public Domain createDomain(String name, SSHKeyPair sshKey) throws OpenshiftException { + public Domain createDomain(String name, ISSHPublicKey sshKey) throws OpenshiftException { return requestDomainAction(new CreateDomainRequest(name, sshKey, username, true)); } @Override - public Domain changeDomain(String newName, SSHKeyPair sshKey) throws OpenshiftException { + public Domain changeDomain(String newName, ISSHPublicKey sshKey) throws OpenshiftException { return requestDomainAction(new ChangeDomainRequest(newName, sshKey, username, true)); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java 2011-09-16 14:39:20 UTC (rev 34816) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java 2011-09-16 14:55:31 UTC (rev 34817) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.core.internal.request; -import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair; +import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; /** @@ -19,13 +19,13 @@ public abstract class AbstractDomainRequest extends AbstractOpenshiftRequest { private String name; - private SSHKeyPair sshKey; + private ISSHPublicKey sshKey; - public AbstractDomainRequest(String name, SSHKeyPair sshKey, String username) { + public AbstractDomainRequest(String name, ISSHPublicKey sshKey, String username) { this(name, sshKey, username, false); } - public AbstractDomainRequest(String name, SSHKeyPair sshKey, String username, boolean debug) { + public AbstractDomainRequest(String name, ISSHPublicKey sshKey, String username, boolean debug) { super(username, debug); this.name = name; this.sshKey = sshKey; @@ -35,7 +35,7 @@ return name; } - public SSHKeyPair getSshKey() { + public ISSHPublicKey getSshKey() { return sshKey; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java 2011-09-16 14:39:20 UTC (rev 34816) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java 2011-09-16 14:55:31 UTC (rev 34817) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.core.internal.request; -import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair; +import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; /** @@ -18,11 +18,11 @@ */ public class ChangeDomainRequest extends AbstractDomainRequest { - public ChangeDomainRequest(String name, SSHKeyPair sshKey, String username) { + public ChangeDomainRequest(String name, ISSHPublicKey sshKey, String username) { this(name, sshKey, username, false); } - public ChangeDomainRequest(String name, SSHKeyPair sshKey, String username, boolean debug) { + public ChangeDomainRequest(String name, ISSHPublicKey sshKey, String username, boolean debug) { super(name, sshKey, username, debug); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java 2011-09-16 14:39:20 UTC (rev 34816) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java 2011-09-16 14:55:31 UTC (rev 34817) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.core.internal.request; -import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair; +import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; /** @@ -18,11 +18,11 @@ */ public class CreateDomainRequest extends AbstractDomainRequest { - public CreateDomainRequest(String name, SSHKeyPair sshKey, ApplicationAction action, String username) { + public CreateDomainRequest(String name, ISSHPublicKey sshKey, ApplicationAction action, String username) { this(name, sshKey, username, false); } - public CreateDomainRequest(String name, SSHKeyPair sshKey, String username, boolean debug) { + public CreateDomainRequest(String name, ISSHPublicKey sshKey, String username, boolean debug) { super(name, sshKey, username, debug); } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationIntegrationTest.java 2011-09-16 14:39:20 UTC (rev 34816) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationIntegrationTest.java 2011-09-16 14:55:31 UTC (rev 34817) @@ -58,7 +58,7 @@ assertEquals(applicationName, application.getName()); assertEquals(cartridge, application.getCartridge()); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -78,7 +78,7 @@ openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -90,7 +90,7 @@ openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -103,7 +103,7 @@ openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); openshiftService.startApplication(applicationName, Cartridge.JBOSSAS_7); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -121,7 +121,7 @@ openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); openshiftService.startApplication(applicationName, Cartridge.JBOSSAS_7); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -140,7 +140,7 @@ openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -158,7 +158,7 @@ openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); openshiftService.restartApplication(applicationName, Cartridge.JBOSSAS_7); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -170,7 +170,7 @@ String applicationStatus = openshiftService.getStatus(application.getName(), application.getCartridge()); assertNotNull(applicationStatus); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -183,7 +183,7 @@ String applicationStatus2 = openshiftService.getStatus(application.getName(), application.getCartridge()); assertEquals(applicationStatus, applicationStatus2); } finally { - silentlyDestroyApplication(applicationName, openshiftService); + silentlyDestroyAS7Application(applicationName, openshiftService); } } @@ -191,7 +191,7 @@ return String.valueOf(System.currentTimeMillis()); } - private void silentlyDestroyApplication(String name, IOpenshiftService service) { + private void silentlyDestroyAS7Application(String name, IOpenshiftService service) { try { service.destroyApplication(name, Cartridge.JBOSSAS_7); } catch (OpenshiftException e) { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java 2011-09-16 14:39:20 UTC (rev 34816) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java 2011-09-16 14:55:31 UTC (rev 34817) @@ -10,9 +10,16 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.test.internal.core; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.util.List; + +import org.jboss.ide.eclipse.as.openshift.core.Application; +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService; +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +import org.jboss.ide.eclipse.as.openshift.core.User; import org.jboss.ide.eclipse.as.openshift.core.UserInfo; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; import org.junit.Before; @@ -37,5 +44,45 @@ public void canGetUserInfo() throws Exception { UserInfo userInfo = openshiftService.getUserInfo(); assertNotNull(userInfo); + + User user = userInfo.getUser(); + assertEquals(USERNAME, user.getRhlogin()); } + + @Test + public void userInfoContainsOneMoreApplicationAfterCreatingNewApplication() throws Exception { + UserInfo userInfo = openshiftService.getUserInfo(); + assertNotNull(userInfo); + + User user = userInfo.getUser(); + assertEquals(USERNAME, user.getRhlogin()); + assertNotNull(user.getSshKey()); + + List<Application> applications = userInfo.getApplications(); + assertNotNull(applications); + int numberOfApplications = applications.size(); + + String applicationName = createRandomName(); + try { + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + + UserInfo userInfo2 = openshiftService.getUserInfo(); + assertEquals(numberOfApplications + 1, userInfo2.getApplications().size()); + } finally { + silentlyDestroyAS7Application(applicationName, openshiftService); + } + } + + private String createRandomName() { + return String.valueOf(System.currentTimeMillis()); + } + + private void silentlyDestroyAS7Application(String name, IOpenshiftService service) { + try { + service.destroyApplication(name, Cartridge.JBOSSAS_7); + } catch (OpenshiftException e) { + e.printStackTrace(); + } + } + } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-16 14:39:20 UTC (rev 34816) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-16 14:55:31 UTC (rev 34817) @@ -16,6 +16,7 @@ import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.Domain; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService; +import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair; import org.jboss.ide.eclipse.as.openshift.core.UserInfo; @@ -66,12 +67,12 @@ } @Override - public Domain changeDomain(String domainName, SSHKeyPair sshKey) throws OpenshiftException { + public Domain changeDomain(String domainName, ISSHPublicKey sshKey) throws OpenshiftException { throw new UnsupportedOperationException(); } @Override - public Domain createDomain(String name, SSHKeyPair keyPair) throws OpenshiftException { + public Domain createDomain(String name, ISSHPublicKey keyPair) throws OpenshiftException { throw new UnsupportedOperationException(); }