Skip to content

Allow escape sequences to span multiple lines and support default fg/bg colors #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwnusbaum merged 12 commits into from
Jan 4, 2019
Merged

Allow escape sequences to span multiple lines and support default fg/bg colors #137

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e6b8ff5
Reproduce #135 in a test
dwnusbaum Nov 16, 2018
cfa7144
Fix #137 by closing open tags at the end of lines and reopening them
dwnusbaum Nov 19, 2018
a95ea81
Close whole AnsiHtmlOutputStream instead of inidividual tags and mino…
dwnusbaum Nov 19, 2018
2c19b61
Support color maps that set default foreground/background colors
dwnusbaum Nov 21, 2018
a2a74eb
Track character offsets correctly for multi-byte characters
dwnusbaum Dec 4, 2018
7d8b58d
Merge branch 'master' into multiline-sequence-bug
dwnusbaum Dec 4, 2018
c1d7aab
Handle multi-byte characters correctly instead of truncating them
dwnusbaum Dec 4, 2018
50893ab
Add Japanese text to non-ascii test case
dwnusbaum Dec 4, 2018
ce424f3
Remove unused code
dwnusbaum Dec 4, 2018
be7df32
Merge branch 'master' into multiline-sequence-bug
dwnusbaum Jan 4, 2019
31bb937
Remove unnecessary implementation of readResolve
dwnusbaum Jan 4, 2019
200bf2b
Address review feedback and add changelog entry
dwnusbaum Jan 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/test/java/hudson/plugins/ansicolor/AnsiColorBuildWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import static org.junit.Assert.*;
import org.junit.Assume;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.runners.model.Statement;
import org.jvnet.hudson.test.BuildWatcher;
Expand Down Expand Up @@ -88,6 +89,34 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
});
}

@Test
Copy link
Member Author

@dwnusbaum dwnusbaum Nov 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should create a JIRA issue for these and add @Issue.

@Ignore
Copy link
Member Author

@dwnusbaum dwnusbaum Nov 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dblock The test is ignored, so it never even ran.

public void testMultilineEscapeSequence() throws Exception {
story.then(r -> {
FreeStyleProject p = r.createFreeStyleProject();
p.getBuildWrappersList().add(new AnsiColorBuildWrapper(null));
p.getBuildersList().add(new TestBuilder() {
@Override
public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
listener.getLogger().println("\u001B[1;34mThis text should be bold and blue");
listener.getLogger().println("\u001B[mThis text should be normal");
return true;
}
});
FreeStyleBuild b = r.buildAndAssertSuccess(p);
StringWriter writer = new StringWriter();
b.getLogText().writeHtmlTo(0L, writer);
String html = writer.toString();
System.out.print(html);
assertThat(html.replaceAll("<span style=\"display: none\">.+?</span>", ""),
allOf(
// <b> and <span> are never closed.
containsString("<b><span style=\"color: #1E90FF;\">This text should be bold and blue</span></b>"),
// This should be inside of a span with `display: none`, but it is not.
not(containsString("\u001B[m"))));
});
}

@Issue("JENKINS-54133")
@Test
public void testWorkflowWrap() throws Exception {
Expand Down