Author: adietish Date: 2011-09-28 12:25:44 -0400 (Wed, 28 Sep 2011) New Revision: 35121 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/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/UserIntegrationTest.java Log: [JBIDE-9773] added integration test for "create a domain when a domain already exists" & Corrected service implementation 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-28 16:10:48 UTC (rev 35120) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-28 16:25:44 UTC (rev 35121) @@ -127,9 +127,9 @@ new DomainResponseUnmarshaller(request.getName(), user).unmarshall(responseString); return response.getOpenshiftObject(); } catch (MalformedURLException e) { - throw new OpenshiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url); + throw new OpenshiftEndpointException(url, e, "Could reach openshift platform at \"{0}\"", url); } catch (HttpClientException e) { - throw new OpenshiftEndpointException(url, e, "Could not list available cartridges at \"{0}\"", url); + throw new OpenshiftEndpointException(url, e, "Could not {0}", request.toHumanReadable()); } } 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-28 16:10:48 UTC (rev 35120) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/AbstractDomainRequest.java 2011-09-28 16:25:44 UTC (rev 35121) @@ -45,4 +45,6 @@ } public abstract boolean isAlter(); + + public abstract String toHumanReadable(); } 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-28 16:10:48 UTC (rev 35120) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/ChangeDomainRequest.java 2011-09-28 16:25:44 UTC (rev 35121) @@ -29,4 +29,9 @@ public boolean isAlter() { return true; } + + @Override + public String toHumanReadable() { + return "change domain to " + getName(); + } } 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-28 16:10:48 UTC (rev 35120) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/request/CreateDomainRequest.java 2011-09-28 16:25:44 UTC (rev 35121) @@ -29,4 +29,10 @@ public boolean isAlter() { return false; } + + @Override + public String toHumanReadable() { + return "create domain " + getName(); + } + } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java 2011-09-28 16:10:48 UTC (rev 35120) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java 2011-09-28 16:25:44 UTC (rev 35121) @@ -23,6 +23,7 @@ import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.IDomain; import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftEndpointException; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.internal.InternalUser; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; @@ -68,6 +69,15 @@ assertTrue(domain.getNamespace().length() > 0); } + @Test(expected=OpenshiftEndpointException.class) + public void cannotCreateDomainIfAlreadyExists() throws OpenshiftException { + IDomain domain = user.getDomain(); + assertNotNull(domain); + ISSHPublicKey key = user.getSshKey(); + assertNotNull(key); + user.createDomain("newDomain", key); + } + @Test public void canGetCartridges() throws OpenshiftException { Collection<ICartridge> cartridges = user.getCartridges();