Index: trunk/test/unit/org/CustomMatchers.java
===================================================================
--- trunk/test/unit/org/CustomMatchers.java	(revision 8856)
+++ trunk/test/unit/org/CustomMatchers.java	(revision 8857)
@@ -14,4 +14,7 @@
 import org.openstreetmap.josm.tools.Predicate;
 
+/**
+ * Custom matchers for unit tests.
+ */
 @Ignore("no test")
 public final class CustomMatchers {
@@ -21,4 +24,9 @@
     }
 
+    /**
+     * Matcher for a predicate.
+     * @param predicate the predicate
+     * @return matcher for a predicate
+     */
     public static <T> Matcher<? extends T> forPredicate(final Predicate<T> predicate) {
         return new TypeSafeMatcher<T>() {
@@ -36,4 +44,9 @@
     }
 
+    /**
+     * Matcher for a collection of a given size.
+     * @param size of collection
+     * @return matcher for a collection of a given size
+     */
     public static Matcher<Collection<?>> hasSize(final int size) {
         return new TypeSafeMatcher<Collection<?>>() {
@@ -50,4 +63,8 @@
     }
 
+    /**
+     * Matcher for an empty collection.
+     * @return matcher for an empty collection
+     */
     public static Matcher<Collection<?>> isEmpty() {
         return new TypeSafeMatcher<Collection<?>>() {
@@ -64,4 +81,9 @@
     }
 
+    /**
+     * Matcher for a point at a given location.
+     * @param expected expected location
+     * @return matcher for a point at a given location
+     */
     public static Matcher<? super Point2D> is(final Point2D expected) {
         return new CustomTypeSafeMatcher<Point2D>("the same Point2D") {
@@ -73,4 +95,9 @@
     }
 
+    /**
+     * Matcher for a point at a given location.
+     * @param expected expected location
+     * @return matcher for a point at a given location
+     */
     public static Matcher<? super LatLon> is(final LatLon expected) {
         return new CustomTypeSafeMatcher<LatLon>("the same LatLon") {
@@ -83,4 +110,9 @@
     }
 
+    /**
+     * Matcher for a point at a given location.
+     * @param expected expected location
+     * @return matcher for a point at a given location
+     */
     public static Matcher<? super EastNorth> is(final EastNorth expected) {
         return new CustomTypeSafeMatcher<EastNorth>("the same EastNorth") {
@@ -92,4 +124,3 @@
         };
     }
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/MainTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 8857)
@@ -2,13 +2,74 @@
 package org.openstreetmap.josm;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collection;
 
 import org.junit.Test;
+import org.openstreetmap.josm.Main.DownloadParamType;
 
+/**
+ * Unit tests of {@link Main} class.
+ */
 public class MainTest {
+
+    /**
+     * Unit test of {@link DownloadParamType#paramType} method.
+     */
     @Test
-    public void testParamType() throws Exception {
-        assertThat(Main.DownloadParamType.paramType("48.000,16.000,48.001,16.001"), is(Main.DownloadParamType.bounds));
+    public void testParamType() {
+        assertEquals(DownloadParamType.bounds, DownloadParamType.paramType("48.000,16.000,48.001,16.001"));
+        assertEquals(DownloadParamType.fileName, DownloadParamType.paramType("data.osm"));
+        assertEquals(DownloadParamType.fileUrl, DownloadParamType.paramType("file:///home/foo/data.osm"));
+        assertEquals(DownloadParamType.fileUrl, DownloadParamType.paramType("file://C:\\Users\\foo\\data.osm"));
+        assertEquals(DownloadParamType.httpUrl, DownloadParamType.paramType("http://somewhere.com/data.osm"));
+        assertEquals(DownloadParamType.httpUrl, DownloadParamType.paramType("https://somewhere.com/data.osm"));
+    }
+
+    /**
+     * Unit tests on log messages.
+     */
+    @Test
+    public void testLogs() {
+
+        assertNull(Main.getErrorMessage(null));
+
+        // Correct behaviour with errors
+        Main.error(new Exception("exception_error"));
+        Main.error("Error message on one line");
+        Main.error("First line of error message on several lines\nline2\nline3\nline4");
+        Collection<String> errors = Main.getLastErrorAndWarnings();
+        assertTrue(errors.contains("E: java.lang.Exception: exception_error"));
+        assertTrue(errors.contains("E: Error message on one line"));
+        assertTrue(errors.contains("E: First line of error message on several lines"));
+
+        // Correct behaviour with warnings
+        Main.warn(new Exception("exception_warn", new Exception("root_cause")));
+        Main.warn("Warning message on one line");
+        Main.warn("First line of warning message on several lines\nline2\nline3\nline4");
+        Collection<String> warnings = Main.getLastErrorAndWarnings();
+        assertTrue(warnings.contains("W: java.lang.Exception: exception_warn. Cause: java.lang.Exception: root_cause"));
+        assertTrue(warnings.contains("W: Warning message on one line"));
+        assertTrue(warnings.contains("W: First line of warning message on several lines"));
+
+        int defaultLevel = Main.logLevel;
+
+        // Check levels
+        Main.logLevel = 5;
+        assertTrue(Main.isTraceEnabled());
+        assertTrue(Main.isDebugEnabled());
+
+        Main.logLevel = 4;
+        assertFalse(Main.isTraceEnabled());
+        assertTrue(Main.isDebugEnabled());
+
+        Main.logLevel = 3;
+        assertFalse(Main.isTraceEnabled());
+        assertFalse(Main.isDebugEnabled());
+
+        Main.logLevel = defaultLevel;
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java	(revision 8857)
@@ -16,5 +16,5 @@
 
 /**
- * Unit tests for class AlignInLineAction.
+ * Unit tests for class {@link AlignInLineAction}.
  */
 public final class AlignInLineActionTest {
Index: trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 8857)
@@ -22,5 +22,5 @@
 
 /**
- * Unit tests for class CombineWayAction.
+ * Unit tests for class {@link CombineWayAction}.
  */
 public class CombineWayActionTest {
@@ -31,5 +31,5 @@
     @BeforeClass
     public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init(false);
+        JOSMFixture.createUnitTestFixture().init();
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java	(revision 8857)
@@ -2,6 +2,5 @@
 package org.openstreetmap.josm.actions;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
@@ -14,6 +13,12 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+/**
+ * Unit tests for class {@link CopyAction}.
+ */
 public class CopyActionTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUpBeforeClass() {
@@ -24,5 +29,5 @@
     public void testCopyStringWay() throws Exception {
         final Way way = new Way(123L);
-        assertThat(CopyAction.getCopyString(Collections.singleton(way)), is("way 123"));
+        assertEquals("way 123", CopyAction.getCopyString(Collections.singleton(way)));
     }
 
@@ -31,6 +36,6 @@
         final Way way = new Way(123L);
         final Relation relation = new Relation(456);
-        assertThat(CopyAction.getCopyString(Arrays.asList(way, relation)), is("way 123,relation 456"));
-        assertThat(CopyAction.getCopyString(Arrays.asList(relation, way)), is("relation 456,way 123"));
+        assertEquals("way 123,relation 456", CopyAction.getCopyString(Arrays.asList(way, relation)));
+        assertEquals("relation 456,way 123", CopyAction.getCopyString(Arrays.asList(relation, way)));
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java	(revision 8857)
@@ -31,5 +31,5 @@
 
 /**
- * Unit tests for class CreateCircleAction.
+ * Unit tests for class {@link CreateCircleAction}.
  */
 public final class CreateCircleActionTest {
Index: trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java	(revision 8857)
@@ -18,5 +18,5 @@
 
 /**
- * Unit tests for class SplitWayAction.
+ * Unit tests for class {@link SplitWayAction}.
  */
 public final class SplitWayActionTest {
Index: trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java	(revision 8857)
@@ -17,5 +17,5 @@
 
 /**
- * Unit tests for class UnJoinNodeWayAction.
+ * Unit tests for class {@link UnJoinNodeWayAction}.
  */
 public final class UnJoinNodeWayActionTest {
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java	(revision 8857)
@@ -24,5 +24,4 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -30,5 +29,4 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.tools.Predicate;
 
 /**
@@ -37,15 +35,7 @@
 public class SelectActionTest {
 
-    public class MapViewMock extends MapView {
-        public OsmDataLayer layer;
-        public DataSet currentDataSet;
-
-        public Predicate<OsmPrimitive> isSelectablePredicate =
-                new Predicate<OsmPrimitive>() {
-                    @Override
-                    public boolean evaluate(OsmPrimitive prim) {
-                        return true;
-                    }
-                };
+    private class MapViewMock extends MapView {
+        private OsmDataLayer layer;
+        private DataSet currentDataSet;
 
         MapViewMock(DataSet dataSet, OsmDataLayer layer) {
@@ -65,10 +55,4 @@
         @Override
         public void removeMouseListener(MouseListener ml) {}
-
-        public void addMouseMotionListener(MouseListener ml) {}
-
-        public void removeMouseMotionListener(MouseListener ml) {}
-
-        public void mvRepaint() {}
 
         @Override
Index: trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java	(revision 8857)
@@ -13,4 +13,7 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+/**
+ * Unit tests for class {@link SearchCompiler}.
+ */
 public class SearchCompilerTest {
 
@@ -109,5 +112,4 @@
     public void testNthParseNegative() throws Exception {
         Assert.assertThat(SearchCompiler.compile("nth:-1").toString(), CoreMatchers.is("Nth{nth=-1, modulo=false}"));
-
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java	(revision 8857)
@@ -13,5 +13,9 @@
 import org.openstreetmap.josm.JOSMFixture;
 
+/**
+ * Unit tests for class {@link JCSCachedTileLoaderJob}.
+ */
 public class JCSCachedTileLoaderJobTest {
+
     private static class TestCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, CacheEntry> {
         private String url;
@@ -44,23 +48,18 @@
             return new CacheEntry("dummy".getBytes());
         }
-
     }
 
     private static class Listener implements ICachedLoaderListener {
-        private CacheEntry data;
         private CacheEntryAttributes attributes;
-        private LoadResult result;
         private boolean ready;
 
         @Override
         public synchronized void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result) {
-            this.data = data;
             this.attributes = attributes;
-            this.result = result;
             this.ready = true;
             this.notify();
         }
+    }
 
-    }
     /**
      * Setup test.
@@ -108,5 +107,4 @@
         }
         assertEquals(responseCode, listener.attributes.getResponseCode());
-
     }
 
@@ -114,5 +112,3 @@
         return new TestCachedTileLoaderJob("http://httpstat.us/" + responseCode);
     }
-
 }
-
Index: trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java	(revision 8857)
@@ -6,4 +6,7 @@
 import org.junit.Test;
 
+/**
+ * Unit tests for class {@link LatLon}.
+ */
 public class LatLonTest {
 
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java	(revision 8857)
@@ -20,9 +20,12 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
+/**
+ * Unit tests for class {@link TemplatedWMSTileSource}.
+ */
 public class TemplatedWMSTileSourceTest {
 
     private ImageryInfo testImageryWMS =  new ImageryInfo("test imagery", "http://localhost", "wms", null, null);
     private ImageryInfo testImageryTMS =  new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
-    //private TileSource testSource = new TemplatedWMSTileSource(testImageryWMS);
+
     /**
      * Setup test.
@@ -52,5 +55,4 @@
         verifyLocation(source, new LatLon(53.5937132, 19.5652017));
         verifyLocation(source, new LatLon(53.501565692302854, 18.54455233898721));
-
     }
 
@@ -107,5 +109,4 @@
         verifyLocation(source, new LatLon(60, 18), 3);
         verifyLocation(source, new LatLon(60, 18));
-
     }
 
@@ -120,5 +121,4 @@
         verifyLocation(source, new LatLon(60, 18.1), 3);
         verifyLocation(source, new LatLon(60, 18.1));
-
     }
 
@@ -129,5 +129,4 @@
         assertEquals(expected.getLat(), result.lat(), 1e-4);
         assertEquals(expected.getLon(), result.lon(), 1e-4);
-        //assertTrue("result: " + result.toDisplayString() + " osmMercator: " +  expected.toDisplayString(), result.equalsEpsilon(expected));
         LatLon tileCenter = new Bounds(result, getTileLatLon(source, x+1, y+1, z)).getCenter();
         TileXY backwardsResult = source.latLonToTileXY(tileCenter.toCoordinate(), z);
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 8857)
@@ -18,4 +18,7 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
+/**
+ * Unit tests for class {@link WMTSTileSource}.
+ */
 public class WMTSTileSourceTest {
 
@@ -28,4 +31,7 @@
     private ImageryInfo testImageryOntario = getImagery("test/data/wmts/WMTSCapabilities-Ontario.xml");
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUp() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 8857)
@@ -14,6 +14,12 @@
 import org.openstreetmap.josm.data.APIDataSet;
 
+/**
+ * Unit tests for class {@link APIDataSet}.
+ */
 public class APIDataSetTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 8857)
@@ -24,6 +24,12 @@
 import org.openstreetmap.josm.data.projection.Projections;
 
+/**
+ * Unit tests for class {@link DataSetMerger}.
+ */
 public class DataSetMergerTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 8857)
@@ -24,4 +24,7 @@
 import org.openstreetmap.josm.io.OsmReader;
 
+/**
+ * Unit tests for class {@link Filter}.
+ */
 public class FilterTest {
 
@@ -35,5 +38,5 @@
 
     @Test
-    public void basic_test() throws ParseError {
+    public void basic() throws ParseError {
         DataSet ds = new DataSet();
         Node n1 = new Node(new LatLon(0, 0));
@@ -63,5 +66,5 @@
 
     @Test
-    public void filter_test() throws ParseError, IllegalDataException, IOException {
+    public void filter() throws ParseError, IllegalDataException, IOException {
         for (int i : new int[] {1, 2, 3, 11, 12, 13, 14, 15}) {
             DataSet ds;
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java	(revision 8857)
@@ -15,8 +15,10 @@
  * Some unit test cases for basic tag management on {@link OsmPrimitive}. Uses
  * {@link Node} for the tests, {@link OsmPrimitive} is abstract.
- *
  */
 public class OsmPrimitiveKeyHandlingTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 8857)
@@ -15,4 +15,7 @@
 public class OsmPrimitiveTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java	(revision 8857)
@@ -2,6 +2,5 @@
 package org.openstreetmap.josm.data.osm;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -12,4 +11,7 @@
 public class OsmUtilsTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void setUp() {
@@ -21,7 +23,7 @@
         final OsmPrimitive p = OsmUtils.createPrimitive("way name=Foo railway=rail");
         assertTrue(p instanceof Way);
-        assertThat(p.keySet().size(), is(2));
-        assertThat(p.get("name"), is("Foo"));
-        assertThat(p.get("railway"), is("rail"));
+        assertEquals(2, p.keySet().size());
+        assertEquals("Foo", p.get("name"));
+        assertEquals("rail", p.get("railway"));
     }
 
@@ -29,7 +31,6 @@
     public void testArea() throws Exception {
         final OsmPrimitive p = OsmUtils.createPrimitive("area name=Foo railway=rail");
-        assertThat(p.getType(), is(OsmPrimitiveType.WAY));
+        assertEquals(OsmPrimitiveType.WAY, p.getType());
         assertTrue(p.getKeys().equals(OsmUtils.createPrimitive("way name=Foo railway=rail").getKeys()));
-
     }
 
@@ -38,4 +39,3 @@
         OsmUtils.createPrimitive("noway name=Foo");
     }
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 8857)
@@ -23,4 +23,7 @@
 public class QuadBucketsTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java	(revision 8857)
@@ -12,4 +12,7 @@
 import org.openstreetmap.josm.data.osm.User;
 
+/**
+ * Unit tests for class {@link HistoryNode}.
+ */
 public class HistoryNodeTest {
 
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 8857)
@@ -14,4 +14,7 @@
 import org.openstreetmap.josm.data.osm.User;
 
+/**
+ * Unit tests for class {@link HistoryWay}.
+ */
 public class HistoryWayTest {
 
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 8857)
@@ -21,4 +21,7 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+/**
+ * Unit tests for class {@link MergeSourceBuildingVisitor}.
+ */
 public class MergeSourceBuildingVisitorTest {
 
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 8857)
@@ -2,8 +2,7 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -33,5 +32,5 @@
 
 /**
- * JUnit Test of MapCSS TagChecker.
+ * JUnit Test of {@link MapCSSTagChecker}.
  */
 public class MapCSSTagCheckerTest {
@@ -53,5 +52,4 @@
     @Test
     public void testNaturalMarsh() throws Exception {
-
         final List<MapCSSTagChecker.TagCheck> checks = MapCSSTagChecker.TagCheck.readMapCSS(new StringReader("" +
                 "*[natural=marsh] {\n" +
@@ -61,24 +59,23 @@
                 "   fixAdd: \"wetland=marsh\";\n" +
                 "}"));
-        assertThat(checks.size(), is(1));
+        assertEquals(1, checks.size());
         final MapCSSTagChecker.TagCheck check = checks.get(0);
-        assertThat(check, notNullValue());
-        assertThat(check.getDescription(null), is("{0.key}=null is deprecated"));
-        assertThat(check.fixCommands.get(0).toString(), is("fixRemove: {0.key}"));
-        assertThat(check.fixCommands.get(1).toString(), is("fixAdd: natural=wetland"));
-        assertThat(check.fixCommands.get(2).toString(), is("fixAdd: wetland=marsh"));
+        assertNotNull(check);
+        assertEquals("{0.key}=null is deprecated", check.getDescription(null));
+        assertEquals("fixRemove: {0.key}", check.fixCommands.get(0).toString());
+        assertEquals("fixAdd: natural=wetland", check.fixCommands.get(1).toString());
+        assertEquals("fixAdd: wetland=marsh", check.fixCommands.get(2).toString());
         final Node n1 = new Node();
         n1.put("natural", "marsh");
         assertTrue(check.evaluate(n1));
-        assertThat(check.getErrorForPrimitive(n1).getMessage(), is("natural=marsh is deprecated"));
-        assertThat(check.getErrorForPrimitive(n1).getSeverity(), is(Severity.WARNING));
-        assertThat(check.fixPrimitive(n1).getDescriptionText(), is("Sequence: Fix of natural=marsh is deprecated"));
-        assertThat(((ChangePropertyCommand) check.fixPrimitive(n1).getChildren().iterator().next()).getTags().toString(),
-                is("{natural=}"));
+        assertEquals("natural=marsh is deprecated", check.getErrorForPrimitive(n1).getMessage());
+        assertEquals(Severity.WARNING, check.getErrorForPrimitive(n1).getSeverity());
+        assertEquals("Sequence: Fix of natural=marsh is deprecated", check.fixPrimitive(n1).getDescriptionText());
+        assertEquals("{natural=}", ((ChangePropertyCommand) check.fixPrimitive(n1).getChildren().iterator().next()).getTags().toString());
         final Node n2 = new Node();
         n2.put("natural", "wood");
         assertFalse(check.evaluate(n2));
-        assertThat(MapCSSTagChecker.TagCheck.insertArguments(check.rule.selectors.get(0), "The key is {0.key} and the value is {0.value}", null),
-                is("The key is natural and the value is marsh"));
+        assertEquals("The key is natural and the value is marsh",
+                MapCSSTagChecker.TagCheck.insertArguments(check.rule.selectors.get(0), "The key is {0.key} and the value is {0.value}", null));
     }
 
@@ -92,8 +89,8 @@
                 "}")).get(0);
         final Command command = check.fixPrimitive(p);
-        assertThat(command instanceof SequenceCommand, is(true));
+        assertTrue(command instanceof SequenceCommand);
         final Iterator<PseudoCommand> it = command.getChildren().iterator();
-        assertThat(it.next() instanceof ChangePropertyKeyCommand, is(true));
-        assertThat(it.next() instanceof ChangePropertyCommand, is(true));
+        assertTrue(it.next() instanceof ChangePropertyKeyCommand);
+        assertTrue(it.next() instanceof ChangePropertyCommand);
     }
 
@@ -104,7 +101,7 @@
         final OsmPrimitive p = OsmUtils.createPrimitive("way alt_name=Foo");
         final Collection<TestError> errors = test.getErrorsForPrimitive(p, false);
-        assertThat(errors.size(), is(1));
-        assertThat(errors.iterator().next().getMessage(), is("has alt_name but not name"));
-        assertThat(errors.iterator().next().getIgnoreSubGroup(), is("3000_*[.+_name][!name]"));
+        assertEquals(1, errors.size());
+        assertEquals("has alt_name but not name", errors.iterator().next().getMessage());
+        assertEquals("3000_*[.+_name][!name]", errors.iterator().next().getIgnoreSubGroup());
     }
 
@@ -115,7 +112,7 @@
         final OsmPrimitive p = OsmUtils.createPrimitive("way highway=footway foot=no");
         final Collection<TestError> errors = test.getErrorsForPrimitive(p, false);
-        assertThat(errors.size(), is(1));
-        assertThat(errors.iterator().next().getMessage(), is("footway used with foot=no"));
-        assertThat(errors.iterator().next().getIgnoreSubGroup(), is("3000_way[highway=footway][foot]"));
+        assertEquals(1, errors.size());
+        assertEquals("footway used with foot=no", errors.iterator().next().getMessage());
+        assertEquals("3000_way[highway=footway][foot]", errors.iterator().next().getIgnoreSubGroup());
     }
 
@@ -125,6 +122,6 @@
                 "@media (min-josm-version: 1) { *[foo] { throwWarning: \"!\"; } }\n" +
                 "@media (min-josm-version: 2147483647) { *[bar] { throwWarning: \"!\"; } }\n");
-        assertThat(test.getErrorsForPrimitive(OsmUtils.createPrimitive("way foo=1"), false).size(), is(1));
-        assertThat(test.getErrorsForPrimitive(OsmUtils.createPrimitive("way bar=1"), false).size(), is(0));
+        assertEquals(1, test.getErrorsForPrimitive(OsmUtils.createPrimitive("way foo=1"), false).size());
+        assertEquals(0, test.getErrorsForPrimitive(OsmUtils.createPrimitive("way bar=1"), false).size());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java	(revision 8857)
@@ -4,6 +4,6 @@
 import static org.CustomMatchers.hasSize;
 import static org.CustomMatchers.isEmpty;
-import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -56,12 +56,12 @@
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Su-Th sunset-24:00,04:00-sunrise; Fr-Sa sunset-sunrise"), isEmpty());
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Su-Th sunset-24:00, 04:00-sunrise; Fr-Sa sunset-sunrise"), hasSize(1));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Su-Th sunset-24:00, 04:00-sunrise; Fr-Sa sunset-sunrise")
-                .get(0).getSeverity(), is(Severity.OTHER));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Su-Th sunset-24:00, 04:00-sunrise; Fr-Sa sunset-sunrise")
-                .get(0).getPrettifiedValue(), is("Su-Th sunset-24:00,04:00-sunrise; Fr-Sa sunset-sunrise"));
-    }
-
-    @Test
-    public void testI18n() throws Exception {
+        assertEquals(Severity.OTHER, OPENING_HOUR_TEST.checkOpeningHourSyntax(
+                key, "Su-Th sunset-24:00, 04:00-sunrise; Fr-Sa sunset-sunrise").get(0).getSeverity());
+        assertEquals("Su-Th sunset-24:00,04:00-sunrise; Fr-Sa sunset-sunrise", OPENING_HOUR_TEST.checkOpeningHourSyntax(
+                key, "Su-Th sunset-24:00, 04:00-sunrise; Fr-Sa sunset-sunrise").get(0).getPrettifiedValue());
+    }
+
+    @Test
+    public void testI18n() {
         assertTrue(OPENING_HOUR_TEST.checkOpeningHourSyntax("opening_hours", ".", OpeningHourTest.CheckMode.POINTS_IN_TIME, false, "de")
                 .get(0).toString().contains("Unerwartetes Zeichen"));
@@ -78,10 +78,10 @@
         final List<OpeningHourTest.OpeningHoursTestError> errors = OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Tue");
         assertThat(errors, hasSize(2));
-        assertThat(errors.get(0).getMessage(), is(key + " - Mo-Tue <--- (Please use the abbreviation \"Tu\" for \"tue\".)"));
-        assertThat(errors.get(0).getSeverity(), is(Severity.WARNING));
-        assertThat(errors.get(1).getMessage(), is(key +
+        assertEquals(key + " - Mo-Tue <--- (Please use the abbreviation \"Tu\" for \"tue\".)", errors.get(0).getMessage());
+        assertEquals(Severity.WARNING, errors.get(0).getSeverity());
+        assertEquals(key +
                 " - Mo-Tue <--- (This rule is not very explicit because there is no time selector being used."+
-                " Please add a time selector to this rule or use a comment to make it more explicit.)"));
-        assertThat(errors.get(1).getSeverity(), is(Severity.WARNING));
+                " Please add a time selector to this rule or use a comment to make it more explicit.)", errors.get(1).getMessage());
+        assertEquals(Severity.WARNING, errors.get(1).getSeverity());
     }
 
@@ -94,9 +94,9 @@
         final List<OpeningHourTest.OpeningHoursTestError> errors = OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Sa-Su 10.00-20.00");
         assertThat(errors, hasSize(2));
-        assertThat(errors.get(0).getMessage(), is(key + " - Sa-Su 10. <--- (Please use \":\" as hour/minute-separator)"));
-        assertThat(errors.get(0).getSeverity(), is(Severity.WARNING));
-        assertThat(errors.get(0).getPrettifiedValue(), is("Sa-Su 10:00-20:00"));
-        assertThat(errors.get(1).getMessage(), is(key + " - Sa-Su 10.00-20. <--- (Please use \":\" as hour/minute-separator)"));
-        assertThat(errors.get(1).getSeverity(), is(Severity.WARNING));
+        assertEquals(key + " - Sa-Su 10. <--- (Please use \":\" as hour/minute-separator)", errors.get(0).getMessage());
+        assertEquals(Severity.WARNING, errors.get(0).getSeverity());
+        assertEquals("Sa-Su 10:00-20:00", errors.get(0).getPrettifiedValue());
+        assertEquals(key + " - Sa-Su 10.00-20. <--- (Please use \":\" as hour/minute-separator)", errors.get(1).getMessage());
+        assertEquals(Severity.WARNING, errors.get(1).getSeverity());
     }
 
@@ -118,10 +118,10 @@
         final String key = "opening_hours";
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "badtext"), hasSize(1));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "badtext").get(0).getMessage(),
-                is(key + " - ba <--- (Unexpected token: \"b\" Invalid/unsupported syntax.)"));
+        assertEquals(key + " - ba <--- (Unexpected token: \"b\" Invalid/unsupported syntax.)",
+                OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "badtext").get(0).getMessage());
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m"), hasSize(1));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m").get(0).getMessage(),
-                is(key + " - 5.00 p <--- (hyphen (-) or open end (+) in time range expected. "
-                       + "For working with points in time, the mode for opening_hours.js has to be altered. Maybe wrong tag?)"));
+        assertEquals(key + " - 5.00 p <--- (hyphen (-) or open end (+) in time range expected. "
+                + "For working with points in time, the mode for opening_hours.js has to be altered. Maybe wrong tag?)",
+                OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m").get(0).getMessage());
     }
 
@@ -142,6 +142,6 @@
         final String key = "opening_hours";
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "9:00-18:00"), hasSize(1));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "9:00-18:00").get(0).getSeverity(), is(Severity.OTHER));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "9:00-18:00").get(0).getPrettifiedValue(), is("09:00-18:00"));
+        assertEquals(Severity.OTHER, OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "9:00-18:00").get(0).getSeverity());
+        assertEquals("09:00-18:00", OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "9:00-18:00").get(0).getPrettifiedValue());
     }
 
@@ -152,9 +152,9 @@
     public void testCheckOpeningHourSyntaxTicket9367() {
         final String key = "opening_hours";
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getSeverity(), is(Severity.WARNING));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getMessage(),
-                is(key + " - Mo,Tu 04-17 <--- (Time range without minutes specified. "
-                       + "Not very explicit! Please use this syntax instead \"04:00-17:00\".)"));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getPrettifiedValue(), is("Mo,Tu 04:00-17:00"));
+        assertEquals(Severity.WARNING, OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getSeverity());
+        assertEquals(key + " - Mo,Tu 04-17 <--- (Time range without minutes specified. "
+                + "Not very explicit! Please use this syntax instead \"04:00-17:00\".)",
+                OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getMessage());
+        assertEquals("Mo,Tu 04:00-17:00", OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getPrettifiedValue());
     }
 
@@ -174,8 +174,10 @@
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00",
                 OpeningHourTest.CheckMode.BOTH), hasSize(1));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00",
-                OpeningHourTest.CheckMode.BOTH).get(0).getPrettifiedValue(), is("Mo-Fr 00:00-00:30,04:00-00:30; Sa,Su,PH 00:00-24:00"));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00",
-                OpeningHourTest.CheckMode.BOTH).get(0).getPrettifiedValue(), is("Mo-Fr 00:00-00:30,04:00-00:30; Sa,Su,PH 00:00-24:00"));
+        assertEquals("Mo-Fr 00:00-00:30,04:00-00:30; Sa,Su,PH 00:00-24:00",
+                OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00",
+                OpeningHourTest.CheckMode.BOTH).get(0).getPrettifiedValue());
+        assertEquals("Mo-Fr 00:00-00:30,04:00-00:30; Sa,Su,PH 00:00-24:00",
+                OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00",
+                OpeningHourTest.CheckMode.BOTH).get(0).getPrettifiedValue());
     }
 
@@ -194,8 +196,10 @@
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 13:30, 17:45, 19:00; Sa 15:00; Su 11:00",
                 OpeningHourTest.CheckMode.BOTH), hasSize(1));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 13:30, 17:45, 19:00; Sa 15:00; Su 11:00",
-                OpeningHourTest.CheckMode.BOTH).get(0).getSeverity(), is(Severity.OTHER));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 13:30, 17:45, 19:00; Sa 15:00; Su 11:00",
-                OpeningHourTest.CheckMode.BOTH).get(0).getPrettifiedValue(), is("Mo-Fr 13:30,17:45,19:00; Sa 15:00; Su 11:00"));
+        assertEquals(Severity.OTHER,
+                OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 13:30, 17:45, 19:00; Sa 15:00; Su 11:00",
+                OpeningHourTest.CheckMode.BOTH).get(0).getSeverity());
+        assertEquals("Mo-Fr 13:30,17:45,19:00; Sa 15:00; Su 11:00",
+                OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 13:30, 17:45, 19:00; Sa 15:00; Su 11:00",
+                OpeningHourTest.CheckMode.BOTH).get(0).getPrettifiedValue());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java	(revision 8857)
@@ -2,6 +2,5 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -16,5 +15,9 @@
 import org.openstreetmap.josm.gui.tagging.TaggingPresets;
 
+/**
+ * JUnit Test of {@link TagChecker}.
+ */
 public class TagCheckerTest {
+
     /**
      * Setup test.
@@ -37,7 +40,7 @@
     public void testInvalidKey() throws Exception {
         final List<TestError> errors = test(OsmUtils.createPrimitive("node Name=Main"));
-        assertThat(errors.size(), is(1));
-        assertThat(errors.get(0).getMessage(), is("Misspelled property key"));
-        assertThat(errors.get(0).getDescription(), is("Key 'Name' looks like 'name'."));
+        assertEquals(1, errors.size());
+        assertEquals("Misspelled property key", errors.get(0).getMessage());
+        assertEquals("Key 'Name' looks like 'name'.", errors.get(0).getDescription());
     }
 
@@ -45,7 +48,7 @@
     public void testMisspelledKey() throws Exception {
         final List<TestError> errors = test(OsmUtils.createPrimitive("node landuse;=forest"));
-        assertThat(errors.size(), is(1));
-        assertThat(errors.get(0).getMessage(), is("Misspelled property key"));
-        assertThat(errors.get(0).getDescription(), is("Key 'landuse;' looks like 'landuse'."));
+        assertEquals(1, errors.size());
+        assertEquals("Misspelled property key", errors.get(0).getMessage());
+        assertEquals("Key 'landuse;' looks like 'landuse'.", errors.get(0).getDescription());
     }
 
@@ -53,7 +56,7 @@
     public void testTranslatedNameKey() throws Exception {
         final List<TestError> errors = test(OsmUtils.createPrimitive("node namez=Baz"));
-        assertThat(errors.size(), is(1));
-        assertThat(errors.get(0).getMessage(), is("Presets do not contain property key"));
-        assertThat(errors.get(0).getDescription(), is("Key 'namez' not in presets."));
+        assertEquals(1, errors.size());
+        assertEquals("Presets do not contain property key", errors.get(0).getMessage());
+        assertEquals("Key 'namez' not in presets.", errors.get(0).getDescription());
     }
 
@@ -61,8 +64,7 @@
     public void testMisspelledTag() throws Exception {
         final List<TestError> errors = test(OsmUtils.createPrimitive("node landuse=forrest"));
-        assertThat(errors.size(), is(1));
-        assertThat(errors.get(0).getMessage(), is("Presets do not contain property value"));
-        assertThat(errors.get(0).getDescription(), is("Value 'forrest' for key 'landuse' not in presets."));
+        assertEquals(1, errors.size());
+        assertEquals("Presets do not contain property value", errors.get(0).getMessage());
+        assertEquals("Value 'forrest' for key 'landuse' not in presets.", errors.get(0).getDescription());
     }
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java	(revision 8857)
@@ -2,7 +2,6 @@
 package org.openstreetmap.josm.gui;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 
 import java.io.FileInputStream;
@@ -30,5 +29,4 @@
 /**
  * Unit tests of {@link DefaultNameFormatter} class.
- *
  */
 public class DefaultNameFormatterTest {
@@ -89,13 +87,18 @@
     @Test
     public void testRelationName() {
-        assertThat(getFormattedRelationName("X=Y"), is("relation (0, 0 members)"));
-        assertThat(getFormattedRelationName("name=Foo"), is("relation (\"Foo\", 0 members)"));
-        assertThat(getFormattedRelationName("type=route route=tram ref=123"), is("route (\"123\", 0 members)"));
-        assertThat(getFormattedRelationName("type=multipolygon building=yes"), is("multipolygon (\"building\", 0 members)"));
-        assertThat(getFormattedRelationName("type=multipolygon building=yes ref=123"), is("multipolygon (\"123\", 0 members)"));
-        assertThat(getFormattedRelationName("type=multipolygon building=yes addr:housenumber=123"),
-                is("multipolygon (\"building\", 0 members)"));
-        assertThat(getFormattedRelationName("type=multipolygon building=residential addr:housenumber=123"),
-                is("multipolygon (\"residential\", 0 members)"));
+        assertEquals("relation (0, 0 members)",
+                getFormattedRelationName("X=Y"));
+        assertEquals("relation (\"Foo\", 0 members)",
+                getFormattedRelationName("name=Foo"));
+        assertEquals("route (\"123\", 0 members)",
+                getFormattedRelationName("type=route route=tram ref=123"));
+        assertEquals("multipolygon (\"building\", 0 members)",
+                getFormattedRelationName("type=multipolygon building=yes"));
+        assertEquals("multipolygon (\"123\", 0 members)",
+                getFormattedRelationName("type=multipolygon building=yes ref=123"));
+        assertEquals("multipolygon (\"building\", 0 members)",
+                getFormattedRelationName("type=multipolygon building=yes addr:housenumber=123"));
+        assertEquals("multipolygon (\"residential\", 0 members)",
+                getFormattedRelationName("type=multipolygon building=residential addr:housenumber=123"));
     }
 
@@ -105,9 +108,8 @@
     @Test
     public void testWayName() {
-        assertThat(getFormattedWayName("building=yes"), is("building (0 nodes)"));
-        assertThat(getFormattedWayName("building=yes addr:housenumber=123"), is("House number 123 (0 nodes)"));
-        assertThat(getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"),
-                is("House number 123 at FooStreet (0 nodes)"));
-        assertThat(getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"), is("House FooName (0 nodes)"));
+        assertEquals("building (0 nodes)", getFormattedWayName("building=yes"));
+        assertEquals("House number 123 (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123"));
+        assertEquals("House number 123 at FooStreet (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"));
+        assertEquals("House FooName (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"));
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java	(revision 8857)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.gui;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -107,8 +106,8 @@
         component.zoomToFactor(0.5);
         assertEquals(initialScale / 2, component.getScale(), 0.00000001);
-        assertThat(component.getCenter(), is(center));
+        assertEquals(center, component.getCenter());
         component.zoomToFactor(2);
         assertEquals(initialScale, component.getScale(), 0.00000001);
-        assertThat(component.getCenter(), is(center));
+        assertEquals(center, component.getCenter());
 
         // zoomToFactor(EastNorth, double)
@@ -116,8 +115,8 @@
         component.zoomToFactor(newCenter, 0.5);
         assertEquals(initialScale / 2, component.getScale(), 0.00000001);
-        assertThat(component.getCenter(), is(newCenter));
+        assertEquals(newCenter, component.getCenter());
         component.zoomToFactor(newCenter, 2);
         assertEquals(initialScale, component.getScale(), 0.00000001);
-        assertThat(component.getCenter(), is(newCenter));
+        assertEquals(newCenter, component.getCenter());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 8857)
@@ -32,4 +32,7 @@
     private DatasetFactory their = new DatasetFactory();
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 8857)
@@ -42,4 +42,7 @@
     PropertiesMergeModel model;
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java	(revision 8857)
@@ -14,6 +14,12 @@
 import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
 
+/**
+ * Unit tests of {@link TagMergeItem} class.
+ */
 public class TagMergeItemTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 8857)
@@ -19,7 +19,13 @@
 import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
 
+/**
+ * Unit tests of {@link TagMergeModel} class.
+ */
 @SuppressWarnings("unchecked")
 public class TagMergeModelTest {
 
+    /**
+     * Setup test.
+     */
     @BeforeClass
     public static void init() {
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java	(revision 8857)
@@ -2,101 +2,37 @@
 package org.openstreetmap.josm.gui.dialogs;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
 
+/**
+ * Unit tests of {@link LatLonDialog} class.
+ */
 public class LatLonDialogTest {
+
+    /**
+     * Unit test of {@link LatLonDialog#parseLatLon} method.
+     */
     @Test
-    public void test1() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49.29918° 19.24788°"), is(new LatLon(49.29918, 19.24788)));
-    }
-
-    @Test
-    public void test2() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("N 49.29918 E 19.24788°"), is(new LatLon(49.29918, 19.24788)));
-    }
-
-    @Test
-    public void test3() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49.29918° 19.24788°"), is(new LatLon(49.29918, 19.24788)));
-    }
-
-    @Test
-    public void test4() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("N 49.29918 E 19.24788"), is(new LatLon(49.29918, 19.24788)));
-    }
-
-    @Test
-    public void test5() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("W 49°29.918' S 19°24.788'"), is(new LatLon(-19 - 24.788 / 60, -49 - 29.918 / 60)));
-    }
-
-    @Test
-    public void test6() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("N 49°29'04\" E 19°24'43\""),
-                is(new LatLon(49 + 29. / 60 + 04. / 3600, 19 + 24. / 60 + 43. / 3600)));
-    }
-
-    @Test
-    public void test7() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49.29918 N, 19.24788 E"), is(new LatLon(49.29918, 19.24788)));
-    }
-
-    @Test
-    public void test8() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49°29'21\" N 19°24'38\" E"),
-                is(new LatLon(49 + 29. / 60 + 21. / 3600, 19 + 24. / 60 + 38. / 3600)));
-    }
-
-    @Test
-    public void test9() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49 29 51, 19 24 18"), is(new LatLon(49 + 29. / 60 + 51. / 3600, 19 + 24. / 60 + 18. / 3600)));
-    }
-
-    @Test
-    public void test10() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49 29, 19 24"), is(new LatLon(49 + 29. / 60, 19 + 24. / 60)));
-    }
-
-    @Test
-    public void test11() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("E 49 29, N 19 24"), is(new LatLon(19 + 24. / 60, 49 + 29. / 60)));
-    }
-
-    @Test
-    public void test12() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49° 29; 19° 24"), is(new LatLon(49 + 29. / 60, 19 + 24. / 60)));
-    }
-
-    @Test
-    public void test13() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49° 29; 19° 24"), is(new LatLon(49 + 29. / 60, 19 + 24. / 60)));
-    }
-
-    @Test
-    public void test14() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("N 49° 29, W 19° 24"), is(new LatLon(49 + 29. / 60, -19 - 24. / 60)));
-    }
-
-    @Test
-    public void test15() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49° 29.5 S, 19° 24.6 E"), is(new LatLon(-49 - 29.5 / 60, 19 + 24.6 / 60)));
-    }
-
-    @Test
-    public void test16() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("N 49 29.918 E 19 15.88"), is(new LatLon(49 + 29.918 / 60, 19 + 15.88 / 60)));
-    }
-
-    @Test
-    public void test17() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("49 29.4 19 24.5"), is(new LatLon(49 + 29.4 / 60, 19 + 24.5 / 60)));
-    }
-
-    @Test
-    public void test18() throws Exception {
-        assertThat(LatLonDialog.parseLatLon("-49 29.4 N -19 24.5 W"), is(new LatLon(-49 - 29.4 / 60, 19 + 24.5 / 60)));
+    public void testparseLatLon() {
+        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("49.29918° 19.24788°"));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("N 49.29918 E 19.24788°"));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("49.29918° 19.24788°"));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("N 49.29918 E 19.24788"));
+        assertEquals(new LatLon(-19 - 24.788 / 60, -49 - 29.918 / 60), LatLonDialog.parseLatLon("W 49°29.918' S 19°24.788'"));
+        assertEquals(new LatLon(49 + 29. / 60 + 04. / 3600, 19 + 24. / 60 + 43. / 3600), LatLonDialog.parseLatLon("N 49°29'04\" E 19°24'43\""));
+        assertEquals(new LatLon(49.29918, 19.24788), LatLonDialog.parseLatLon("49.29918 N, 19.24788 E"));
+        assertEquals(new LatLon(49 + 29. / 60 + 21. / 3600, 19 + 24. / 60 + 38. / 3600), LatLonDialog.parseLatLon("49°29'21\" N 19°24'38\" E"));
+        assertEquals(new LatLon(49 + 29. / 60 + 51. / 3600, 19 + 24. / 60 + 18. / 3600), LatLonDialog.parseLatLon("49 29 51, 19 24 18"));
+        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLonDialog.parseLatLon("49 29, 19 24"));
+        assertEquals(new LatLon(19 + 24. / 60, 49 + 29. / 60), LatLonDialog.parseLatLon("E 49 29, N 19 24"));
+        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLonDialog.parseLatLon("49° 29; 19° 24"));
+        assertEquals(new LatLon(49 + 29. / 60, 19 + 24. / 60), LatLonDialog.parseLatLon("49° 29; 19° 24"));
+        assertEquals(new LatLon(49 + 29. / 60, -19 - 24. / 60), LatLonDialog.parseLatLon("N 49° 29, W 19° 24"));
+        assertEquals(new LatLon(-49 - 29.5 / 60, 19 + 24.6 / 60), LatLonDialog.parseLatLon("49° 29.5 S, 19° 24.6 E"));
+        assertEquals(new LatLon(49 + 29.918 / 60, 19 + 15.88 / 60), LatLonDialog.parseLatLon("N 49 29.918 E 19 15.88"));
+        assertEquals(new LatLon(49 + 29.4 / 60, 19 + 24.5 / 60), LatLonDialog.parseLatLon("49 29.4 19 24.5"));
+        assertEquals(new LatLon(-49 - 29.4 / 60, 19 + 24.5 / 60), LatLonDialog.parseLatLon("-49 29.4 N -19 24.5 W"));
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java	(revision 8857)
@@ -19,7 +19,10 @@
 import org.openstreetmap.josm.io.OsmReader;
 
+/**
+ * Unit tests of {@link RelationSorter} class.
+ */
 public class RelationSorterTest {
 
-    private RelationSorter sorter = new RelationSorter();
+    private final RelationSorter sorter = new RelationSorter();
     private static DataSet testDataset;
 
@@ -69,4 +72,3 @@
         Assert.assertArrayEquals(new String[]{"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4", "playground", "tree"}, actual);
     }
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java	(revision 8857)
@@ -19,4 +19,7 @@
 import org.openstreetmap.josm.io.OsmReader;
 
+/**
+ * Unit tests of {@link WayConnectionTypeCalculator} class.
+ */
 public class WayConnectionTypeCalculatorTest {
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java	(revision 8857)
@@ -19,4 +19,7 @@
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences.ActionParser;
 
+/**
+ * Unit tests of {@link ToolbarPreferences} class.
+ */
 public class ToolbarPreferencesTest {
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java	(revision 8857)
@@ -3,5 +3,5 @@
 
 import static org.CustomMatchers.hasSize;
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
@@ -56,5 +56,5 @@
             }
         });
-        assertThat(keys.toString(), is("[A1, A2, A3, B1, B2, B3, C1, C2, C3]"));
+        assertEquals("[A1, A2, A3, B1, B2, B3, C1, C2, C3]", keys.toString());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/util/RotationAngleTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/util/RotationAngleTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/gui/util/RotationAngleTest.java	(revision 8857)
@@ -2,25 +2,29 @@
 package org.openstreetmap.josm.gui.util;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+/**
+ * Unit tests of {@link RotationAngle} class.
+ */
 public class RotationAngleTest {
 
+    private static final double EPSILON = 1e-11;
+
     @Test
-    public void testParseCardinal() throws Exception {
-        assertThat(RotationAngle.buildStaticRotation("south").getRotationAngle(null), is(Math.PI));
-        assertThat(RotationAngle.buildStaticRotation("s").getRotationAngle(null), is(Math.PI));
-        assertThat(RotationAngle.buildStaticRotation("northwest").getRotationAngle(null), is(Math.toRadians(315)));
+    public void testParseCardinal() {
+        assertEquals(Math.PI, RotationAngle.buildStaticRotation("south").getRotationAngle(null), EPSILON);
+        assertEquals(Math.PI, RotationAngle.buildStaticRotation("s").getRotationAngle(null), EPSILON);
+        assertEquals(Math.toRadians(315), RotationAngle.buildStaticRotation("northwest").getRotationAngle(null), EPSILON);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testParseFail() throws Exception {
+    public void testParseFail() {
         RotationAngle.buildStaticRotation("bad");
     }
 
     @Test(expected = NullPointerException.class)
-    public void testParseNull() throws Exception {
+    public void testParseNull() {
         RotationAngle.buildStaticRotation(null);
     }
Index: trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java	(revision 8857)
@@ -7,4 +7,7 @@
 import org.junit.Test;
 
+/**
+ * Unit tests of {@link ImportHandler} class.
+ */
 public class ImportHandlerTest {
 
Index: trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java	(revision 8857)
@@ -2,6 +2,5 @@
 package org.openstreetmap.josm.io.remotecontrol.handler;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Collections;
@@ -12,4 +11,7 @@
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 
+/**
+ * Unit tests of {@link RequestHandler} class.
+ */
 public class RequestHandlerTest {
 
@@ -48,18 +50,17 @@
         expected.put("query", "a");
         expected.put("b", "=c");
-        assertThat(getRequestParameter("http://example.com/?query=a&b==c"),
-                is(expected));
+        assertEquals(expected, getRequestParameter("http://example.com/?query=a&b==c"));
     }
 
     @Test
     public void testRequestParameter12() {
-        assertThat(getRequestParameter("http://example.com/?query=a%26b==c"),
-                is(Collections.singletonMap("query", "a&b==c")));
+        assertEquals(Collections.singletonMap("query", "a&b==c"),
+                getRequestParameter("http://example.com/?query=a%26b==c"));
     }
 
     @Test
     public void testRequestParameter3() {
-        assertThat(getRequestParameter("http://example.com/blue+light%20blue?blue%2Blight+blue").keySet(),
-                is((Collections.singleton("blue+light blue"))));
+        assertEquals(Collections.singleton("blue+light blue"),
+                getRequestParameter("http://example.com/blue+light%20blue?blue%2Blight+blue").keySet());
     }
 
@@ -70,9 +71,8 @@
     @Test
     public void testRequestParameter4() {
-        assertThat(getRequestParameter(
+        assertEquals(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;=="), getRequestParameter(
                 // CHECKSTYLE.OFF: LineLength
-                "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="),
+                "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="));
                 // CHECKSTYLE.ON: LineLength
-                is(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;==")));
     }
 
@@ -82,6 +82,5 @@
         expected.put("space", " ");
         expected.put("tab", "\t");
-        assertThat(getRequestParameter("http://example.com/?space=%20&tab=%09"),
-                is(expected));
+        assertEquals(expected, getRequestParameter("http://example.com/?space=%20&tab=%09"));
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java	(revision 8857)
@@ -2,9 +2,7 @@
 package org.openstreetmap.josm.io.session;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -122,5 +120,5 @@
         assertTrue(layers.get(0) instanceof ImageryLayer);
         final ImageryLayer image = (ImageryLayer) layers.get(0);
-        assertThat(image.getName(), is("Bing aerial imagery"));
+        assertEquals("Bing aerial imagery", image.getName());
         assertEquals(image.getDx(), 12.34, 1e-9);
         assertEquals(image.getDy(), -56.78, 1e-9);
Index: trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java	(revision 8857)
@@ -2,8 +2,9 @@
 package org.openstreetmap.josm.tools;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.awt.Transparency;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -24,8 +25,8 @@
     public void testTicket9984() throws IOException {
         File file = new File(TestUtils.getRegressionDataFile(9984, "tile.png"));
-        assertThat(ImageProvider.read(file, true, true).getTransparency(), is(Transparency.TRANSLUCENT));
-        assertThat(ImageProvider.read(file, false, true).getTransparency(), is(Transparency.TRANSLUCENT));
-        assertThat(ImageProvider.read(file, false, false).getTransparency(), is(Transparency.OPAQUE));
-        assertThat(ImageProvider.read(file, true, false).getTransparency(), is(Transparency.OPAQUE));
+        assertEquals(Transparency.TRANSLUCENT, ImageProvider.read(file, true, true).getTransparency());
+        assertEquals(Transparency.TRANSLUCENT, ImageProvider.read(file, false, true).getTransparency());
+        assertEquals(Transparency.OPAQUE, ImageProvider.read(file, false, false).getTransparency());
+        assertEquals(Transparency.OPAQUE, ImageProvider.read(file, true, false).getTransparency());
     }
 
@@ -37,5 +38,6 @@
     public void testTicket10030() throws IOException {
         File file = new File(TestUtils.getRegressionDataFile(10030, "tile.jpg"));
-        ImageProvider.read(file, true, true);
+        BufferedImage img = ImageProvider.read(file, true, true);
+        assertNotNull(img);
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java	(revision 8857)
@@ -2,6 +2,5 @@
 package org.openstreetmap.josm.tools;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
@@ -9,4 +8,7 @@
 import org.openstreetmap.josm.JOSMFixture;
 
+/**
+ * Unit tests of {@link OverpassTurboQueryWizard} class.
+ */
 public class OverpassTurboQueryWizardTest {
 
@@ -21,7 +23,7 @@
 
     @Test
-    public void testKeyValue() throws Exception {
+    public void testKeyValue() {
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity=drinking_water");
-        assertThat(query, is("" +
+        assertEquals("" +
                 "[timeout:25];\n" +
                 "// gather results\n" +
@@ -35,9 +37,9 @@
                 "out meta;\n" +
                 ">;\n" +
-                "out meta;"));
+                "out meta;", query);
     }
 
     @Test(expected = OverpassTurboQueryWizard.ParseException.class)
-    public void testErroneous() throws Exception {
+    public void testErroneous() {
         OverpassTurboQueryWizard.getInstance().constructQuery("foo");
     }
Index: trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java	(revision 8857)
@@ -11,4 +11,7 @@
 import org.openstreetmap.josm.JOSMFixture;
 
+/**
+ * Unit tests of {@link TextTagParser} class.
+ */
 public class TextTagParserTest {
 
@@ -21,4 +24,7 @@
     }
 
+    /**
+     * Test of {@link TextTagParser#unescape} method.
+     */
     @Test
     public void testUnescape() {
@@ -37,4 +43,7 @@
     }
 
+    /**
+     * Test of {@link TextTagParser#readTagsFromText} method with tabs and new lines.
+     */
     @Test
     public void testTNformat() {
@@ -47,4 +56,7 @@
     }
 
+    /**
+     * Test of {@link TextTagParser#readTagsFromText} method with quotes.
+     */
     @Test
     public void testEQformat() {
@@ -58,4 +70,7 @@
     }
 
+    /**
+     * Test of {@link TextTagParser#readTagsFromText} method with JSON.
+     */
     @Test
     public void testJSONformat() {
@@ -78,4 +93,7 @@
     }
 
+    /**
+     * Test of {@link TextTagParser#readTagsFromText} method with free format.
+     */
     @Test
     public void testFreeformat() {
@@ -88,4 +106,7 @@
     }
 
+    /**
+     * Test of {@link TextTagParser#readTagsFromText} method (error detection).
+     */
     @Test
     public void errorDetect() {
@@ -93,9 +114,11 @@
         Map<String, String> tags = TextTagParser.readTagsFromText(txt);
         Assert.assertEquals(Collections.EMPTY_MAP, tags);
-
     }
 
+    /**
+     * Test of {@link TextTagParser#readTagsFromText} method with tabs.
+     */
     @Test
-    public void testTab() throws Exception {
+    public void testTab() {
         Assert.assertEquals(TextTagParser.readTagsFromText("shop\tjewelry"), Collections.singletonMap("shop", "jewelry"));
         Assert.assertEquals(TextTagParser.readTagsFromText("!shop\tjewelry"), Collections.singletonMap("shop", "jewelry"));
Index: trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java	(revision 8857)
@@ -2,6 +2,5 @@
 package org.openstreetmap.josm.tools;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedReader;
@@ -109,9 +108,9 @@
     @Test
     public void testPositionListString() {
-        assertThat(Utils.getPositionListString(Arrays.asList(1)), is("1"));
-        assertThat(Utils.getPositionListString(Arrays.asList(1, 2, 3)), is("1-3"));
-        assertThat(Utils.getPositionListString(Arrays.asList(3, 1, 2)), is("1-3"));
-        assertThat(Utils.getPositionListString(Arrays.asList(1, 2, 3, 6, 7, 8)), is("1-3,6-8"));
-        assertThat(Utils.getPositionListString(Arrays.asList(1, 5, 2, 6, 7)), is("1-2,5-7"));
+        assertEquals("1", Utils.getPositionListString(Arrays.asList(1)));
+        assertEquals("1-3", Utils.getPositionListString(Arrays.asList(1, 2, 3)));
+        assertEquals("1-3", Utils.getPositionListString(Arrays.asList(3, 1, 2)));
+        assertEquals("1-3,6-8", Utils.getPositionListString(Arrays.asList(1, 2, 3, 6, 7, 8)));
+        assertEquals("1-2,5-7", Utils.getPositionListString(Arrays.asList(1, 5, 2, 6, 7)));
     }
 
@@ -122,23 +121,29 @@
     public void testDurationString() {
         I18n.set("en");
-        assertThat(Utils.getDurationString(123), is("123 ms"));
-        assertThat(Utils.getDurationString(1234), is("1.2 s"));
-        assertThat(Utils.getDurationString(57 * 1000), is("57.0 s"));
-        assertThat(Utils.getDurationString(507 * 1000), is("8 min 27 s"));
-        assertThat(Utils.getDurationString((long) (8.4 * 60 * 60 * 1000)), is("8 h 24 min"));
-        assertThat(Utils.getDurationString((long) (1.5 * 24 * 60 * 60 * 1000)), is("1 day 12 h"));
-        assertThat(Utils.getDurationString((long) (8.5 * 24 * 60 * 60 * 1000)), is("8 days 12 h"));
+        assertEquals("123 ms", Utils.getDurationString(123));
+        assertEquals("1.2 s", Utils.getDurationString(1234));
+        assertEquals("57.0 s", Utils.getDurationString(57 * 1000));
+        assertEquals("8 min 27 s", Utils.getDurationString(507 * 1000));
+        assertEquals("8 h 24 min", Utils.getDurationString((long) (8.4 * 60 * 60 * 1000)));
+        assertEquals("1 day 12 h", Utils.getDurationString((long) (1.5 * 24 * 60 * 60 * 1000)));
+        assertEquals("8 days 12 h", Utils.getDurationString((long) (8.5 * 24 * 60 * 60 * 1000)));
     }
 
+    /**
+     * Test of {@link Utils#escapeReservedCharactersHTML} method.
+     */
     @Test
-    public void testEscapeReservedCharactersHTML() throws Exception {
-        assertThat(Utils.escapeReservedCharactersHTML("foo -> bar -> '&'"), is("foo -&gt; bar -&gt; '&amp;'"));
+    public void testEscapeReservedCharactersHTML() {
+        assertEquals("foo -&gt; bar -&gt; '&amp;'", Utils.escapeReservedCharactersHTML("foo -> bar -> '&'"));
     }
 
+    /**
+     * Test of {@link Utils#restrictStringLines} method.
+     */
     @Test
-    public void testRestrictStringLines() throws Exception {
-        assertThat(Utils.restrictStringLines("1\n2\n3", 2), is("1\n..."));
-        assertThat(Utils.restrictStringLines("1\n2\n3", 3), is("1\n2\n3"));
-        assertThat(Utils.restrictStringLines("1\n2\n3", 4), is("1\n2\n3"));
+    public void testRestrictStringLines() {
+        assertEquals("1\n...", Utils.restrictStringLines("1\n2\n3", 2));
+        assertEquals("1\n2\n3", Utils.restrictStringLines("1\n2\n3", 3));
+        assertEquals("1\n2\n3", Utils.restrictStringLines("1\n2\n3", 4));
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java	(revision 8857)
@@ -2,13 +2,15 @@
 package org.openstreetmap.josm.tools.date;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+/**
+ * Unit tests of {@link DateUtils} class.
+ */
 public class DateUtilsTest {
     @Test
     public void testMapDate() throws Exception {
-        assertThat(DateUtils.fromString("2012-08-13T15:10:37Z").getTime(), is(1344870637000L));
+        assertEquals(1344870637000L, DateUtils.fromString("2012-08-13T15:10:37Z").getTime());
 
     }
@@ -16,5 +18,5 @@
     @Test
     public void testNoteDate() throws Exception {
-        assertThat(DateUtils.fromString("2014-11-29 22:08:50 UTC").getTime(), is(1417298930000L));
+        assertEquals(1417298930000L, DateUtils.fromString("2014-11-29 22:08:50 UTC").getTime());
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java	(revision 8856)
+++ trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java	(revision 8857)
@@ -17,4 +17,7 @@
 import org.unitils.reflectionassert.ReflectionAssert;
 
+/**
+ * Unit tests of {@link TemplateParser} class.
+ */
 public class TemplateEngineTest {
 
@@ -286,4 +289,3 @@
         Assert.assertEquals("child2", sb.toString());
     }
-
 }