Merge pull request #465 from csmith/master

Random test tidying.

calc/test/com/dmdirc/addons/calc/ParserTest.java

 
         parser.parseHiddenOperator(tokens, 0);
         assertEquals(4, tokens.size());
-        assertTrue(tokens.get(0).getToken().getType() == TokenType.BRACKET_OPEN);
+        assertSame(TokenType.BRACKET_OPEN, tokens.get(0).getToken().getType());
 
         parser.parseHiddenOperator(tokens, 3);
         assertEquals(3, tokens.size());
-        assertTrue(tokens.get(2).getToken().getType() == TokenType.BRACKET_CLOSE);
+        assertSame(TokenType.BRACKET_CLOSE, tokens.get(2).getToken().getType());
     }
 
     @Test
 
         parser.parseUnaryOperator(tokens, 1);
         assertEquals(3, tokens.size());
-        assertTrue(tokens.get(0).getToken().getType() == TokenType.START);
-        assertTrue(tokens.get(1).getToken().getType() == TokenType.MOD_NEGATIVE);
-        assertTrue(tokens.get(2).getToken().getType() == TokenType.END);
+        assertSame(TokenType.START, tokens.get(0).getToken().getType());
+        assertSame(TokenType.MOD_NEGATIVE, tokens.get(1).getToken().getType());
+        assertSame(TokenType.END, tokens.get(2).getToken().getType());
 
         assertTrue(tokens.get(1).isProcessed());
         assertEquals(1, tokens.get(1).getChildren().size());
         parser.parseBinaryOperator(tokens, 2);
 
         assertEquals(3, tokens.size());
-        assertTrue(tokens.get(0).getToken().getType() == TokenType.START);
-        assertTrue(tokens.get(1).getToken().getType() == TokenType.OP_MINUS);
-        assertTrue(tokens.get(2).getToken().getType() == TokenType.END);
+        assertSame(TokenType.START, tokens.get(0).getToken().getType());
+        assertSame(TokenType.OP_MINUS, tokens.get(1).getToken().getType());
+        assertSame(TokenType.END, tokens.get(2).getToken().getType());
 
         assertTrue(tokens.get(1).isProcessed());
         assertEquals(2, tokens.get(1).getChildren().size());

mediasource_vlc/test/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePluginTest.java

 public class VlcMediaSourcePluginTest {
 
     @Test
-    public void testProcessInformation1() throws IOException, URISyntaxException,
-            UnsupportedEncodingException {
+    public void testProcessInformation1() throws Exception {
         final PluginInfo pluginInfo = mock(PluginInfo.class);
         final IdentityController identityController = mock(IdentityController.class);
         final VlcManager plugin = new VlcManager(pluginInfo, identityController);

ui_swing/test/com/dmdirc/addons/ui_swing/components/vetoable/VetoableListSelectionModelTest.java

     @Test
     public void testInitialState() {
         final VetoableListSelectionModel instance = new VetoableListSelectionModel();
-        assertEquals(instance.getLeadSelectionIndex(), -1);
-        assertEquals(instance.getSelectionMode(), SINGLE_SELECTION);
+        assertEquals(-1, instance.getLeadSelectionIndex());
+        assertEquals(SINGLE_SELECTION, instance.getSelectionMode());
         assertFalse(instance.getValueIsAdjusting());
     }
 
     public void testNonVetoed() {
         final VetoableListSelectionModel instance = new VetoableListSelectionModel();
         instance.setLeadSelectionIndex(5);
-        assertEquals(instance.getLeadSelectionIndex(), 5);
+        assertEquals(5, instance.getLeadSelectionIndex());
     }
 
     @Test
         final VetoableListSelectionModel instance = new VetoableListSelectionModel();
         instance.addVetoableSelectionListener(vetoListener);
         instance.setLeadSelectionIndex(5);
-        assertEquals(instance.getLeadSelectionIndex(), 5);
+        assertEquals(5, instance.getLeadSelectionIndex());
         verify(vetoListener).vetoableChange(any(PropertyChangeEvent.class));
     }
 
         final VetoableListSelectionModel instance = new VetoableListSelectionModel();
         instance.addVetoableSelectionListener(vetoListener);
         instance.setLeadSelectionIndex(5);
-        assertEquals(instance.getLeadSelectionIndex(), -1);
+        assertEquals(-1, instance.getLeadSelectionIndex());
     }
 
     @Test
         final VetoableListSelectionModel instance = new VetoableListSelectionModel();
         instance.addListSelectionListener(selectionListener);
         instance.setLeadSelectionIndex(5);
-        assertEquals(instance.getLeadSelectionIndex(), 5);
+        assertEquals(5, instance.getLeadSelectionIndex());
         verify(selectionListener).valueChanged(any(ListSelectionEvent.class));
     }
 
         instance.addListSelectionListener(selectionListener);
         instance.addVetoableSelectionListener(vetoListener);
         instance.setLeadSelectionIndex(5);
-        assertEquals(instance.getLeadSelectionIndex(), 5);
+        assertEquals(5, instance.getLeadSelectionIndex());
         verify(vetoListener).vetoableChange(any(PropertyChangeEvent.class));
         verify(selectionListener).valueChanged(any(ListSelectionEvent.class));
     }
         instance.addListSelectionListener(selectionListener);
         instance.addVetoableSelectionListener(vetoListener);
         instance.setLeadSelectionIndex(5);
-        assertEquals(instance.getLeadSelectionIndex(), -1);
+        assertEquals(-1, instance.getLeadSelectionIndex());
         verify(vetoListener).vetoableChange(any(PropertyChangeEvent.class));
         verify(selectionListener, never()).valueChanged(any(ListSelectionEvent.class));
     }
     public void testClearSelection() {
         final VetoableListSelectionModel instance = new VetoableListSelectionModel();
         instance.setLeadSelectionIndex(5);
-        assertEquals(instance.getLeadSelectionIndex(), 5);
+        assertEquals(5, instance.getLeadSelectionIndex());
         instance.clearSelection();
-        assertEquals(instance.getLeadSelectionIndex(), -1);
+        assertEquals(-1, instance.getLeadSelectionIndex());
     }
 
     @Test