ソースを参照

Tidy a couple of tests.

Change-Id: I11b3c8aa740b6a70a58190c75070045b1cbcd3ca
Reviewed-on: http://gerrit.dmdirc.com/3917
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
pull/1/head
Chris Smith 9年前
コミット
2bff1052d7

+ 1
- 1
test/com/dmdirc/actions/ActionComparisonNamesTest.java ファイルの表示

36
 @RunWith(Parameterized.class)
36
 @RunWith(Parameterized.class)
37
 public class ActionComparisonNamesTest {
37
 public class ActionComparisonNamesTest {
38
 
38
 
39
-    private ActionComparison comparison;
39
+    private final ActionComparison comparison;
40
 
40
 
41
     public ActionComparisonNamesTest(final ActionComparison comparison) {
41
     public ActionComparisonNamesTest(final ActionComparison comparison) {
42
         this.comparison = comparison;
42
         this.comparison = comparison;

+ 4
- 3
test/com/dmdirc/actions/StringComponentsTest.java ファイルの表示

34
 @RunWith(Parameterized.class)
34
 @RunWith(Parameterized.class)
35
 public class StringComponentsTest {
35
 public class StringComponentsTest {
36
 
36
 
37
-    private String string1, string2;
37
+    private final String string1;
38
+    private final String string2;
38
 
39
 
39
     public StringComponentsTest(final String string1, final String string2) {
40
     public StringComponentsTest(final String string1, final String string2) {
40
         this.string1 = string1;
41
         this.string1 = string1;
61
 
62
 
62
     @Test
63
     @Test
63
     public void testContains() {
64
     public void testContains() {
64
-        assertEquals(string1.indexOf(string2) != -1,
65
+        assertEquals(string1.contains(string2),
65
                 CoreActionComparison.STRING_CONTAINS.test(string1, string2));
66
                 CoreActionComparison.STRING_CONTAINS.test(string1, string2));
66
     }
67
     }
67
 
68
 
68
     @Test
69
     @Test
69
     public void testNotContains() {
70
     public void testNotContains() {
70
-        assertEquals(string1.indexOf(string2) == -1,
71
+        assertEquals(!string1.contains(string2),
71
                 CoreActionComparison.STRING_NCONTAINS.test(string1, string2));
72
                 CoreActionComparison.STRING_NCONTAINS.test(string1, string2));
72
     }
73
     }
73
 
74
 

読み込み中…
キャンセル
保存