Index: trunk/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.groovy	(revision 11403)
+++ 	(revision )
@@ -1,18 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.tools
-
-class AlphanumComparatorTest extends GroovyTestCase {
-
-    void testNumeric() {
-        def lst = Arrays.asList("1", "20", "-1", "00999", "100")
-        Collections.sort(lst, AlphanumComparator.getInstance())
-        assert lst == Arrays.asList("-1", "1", "20", "100", "00999")
-    }
-
-    void testMixed() {
-        def lst = Arrays.asList("b1", "b20", "a5", "a00999", "a100")
-        Collections.sort(lst, AlphanumComparator.getInstance())
-        assert lst == Arrays.asList("a5", "a100", "a00999", "b1", "b20")
-    }
-
-}
Index: trunk/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.java	(revision 11404)
+++ trunk/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.java	(revision 11404)
@@ -0,0 +1,34 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+/**
+ * Unit tests of {@link AlphanumComparator}.
+ */
+public class AlphanumComparatorTest {
+
+    /**
+     * Test numeric strings.
+     */
+    @Test
+    public void testNumeric() {
+        List<String> lst = Arrays.asList("1", "20", "-1", "00999", "100");
+        Collections.sort(lst, AlphanumComparator.getInstance());
+        assert lst == Arrays.asList("-1", "1", "20", "100", "00999");
+    }
+
+    /**
+     * Test mixed character strings.
+     */
+    @Test
+    public void testMixed() {
+        List<String> lst = Arrays.asList("b1", "b20", "a5", "a00999", "a100");
+        Collections.sort(lst, AlphanumComparator.getInstance());
+        assert lst == Arrays.asList("a5", "a100", "a00999", "b1", "b20");
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/tools/I18nTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/I18nTest.groovy	(revision 11403)
+++ 	(revision )
@@ -1,10 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.tools
-
-class I18nTest extends GroovyTestCase {
-    void testEscape() {
-        def foobar = "{foo'bar}"
-        assert I18n.escape(foobar) == "'{'foo''bar'}'"
-        assert I18n.tr(I18n.escape(foobar)) == foobar
-    }
-}
Index: trunk/test/unit/org/openstreetmap/josm/tools/I18nTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/I18nTest.java	(revision 11404)
+++ trunk/test/unit/org/openstreetmap/josm/tools/I18nTest.java	(revision 11404)
@@ -0,0 +1,22 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Unit tests of {@link I18n}.
+ */
+public class I18nTest {
+
+    /**
+     * Unit test of {@link I18n#escape}.
+     */
+    @Test
+    public void testEscape() {
+        String foobar = "{foo'bar}";
+        assertEquals("'{'foo''bar'}'", I18n.escape(foobar));
+        assertEquals(foobar, I18n.tr(I18n.escape(foobar)));
+    }
+}