PMD fixes

Change-Id: I348b37a14097439f8a56b0a671794410e46201ca
Reviewed-on: http://gerrit.dmdirc.com/3938
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

test/com/dmdirc/util/ReturnableThreadTest.java

@@ -30,7 +30,7 @@ public class ReturnableThreadTest {
     @Test
     public void testSetAndGetObject() {
         final Object result = new Object();
-        ReturnableThread instance = new RetunableThreadImpl();
+        final ReturnableThread instance = new RetunableThreadImpl();
         instance.setObject(result);
         assertSame(result, instance.getObject());
     }

test/com/dmdirc/util/SimpleInjectorTest.java

@@ -31,14 +31,14 @@ public class SimpleInjectorTest {
 
     @Test
     public void testNoParams() {
-        SimpleInjector instance = new SimpleInjector();
+        final SimpleInjector instance = new SimpleInjector();
         assertTrue(instance.getParameters().isEmpty());
     }
 
     @Test
     public void testAddParams() {
         final Object object = new Object();
-        SimpleInjector instance = new SimpleInjector();
+        final SimpleInjector instance = new SimpleInjector();
         instance.addParameter(Object.class, object);
         assertEquals(1, instance.getParameters().size());
     }
@@ -46,7 +46,7 @@ public class SimpleInjectorTest {
     @Test
     public void testAddObjectsParams() {
         final TestObject object = new TestObject("");
-        SimpleInjector instance = new SimpleInjector();
+        final SimpleInjector instance = new SimpleInjector();
         instance.addParameter(object);
         assertEquals(3, instance.getParameters().size());
     }
@@ -54,22 +54,22 @@ public class SimpleInjectorTest {
     @Test
     public void testParentsParams() {
         final Object object = new Object();
-        SimpleInjector parent = new SimpleInjector();
+        final SimpleInjector parent = new SimpleInjector();
         parent.addParameter(Object.class, object);
-        SimpleInjector child = new SimpleInjector(parent);
+        final SimpleInjector child = new SimpleInjector(parent);
         assertEquals(1, child.getParameters().size());
     }
 
     @Test
     public void testCreateInstanceNoParams() {
-        SimpleInjector instance = new SimpleInjector();
+        final SimpleInjector instance = new SimpleInjector();
         final Object result = instance.createInstance(Object.class);
         assertNotNull(result);
     }
 
     @Test
     public void testCreateInstanceParams() {
-        SimpleInjector instance = new SimpleInjector();
+        final SimpleInjector instance = new SimpleInjector();
         instance.addParameter(String.class, "test");
         instance.addParameter(SimpleInjectorTest.class, this);
         final TestObject result = instance.createInstance(TestObject.class);
@@ -78,14 +78,14 @@ public class SimpleInjectorTest {
 
     @Test(expected=IllegalArgumentException.class)
     public void testCreateUnsatisfiedConstructor() {
-        SimpleInjector instance = new SimpleInjector();
+        final SimpleInjector instance = new SimpleInjector();
         final Object result = instance.createInstance(TestObject.class);
         assertNull(result);
     }
 
     @Test(expected=IllegalArgumentException.class)
     public void testCreatePrivateConstructor() {
-        SimpleInjector instance = new SimpleInjector();
+        final SimpleInjector instance = new SimpleInjector();
         instance.addParameter(String.class, "");
         final Object result = instance.createInstance(PrivateObject.class);
         assertNull(result);
@@ -93,7 +93,7 @@ public class SimpleInjectorTest {
 
     @Test(expected=IllegalArgumentException.class)
     public void testCreateExceptionConstructor() {
-        SimpleInjector instance = new SimpleInjector();
+        final SimpleInjector instance = new SimpleInjector();
         instance.addParameter(String.class, "");
         instance.addParameter(SimpleInjectorTest.class, this);
         final Object result = instance.createInstance(ExceptionObject.class);
@@ -102,7 +102,7 @@ public class SimpleInjectorTest {
 
     class TestObject implements Serializable {
 
-        public TestObject(final String test) {
+        public TestObject(final String test) { // NOPMD
         }
     }
 

test/com/dmdirc/util/collections/DoubleMapTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.util.collections;
 
-import com.dmdirc.util.collections.DoubleMap;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/collections/EquatableWeakReferenceTest.java

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.util.collections;
 
-import com.dmdirc.util.collections.EquatableWeakReference;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import org.junit.Test;

test/com/dmdirc/util/collections/ListenerListTest.java

@@ -32,7 +32,7 @@ public class ListenerListTest {
     public void testGenericAddListener() {
         final Object listener = new Object();
         final Object listener2 = new Object();
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add(Object.class, listener);
         instance.add(Object.class, listener2);
         assertTrue(instance.get(Object.class).contains(listener));
@@ -42,7 +42,7 @@ public class ListenerListTest {
 
     @Test(expected=IllegalArgumentException.class)
     public void testGenericAddNull() {
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add(Object.class, null);
         assertFalse(instance.get(Object.class).contains(null));
     }
@@ -51,7 +51,7 @@ public class ListenerListTest {
     public void testStringAddListener() {
         final Object listener = new Object();
         final Object listener2 = new Object();
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add("Object", listener);
         instance.add("Object", listener2);
         assertTrue(instance.get("Object").contains(listener));
@@ -59,7 +59,7 @@ public class ListenerListTest {
     }
     @Test(expected=IllegalArgumentException.class)
     public void testStringAddNull() {
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add("Object", null);
         assertFalse(instance.get(Object.class).contains(null));
     }
@@ -67,7 +67,7 @@ public class ListenerListTest {
     @Test
     public void testGenericRemoveListener() {
         final Object listener = new Object();
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add(Object.class, listener);
         assertTrue(instance.get(Object.class).contains(listener));
         instance.remove(Object.class, listener);
@@ -77,7 +77,7 @@ public class ListenerListTest {
     @Test
     public void testStringRemoveListener() {
         final Object listener = new Object();
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add("Object", listener);
         assertTrue(instance.get("Object").contains(listener));
         instance.remove("Object", listener);
@@ -87,7 +87,7 @@ public class ListenerListTest {
     @Test
     public void testStringRemoveUnknownListener() {
         final Object listener = new Object();
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add("Object", listener);
         assertTrue(instance.get("Object").contains(listener));
         instance.remove("String", listener);
@@ -98,7 +98,7 @@ public class ListenerListTest {
     public void testGenericGetListeners() {
         final Object listener = new Object();
         final String listener2 = "";
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         assertTrue(instance.get(Object.class).isEmpty());
         instance.add(Object.class, listener);
         assertTrue(instance.get(Object.class).contains(listener));
@@ -111,7 +111,7 @@ public class ListenerListTest {
     public void testStringGetListeners() {
         final Object listener = new Object();
         final String listener2 = "";
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         assertTrue(instance.get("Object").isEmpty());
         instance.add("Object", listener);
         assertTrue(instance.get("Object").contains(listener));
@@ -124,7 +124,7 @@ public class ListenerListTest {
     public void testGetCallableNoArgs() {
         final TestCallable one = mock(TestCallable.class);
         final TestCallable two = mock(TestCallable.class);
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add(TestCallable.class, one);
         instance.add(TestCallable.class, two);
         final TestCallable test = instance.getCallable(TestCallable.class);
@@ -136,7 +136,7 @@ public class ListenerListTest {
     @Test
     public void testGetCallableArg() {
         final TestCallable one = mock(TestCallable.class);
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add(TestCallable.class, one);
         final TestCallable test = instance.getCallable(TestCallable.class);
         test.testMethod("test");
@@ -146,7 +146,7 @@ public class ListenerListTest {
     @Test
     public void testGetCallableArgs() {
         final TestCallable one = mock(TestCallable.class);
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add(TestCallable.class, one);
         final TestCallable test = instance.getCallable(TestCallable.class);
         test.testMethod("test", "test1");
@@ -157,7 +157,7 @@ public class ListenerListTest {
     public void testGetCallableThrowsException() {
         final TestCallable one = mock(TestCallable.class);
         when(one.testMethod()).thenThrow(new IndexOutOfBoundsException());
-        ListenerList instance = new ListenerList();
+        final ListenerList instance = new ListenerList();
         instance.add(TestCallable.class, one);
         final TestCallable test = instance.getCallable(TestCallable.class);
         test.testMethod();

test/com/dmdirc/util/collections/ObservableListDecoratorTest.java

@@ -22,9 +22,6 @@
 
 package com.dmdirc.util.collections;
 
-import com.dmdirc.util.collections.ObservableListDecorator;
-import com.dmdirc.util.collections.ObservableList;
-import com.dmdirc.util.collections.ListObserver;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;

test/com/dmdirc/util/collections/RollingListTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.util.collections;
 
-import com.dmdirc.util.collections.RollingList;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/collections/WeakListTest.java

@@ -49,7 +49,7 @@ public class WeakListTest {
     }
 
     @Test
-    public void testAdd_Int() {
+    public void testAddInt() {
         final WeakList<String> instance = new WeakList<>();
         assertTrue(instance.add("test1"));
         instance.add(0, "test2");
@@ -66,7 +66,7 @@ public class WeakListTest {
     }
 
     @Test
-    public void testRemove_Int() {
+    public void testRemoveInt() {
         final WeakList<String> instance = new WeakList<>();
         assertTrue(instance.isEmpty());
         instance.add("test1");
@@ -98,7 +98,7 @@ public class WeakListTest {
      * Test of toArray method, of class WeakList.
      */
     @Test
-    public void testToArray_0args() {
+    public void testToArray0args() {
         final WeakList<String> instance = new WeakList<>();
         assertEquals(0, instance.toArray().length);
         instance.add("test1");
@@ -113,9 +113,9 @@ public class WeakListTest {
      * Test of toArray method, of class WeakList.
      */
     @Test
-    public void testToArray_GenericType() {
+    public void testToArrayGenericType() {
         final WeakList<String> instance = new WeakList<>();
-        assertEquals(0, instance.toArray(new String[0]).length);
+        assertEquals(0, instance.toArray(new String[instance.size()]).length);
         instance.add("test1");
         instance.add("test2");
         final Object[] result = instance.toArray(new String[2]);
@@ -141,7 +141,7 @@ public class WeakListTest {
     }
 
     @Test
-    public void testAddAll_int_Collection() {
+    public void testAddAllIntCollection() {
         final List<String> list = new ArrayList<>();
         list.add("test1");
         list.add("test2");
@@ -240,7 +240,7 @@ public class WeakListTest {
     }
 
     @Test
-    public void testListIterator_0args() {
+    public void testListIterator0args() {
         final WeakList<String> instance = new WeakList<>();
         ListIterator result = instance.listIterator();
         assertFalse(result.hasNext());
@@ -253,7 +253,7 @@ public class WeakListTest {
     }
 
     @Test(expected=IndexOutOfBoundsException.class)
-    public void testListIterator_int() {
+    public void testListIteratorInt() {
         final WeakList<String> instance = new WeakList<>();
         ListIterator result = instance.listIterator(1);
         assertFalse(result.hasNext());
@@ -274,7 +274,7 @@ public class WeakListTest {
         instance.add("test2");
         instance.add("test3");
         instance.add("test4");
-        List result = instance.subList(1, 3);
+        final List result = instance.subList(1, 3);
         assertEquals(2, result.size());
         assertTrue(result.contains("test2"));
         assertTrue(result.contains("test3"));

test/com/dmdirc/util/io/ConfigFileTest.java

@@ -226,7 +226,7 @@ public class ConfigFileTest {
     public void testDelete() throws IOException {
         final File file = File.createTempFile("DMDirc_unittest", null);
         file.deleteOnExit();
-        ConfigFile config = new ConfigFile(file);
+        final ConfigFile config = new ConfigFile(file);
         config.write();
         assertTrue(file.exists());
         config.delete();

test/com/dmdirc/util/io/TextFileTest.java

@@ -56,12 +56,10 @@ public class TextFileTest {
 
     @Test
     public void testWrite() throws IOException {
-        File tempFile = File.createTempFile("dmdirc_unit_test", null);
+        final File tempFile = File.createTempFile("dmdirc_unit_test", null);
         TextFile file = new TextFile(tempFile);
 
-        final List<String> lines = Arrays.asList(new String[]{
-            "hello", "this is a test", "meep"
-        });
+        final List<String> lines = Arrays.asList("hello", "this is a test", "meep");
 
         file.writeLines(lines);
 
@@ -76,9 +74,7 @@ public class TextFileTest {
     public void testIllegalWrite() throws IOException {
         final TextFile file
                 = new TextFile(getClass().getResourceAsStream("test1.txt"));
-        file.writeLines(Arrays.asList(new String[]{
-            "hello", "this is a test", "meep"
-        }));
+        file.writeLines(Arrays.asList("hello", "this is a test", "meep"));
     }
 
     @Test(expected = UnsupportedOperationException.class)
@@ -90,12 +86,10 @@ public class TextFileTest {
 
     @Test
     public void testDelete() throws IOException {
-        File tempFile = File.createTempFile("dmdirc_unit_test", "de;ete");
+        final File tempFile = File.createTempFile("dmdirc_unit_test", "de;ete");
         TextFile file = new TextFile(tempFile);
 
-        final List<String> lines = Arrays.asList(new String[]{
-            "hello", "this is a test", "meep"
-        });
+        final List<String> lines = Arrays.asList("hello", "this is a test", "meep");
 
         file.writeLines(lines);
 

test/com/dmdirc/util/validators/DisabledOptionValidatorTest.java

@@ -30,19 +30,19 @@ public class DisabledOptionValidatorTest {
 
     @Test
     public void testValidateNull() {
-        DisabledOptionValidator instance = new DisabledOptionValidator();
+        final DisabledOptionValidator instance = new DisabledOptionValidator();
         assertFalse(instance.validate(null).isFailure());
     }
 
     @Test
     public void testValidateFalse() {
-        DisabledOptionValidator instance = new DisabledOptionValidator();
+        final DisabledOptionValidator instance = new DisabledOptionValidator();
         assertTrue(instance.validate("false:moo").isFailure());
     }
 
     @Test
     public void testValidateTrue() {
-        DisabledOptionValidator instance = new DisabledOptionValidator();
+        final DisabledOptionValidator instance = new DisabledOptionValidator();
         assertFalse(instance.validate("true:moo").isFailure());
     }
 }

test/com/dmdirc/util/validators/FileNameValidatorTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.FileNameValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/validators/IdentValidatorTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.IdentValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/validators/NicknameValidatorTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.NicknameValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/validators/NotEmptyValidatorTest.java

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.NotEmptyValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/validators/PortValidatorTest.java

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.PortValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/validators/RegexStringValidatorTest.java

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.RegexStringValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/validators/RegexValidatorTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.RegexValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/validators/ServerNameValidatorTest.java

@@ -31,38 +31,38 @@ public class ServerNameValidatorTest {
 
     @Test
     public void testValidateNull() {
-        ServerNameValidator instance = new ServerNameValidator();
+        final ServerNameValidator instance = new ServerNameValidator();
         assertTrue(instance.validate(null).isFailure());
     }
 
     @Test
     public void testValidateEmpty() {
-        ServerNameValidator instance = new ServerNameValidator();
+        final ServerNameValidator instance = new ServerNameValidator();
         assertTrue(instance.validate("").isFailure());
     }
 
     @Test
     public void testValidateNoProtocol() {
-        ServerNameValidator instance = new ServerNameValidator();
+        final ServerNameValidator instance = new ServerNameValidator();
         assertFalse(instance.validate("test.com").isFailure());
     }
 
     @Test
     public void testValidateNoHostname() {
-        ServerNameValidator instance = new ServerNameValidator();
+        final ServerNameValidator instance = new ServerNameValidator();
         assertEquals("Address requires a hostname.",
                 instance.validate("irc://").getFailureReason());
     }
 
     @Test
     public void testValidateInvalidURI() {
-        ServerNameValidator instance = new ServerNameValidator();
+        final ServerNameValidator instance = new ServerNameValidator();
         assertTrue(instance.validate("irc://^").isFailure());
     }
 
     @Test
     public void testValidateValid() {
-        ServerNameValidator instance = new ServerNameValidator();
+        final ServerNameValidator instance = new ServerNameValidator();
         assertFalse(instance.validate("irc://test.com").isFailure());
     }
 }

test/com/dmdirc/util/validators/StringLengthValidatorTest.java

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.StringLengthValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/validators/URIValidatorTest.java

@@ -30,20 +30,20 @@ public class URIValidatorTest {
 
     @Test
     public void testValidateNoHostname() {
-        ServerNameValidator instance = new ServerNameValidator();
+        final ServerNameValidator instance = new ServerNameValidator();
         assertEquals("Address requires a hostname.",
                 instance.validate("irc://").getFailureReason());
     }
 
     @Test
     public void testValidateInvalidURI() {
-        URIValidator instance = new URIValidator();
+        final URIValidator instance = new URIValidator();
         assertTrue(instance.validate("http://^").isFailure());
     }
 
     @Test
     public void testValidateValid() {
-        URIValidator instance = new URIValidator();
+        final URIValidator instance = new URIValidator();
         assertFalse(instance.validate("http://google.com:80").isFailure());
     }
 }

test/com/dmdirc/util/validators/ValidatorChainTest.java

@@ -22,9 +22,6 @@
 
 package com.dmdirc.util.validators;
 
-import com.dmdirc.util.validators.ValidatorChain;
-import com.dmdirc.util.validators.RegexStringValidator;
-import com.dmdirc.util.validators.NotEmptyValidator;
 import org.junit.Test;
 import static org.junit.Assert.*;