Index: trunk/test/unit/org/openstreetmap/josm/tools/OptionParserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/OptionParserTest.java	(revision 14415)
+++ trunk/test/unit/org/openstreetmap/josm/tools/OptionParserTest.java	(revision 14435)
@@ -3,4 +3,6 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
@@ -20,5 +22,5 @@
 public class OptionParserTest {
 
-    // A reason for moving to jupter...
+    // A reason for moving to jupiter...
     @Test(expected = OptionParseException.class)
     public void testEmptyParserRejectsLongopt() {
@@ -43,5 +45,5 @@
 
     @Test
-    public void testparserOption() {
+    public void testParserOption() {
         AtomicReference<String> argFound = new AtomicReference<>();
         OptionParser parser = new OptionParser("test")
@@ -53,5 +55,5 @@
 
     @Test(expected = OptionParseException.class)
-    public void testparserOptionFailsIfMissing() {
+    public void testParserOptionFailsIfMissing() {
         AtomicReference<String> argFound = new AtomicReference<>();
         OptionParser parser = new OptionParser("test")
@@ -62,5 +64,5 @@
 
     @Test(expected = OptionParseException.class)
-    public void testparserOptionFailsIfMissingArgument() {
+    public void testParserOptionFailsIfMissingArgument() {
         AtomicReference<String> argFound = new AtomicReference<>();
         OptionParser parser = new OptionParser("test")
@@ -71,5 +73,5 @@
 
     @Test(expected = OptionParseException.class)
-    public void testparserOptionFailsIfMissing2() {
+    public void testParserOptionFailsIfMissing2() {
         AtomicReference<String> argFound = new AtomicReference<>();
         OptionParser parser = new OptionParser("test")
@@ -80,5 +82,5 @@
 
     @Test(expected = OptionParseException.class)
-    public void testparserOptionFailsIfTwice() {
+    public void testParserOptionFailsIfTwice() {
         AtomicReference<String> argFound = new AtomicReference<>();
         OptionParser parser = new OptionParser("test")
@@ -89,5 +91,5 @@
 
     @Test(expected = OptionParseException.class)
-    public void testparserOptionFailsIfTwiceForAlias() {
+    public void testParserOptionFailsIfTwiceForAlias() {
         AtomicReference<String> argFound = new AtomicReference<>();
         OptionParser parser = new OptionParser("test")
@@ -226,6 +228,6 @@
         assertEquals("arg", argFound.get());
         assertEquals(Arrays.asList("m1", "m2"), multiFound);
-        assertEquals(true, usedFlag.get());
-        assertEquals(false, unusedFlag.get());
+        assertTrue(usedFlag.get());
+        assertFalse(unusedFlag.get());
     }
 
@@ -245,10 +247,10 @@
         assertEquals(Arrays.asList(), remaining);
         assertEquals("arg", argFound.get());
-        assertEquals(true, usedFlag.get());
-        assertEquals(false, unusedFlag.get());
-    }
-
-    @Test(expected = OptionParseException.class)
-    public void testAbigiousAlternatives() {
+        assertTrue(usedFlag.get());
+        assertFalse(unusedFlag.get());
+    }
+
+    @Test(expected = OptionParseException.class)
+    public void testAmbiguousAlternatives() {
         AtomicReference<String> argFound = new AtomicReference<>();
         AtomicBoolean usedFlag = new AtomicBoolean();
@@ -280,6 +282,6 @@
         assertEquals(Arrays.asList("x"), remaining);
         assertEquals("arg", argFound.get());
-        assertEquals(true, usedFlag.get());
-        assertEquals(false, unusedFlag.get());
+        assertTrue(usedFlag.get());
+        assertFalse(unusedFlag.get());
 
         remaining = parser.parseOptions(Arrays.asList("-ft", "arg", "x"));
@@ -287,6 +289,6 @@
         assertEquals(Arrays.asList("x"), remaining);
         assertEquals("arg", argFound.get());
-        assertEquals(true, usedFlag.get());
-        assertEquals(false, unusedFlag.get());
+        assertTrue(usedFlag.get());
+        assertFalse(unusedFlag.get());
 
         remaining = parser.parseOptions(Arrays.asList("-f", "-t=arg", "x"));
@@ -294,6 +296,6 @@
         assertEquals(Arrays.asList("x"), remaining);
         assertEquals("arg", argFound.get());
-        assertEquals(true, usedFlag.get());
-        assertEquals(false, unusedFlag.get());
+        assertTrue(usedFlag.get());
+        assertFalse(unusedFlag.get());
     }
 
@@ -319,10 +321,10 @@
 
     @Test(expected = IllegalArgumentException.class)
-    public void testDupplicateOptionName() {
+    public void testDuplicateOptionName() {
         new OptionParser("test").addFlagParameter("test", this::nop).addFlagParameter("test", this::nop);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testDupplicateOptionName2() {
+    public void testDuplicateOptionName2() {
         new OptionParser("test").addFlagParameter("test", this::nop)
             .addArgumentParameter("test", OptionCount.OPTIONAL, this::nop);
@@ -345,5 +347,5 @@
 
     @Test(expected = IllegalArgumentException.class)
-    public void testDupplicateShortAlias() {
+    public void testDuplicateShortAlias() {
         new OptionParser("test").addFlagParameter("test", this::nop)
         .addFlagParameter("test2", this::nop)