Skip to content

Commit

Permalink
Revert "[remkop#1320] fix failing test"
Browse files Browse the repository at this point in the history
This reverts commit 33bce97.
  • Loading branch information
MarkoMackic committed Oct 17, 2021
1 parent 06fd8bd commit 9ceeda2
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/test/java/picocli/Issue1320.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import java.nio.charset.Charset;

import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;

public class Issue1320 {

Expand Down Expand Up @@ -47,18 +47,15 @@ public void run() {
@Test
public void testIssue1320() {
String unmappable = "[abcµ]";
String alt1 = "[abc\u00B5]";
String alt2 = "[abc\u03BC]";
//String unmappable2 = "[abcμ]";

resetLogs();
System.clearProperty(SUN_STDOUT_ENCODING);
System.clearProperty(SUN_STDERR_ENCODING);
fixLogPrintStream(Charset.defaultCharset().name());
assertEquals(CommandLine.ExitCode.OK, new CommandLine(new TestCommand()).execute(unmappable));
// assertEquals(systemOutRule.getLog(), unmappable, systemOutRule.getLog());
// assertEquals(systemErrRule.getLog(), unmappable, systemErrRule.getLog());
assertTrue(systemOutRule.getLog(), alt1.equals(systemOutRule.getLog()) || alt2.equals(systemOutRule.getLog()));
assertTrue(systemErrRule.getLog(), alt1.equals(systemErrRule.getLog()) || alt2.equals(systemErrRule.getLog()));
assertEquals(systemOutRule.getLog(), unmappable, systemOutRule.getLog());
assertEquals(systemErrRule.getLog(), unmappable, systemErrRule.getLog());

resetLogs();
System.setProperty(SUN_STDOUT_ENCODING, CP_437);
Expand Down

0 comments on commit 9ceeda2

Please sign in to comment.