Author: adietish Date: 2011-09-16 05:19:23 -0400 (Fri, 16 Sep 2011) New Revision: 34809 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/StringResponseUnmarshaller.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.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/response/AbstractOpenshiftJsonResponseUnmarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java Log: [JBIDE-9510] implementing IOpenshiftService#getUserInfo Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Application.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -15,12 +15,22 @@ private String name; private Cartridge cartridge; + private String uuid; + private long creationTime; private IOpenshiftService service; private ApplicationLogReader logReader; + private String embedded; public Application(String name, Cartridge cartridge, IOpenshiftService service) { + this(name, null, cartridge, null, -1, service); + } + + public Application(String name, String uuid, Cartridge cartridge, String embedded, long creationTime, IOpenshiftService service) { this.name = name; this.cartridge = cartridge; + this.uuid = uuid; + this.embedded = embedded; + this.creationTime = creationTime; this.service = service; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/Domain.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -16,19 +16,23 @@ */ public class Domain { - private User user; - private String name; + private String namespace; + private String rhcDomain; - public Domain(String name, User user) { - this.name = name; - this.user = user; + public Domain(String namespace) { + this(namespace, null); } - public String getName() { - return name; + public Domain(String namespace, String rhcDomain) { + this.namespace = namespace; + this.rhcDomain = rhcDomain; } - public User getUser() { - return user; + public String getRhcDomain() { + return rhcDomain; } + + public String getNamespace() { + return namespace; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IOpenshiftJsonConstants.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -32,5 +32,10 @@ public static final String PROPERTY_ALTER = "alter"; public static final String PROPERTY_SSH = "ssh"; public static final String PROPERTY_UUID = "uuid"; + public static final String PROPERTY_USER_INFO = "user_info"; + public static final String PROPERTY_APP_INFO = "app.info"; + public static final String PROPERTY_RHC_DOMAIN = "rhc_domain"; + public static final String PROPERTY_EMBEDDED = "embedded"; + public static final String PROPERTY_FRAMEWORK = "framework"; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/User.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -17,12 +17,28 @@ private String rhlogin; private String uuid; + private SSHKey sshKey; + private Domain domain; - public User(String rhlogin, String uuid) { + public User(String rhlogin, String uuid, Domain domain) { + this(rhlogin, uuid, null, domain); + } + + public User(String rhlogin, String uuid, SSHKey sshKey, Domain domain) { this.rhlogin = rhlogin; this.uuid = uuid; + this.sshKey = sshKey; + this.domain = domain; } + + public Domain getDomain() { + return domain; + } + public SSHKey getSshKey() { + return sshKey; + } + public String getRhlogin() { return rhlogin; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserInfo.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -10,42 +10,27 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.core; +import java.util.List; + /** * @author André Dietisheim */ public class UserInfo { - private String rhlogin; - private String uuId; - private String sshKey; - private String rhcDomain; - private String namespace; + private User user; + private List<Application> applications; - public UserInfo(String rhlogin, String uuid, String sshKey, String rhcDomain, String namespace) { - this.rhlogin = rhlogin; - this.uuId = uuid; - this.sshKey = sshKey; - this.rhcDomain = rhcDomain; - this.namespace = namespace; + public UserInfo(User user, List<Application> applications) { + this.user = user; + this.applications = applications; } - public String getRhlogin() { - return rhlogin; + protected User getUser() { + return user; } - public String getUuId() { - return uuId; + protected List<Application> getApplications() { + return applications; } - public String getRhcDomain() { - return rhcDomain; - } - - public String getSSHKey() { - return sshKey; - } - - public String getNamespace() { - return namespace; - } } 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 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -71,7 +71,7 @@ String responseString = createHttpClient(url).post(openShiftRequestString); responseString = JsonSanitizer.sanitize(responseString); OpenshiftResponse<UserInfo> response = - new UserInfoResponseUnmarshaller().unmarshall(responseString); + new UserInfoResponseUnmarshaller(this).unmarshall(responseString); return response.getOpenshiftObject(); } catch (MalformedURLException e) { throw new OpenshiftEndpointException( Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/AbstractOpenshiftJsonResponseUnmarshaller.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -29,7 +29,7 @@ String messages = getString(IOpenshiftJsonConstants.PROPERTY_MESSAGES, node); String result = getString(IOpenshiftJsonConstants.PROPERTY_RESULT, node); int exitCode = node.get(IOpenshiftJsonConstants.PROPERTY_EXIT_CODE).asInt(); - OPENSHIFTOBJECT openshiftObject = createFromResultNode(node.get(IOpenshiftJsonConstants.PROPERTY_RESULT)); + OPENSHIFTOBJECT openshiftObject = createOpenshiftObject(node); return new OpenshiftResponse<OPENSHIFTOBJECT>(debug, messages, result, openshiftObject, exitCode); } catch (IllegalArgumentException e) { throw new OpenshiftException(e, "Could not parse response \"{0}\"", response); @@ -38,10 +38,8 @@ } } + protected abstract OPENSHIFTOBJECT createOpenshiftObject(ModelNode responseNode); - - protected abstract OPENSHIFTOBJECT createFromResultNode(ModelNode dataNode); - protected String getResponse() { return response; } @@ -55,4 +53,8 @@ return propertyNode.asString(); } + protected long getLong(String property, ModelNode node) { + ModelNode propertyNode = node.get(property); + return propertyNode.asLong(-1); + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationResponseUnmarshaller.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -31,7 +31,7 @@ } @Override - protected Application createFromResultNode(ModelNode node) { + protected Application createOpenshiftObject(ModelNode node) { return new Application(applicationName, cartridge, service); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ApplicationStatusResponseUnmarshaller.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -10,10 +10,19 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.core.internal.response; +import org.jboss.dmr.ModelNode; +import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; + /** * @author André Dietisheim */ -public class ApplicationStatusResponseUnmarshaller extends StringResponseUnmarshaller { +public class ApplicationStatusResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<String> { + @Override + protected String createOpenshiftObject(ModelNode responseNode) { + ModelNode resultNode = responseNode.get(IOpenshiftJsonConstants.PROPERTY_RESULT); + return resultNode.asString(); + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/DomainResponseUnmarshaller.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -12,8 +12,6 @@ import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.Domain; -import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; -import org.jboss.ide.eclipse.as.openshift.core.User; /** * @author André Dietisheim @@ -27,15 +25,7 @@ } @Override - protected Domain createFromResultNode(ModelNode node) { - User user = createUser(node); - return new Domain(domainName, user); + protected Domain createOpenshiftObject(ModelNode node) { + return new Domain(domainName); } - - protected User createUser(ModelNode node) { - String username = getString(IOpenshiftJsonConstants.PROPERTY_RHLOGIN, node); - String uuid = getString(IOpenshiftJsonConstants.PROPERTY_UUID, node); - - return new User(username, uuid); - } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/ListCartridgesResponseUnmarshaller.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -27,9 +27,16 @@ public class ListCartridgesResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<List<Cartridge>> { @Override - protected List<Cartridge> createFromResultNode(ModelNode dataNode) { + protected List<Cartridge> createOpenshiftObject(ModelNode responseNode) { List<Cartridge> cartridges = new ArrayList<Cartridge>(); + ModelNode dataNode = responseNode.get(IOpenshiftJsonConstants.PROPERTY_DATA); + if (dataNode == null) { + return cartridges; + } ModelNode cartridgesNode = dataNode.get(IOpenshiftJsonConstants.PROPERTY_CARTS); + if (cartridgesNode == null) { + return cartridges; + } for (ModelNode cartridgeNode : cartridgesNode.asList()) { cartridges.add(createCartridge(cartridgeNode)); } Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/StringResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/StringResponseUnmarshaller.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/StringResponseUnmarshaller.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -1,25 +0,0 @@ -/******************************************************************************* - * 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.core.internal.response; - -import org.jboss.dmr.ModelNode; - -/** - * @author André Dietisheim - */ -public class StringResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<String> { - - @Override - protected String createFromResultNode(ModelNode node) { - return node.asString(); - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/UserInfoResponseUnmarshaller.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -10,7 +10,16 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.core.internal.response; +import java.util.ArrayList; +import java.util.List; + import org.jboss.dmr.ModelNode; +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.Domain; +import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; +import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftService; +import org.jboss.ide.eclipse.as.openshift.core.User; import org.jboss.ide.eclipse.as.openshift.core.UserInfo; /** @@ -18,8 +27,60 @@ */ public class UserInfoResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<UserInfo> { + private IOpenshiftService service; + + public UserInfoResponseUnmarshaller(IOpenshiftService service) { + this.service = service; + } + @Override - protected UserInfo createFromResultNode(ModelNode node) { - return new UserInfo("", "", "", "", ""); + protected UserInfo createOpenshiftObject(ModelNode node) { + ModelNode dataNode = node.get(IOpenshiftJsonConstants.PROPERTY_DATA); + if (dataNode == null) { + return null; + } + ModelNode userInfoNode = node.get(IOpenshiftJsonConstants.PROPERTY_USER_INFO); + if (userInfoNode == null) { + return null; + } + Domain domain = createDomain(userInfoNode); + User user = createUser(userInfoNode, domain); + return new UserInfo( + user, + createApplications(node.get(IOpenshiftJsonConstants.PROPERTY_APP_INFO))); } + + private List<Application> createApplications(ModelNode appInfoNode) { + List<Application> applications = new ArrayList<Application>(); + if (appInfoNode == null) { + return applications; + } + + for(String name : appInfoNode.keys()) { + applications.add(createApplication(name, appInfoNode.get(name))); + } + return applications; + } + + + private Application createApplication(String name, ModelNode appNode) { + String embedded = getString(IOpenshiftJsonConstants.PROPERTY_EMBEDDED, appNode); + String uuid = getString(IOpenshiftJsonConstants.PROPERTY_UUID, appNode); + Cartridge cartrdige = new Cartridge(getString(IOpenshiftJsonConstants.PROPERTY_FRAMEWORK, appNode)); + long creationTime = getLong(IOpenshiftJsonConstants.PROPERTY_FRAMEWORK, appNode); + return new Application(name, uuid, cartrdige, embedded, creationTime, service); + } + + protected User createUser(ModelNode userInfoNode, Domain domain) { + String rhlogin = getString(IOpenshiftJsonConstants.PROPERTY_RHLOGIN, userInfoNode); + String uuid = getString(IOpenshiftJsonConstants.PROPERTY_RHLOGIN, userInfoNode); + return new User(rhlogin, uuid, domain); + } + + protected Domain createDomain(ModelNode userInfoNode) { + String namespace = getString(IOpenshiftJsonConstants.PROPERTY_NAMESPACE, userInfoNode); + String rhcDomain = getString(IOpenshiftJsonConstants.PROPERTY_RHC_DOMAIN, userInfoNode); + return new Domain(namespace, rhcDomain); + } + } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -15,7 +15,6 @@ 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.core.internal.OpenshiftService; import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestSSHKey; import org.junit.Before; @@ -41,11 +40,7 @@ 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()); + assertEquals(domainName, domain.getNamespace()); } @Test @@ -56,11 +51,7 @@ 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()); + assertEquals(domainName, domain.getNamespace()); } private String createRandomString() { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java 2011-09-16 09:17:29 UTC (rev 34808) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java 2011-09-16 09:19:23 UTC (rev 34809) @@ -20,7 +20,6 @@ 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.core.internal.request.ChangeDomainRequest; import org.jboss.ide.eclipse.as.openshift.core.internal.request.CreateDomainRequest; import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftEnvelopeFactory; @@ -65,11 +64,7 @@ assertNotNull(response); Domain domain = response.getOpenshiftObject(); - assertEquals(domainName, domain.getName()); - User user = domain.getUser(); - assertNotNull(user); - assertEquals(USERNAME, user.getRhlogin()); - assertEquals(UUID, user.getUuid()); + assertEquals(domainName, domain.getNamespace()); } @Test