[jbosstools-commits] JBoss Tools SVN: r35306 - in trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core: fakes and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-10-03 21:20:20 -0400 (Mon, 03 Oct 2011)
New Revision: 35306

Modified:
   trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java
   trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java
   trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/TestUser.java
Log:
[JBIDE-9793] implemented IUser#hasDomain and changed API so that IUser#getDomain returns null if no domain was created 

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java	2011-10-04 00:05:42 UTC (rev 35305)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java	2011-10-04 01:20:20 UTC (rev 35306)
@@ -35,9 +35,6 @@
  */
 public class UserInfoIntegrationTest {
 
-	private static final String PASSWORD_USER_WITHOUT_DOMAIN = "1q2w3e";
-	private static final String RHLOGIN_USER_WITHOUT_DOMAIN = "toolsjboss.no.domain at gmail.com";
-	
 	private OpenshiftService openshiftService;
 	private TestUser user;
 
@@ -67,7 +64,7 @@
 	 */
 	@Test(expected = NotFoundOpenshiftException.class)
 	public void canGetUserInfoForUserWithoutDomain() throws Exception {
-		TestUser inexistantUser = new TestUser(RHLOGIN_USER_WITHOUT_DOMAIN, PASSWORD_USER_WITHOUT_DOMAIN);
+		TestUser inexistantUser = new TestUser(TestUser.RHLOGIN_USER_WITHOUT_DOMAIN, TestUser.PASSWORD_USER_WITHOUT_DOMAIN);
 		openshiftService.getUserInfo(inexistantUser);
 	}
 

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-10-04 00:05:42 UTC (rev 35305)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserIntegrationTest.java	2011-10-04 01:20:20 UTC (rev 35306)
@@ -14,6 +14,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Collection;
@@ -42,25 +43,27 @@
 	private User user;
 	private TestUser invalidUser;
 	private TestUser badUrlUser;
+	private TestUser userWithoutDomain;
 
 	@Before
 	public void setUp() throws OpenshiftException, DatatypeConfigurationException {
 		this.user = new TestUser();
 		this.invalidUser = new TestUser("bogusPassword");
 		this.badUrlUser = new TestUser(TestUser.RHLOGIN, TestUser.PASSWORD, "http://www.redhat.com");
+		this.userWithoutDomain = new TestUser(TestUser.RHLOGIN_USER_WITHOUT_DOMAIN, TestUser.PASSWORD_USER_WITHOUT_DOMAIN);
 	}
 
-	@Test 
+	@Test
 	public void canCheckIfUserIsValid() throws OpenshiftException {
 		assertTrue(user.isValid());
 	}
-	
+
 	@Test
 	public void throwsExceptionIfInvalidCredentials() throws OpenshiftException {
 		assertFalse(invalidUser.isValid());
 	}
 
-	@Test(expected=NotFoundOpenshiftException.class)
+	@Test(expected = NotFoundOpenshiftException.class)
 	public void throwsExceptionIfBadUrl() throws OpenshiftException {
 		badUrlUser.isValid();
 	}
@@ -90,7 +93,7 @@
 		assertTrue(domain.getNamespace().length() > 0);
 	}
 
-	@Test(expected=OpenshiftEndpointException.class)
+	@Test(expected = OpenshiftEndpointException.class)
 	public void cannotCreateDomainIfAlreadyExists() throws OpenshiftException {
 		IDomain domain = user.getDomain();
 		assertNotNull(domain);
@@ -100,6 +103,12 @@
 	}
 
 	@Test
+	public void getNullIfNoDomainPresent() throws OpenshiftException {
+		IDomain domain = userWithoutDomain.getDomain();
+		assertNull(domain);
+	}
+
+	@Test
 	public void canGetCartridges() throws OpenshiftException {
 		Collection<ICartridge> cartridges = user.getCartridges();
 		assertNotNull(cartridges);

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/TestUser.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/TestUser.java	2011-10-04 00:05:42 UTC (rev 35305)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/TestUser.java	2011-10-04 01:20:20 UTC (rev 35306)
@@ -21,6 +21,9 @@
  */
 public class TestUser extends User {
 
+	public static final String RHLOGIN_USER_WITHOUT_DOMAIN = "toolsjboss.no.domain2 at gmail.com";
+	public static final String PASSWORD_USER_WITHOUT_DOMAIN = "1q2w3e";
+
 	public static final String RHLOGIN = "toolsjboss at gmail.com";
 	public static final String PASSWORD = "1q2w3e";