From 1aa439311b520ca54a8b917891cbac3cce23c28d Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 29 Nov 2015 00:17:50 +0100 Subject: [PATCH] Remove some warnings --- .../com/termux/terminal/OperatingSystemControlTest.java | 2 +- app/src/test/java/com/termux/terminal/TerminalTestCase.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/test/java/com/termux/terminal/OperatingSystemControlTest.java b/app/src/test/java/com/termux/terminal/OperatingSystemControlTest.java index 0019ed69..b436d68b 100644 --- a/app/src/test/java/com/termux/terminal/OperatingSystemControlTest.java +++ b/app/src/test/java/com/termux/terminal/OperatingSystemControlTest.java @@ -15,7 +15,7 @@ public class OperatingSystemControlTest extends TerminalTestCase { withTerminalSized(10, 10); enterString("\033]0;Hello, world\007"); assertEquals("Hello, world", mTerminal.getTitle()); - expectedTitleChanges.add(new ChangedTitle((String) null, "Hello, world")); + expectedTitleChanges.add(new ChangedTitle(null, "Hello, world")); assertEquals(expectedTitleChanges, mOutput.titleChanges); enterString("\033]0;Goodbye, world\007"); diff --git a/app/src/test/java/com/termux/terminal/TerminalTestCase.java b/app/src/test/java/com/termux/terminal/TerminalTestCase.java index 32f6e90a..48a6cb33 100644 --- a/app/src/test/java/com/termux/terminal/TerminalTestCase.java +++ b/app/src/test/java/com/termux/terminal/TerminalTestCase.java @@ -57,7 +57,7 @@ public abstract class TerminalTestCase extends TestCase { public TerminalEmulator mTerminal; public MockTerminalOutput mOutput; - public static class ChangedTitle { + public static final class ChangedTitle { final String oldTitle; final String newTitle; @@ -68,6 +68,7 @@ public abstract class TerminalTestCase extends TestCase { @Override public boolean equals(Object o) { + if (!(o instanceof ChangedTitle)) return false; ChangedTitle other = (ChangedTitle) o; 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; public LineWrapper(TerminalRow line) { @@ -129,6 +130,7 @@ public abstract class TerminalTestCase extends TestCase { @Override public boolean equals(Object o) { + if (!(o instanceof LineWrapper)) return false; return ((LineWrapper) o).mLine == mLine; } }