From 765231cc577bc60d7f24824ba651dde2071430f3 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 9 Mar 2010 01:18:56 +0000 Subject: [PATCH] added a test to make sure console annotation works as expected in the polling log. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@28437 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/model/AbstractProject.java | 2 + .../org/jvnet/hudson/test/SingleFileSCM.java | 5 ++ .../hudson/console/ConsoleAnnotatorTest.java | 61 ++++++++++++++++++- 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 2762c10f47..b818107d94 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1221,6 +1221,7 @@ public abstract class AbstractProject

,R extends A // add collection.add(item); save(); + updateTransientActions(); } protected final synchronized > @@ -1230,6 +1231,7 @@ public abstract class AbstractProject

,R extends A // found it collection.remove(i); save(); + updateTransientActions(); return; } } diff --git a/test/src/main/java/org/jvnet/hudson/test/SingleFileSCM.java b/test/src/main/java/org/jvnet/hudson/test/SingleFileSCM.java index cff425f006..2fbcd9ba78 100644 --- a/test/src/main/java/org/jvnet/hudson/test/SingleFileSCM.java +++ b/test/src/main/java/org/jvnet/hudson/test/SingleFileSCM.java @@ -73,4 +73,9 @@ public class SingleFileSCM extends NullSCM { os.close(); return true; } + + /** + * Don't write 'this', so that subtypes can be implemented as anonymous clas. + */ + private Object writeReplace() { return new Object(); } } diff --git a/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java b/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java index 61dd531bfc..de8b6dfba9 100644 --- a/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java +++ b/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java @@ -3,20 +3,31 @@ package hudson.console; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.WebRequestSettings; import com.gargoylesoftware.htmlunit.html.HtmlPage; +import hudson.FilePath; import hudson.Launcher; import hudson.MarkupText; import hudson.model.AbstractBuild; +import hudson.model.AbstractProject; import hudson.model.BuildListener; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Run; +import hudson.model.TaskListener; +import hudson.scm.PollingResult; +import hudson.scm.PollingResult.Change; +import hudson.scm.RepositoryBrowser; +import hudson.scm.SCMDescriptor; +import hudson.scm.SCMRevisionState; +import hudson.triggers.SCMTrigger; import org.jvnet.hudson.test.Bug; import org.jvnet.hudson.test.HudsonTestCase; import org.jvnet.hudson.test.SequenceLock; +import org.jvnet.hudson.test.SingleFileSCM; import org.jvnet.hudson.test.TestBuilder; import org.jvnet.hudson.test.TestExtension; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -216,8 +227,8 @@ public class ConsoleAnnotatorTest extends HudsonTestCase { /** * Places a triple dollar mark at the specified position. */ - public static final class DollarMark extends ConsoleNote { - public ConsoleAnnotator annotate(Run build, MarkupText text, int charPos) { + public static final class DollarMark extends ConsoleNote { + public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) { text.addMarkup(charPos,"$$$"); return null; } @@ -286,4 +297,50 @@ public class ConsoleAnnotatorTest extends HudsonTestCase { assertTrue(text.contains("&")); assertTrue(b.getLog().contains("&")); } + + + /** + * Makes sure that annotations in the polling output is handled correctly. + */ + public void testPollingOutput() throws Exception { + FreeStyleProject p = createFreeStyleProject(); + p.setScm(new PollingSCM()); + SCMTrigger t = new SCMTrigger("@daily"); + t.start(p,true); + p.addTrigger(t); + + buildAndAssertSuccess(p); + + // poll now + t.new Runner().run(); + + HtmlPage log = createWebClient().getPage(p, "scmPollLog"); + String text = log.asText(); + assertTrue(text, text.contains("$$$hello from polling")); + } + + public static class PollingSCM extends SingleFileSCM { + public PollingSCM() throws UnsupportedEncodingException { + super("abc", "def"); + } + + @Override + protected PollingResult compareRemoteRevisionWith(AbstractProject project, Launcher launcher, FilePath workspace, TaskListener listener, SCMRevisionState baseline) throws IOException, InterruptedException { + listener.annotate(new DollarMark()); + listener.getLogger().println("hello from polling"); + return new PollingResult(Change.NONE); + } + + @TestExtension + public static final class DescriptorImpl extends SCMDescriptor { + public DescriptorImpl() { + super(PollingSCM.class, RepositoryBrowser.class); + } + + @Override + public String getDisplayName() { + return "Test SCM"; + } + } + } }