[jbosstools-commits] JBoss Tools SVN: r25937 - in trunk/deltacloud/tests/org.jboss.tools.deltacloud.test: META-INF and 2 other directories.

Author: adietish Date: 2010-10-20 07:10:19 -0400 (Wed, 20 Oct 2010) New Revision: 25937 Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.classpath trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/deltacloud-dependencies.jar trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudClientTest.java Log: [JBIDE-7371] moved deltacloud url checking to deltacloud client, added tests Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.classpath =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.classpath 2010-10-20 11:09:13 UTC (rev 25936) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.classpath 2010-10-20 11:10:19 UTC (rev 25937) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="jruby-complete-1.5.3.jar"/> <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="lib" path="deltacloud-dependencies.jar"/> + <classpathentry kind="lib" path="jruby-complete-1.5.3.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2010-10-20 11:09:13 UTC (rev 25936) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2010-10-20 11:10:19 UTC (rev 25937) @@ -4,7 +4,8 @@ Bundle-SymbolicName: org.jboss.tools.deltacloud.test Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="4.8.1", - org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)" +Require-Bundle: org.jboss.tools.deltacloud.core;bundle-version="0.0.1", + org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.junit;bundle-version="4.8.1" Bundle-ClassPath: jruby-complete-1.5.3.jar, . Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/deltacloud-dependencies.jar =================================================================== (Binary files differ) Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java 2010-10-20 11:09:13 UTC (rev 25936) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java 2010-10-20 11:10:19 UTC (rev 25937) @@ -10,11 +10,9 @@ import org.jruby.Ruby; import org.jruby.RubyInstanceConfig; import org.jruby.javasupport.JavaEmbedUtils; -import org.junit.Test; public class DeltacloudIntegrationTest { - @Test public void runDeltaCloud() throws IOException { RubyInstanceConfig config = new RubyInstanceConfig(); Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudClientTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudClientTest.java 2010-10-20 11:09:13 UTC (rev 25936) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudClientTest.java 2010-10-20 11:10:19 UTC (rev 25937) @@ -1,5 +1,43 @@ package org.jboss.tools.internal.deltacloud.test.core; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; + +import org.jboss.tools.deltacloud.core.client.DeltaCloudClient; +import org.junit.Before; +import org.junit.Test; + public class DeltaCloudClientTest { + private static final String DELTACLOUD_URL = "http://localhost:3001"; + private static final String DELTACLOUD_USER = "user"; + private static final String DELTACLOUD_PASSWORD = "password"; + + private DeltaCloudClient client; + + @Before + public void createDeltaCloudClient() throws MalformedURLException { + this.client = new DeltaCloudClient(new URL(DELTACLOUD_URL), DELTACLOUD_USER, DELTACLOUD_PASSWORD); + } + + @Test + public void isDeltaCloudRunning() throws MalformedURLException, IOException { + URLConnection connection = new URL(DELTACLOUD_URL).openConnection(); + connection.connect(); + } + + @Test + public void canRecognizeMockDeltaCloud() throws IOException { + Process process = launchDeltaCloudMock(); + assertEquals(DeltaCloudClient.DeltaCloudType.MOCK, DeltaCloudClient.getDeltaCloudType(DELTACLOUD_URL)); + process.destroy(); + } + + private Process launchDeltaCloudMock() throws IOException { + return Runtime.getRuntime().exec("/usr/bin/deltacloudd -i mock"); + } }