Author: adietish Date: 2011-09-26 10:39:13 -0400 (Mon, 26 Sep 2011) New Revision: 35045 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IApplication.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.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/User.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/DomainResponseUnmarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/ListCartridgesResponseUnmarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StreamUtils.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgeTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgesIntegrationTest.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 trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 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/utils/CartridgeAsserts.java Log: [JBIDE-9773] correcting ApplicationLogReader implementation and adding new tests Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IApplication.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IApplication.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IApplication.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -17,26 +17,28 @@ */ public interface IApplication { - public abstract String getUUID() throws OpenshiftException; + public String getName(); + + public String getUUID() throws OpenshiftException; - public abstract ICartridge getCartridge(); + public ICartridge getCartridge(); - public abstract String getEmbedded() throws OpenshiftException; + public String getEmbedded() throws OpenshiftException; - public abstract Date getCreationTime() throws OpenshiftException; + public Date getCreationTime() throws OpenshiftException; - public abstract void destroy() throws OpenshiftException; + public void destroy() throws OpenshiftException; - public abstract void start() throws OpenshiftException; + public void start() throws OpenshiftException; - public abstract void restart() throws OpenshiftException; + public void restart() throws OpenshiftException; - public abstract void stop() throws OpenshiftException; + public void stop() throws OpenshiftException; - public abstract ApplicationLogReader getLog() throws OpenshiftException; + public ApplicationLogReader getLog() throws OpenshiftException; - public abstract String getGitUri() throws OpenshiftException; + public String getGitUri() throws OpenshiftException; - public abstract String getApplicationUrl() throws OpenshiftException; + public String getApplicationUrl() throws OpenshiftException; } \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IUser.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -12,26 +12,27 @@ import java.util.Collection; -import org.jboss.ide.eclipse.as.openshift.core.internal.Application; -import org.jboss.ide.eclipse.as.openshift.core.internal.Domain; +import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain; /** * @author André Dietisheim */ public interface IUser { - public abstract String getRhlogin(); + public String getRhlogin(); - public abstract String getPassword(); + public String getPassword(); - public abstract Domain getDomain() throws OpenshiftException; + public IDomain getDomain() throws OpenshiftException; - public abstract ISSHPublicKey getSshKey() throws OpenshiftException; + public ISSHPublicKey getSshKey() throws OpenshiftException; - public abstract Collection<Cartridge> getCartridges() throws OpenshiftException; + public Collection<ICartridge> getCartridges() throws OpenshiftException; - public Application createApplication(String name, Cartridge cartridge) throws OpenshiftException; + public IApplication createApplication(String name, ICartridge cartridge) throws OpenshiftException; - public abstract Collection<Application> getApplications() throws OpenshiftException; + public Collection<IApplication> getApplications() throws OpenshiftException; + public IApplication getApplicationByName(String name) throws OpenshiftException; + } \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -108,7 +108,7 @@ @Override public String getGitUri() throws OpenshiftException { - Domain domain = user.getDomain(); + IDomain domain = user.getDomain(); if (domain == null) { return null; } @@ -118,7 +118,7 @@ @Override public String getApplicationUrl() throws OpenshiftException { - Domain domain = user.getDomain(); + IDomain domain = user.getDomain(); if (domain == null) { return null; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -16,7 +16,7 @@ /** * @author André Dietisheim */ -public class Domain { +public class Domain implements IDomain { private String namespace; private String rhcDomain; @@ -32,10 +32,12 @@ this.user = user; } + @Override public String getNamespace() throws OpenshiftException { return namespace; } + @Override public String getRhcDomain() throws OpenshiftException { user.loadLazyValues(); return rhcDomain; Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -0,0 +1,11 @@ +package org.jboss.ide.eclipse.as.openshift.core.internal; + +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; + +public interface IDomain { + + public abstract String getNamespace() throws OpenshiftException; + + public abstract String getRhcDomain() throws OpenshiftException; + +} \ No newline at end of file Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IDomain.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/IOpenshiftService.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -12,7 +12,6 @@ import java.util.List; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.IApplication; import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; @@ -23,7 +22,7 @@ */ public interface IOpenshiftService { - public List<Cartridge> getCartridges(User user) throws OpenshiftException; + public List<ICartridge> getCartridges(User user) throws OpenshiftException; public Application createApplication(String name, ICartridge cartridge, User user) throws OpenshiftException; @@ -37,9 +36,9 @@ public String getStatus(String name, ICartridge cartridge, User user) throws OpenshiftException; - public Domain changeDomain(String name, ISSHPublicKey sshKey, User user) throws OpenshiftException; + public IDomain changeDomain(String name, ISSHPublicKey sshKey, User user) throws OpenshiftException; - public Domain createDomain(String name, ISSHPublicKey sshKey, User user) throws OpenshiftException; + public IDomain createDomain(String name, ISSHPublicKey sshKey, User user) throws OpenshiftException; public UserInfo getUserInfo(User user) throws OpenshiftException; } 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-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/OpenshiftService.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -14,7 +14,6 @@ import java.net.URL; import java.util.List; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.IApplication; import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.IHttpClient; @@ -75,7 +74,7 @@ } @Override - public List<Cartridge> getCartridges(User user) throws OpenshiftException { + public List<ICartridge> getCartridges(User user) throws OpenshiftException { ListCartridgesRequest listCartridgesRequest = new ListCartridgesRequest(user.getRhlogin(), true); String url = listCartridgesRequest.getUrlString(BASE_URL); try { @@ -85,7 +84,7 @@ .createString(); String listCatridgesReponse = createHttpClient(url).post(request); listCatridgesReponse = JsonSanitizer.sanitize(listCatridgesReponse); - OpenshiftResponse<List<Cartridge>> response = + OpenshiftResponse<List<ICartridge>> response = new ListCartridgesResponseUnmarshaller().unmarshall(listCatridgesReponse); return response.getOpenshiftObject(); } catch (MalformedURLException e) { @@ -96,16 +95,16 @@ } @Override - public Domain createDomain(String name, ISSHPublicKey sshKey, User user) throws OpenshiftException { + public IDomain createDomain(String name, ISSHPublicKey sshKey, User user) throws OpenshiftException { return requestDomainAction(new CreateDomainRequest(name, sshKey, user.getRhlogin(), true), user); } @Override - public Domain changeDomain(String newName, ISSHPublicKey sshKey, User user) throws OpenshiftException { + public IDomain changeDomain(String newName, ISSHPublicKey sshKey, User user) throws OpenshiftException { return requestDomainAction(new ChangeDomainRequest(newName, sshKey, user.getRhlogin(), true), user); } - protected Domain requestDomainAction(AbstractDomainRequest request, User user) throws OpenshiftException { + protected IDomain requestDomainAction(AbstractDomainRequest request, User user) throws OpenshiftException { String url = request.getUrlString(BASE_URL); try { String requestString = @@ -115,7 +114,7 @@ .createString(); String responseString = createHttpClient(url).post(requestString); responseString = JsonSanitizer.sanitize(responseString); - OpenshiftResponse<Domain> response = + OpenshiftResponse<IDomain> response = new DomainResponseUnmarshaller(request.getName(), user).unmarshall(responseString); return response.getOpenshiftObject(); } catch (MalformedURLException e) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/User.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/User.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/User.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -15,8 +15,8 @@ import java.util.Collections; import java.util.List; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.IApplication; +import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; import org.jboss.ide.eclipse.as.openshift.core.IUser; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; @@ -32,8 +32,8 @@ private ISSHPublicKey sshKey; private Domain domain; private UserInfo userInfo; - private List<Cartridge> cartridges; - private List<Application> applications = new ArrayList<Application>(); + private List<ICartridge> cartridges; + private List<IApplication> applications = new ArrayList<IApplication>(); private IOpenshiftService service; @@ -53,7 +53,7 @@ } @Override - public Domain getDomain() throws OpenshiftException { + public IDomain getDomain() throws OpenshiftException { loadLazyValues(); return domain; } @@ -80,7 +80,7 @@ } @Override - public List<Cartridge> getCartridges() throws OpenshiftException { + public List<ICartridge> getCartridges() throws OpenshiftException { if (cartridges == null) { this.cartridges = service.getCartridges(this); } @@ -88,26 +88,27 @@ } @Override - public Application createApplication(String name, Cartridge cartridge) throws OpenshiftException { + public IApplication createApplication(String name, ICartridge cartridge) throws OpenshiftException { Application application = service.createApplication(name, cartridge, this); add(application); return application; } - + @Override - public Collection<Application> getApplications() throws OpenshiftException { + public Collection<IApplication> getApplications() throws OpenshiftException { loadLazyValues(); return Collections.unmodifiableList(applications); } + @Override public IApplication getApplicationByName(String name) throws OpenshiftException { loadLazyValues(); return getApplicationByName(name, applications); } - private Application getApplicationByName(String name, Collection<Application> applications) { - Application matchingApplication = null; - for (Application application : applications) { + private IApplication getApplicationByName(String name, Collection<IApplication> applications) { + IApplication matchingApplication = null; + for (IApplication application : applications) { if (name.equals(application.getName())) { matchingApplication = application; } @@ -123,6 +124,10 @@ applications.remove(application); } + public void setSshPublicKey(ISSHPublicKey key) { + this.sshKey = key; + } + /** * Loads the lazy values from the server if needed. Updates itself all * referenced objects (applications, domain). @@ -166,9 +171,9 @@ private void update(List<ApplicationInfo> applicationInfos) { for (ApplicationInfo applicationInfo : applicationInfos) { - Application application = getApplicationByName(applicationInfo.getName(), applications); + IApplication application = getApplicationByName(applicationInfo.getName(), applications); if (application != null) { - application.update(applicationInfo); + ((Application) application).update(applicationInfo); } else { applications.add(createApplication(applicationInfo)); } @@ -184,7 +189,8 @@ , this, service); } - public void setSshPublicKey(ISSHPublicKey key) { - this.sshKey = key; + protected IOpenshiftService getService() { + return service; } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/DomainResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/DomainResponseUnmarshaller.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/DomainResponseUnmarshaller.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -12,12 +12,13 @@ import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.internal.Domain; +import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain; import org.jboss.ide.eclipse.as.openshift.core.internal.User; /** * @author André Dietisheim */ -public class DomainResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<Domain> { +public class DomainResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<IDomain> { private String domainName; private User user; @@ -28,7 +29,7 @@ } @Override - protected Domain createOpenshiftObject(ModelNode node) { + protected IDomain createOpenshiftObject(ModelNode node) { return new Domain(domainName, user); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/ListCartridgesResponseUnmarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/ListCartridgesResponseUnmarshaller.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/response/unmarshalling/ListCartridgesResponseUnmarshaller.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -15,6 +15,7 @@ import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.internal.IOpenshiftJsonConstants; /** @@ -24,11 +25,11 @@ * * @author André Dietisheim */ -public class ListCartridgesResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<List<Cartridge>> { +public class ListCartridgesResponseUnmarshaller extends AbstractOpenshiftJsonResponseUnmarshaller<List<ICartridge>> { @Override - protected List<Cartridge> createOpenshiftObject(ModelNode responseNode) { - List<Cartridge> cartridges = new ArrayList<Cartridge>(); + protected List<ICartridge> createOpenshiftObject(ModelNode responseNode) { + List<ICartridge> cartridges = new ArrayList<ICartridge>(); ModelNode dataNode = responseNode.get(IOpenshiftJsonConstants.PROPERTY_DATA); if (dataNode == null) { return cartridges; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StreamUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StreamUtils.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/utils/StreamUtils.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -6,6 +6,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.io.Reader; import java.io.StringWriter; import java.util.ArrayList; import java.util.List; @@ -37,27 +38,27 @@ } public static String readToString(InputStream inputStream) throws IOException { - try { - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); - StringWriter writer = new StringWriter(); - String line = null; - while ((line = reader.readLine()) != null) { - writer.write(line); - } - return writer.toString(); - } finally { - if (inputStream != null) { - inputStream.close(); - } + return readToString(new InputStreamReader(inputStream)); + } + + public static String readToString(Reader reader) throws IOException { + BufferedReader bufferedReader = new BufferedReader(reader); + StringWriter writer = new StringWriter(); + String line = null; + while ((line = bufferedReader.readLine()) != null) { + writer.write(line); } + return writer.toString(); } /** * Writes the given string to the given output stream. The stream is closed * after writing all data. * - * @param data the data to write - * @param outputStream the stream to write to + * @param data + * the data to write + * @param outputStream + * the stream to write to * @throws IOException */ public static void writeTo(byte[] data, OutputStream outputStream) throws IOException { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -10,18 +10,24 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.test.internal.core; -import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader; +import org.jboss.ide.eclipse.as.openshift.core.IApplication; import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.internal.Application; import org.jboss.ide.eclipse.as.openshift.core.internal.IOpenshiftService; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; -import org.jboss.ide.eclipse.as.openshift.core.internal.User; +import org.jboss.ide.eclipse.as.openshift.core.internal.utils.StreamUtils; import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser; import org.jboss.ide.eclipse.as.openshift.test.internal.core.utils.ApplicationUtils; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; /** @@ -29,10 +35,11 @@ */ public class ApplicationLogReaderIntegrationTest { + private static final long TIMEOUT = 6 * 1024; + private IOpenshiftService service; + private TestUser user; - private User user; - @Before public void setUp() { this.service = new OpenshiftService(); @@ -45,6 +52,7 @@ * * @throws Exception */ + @Ignore @Test public void getStatusReturnsTheWholeLogIfNoNewLogEntryOnServer() throws Exception { String applicationName = ApplicationUtils.createRandomApplicationName(); @@ -62,6 +70,7 @@ * Asserts the service implementation: getStatus returns the new entries * (and a tailing-header) if new log entries are available */ + @Ignore @Test public void getStatusReturnsNewEntriesIfNewLogEntriesOnServer() throws Exception { String applicationName = ApplicationUtils.createRandomApplicationName(); @@ -76,4 +85,79 @@ } } + @Test + public void logReaderReturnsNewEntriesAfterApplicationRestart() throws Exception { + IApplication application = null; + ExecutorService executor = null; + long startTime = System.currentTimeMillis(); + try { + application = user.createTestApplication(); + ApplicationLogReader logReader = application.getLog(); + String log = StreamUtils.readToString(logReader); + System.err.println(log); + LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader); + executor = Executors.newSingleThreadExecutor(); + executor.submit(logReaderRunnable); + boolean logAvailable = waitForLog(startTime, System.currentTimeMillis() + TIMEOUT, logReaderRunnable); + assertTrue(logReaderRunnable.isRunning()); + assertFalse(logAvailable); + application.restart(); + logAvailable = waitForLog(startTime, System.currentTimeMillis() + TIMEOUT, logReaderRunnable); + assertTrue(logAvailable); + assertTrue(logReaderRunnable.isRunning()); + } finally { + if (executor != null) { + executor.shutdownNow(); + } + if (application != null) { + user.silentlyDestroyApplication(application); + } + } + } + + protected boolean waitForLog(long startTime, long timeout, LogReaderRunnable logReaderRunnable) + throws InterruptedException { + while (logReaderRunnable.isEmpty() + && System.currentTimeMillis() <= timeout) { + Thread.sleep(1 * 1024); + } + return logReaderRunnable.isEmpty(); + } + + private static class LogReaderRunnable implements Runnable { + + private ApplicationLogReader logReader; + private StringBuilder builder; + private boolean running; + + public LogReaderRunnable(ApplicationLogReader logReader) { + this.logReader = logReader; + this.builder = new StringBuilder(); + } + + @Override + public void run() { + this.running = true; + try { + for (int data = -1; (data = logReader.read()) != -1;) { + builder.append((char) data); + } + } catch (Exception e) { + this.running = false; + } + } + + public boolean isRunning() { + return running; + } + + public String getLog() { + return builder.toString(); + } + + public boolean isEmpty() { + return builder.length() == 0; + } + } + } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgeTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgeTest.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgeTest.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -15,7 +15,7 @@ import java.util.List; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.internal.response.OpenshiftResponse; import org.jboss.ide.eclipse.as.openshift.core.internal.response.unmarshalling.JsonSanitizer; @@ -31,9 +31,9 @@ @Test public void canUnmarshallApplicationResponse() throws OpenshiftException { String response = JsonSanitizer.sanitize(CartridgeResponseFake.RESPONSE); - OpenshiftResponse<List<Cartridge>> openshiftResponse = + OpenshiftResponse<List<ICartridge>> openshiftResponse = new ListCartridgesResponseUnmarshaller().unmarshall(response); - List<Cartridge> cartridges = openshiftResponse.getOpenshiftObject(); + List<ICartridge> cartridges = openshiftResponse.getOpenshiftObject(); assertNotNull(cartridges); assertThatContainsCartridge(CartridgeResponseFake.CARTRIDGE_JBOSSAS70, cartridges); assertThatContainsCartridge(CartridgeResponseFake.CARTRIDGE_PERL5, cartridges); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgesIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgesIntegrationTest.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/CartridgesIntegrationTest.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -15,7 +15,7 @@ import java.util.List; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; import org.jboss.ide.eclipse.as.openshift.core.internal.User; import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser; @@ -41,7 +41,7 @@ @Ignore @Test public void canRequestListCartridges() throws Exception { - List<Cartridge> cartridges = openshiftService.getCartridges(user); + List<ICartridge> cartridges = openshiftService.getCartridges(user); assertNotNull(cartridges); assertTrue(cartridges.size() > 0); } 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-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainIntegrationTest.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -14,7 +14,7 @@ import static org.junit.Assert.assertNotNull; import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair; -import org.jboss.ide.eclipse.as.openshift.core.internal.Domain; +import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestSSHKey; import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser; @@ -37,7 +37,7 @@ String domainName = createRandomString(); SSHKeyPair sshKey = TestSSHKey.create(); - Domain domain = openshiftService.createDomain(domainName, sshKey, user); + IDomain domain = openshiftService.createDomain(domainName, sshKey, user); assertNotNull(domain); assertEquals(domainName, domain.getNamespace()); @@ -48,7 +48,7 @@ String domainName = createRandomString(); SSHKeyPair sshKey = TestSSHKey.create(); - Domain domain = openshiftService.changeDomain(domainName, sshKey, user); + IDomain domain = openshiftService.changeDomain(domainName, sshKey, user); assertNotNull(domain); assertEquals(domainName, domain.getNamespace()); 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-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/DomainTest.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -19,7 +19,7 @@ import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair; -import org.jboss.ide.eclipse.as.openshift.core.internal.Domain; +import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain; import org.jboss.ide.eclipse.as.openshift.core.internal.User; import org.jboss.ide.eclipse.as.openshift.core.internal.request.ChangeDomainRequest; import org.jboss.ide.eclipse.as.openshift.core.internal.request.CreateDomainRequest; @@ -63,10 +63,10 @@ responseString = JsonSanitizer.sanitize(responseString); User user = new User(RHLOGIN, PASSWORD, new NoopOpenshiftServiceFake()); - OpenshiftResponse<Domain> response = new DomainResponseUnmarshaller(domainName, user).unmarshall(responseString); + OpenshiftResponse<IDomain> response = new DomainResponseUnmarshaller(domainName, user).unmarshall(responseString); assertNotNull(response); - Domain domain = response.getOpenshiftObject(); + IDomain domain = response.getOpenshiftObject(); assertEquals(domainName, domain.getNamespace()); } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesIntegrationTest.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesIntegrationTest.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -16,7 +16,7 @@ import java.util.List; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; import org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes.TestUser; import org.junit.Before; @@ -38,7 +38,7 @@ @Test public void canListCartridges() throws Exception { - List<Cartridge> cartridges = openshiftService.getCartridges(user); + List<ICartridge> cartridges = openshiftService.getCartridges(user); assertNotNull(cartridges); assertTrue(cartridges.size() > 0); assertThatContainsCartridge("jbossas-7.0", cartridges); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesTest.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ListCartridgesTest.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -16,7 +16,7 @@ import java.net.URLEncoder; import java.util.List; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.internal.request.ListCartridgesRequest; import org.jboss.ide.eclipse.as.openshift.core.internal.request.OpenshiftEnvelopeFactory; @@ -75,12 +75,12 @@ + "\"exit_code\":0}"; cartridgeListResponse = JsonSanitizer.sanitize(cartridgeListResponse); - OpenshiftResponse<List<Cartridge>> response = + OpenshiftResponse<List<ICartridge>> response = new ListCartridgesResponseUnmarshaller().unmarshall(cartridgeListResponse); assertEquals("", response.getMessages()); assertEquals(false, response.isDebug()); - List<Cartridge> cartridges = response.getOpenshiftObject(); + List<ICartridge> cartridges = response.getOpenshiftObject(); assertEquals(5, cartridges.size()); assertThatContainsCartridge("perl-5.10", cartridges); assertThatContainsCartridge("jbossas-7.0", cartridges); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/UserTest.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -24,11 +24,11 @@ import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.IApplication; +import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; -import org.jboss.ide.eclipse.as.openshift.core.internal.Application; import org.jboss.ide.eclipse.as.openshift.core.internal.ApplicationInfo; -import org.jboss.ide.eclipse.as.openshift.core.internal.Domain; +import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; import org.jboss.ide.eclipse.as.openshift.core.internal.User; import org.jboss.ide.eclipse.as.openshift.core.internal.UserInfo; @@ -68,7 +68,7 @@ @Test public void canGetDomain() throws OpenshiftException { - Domain domain = user.getDomain(); + IDomain domain = user.getDomain(); assertNotNull(domain); assertEquals(UserInfoResponseFake.RHC_DOMAIN, domain.getRhcDomain()); assertEquals(UserInfoResponseFake.NAMESPACE, domain.getNamespace()); @@ -79,8 +79,8 @@ OpenshiftService cartridgeListService = new NoopOpenshiftServiceFake() { @Override - public List<Cartridge> getCartridges(User user) throws OpenshiftException { - ArrayList<Cartridge> cartridges = new ArrayList<Cartridge>(); + public List<ICartridge> getCartridges(User user) throws OpenshiftException { + ArrayList<ICartridge> cartridges = new ArrayList<ICartridge>(); cartridges.add(new Cartridge(CartridgeResponseFake.CARTRIDGE_JBOSSAS70)); cartridges.add(new Cartridge(CartridgeResponseFake.CARTRIDGE_PERL5)); cartridges.add(new Cartridge(CartridgeResponseFake.CARTRIDGE_PHP53)); @@ -90,7 +90,7 @@ } }; User user = new User(UserInfoResponseFake.RHLOGIN, UserInfoResponseFake.PASSWORD, cartridgeListService); - Collection<Cartridge> cartridges = user.getCartridges(); + Collection<ICartridge> cartridges = user.getCartridges(); assertNotNull(cartridges); assertEquals(5, cartridges.size()); assertThatContainsCartridge(CartridgeResponseFake.CARTRIDGE_JBOSSAS70, cartridges); @@ -103,7 +103,7 @@ @Test public void canGetApplications() throws OpenshiftException { /** response is UserInfoResponseFake */ - Collection<Application> applications = user.getApplications(); + Collection<IApplication> applications = user.getApplications(); assertNotNull(applications); assertEquals(2, applications.size()); } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/NoopOpenshiftServiceFake.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -12,13 +12,12 @@ import java.util.List; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.IApplication; import org.jboss.ide.eclipse.as.openshift.core.ICartridge; import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.internal.Application; -import org.jboss.ide.eclipse.as.openshift.core.internal.Domain; +import org.jboss.ide.eclipse.as.openshift.core.internal.IDomain; import org.jboss.ide.eclipse.as.openshift.core.internal.OpenshiftService; import org.jboss.ide.eclipse.as.openshift.core.internal.User; import org.jboss.ide.eclipse.as.openshift.core.internal.UserInfo; @@ -34,7 +33,7 @@ } @Override - public List<Cartridge> getCartridges(User user) throws OpenshiftException { + public List<ICartridge> getCartridges(User user) throws OpenshiftException { throw new UnsupportedOperationException(); } @@ -69,12 +68,12 @@ } @Override - public Domain changeDomain(String domainName, ISSHPublicKey sshKey, User user) throws OpenshiftException { + public IDomain changeDomain(String domainName, ISSHPublicKey sshKey, User user) throws OpenshiftException { throw new UnsupportedOperationException(); } @Override - public Domain createDomain(String name, ISSHPublicKey keyPair, User user) throws OpenshiftException { + public IDomain createDomain(String name, ISSHPublicKey keyPair, User user) throws OpenshiftException { throw new UnsupportedOperationException(); } } 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-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/fakes/TestUser.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -10,7 +10,11 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.openshift.test.internal.core.fakes; +import org.jboss.ide.eclipse.as.openshift.core.Cartridge; +import org.jboss.ide.eclipse.as.openshift.core.IApplication; +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.internal.User; +import org.jboss.ide.eclipse.as.openshift.test.internal.core.utils.ApplicationUtils; /** * @author André Dietisheim @@ -27,4 +31,16 @@ public TestUser(String password) { super(RHLOGIN, password); } + + public IApplication createTestApplication() throws OpenshiftException { + return createApplication(ApplicationUtils.createRandomApplicationName(), Cartridge.JBOSSAS_7); + } + + public void silentlyDestroyApplication(IApplication application) { + try { + getService().destroyApplication(application.getName(), application.getCartridge(), this); + } catch (OpenshiftException e) { + e.printStackTrace(); + } + } } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/CartridgeAsserts.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/CartridgeAsserts.java 2011-09-26 14:33:51 UTC (rev 35044) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/CartridgeAsserts.java 2011-09-26 14:39:13 UTC (rev 35045) @@ -15,7 +15,6 @@ import java.text.MessageFormat; import java.util.Collection; -import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.ICartridge; /** @@ -23,7 +22,7 @@ */ public class CartridgeAsserts { - public static void assertThatContainsCartridge(String cartridgeName, Collection<Cartridge> cartridges) { + public static void assertThatContainsCartridge(String cartridgeName, Collection<ICartridge> cartridges) { boolean found = false; for (ICartridge cartridge : cartridges) { if (cartridgeName.equals(cartridge.getName())) { @@ -35,6 +34,4 @@ fail(MessageFormat.format("Could not find cartridge with name \"{0}\"", cartridgeName)); } } - - }