Author: adietish Date: 2011-09-27 12:54:27 -0400 (Tue, 27 Sep 2011) New Revision: 35074 Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java Log: [JBIDE-9773] correcting ApplicationLogReader implementation and adding new tests 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-27 16:53:50 UTC (rev 35073) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 16:54:27 UTC (rev 35074) @@ -15,11 +15,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.concurrent.BlockingQueue; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.TimeUnit; import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader; import org.jboss.ide.eclipse.as.openshift.core.IApplication; @@ -38,8 +35,6 @@ */ public class ApplicationLogReaderIntegrationTest { - private static final long TIMEOUT = 10; - private IOpenshiftService service; private TestUser user; @@ -116,43 +111,4 @@ } } } - - private static class LogReaderRunnable implements Runnable { - - private ApplicationLogReader logReader; - private BlockingQueue<Character> logQueue; - - public LogReaderRunnable(ApplicationLogReader logReader) { - this.logReader = logReader; - this.logQueue = new LinkedBlockingDeque<Character>(); - } - - @Override - public void run() { - try { - for (int data = -1; (data = logReader.read()) != -1;) { - logQueue.put((char) data); - } - } catch (Exception e) { - // do nothing - } - } - - private boolean waitForNewLogentries(StringBuilder builder) throws InterruptedException { - Character character = logQueue.poll(TIMEOUT, TimeUnit.SECONDS); - boolean newEntry = character != null; - if (newEntry) { - builder.append(character); - } - return newEntry; - } - - public String waitUntilNoNewLogentries() throws InterruptedException { - StringBuilder builder = new StringBuilder(); - while (waitForNewLogentries(builder)) { - ; - } - return builder.toString(); - } - } } Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java 2011-09-27 16:54:27 UTC (rev 35074) @@ -0,0 +1,113 @@ +/******************************************************************************* + * 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.test.internal.core; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +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.ICartridge; +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.test.internal.core.fakes.NoopOpenshiftServiceFake; +import org.junit.Before; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class ApplicationLogReaderTest { + + private Application application; + + @Before + public void setUp() { + this.application = new Application("fakeApplication", ICartridge.JBOSSAS_7, null, + new NoopOpenshiftServiceFake()) { + + private String log = INITIAL_LOG; + + private static final String INITIAL_LOG = + "11:31:36,289 INFO [org.jboss.as.ee] (Controller Boot Thread) Activating EE subsystem" + +"11:31:36,340 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080" + +"11:31:36,440 INFO [org.jboss.as.connector] (MSC service thread 1-4) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)" + +"11:31:36,471 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-1) Bound data source [java:jboss/datasources/ExampleDS]" + +"11:31:36,966 INFO [org.jboss.as.deployment] (MSC service thread 1-3) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments" + +"11:31:36,982 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2796ms - Started 82 of 107 services (22 services are passive or on-demand)" + +"11:31:37,004 INFO [org.jboss.as.server.deployment] (MSC service thread 1-2) Starting deployment of \"ROOT.war\"" + +"11:31:37,084 INFO [org.jboss.as.jpa] (MSC service thread 1-4) added javax.persistence.api dependency to ROOT.war" + +"11:31:37,403 INFO [org.jboss.web] (MSC service thread 1-3) registering web context: " + +"11:31:37,445 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\""; + + private static final String LOG_CONTINUATION = + "11:32:13,187 INFO [org.apache.catalina.core.AprLifecycleListener] (MSC service thread 1-3) The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib" + +"11:32:13,295 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-1) Starting Coyote HTTP/1.1 on http--127.1.9.1-8080" + +"11:32:13,344 INFO [org.jboss.as.connector] (MSC service thread 1-1) Starting JCA Subsystem (JBoss IronJacamar 1.0.3.Final)" + +"11:32:13,383 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-2) Bound data source [java:jboss/datasources/ExampleDS]" + +"11:32:13,746 INFO [org.jboss.as.deployment] (MSC service thread 1-2) Started FileSystemDeploymentService for directory /var/lib/libra/b8ea642ed6aa4dd0af2a4fe94c0ff07c/1317137507620/jbossas-7.0/standalone/deployments" + +"11:32:13,764 INFO [org.jboss.as] (Controller Boot Thread) JBoss AS 7.0.1.Final \"Zap\" started in 2736ms - Started 82 of 107 services (22 services are passive or on-demand)" + +"11:32:13,772 INFO [org.jboss.as.server.deployment] (MSC service thread 1-4) Starting deployment of \"ROOT.war\"" + +"11:32:13,868 INFO [org.jboss.as.jpa] (MSC service thread 1-1) added javax.persistence.api dependency to ROOT.war" + +"11:32:14,176 INFO [org.jboss.web] (MSC service thread 1-2) registering web context: " + +"11:32:14,207 INFO [org.jboss.as.server.controller] (DeploymentScanner-threads - 2) Deployed \"ROOT.war\""; + + + @Override + public ApplicationLogReader getLogReader() throws OpenshiftException { + return new ApplicationLogReader(this, getUser(), getService()) { + + @Override + protected int readStatus(char[] cbuf, int off, int len) throws IOException, InterruptedException { + System.arraycopy(log.toCharArray(), 0, cbuf, off, len); + return len; + } + + }; + } + + @Override + public void restart() throws OpenshiftException { + log = LOG_CONTINUATION; + } + }; + } + + @Test + public void logReaderReturnsNewEntriesAfterApplicationRestart() throws Exception { + ExecutorService executor = null; + try { + ApplicationLogReader logReader = application.getLogReader(); + LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader); + executor = Executors.newSingleThreadExecutor(); + executor.submit(logReaderRunnable); + + String log = logReaderRunnable.waitUntilNoNewLogentries(); + assertNotNull(log); + assertTrue(log.length() > 0); + + application.restart(); + + String newLog = logReaderRunnable.waitUntilNoNewLogentries(); + assertFalse(log.equals(newLog)); + } finally { + if (executor != null) { + executor.shutdownNow(); + } + } + } + + +} Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java 2011-09-27 16:54:27 UTC (rev 35074) @@ -0,0 +1,60 @@ +/******************************************************************************* + * 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.test.internal.core; + +import static org.junit.Assert.fail; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.TimeUnit; + +import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader; + +public class LogReaderRunnable implements Runnable { + + private static final long TIMEOUT = 10; // 10 seconds + + private ApplicationLogReader logReader; + private BlockingQueue<Character> logQueue; + + public LogReaderRunnable(ApplicationLogReader logReader) { + this.logReader = logReader; + this.logQueue = new LinkedBlockingDeque<Character>(); + } + + @Override + public void run() { + try { + for (int data = -1; (data = logReader.read()) != -1;) { + logQueue.put((char) data); + } + } catch (Exception e) { + fail(e.getMessage()); + } + } + + private boolean waitForNewLogentries(StringBuilder builder) throws InterruptedException { + Character character = logQueue.poll(TIMEOUT, TimeUnit.SECONDS); + boolean isNewEntry = character != null; + if (isNewEntry) { + builder.append(character); + } + return isNewEntry; + } + + public String waitUntilNoNewLogentries() throws InterruptedException { + StringBuilder builder = new StringBuilder(); + while (waitForNewLogentries(builder)) { + ; + } + return builder.toString(); + } +} \ No newline at end of file Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/LogReaderRunnable.java ___________________________________________________________________ Added: svn:mime-type + text/plain