Author: adietish Date: 2011-09-16 11:04:16 -0400 (Fri, 16 Sep 2011) New Revision: 34818 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/utils/ApplicationAsserts.java Log: [JBIDE-9510] implementing IOpenshiftService#getUserInfo (integration test is now also successful) 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-09-16 14:55:31 UTC (rev 34817) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserInfoIntegrationTest.java 2011-09-16 15:04:16 UTC (rev 34818) @@ -22,6 +22,7 @@ import org.jboss.ide.eclipse.as.openshift.core.User; import org.jboss.ide.eclipse.as.openshift.core.UserInfo; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; +import org.jboss.ide.eclipse.as.openshift.test.internal.core.utils.ApplicationAsserts; import org.junit.Before; import org.junit.Test; @@ -68,6 +69,7 @@ UserInfo userInfo2 = openshiftService.getUserInfo(); assertEquals(numberOfApplications + 1, userInfo2.getApplications().size()); + ApplicationAsserts.assertThatContainsApplication(applicationName, userInfo2.getApplications()); } finally { silentlyDestroyAS7Application(applicationName, openshiftService); } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java 2011-09-16 14:55:31 UTC (rev 34817) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java 2011-09-16 15:04:16 UTC (rev 34818) @@ -29,19 +29,28 @@ public static void assertThatContainsApplication(String applicationName, String embedded, String applicationUUID, String cartridgeName, String creationTime, List<Application> applications) { - boolean found = false; + Application application = getApplication(applicationName, applications); + if (application == null) { + fail(MessageFormat.format("Could not find application with name \"{0}\"", applicationName)); + } + assertApplication(embedded, applicationUUID, cartridgeName, creationTime, application); + } + + public static void assertThatContainsApplication(String applicationName, List<Application> applications) { + assertNotNull(getApplication(applicationName, applications)); + } + + private static Application getApplication(String name, List<Application> applications) { + Application matchingApplication = null; for (Application application : applications) { - if (applicationName.equals(application.getName())) { - found = true; - assertApplication(embedded, applicationUUID, cartridgeName, creationTime, application); + if (name.equals(application.getName())) { + matchingApplication = application; break; } } - if (!found) { - fail(MessageFormat.format("Could not find application with name \"{0}\"", applicationName)); - } + return matchingApplication; } - + private static void assertApplication(String embedded, String uuid, String cartridgeName, String creationTime, Application application) { assertEquals(embedded, application.getEmbedded());