Remove some warnings

This commit is contained in:
Fredrik Fornwall
2015-11-29 00:17:50 +01:00
parent 12ddaccaf7
commit 1aa439311b
2 changed files with 5 additions and 3 deletions

View File

@@ -15,7 +15,7 @@ public class OperatingSystemControlTest extends TerminalTestCase {
withTerminalSized(10, 10); withTerminalSized(10, 10);
enterString("\033]0;Hello, world\007"); enterString("\033]0;Hello, world\007");
assertEquals("Hello, world", mTerminal.getTitle()); assertEquals("Hello, world", mTerminal.getTitle());
expectedTitleChanges.add(new ChangedTitle((String) null, "Hello, world")); expectedTitleChanges.add(new ChangedTitle(null, "Hello, world"));
assertEquals(expectedTitleChanges, mOutput.titleChanges); assertEquals(expectedTitleChanges, mOutput.titleChanges);
enterString("\033]0;Goodbye, world\007"); enterString("\033]0;Goodbye, world\007");

View File

@@ -57,7 +57,7 @@ public abstract class TerminalTestCase extends TestCase {
public TerminalEmulator mTerminal; public TerminalEmulator mTerminal;
public MockTerminalOutput mOutput; public MockTerminalOutput mOutput;
public static class ChangedTitle { public static final class ChangedTitle {
final String oldTitle; final String oldTitle;
final String newTitle; final String newTitle;
@@ -68,6 +68,7 @@ public abstract class TerminalTestCase extends TestCase {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof ChangedTitle)) return false;
ChangedTitle other = (ChangedTitle) o; ChangedTitle other = (ChangedTitle) o;
return Objects.equals(oldTitle, other.oldTitle) && Objects.equals(newTitle, other.newTitle); return Objects.equals(oldTitle, other.oldTitle) && Objects.equals(newTitle, other.newTitle);
} }
@@ -115,7 +116,7 @@ public abstract class TerminalTestCase extends TestCase {
} }
} }
private static class LineWrapper { private static final class LineWrapper {
TerminalRow mLine; TerminalRow mLine;
public LineWrapper(TerminalRow line) { public LineWrapper(TerminalRow line) {
@@ -129,6 +130,7 @@ public abstract class TerminalTestCase extends TestCase {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof LineWrapper)) return false;
return ((LineWrapper) o).mLine == mLine; return ((LineWrapper) o).mLine == mLine;
} }
} }