[jbosstools-commits] JBoss Tools SVN: r40175 - in trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot: util and 1 other directory.

Author: sbunciak Date: 2012-04-13 08:59:23 -0400 (Fri, 13 Apr 2012) New Revision: 40175 Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java Log: Secure storage fix Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java 2012-04-13 12:51:38 UTC (rev 40174) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java 2012-04-13 12:59:23 UTC (rev 40175) @@ -36,7 +36,7 @@ SWTBot wiz = open.newObject(OpenShiftUI.NewApplication.iNewObject); storePasswordThenForward(); - + // set wrong user credentials wiz.text(0).setText(TestProperties.getProperty("openshift.user.name")); wiz.text(1).setText( @@ -72,6 +72,8 @@ private void storePasswordThenForward() { if (bot.waitForShell(IDELabel.Shell.SECURE_STORAGE) != null) { bot.text(0).setText(TestProperties.getPassphrase()); + if (bot.text(1) != null) + bot.text(1).setText(TestProperties.getPassphrase()); bot.button(IDELabel.Button.OK).click(); } } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-04-13 12:51:38 UTC (rev 40174) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-04-13 12:59:23 UTC (rev 40175) @@ -47,10 +47,15 @@ * @param args */ public static void main(String[] args) { - if (destroyDomain("rhtestdomain", "sbunciak", "rhtest123") == 200) { + int resp_code = DomainDestroyer.destroyDomain( + TestProperties.getProperty("openshift.domain.new"), + TestProperties.getProperty("openshift.user.name"), + TestProperties.getProperty("openshift.user.pwd")); + + if (resp_code == 200) { System.out.println("Domain destroyed."); } else { - System.out.println("Domain was not destroyed."); + System.out.println("Domain was not destroyed. Response code: "+resp_code); } } }