Author: adietish Date: 2011-09-13 07:53:25 -0400 (Tue, 13 Sep 2011) New Revision: 34670 Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.classpath trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.project trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.settings/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/build.properties trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/Activator.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgesIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTestSuite.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTestSuite.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/SSHKeyTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/UserInfoTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/fakes/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/fakes/TestSSHKey.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/utils/ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/utils/StreamUtils.java Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/.classpath Log: [JBIDE-9510] moving org.jboss.ide.eclipse.as.openshift.test to tests Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-09-13 11:51:57 UTC (rev 34669) +++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -19,13 +19,15 @@ public class EGitUtilsTest { private static final String GIT_EMAIL = &quot;dummyUser(a)redhat.com&quot;; - private static final String GIT_USER = "dummyUser"; - + private static final String REPO2_REMOTE_NAME = "openshift"; + protected final TestUtils testUtils = new TestUtils(); private TestRepository testRepository; + private TestRepository testRepository2; private TestProject testProject; + private TestProject testProject2; private TestRepository clonedTestRepository; @Before @@ -39,7 +41,14 @@ testRepository.setUserAndEmail(GIT_USER, GIT_EMAIL); testRepository.connect(testProject.getProject()); + this.testProject2 = new TestProject(true); + + this.testRepository2 = new TestRepository(TestUtils.createGitDir(testProject2)); + testRepository2.setUserAndEmail(GIT_USER, GIT_EMAIL); + testRepository2.connect(testProject2.getProject()); + this.clonedTestRepository = cloneRepository(testRepository); + clonedTestRepository.addRemoteTo(REPO2_REMOTE_NAME, testRepository2.getRepository()); } private TestRepository cloneRepository(TestRepository repository) throws URISyntaxException, @@ -54,9 +63,11 @@ public void tearDown() throws Exception { testRepository.dispose(); clonedTestRepository.dispose(); - + testRepository2.dispose(); + Activator.getDefault().getRepositoryCache().clear(); + testProject.dispose(); - Activator.getDefault().getRepositoryCache().clear(); + testProject2.dispose(); } @Test @@ -96,35 +107,42 @@ @Test public void fileAddedToCloneIsInRemoteAfterPush() throws Exception { - TestProject testProject2 = null; - TestRepository testRepository2 = null; String fileName = "c.txt"; String fileContent = &quot;adietish(a)redhat.com&quot;; - String remoteRepoName = "openshift"; - - try { - testProject2 = new TestProject(true); - File gitDir = TestUtils.createGitDir(testProject2); - testRepository2 = new TestRepository(gitDir); - clonedTestRepository.addRemoteTo(remoteRepoName, testRepository2.getRepository()); - File file = clonedTestRepository.createFile(fileName, fileContent); - clonedTestRepository.addAndCommit(file, "adding a file"); + File file = clonedTestRepository.createFile(fileName, fileContent); + clonedTestRepository.addAndCommit(file, "adding a file"); - EGitUtils.push(remoteRepoName, clonedTestRepository.getRepository(), null); + EGitUtils.push(REPO2_REMOTE_NAME, clonedTestRepository.getRepository(), null); - // does origin contain file added to clone? - testUtils.assertRepositoryContainsFilesWithContent( - clonedTestRepository.getRepository(), - fileName, - fileContent); - } finally { - if (testProject2 != null) { - testProject2.dispose(); - } - if (testRepository2 != null) { - testRepository2.dispose(); - } - } + // does origin contain file added to clone? + testUtils.assertRepositoryContainsFilesWithContent( + testRepository2.getRepository(), + fileName, + fileContent); } + + @Test + public void forcedPushRemovesFileInRemote() throws Exception { + String fileName = "c.txt"; + String fileContent = &quot;adietish(a)redhat.com&quot;; + + IFile fileInRepo2 = testUtils.addFileToProject( + testProject2.getProject(), + fileName, + fileContent); + testRepository2.track(fileInRepo2); + + File fileInClone = clonedTestRepository.createFile(fileName, fileContent); + clonedTestRepository.addAndCommit(fileInClone, "adding a file"); + + EGitUtils.push(REPO2_REMOTE_NAME, clonedTestRepository.getRepository(), null); + + // does origin contain file added to clone? + testUtils.assertRepositoryContainsFilesWithContent( + clonedTestRepository.getRepository(), + fileName, + fileContent); + } + } Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.classpath =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.classpath (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.classpath 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.project =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.project (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.project 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.ide.eclipse.as.openshift.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/.settings/org.eclipse.jdt.core.prefs 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,8 @@ +#Thu Aug 25 16:44:11 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/META-INF/MANIFEST.MF 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Openshift Test Plugin +Bundle-SymbolicName: org.jboss.ide.eclipse.as.openshift.test +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.jboss.ide.eclipse.as.openshift.internal.test.core.Activator +Bundle-Vendor: JBoss by Red Hat +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", + org.junit;bundle-version="[4.8.0,5.0.0)", + org.jboss.ide.eclipse.as.openshift.core;bundle-version="[1.0.0,2.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/build.properties =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/build.properties (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/build.properties 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/Activator.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/Activator.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/Activator.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class Activator implements BundleActivator { + + private static BundleContext context; + + static BundleContext getContext() { + return context; + } + + public void start(BundleContext bundleContext) throws Exception { + Activator.context = bundleContext; + } + + public void stop(BundleContext bundleContext) throws Exception { + Activator.context = null; + } + +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationIntegrationTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,188 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +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.InvalidCredentialsOpenshiftException; +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +import org.jboss.ide.eclipse.as.openshift.core.Status; +import org.jboss.ide.eclipse.as.openshift.internal.core.OpenshiftService; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class ApplicationIntegrationTest { + + private IOpenshiftService openshiftService; + private IOpenshiftService invalidCredentialsOpenshiftService; + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + + @Before + public void setUp() { + this.openshiftService = new OpenshiftService(USERNAME, PASSWORD); + this.invalidCredentialsOpenshiftService = new OpenshiftService(USERNAME, "bogus"); + } + + @Ignore + @Test(expected = InvalidCredentialsOpenshiftException.class) + public void createApplicationWithInvalidCredentialsThrowsException() throws Exception { + invalidCredentialsOpenshiftService.createApplication(createRandomApplicationName(), Cartridge.JBOSSAS_7); + } + + @Ignore + @Test + public void canCreateApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + Cartridge cartridge = Cartridge.JBOSSAS_7; + Application application = openshiftService.createApplication(applicationName, cartridge); + assertNotNull(application); + assertEquals(applicationName, application.getName()); + assertEquals(cartridge, application.getCartridge()); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Ignore + @Test + public void canDestroyApplication() throws Exception { + String applicationName = createRandomApplicationName(); + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.destroyApplication(applicationName, Cartridge.JBOSSAS_7); + } + + @Ignore + @Test(expected = OpenshiftException.class) + public void createDuplicateApplicationThrowsException() throws Exception { + String applicationName = createRandomApplicationName(); + try { + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Ignore + @Test + public void canStopApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Ignore + @Test + public void canStartStoppedApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.startApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Ignore + @Test + public void canStartStartedApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + /** + * freshly created apps are started + * + * @link + * https://github.com/openshift/os-client-tools/blob/master/express/doc/API + */ + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.startApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Ignore + @Test + public void canStopStoppedApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + /** + * freshly created apps are started + * + * @link + * https://github.com/openshift/os-client-tools/blob/master/express/doc/API + */ + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.stopApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Ignore + @Test + public void canRestartApplication() throws Exception { + String applicationName = createRandomApplicationName(); + try { + /** + * freshly created apps are started + * + * @link + * https://github.com/openshift/os-client-tools/blob/master/express/doc/API + */ + openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + openshiftService.restartApplication(applicationName, Cartridge.JBOSSAS_7); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + @Test + public void canGetStatus() throws Exception { + String applicationName = createRandomApplicationName(); + try { + Application application = openshiftService.createApplication(applicationName, Cartridge.JBOSSAS_7); + Status status = openshiftService.getStatus(application); + assertNotNull(status); + } finally { + silentlyDestroyApplication(applicationName, openshiftService); + } + } + + private String createRandomApplicationName() { + return String.valueOf(System.currentTimeMillis()); + } + + private void silentlyDestroyApplication(String name, IOpenshiftService service) { + try { + service.destroyApplication(name, Cartridge.JBOSSAS_7); + } catch (OpenshiftException e) { + e.printStackTrace(); + } + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.assertEquals; + +import java.net.URLEncoder; + +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.ApplicationRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationAction; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationRequest; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class ApplicationTest { + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + + @Test + public void canMarshallApplicationCreateRequest() throws Exception { + String expectedRequestString = + "password=" + + PASSWORD + + "&json_data=%7B" + + "%22rhlogin%22+%3A+%22" + + URLEncoder.encode(USERNAME, "UTF-8") + + "%22" + + "%2C+%22debug%22+%3A+%22true%22" + + "%2C+%22cartridge%22+%3A+%22jbossas-7.0%22" + + "%2C+%22action%22+%3A+%22configure%22" + + "%2C+%22app_name%22+%3A+%22test-application%22" + + "%7D"; + + String createApplicationRequest = new ApplicationRequestJsonMarshaller().marshall( + new ApplicationRequest( + "test-application", Cartridge.JBOSSAS_7, ApplicationAction.CONFIGURE, USERNAME, true)); + String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, createApplicationRequest).create(); + + assertEquals(expectedRequestString, effectiveRequest); + } + + @Test + public void canMarshallApplicationDestroyRequest() throws Exception { + String expectedRequestString = + "password=" + + PASSWORD + + "&json_data=%7B" + + "%22rhlogin%22+%3A+" + + "%22" + URLEncoder.encode(USERNAME, "UTF-8") + "%22" + + "%2C+%22debug%22+%3A+%22true%22" + + "%2C+%22cartridge%22+%3A+%22jbossas-7.0%22" + + "%2C+%22action%22+%3A+%22deconfigure%22" + + "%2C+%22app_name%22+%3A+%22test-application%22" + + "%7D"; + + String createApplicationRequest = new ApplicationRequestJsonMarshaller().marshall( + new ApplicationRequest( + "test-application", Cartridge.JBOSSAS_7, ApplicationAction.DECONFIGURE, USERNAME, true)); + String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, createApplicationRequest).create(); + + assertEquals(expectedRequestString, effectiveRequest); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgeAsserts.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.fail; + +import java.text.MessageFormat; +import java.util.List; + +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; + +public class CartridgeAsserts { + + public static void assertThatContainsCartridge(String cartridgeName, List<Cartridge> cartridges) { + boolean found = false; + for (Cartridge cartridge : cartridges) { + if (cartridgeName.equals(cartridge.getName())) { + found = true; + break; + } + } + if (!found) { + fail(MessageFormat.format("Could not find cartridge with name \"{0}\"", cartridgeName)); + } + } + + +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgesIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgesIntegrationTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/CartridgesIntegrationTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,33 @@ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.List; + +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.internal.core.OpenshiftService; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +public class CartridgesIntegrationTest { + + private OpenshiftService openshiftService; + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + + @Before + public void setUp() { + this.openshiftService = new OpenshiftService(USERNAME, PASSWORD); + } + + @Ignore + @Test + public void canRequestListCartridges() throws Exception { + List<Cartridge> cartridges = openshiftService.getCartridges(); + assertNotNull(cartridges); + assertTrue(cartridges.size() > 0); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainIntegrationTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainIntegrationTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.jboss.ide.eclipse.as.openshift.core.Domain; +import org.jboss.ide.eclipse.as.openshift.core.SSHKey; +import org.jboss.ide.eclipse.as.openshift.core.User; +import org.jboss.ide.eclipse.as.openshift.internal.core.OpenshiftService; +import org.jboss.ide.eclipse.as.openshift.internal.test.core.fakes.TestSSHKey; +import org.junit.Before; +import org.junit.Test; + +public class DomainIntegrationTest { + + private OpenshiftService openshiftService; + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + + @Before + public void setUp() { + this.openshiftService = new OpenshiftService(USERNAME, PASSWORD); + } + + @Test + public void canCreateDomain() throws Exception { + + String domainName = createRandomString(); + SSHKey sshKey = TestSSHKey.create(); + Domain domain = openshiftService.createDomain(domainName, sshKey); + + assertNotNull(domain); + assertEquals(domainName, domain.getName()); + assertNotNull(domain.getUser()); + User user = domain.getUser(); + assertEquals(USERNAME, user.getRhlogin()); + assertNotNull(user.getUuid()); + } + + @Test + public void canChangeDomain() throws Exception { + + String domainName = createRandomString(); + SSHKey sshKey = TestSSHKey.create(); + Domain domain = openshiftService.changeDomain(domainName, sshKey); + + assertNotNull(domain); + assertEquals(domainName, domain.getName()); + assertNotNull(domain.getUser()); + User user = domain.getUser(); + assertEquals(USERNAME, user.getRhlogin()); + assertNotNull(user.getUuid()); + } + + private String createRandomString() { + return String.valueOf(System.currentTimeMillis()); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,124 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +import org.jboss.ide.eclipse.as.openshift.core.Domain; +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +import org.jboss.ide.eclipse.as.openshift.core.SSHKey; +import org.jboss.ide.eclipse.as.openshift.core.User; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.DomainRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.ChangeDomainRequest; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.CreateDomainRequest; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; +import org.jboss.ide.eclipse.as.openshift.internal.core.response.DomainResponseUnmarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.response.JsonSanitizer; +import org.jboss.ide.eclipse.as.openshift.internal.core.response.OpenshiftResponse; +import org.jboss.ide.eclipse.as.openshift.internal.test.core.fakes.TestSSHKey; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class DomainTest { + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + private static final String UUID = "0c82860dae904a4d87f8e5d87a5af840"; + + @Test + public void canMarshallDomainCreateRequest() throws IOException, OpenshiftException { + SSHKey sshKey = TestSSHKey.create(); + String expectedRequestString = createDomainRequestString(PASSWORD, USERNAME, true, "myDomain", false, + sshKey.getPublicKeyContent()); + + CreateDomainRequest request = new CreateDomainRequest("myDomain", sshKey, USERNAME, true); + String requestString = + new OpenshiftJsonRequestFactory( + PASSWORD, + new DomainRequestJsonMarshaller().marshall(request)) + .create(); + assertEquals(expectedRequestString, requestString); + } + + @Test + public void canUnmarshallDomainCreateResponse() throws IOException, OpenshiftException { + String domainName = "myDomain"; + String responseString = createDomainResponseString(USERNAME, UUID); + + responseString = JsonSanitizer.sanitize(responseString); + OpenshiftResponse<Domain> response = new DomainResponseUnmarshaller(domainName).unmarshall(responseString); + + assertNotNull(response); + Domain domain = response.getData(); + assertEquals(domainName, domain.getName()); + User user = domain.getUser(); + assertNotNull(user); + assertEquals(USERNAME, user.getRhlogin()); + assertEquals(UUID, user.getUuid()); + } + + @Test + public void canMarshallDomainAlterRequest() throws IOException, OpenshiftException { + SSHKey sshKey = TestSSHKey.create(); + String expectedRequestString = createDomainRequestString(PASSWORD, USERNAME, true, "myDomain", true, + sshKey.getPublicKeyContent()); + + ChangeDomainRequest request = new ChangeDomainRequest("myDomain", sshKey, USERNAME, true); + String requestString = + new OpenshiftJsonRequestFactory( + PASSWORD, + new DomainRequestJsonMarshaller().marshall(request)) + .create(); + assertEquals(expectedRequestString, requestString); + } + + private String createDomainRequestString(String password, String username, boolean debug, String namespace, + boolean alter, String sshPublicKey) throws UnsupportedEncodingException { + return "password=" + + password + + "&json_data=%7B" + + "%22rhlogin%22+%3A+" + + "%22" + + URLEncoder.encode(username, "UTF-8") + + "%22" + + "%2C+%22debug%22+%3A+%22" + String.valueOf(debug) + "%22" + + "%2C+%22namespace%22+%3A+%22" + URLEncoder.encode(namespace, "UTF-8") + "%22" + + "%2C+%22alter%22+%3A+%22" + String.valueOf(alter) + "%22" + + "%2C+%22ssh%22+%3A+%22" + + URLEncoder.encode(sshPublicKey, "UTF-8") + + "%22" + + "%7D"; + } + + /** + * WARNING: the response this method returns matches the actual response + * from the openshift service (9-12-2011). It is not valid json since it quotes the + * nested json object + * <p> + * "data": "{\"rhlogin\": ... + */ + private String createDomainResponseString(String username, String uuid) { + return "{\"messages\":\"\",\"debug\":\"\",\"data\":\"" + + "{\\\"rhlogin\\\":\\\"" + + username + + "\\\",\\\"uuid\\\":\\\"" + + uuid + + "\\\"}" + + "\",\"api\":\"1.1.1\",\"api_c\":[\"placeholder\"],\"result\":null,\"broker\":\"1.1.1\",\"broker_c\":[\"namespace\",\"rhlogin\",\"ssh\",\"app_uuid\",\"debug\",\"alter\",\"cartridge\",\"cart_type\",\"action\",\"app_name\",\"api\"],\"exit_code\":0}"; + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesIntegrationTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.jboss.ide.eclipse.as.openshift.internal.test.core.CartridgeAsserts.assertThatContainsCartridge; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.List; + +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.internal.core.OpenshiftService; +import org.junit.Before; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class ListCartridgesIntegrationTest { + + private OpenshiftService openshiftService; + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + + @Before + public void setUp() { + this.openshiftService = new OpenshiftService(USERNAME, PASSWORD); + } + + @Test + public void canListCartridges() throws Exception { + List<Cartridge> cartridges = openshiftService.getCartridges(); + assertNotNull(cartridges); + assertTrue(cartridges.size() > 0); + assertThatContainsCartridge("jbossas-7.0", cartridges); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,94 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.jboss.ide.eclipse.as.openshift.internal.test.core.CartridgeAsserts.assertThatContainsCartridge; +import static org.junit.Assert.assertEquals; + +import java.net.URLEncoder; +import java.util.List; + +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.ListCartridgesRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.ListCartridgesRequest; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; +import org.jboss.ide.eclipse.as.openshift.internal.core.response.JsonSanitizer; +import org.jboss.ide.eclipse.as.openshift.internal.core.response.ListCartridgesResponseUnmarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.response.OpenshiftResponse; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class ListCartridgesTest { + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + + @Test + public void canMarshallListCartridgesRequest() throws Exception { + String expectedRequestString = "password=" + PASSWORD + "&json_data=%7B%22rhlogin%22+%3A+%22" + + URLEncoder.encode(USERNAME, "UTF-8") + + "%22%2C+%22debug%22+%3A+%22true%22%2C+%22cart_type%22+%3A+%22standalone%22%7D"; + + String listCartridgeRequest = new ListCartridgesRequestJsonMarshaller().marshall( + new ListCartridgesRequest(USERNAME, true)); + String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, listCartridgeRequest).create(); + + assertEquals(expectedRequestString, effectiveRequest); + } + + @Test + public void canUnmarshallCartridgeListResponse() throws OpenshiftException { + String cartridgeListResponse = + "{" + + "\"messages\":\"\"," + + "\"debug\":\"\"," + + "\"data\":" + + "\"{\\\"carts\\\":[\\\"perl-5.10\\\",\\\"jbossas-7.0\\\",\\\"wsgi-3.2\\\",\\\"rack-1.1\\\",\\\"php-5.3\\\"]}\"," + + "\"api\":\"1.1.1\"," + + "\"api_c\":[\"placeholder\"]," + + "\"result\":null," + + "\"broker\":\"1.1.1\"," + + "\"broker_c\":[" + + "\"namespace\"," + + "\"rhlogin\"," + + "\"ssh\"," + + "\"app_uuid\"," + + "\"debug\"," + + "\"alter\"," + + "\"cartridge\"," + + "\"cart_type\"," + + "\"action\"," + + "\"app_name\"," + + "\"api" + + "\"]," + + "\"exit_code\":0}"; + + cartridgeListResponse = JsonSanitizer.sanitize(cartridgeListResponse); + OpenshiftResponse<List<Cartridge>> response = + new ListCartridgesResponseUnmarshaller().unmarshall(cartridgeListResponse); + assertEquals("", response.getMessages()); + assertEquals(false, response.isDebug()); + + List<Cartridge> cartridges = response.getData(); + assertEquals(5, cartridges.size()); + assertThatContainsCartridge("perl-5.10", cartridges); + assertThatContainsCartridge("jbossas-7.0", cartridges); + assertThatContainsCartridge("wsgi-3.2", cartridges); + assertThatContainsCartridge("rack-1.1", cartridges); + assertThatContainsCartridge("php-5.3", cartridges); + assertEquals(null, response.getResult()); + assertEquals(0, response.getExitCode()); + } + +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTestSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTestSuite.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftIntegrationTestSuite.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + + +(a)RunWith(Suite.class) +(a)Suite.SuiteClasses({ + ApplicationIntegrationTest.class, + CartridgesIntegrationTest.class, + DomainIntegrationTest.class, + ListCartridgesIntegrationTest.class +}) +/** + * @author André Dietisheim + */ +public class OpenshiftIntegrationTestSuite { + +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTestSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTestSuite.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/OpenshiftTestSuite.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + + +(a)RunWith(Suite.class) +(a)Suite.SuiteClasses({ + ApplicationTest.class, + ListCartridgesTest.class, + DomainTest.class, + UserInfoTest.class +}) +/** + * @author André Dietisheim + */ +public class OpenshiftTestSuite { + +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/SSHKeyTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/SSHKeyTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/SSHKeyTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; + +import org.jboss.ide.eclipse.as.openshift.core.SSHKey; +import org.junit.Test; + +public class SSHKeyTest { + + private static final String PASSPHRASE = "12345"; + + @Test + public void canCreatePublicKey() throws Exception { + String publicKeyPath = createTempFile().getAbsolutePath(); + String privateKeyPath = createTempFile().getAbsolutePath(); + SSHKey sshKey = SSHKey.create(PASSPHRASE, privateKeyPath, publicKeyPath); + String publicKey = sshKey.getPublicKeyContent(); + + assertNotNull(publicKey); + assertTrue(!publicKey.contains("ssh-rsa")); // no identifier + assertTrue(!publicKey.contains(" ")); // no comment + } + + @Test + public void canLoadPublicKey() throws Exception { + String publicKeyPath = createTempFile().getAbsolutePath(); + String privateKeyPath = createTempFile().getAbsolutePath(); + SSHKey.create(PASSPHRASE, privateKeyPath, publicKeyPath); + + SSHKey sshKey = SSHKey.load(privateKeyPath, publicKeyPath); + String publicKey = sshKey.getPublicKeyContent(); + + assertNotNull(publicKey); + assertTrue(!publicKey.contains("ssh-rsa")); // no identifier + assertTrue(!publicKey.contains(" ")); // no comment + } + + private File createTempFile() throws IOException { + return File.createTempFile(String.valueOf(System.currentTimeMillis()), null); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/UserInfoTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/UserInfoTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/UserInfoTest.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core; + +import static org.junit.Assert.assertEquals; + +import java.net.URLEncoder; + +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.UserInfoRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; +import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class UserInfoTest { + + private static final String USERNAME = &quot;toolsjboss(a)gmail.com&quot;; + private static final String PASSWORD = "1q2w3e"; + + @Test + public void canMarshallUserInfoRequest() throws Exception { + String expectedRequestString = + "password=" + PASSWORD + + "&json_data=%7B" + + "%22rhlogin%22+%3A+%22" + URLEncoder.encode(USERNAME, "UTF-8") + "%22%2C+" + + "%22debug%22+%3A+%22true%22" + + "%7D"; + + String userInfoRequest = new UserInfoRequestJsonMarshaller().marshall(new UserInfoRequest(USERNAME, true)); + String effectiveRequest = new OpenshiftJsonRequestFactory(PASSWORD, userInfoRequest).create(); + + assertEquals(expectedRequestString, effectiveRequest); + } +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/fakes/TestSSHKey.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/fakes/TestSSHKey.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/fakes/TestSSHKey.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core.fakes; + +import java.io.File; +import java.io.IOException; + +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; +import org.jboss.ide.eclipse.as.openshift.core.SSHKey; +import org.jboss.ide.eclipse.as.openshift.internal.test.core.utils.StreamUtils; + +/** + * @author André Dietisheim + */ +public class TestSSHKey { + + private static final String privateKey = + "-----BEGIN RSA PRIVATE KEY-----\n" + + "Proc-Type: 4,ENCRYPTED\n" + + "DEK-Info: DES-EDE3-CBC,30E8B3A668E44D77\n" + + "\n" + + "wsXCU31SUTYhjPnOiW56UlZ7VXKlIjItLo5Wrk5LwCLv/OERK7UWJkrwM2bHPb6n\n" + + "3zAaDDZfQe786URQjfmUYWBdVeI7DrRMwoLaaUcR1tuJtMu3Jv3CK72YMkOzGapZ\n" + + "ZAAoTno/GRhTwptXG1KPSqKyzfqlxjbZry1HZmY+P6ikw9DWOPZC6rISIqQ3u9zm\n" + + "iPvi/Oo7JWZtX1d1MYp3vVt2bo2duD4RSoXWWaW471WUOIQZUh0V4dxp+eAHZziu\n" + + "osAfU4WoIrrSCSVl2uiKS2Zijn77PvcCXnm45eMQpww32AlslzIBNsMzUXhPtVAZ\n" + + "a9uvfZxlOIRu4ObN7AB3WExucbBHCvTOgxpSs95br1QtfMVl62d9VkIAXg1x9gH8\n" + + "kjcEP+0OS3EItYTFj1tCKC8GgBImj44AxbPSWu3SfTnYfAtFnO0pUqhPOBN63DCC\n" + + "XxzMm13UeER7Z3s968Swa48r6LRAbHI8JD0Ld4E02fgBYM/N/aGtPppD0FoJJwo3\n" + + "QVafS2PY+bALgy4qrI9daOo1mTS3gWDSAG0QbLoKd3hD8ZnLEk6rfR/0SE34Fc7j\n" + + "mviCy78C16hkllhWz27ROl5pheHV0Xt6ZlUsNWVz7tg/AcIFB0geMuzuM0Kd7ufj\n" + + "g5c8mhlI06n4vzo0uB6UXtwTBzNqyUl8yxA31S2VJfBZxkEwKc5cktNUiejQuWbU\n" + + "iwapdiSR0gNGyYBNMYax9OOfYH+BBQeD5kboVU3yvT7UNcz0T9GZiEhfvcaYSP8C\n" + + "ejQ1vuTNTKMrgyLpNi/4Sq8lm8OukRqQyE0EKYCwvkI=\n" + + "-----END RSA PRIVATE KEY-----"; + + private static final String publicKey = + "ssh-rsa " + + + "AAAAB3NzaC1yc2EAAAADAQABAAAAgQC6BGRDydfGsQHhnZgo43dEfLzSJBke/hE8MLBBG1+5Z" + + "wktsrE+f2VdVt0McRLVAO6rdJRyMUX0rTbm7SABRVSX+zeQjlfqbbUtYFc7TIfd4RQc3GaISG" + + "1rS3C4svRSjdWaG36vDY2KxowdFvpKj8i8IYNPlLoRA/7EzzyneS6iyw" + + "== created by org.jboss.ide.eclipse.as.openshift.core"; + + public static SSHKey create() throws IOException, OpenshiftException { + File privateKeyFile = File.createTempFile(createRandomString(), null); + StreamUtils.writeTo(privateKey, privateKeyFile); + + File publicKeyFile = File.createTempFile(createRandomString(), null); + StreamUtils.writeTo(publicKey, publicKeyFile); + + return SSHKey.load(privateKeyFile.getAbsolutePath(), publicKeyFile.getAbsolutePath()); + } + + private static String createRandomString() { + return String.valueOf(System.currentTimeMillis()); + } + + +} Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/utils/StreamUtils.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/utils/StreamUtils.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/utils/StreamUtils.java 2011-09-13 11:53:25 UTC (rev 34670) @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.internal.test.core.utils; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; + +public class StreamUtils { + + public static void writeTo(String data, String path) throws IOException { + writeTo(data, new File(path)); + } + + public static void writeTo(String data, File file) throws IOException { + StringReader reader = null; + FileWriter writer = null; + try { + writer = new FileWriter(file); + reader = new StringReader(data); + for (int character = -1; (character = reader.read()) != -1;) { + writer.write(character); + } + } finally { + if (writer != null) { + writer.flush(); + writer.close(); + } + if (reader != null) { + reader.close(); + } + } + } +} Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/.classpath =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/.classpath 2011-09-13 11:51:57 UTC (rev 34669) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/.classpath 2011-09-13 11:53:25 UTC (rev 34670) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath>