Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 10876)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 10937)
@@ -6,5 +6,4 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.File;
@@ -40,4 +39,7 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 
+/**
+ * Unit tests of {@link MultiFetchServerObjectReader}.
+ */
 public class MultiFetchServerObjectReaderTest {
     private static Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
@@ -138,6 +140,10 @@
     }
 
+    /**
+     * Setup test.
+     * @throws Exception if an error occurs
+     */
     @BeforeClass
-    public static void init() throws OsmTransferException {
+    public static void init() throws Exception {
         logger.info("initializing ...");
         JOSMFixture.createFunctionalTestFixture().init();
@@ -177,6 +183,4 @@
                 w.footer();
             }
-        } catch (IOException e) {
-            fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
     }
@@ -200,4 +204,8 @@
     }
 
+    /**
+     * Test to multi-get 10 nodes.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testMultiGet10Nodes() throws OsmTransferException {
@@ -217,4 +225,8 @@
     }
 
+    /**
+     * Test to multi-get 10 ways.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testMultiGet10Ways() throws OsmTransferException {
@@ -235,4 +247,8 @@
     }
 
+    /**
+     * Test to multi-get 10 relations.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testMultiGet10Relations() throws OsmTransferException {
@@ -253,4 +269,8 @@
     }
 
+    /**
+     * Test to multi-get 800 nodes.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testMultiGet800Nodes() throws OsmTransferException {
@@ -270,4 +290,8 @@
     }
 
+    /**
+     * Test to multi-get non-existing node.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testMultiGetWithNonExistingNode() throws OsmTransferException {
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 10876)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 10937)
@@ -151,7 +151,8 @@
      * @throws OsmTransferException if something goes wrong
      * @throws CyclicUploadDependencyException if a cyclic dependency is detected
+     * @throws IOException if an I/O error occurs
      */
     @BeforeClass
-    public static void setUpBeforeClass() throws OsmTransferException, CyclicUploadDependencyException {
+    public static void setUpBeforeClass() throws OsmTransferException, CyclicUploadDependencyException, IOException {
         logger.info("initializing ...");
 
@@ -196,6 +197,4 @@
                 w.footer();
             }
-        } catch (IOException e) {
-            fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
     }
@@ -219,4 +218,8 @@
     }
 
+    /**
+     * Test reading references for a node.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testBackreferenceForNode() throws OsmTransferException {
@@ -272,4 +275,8 @@
     }
 
+    /**
+     * Test reading full references for a node.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testBackreferenceForNodeFull() throws OsmTransferException {
@@ -316,4 +323,8 @@
     }
 
+    /**
+     * Test reading references for a way.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testBackreferenceForWay() throws OsmTransferException {
@@ -356,4 +367,8 @@
     }
 
+    /**
+     * Test reading full references for a way.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testBackreferenceForWayFull() throws OsmTransferException {
@@ -390,4 +405,8 @@
     }
 
+    /**
+     * Test reading references for a relation.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testBackreferenceForRelation() throws OsmTransferException {
@@ -505,4 +524,8 @@
     }
 
+    /**
+     * Test reading full references for a relation.
+     * @throws OsmTransferException if an error occurs
+     */
     @Test
     public void testBackreferenceForRelationFull() throws OsmTransferException {