Index: /trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java (revision 8876) @@ -26,12 +26,18 @@ } + /** + * Test of {@link CopyAction#getCopyString} method for a single way. + */ @Test - public void testCopyStringWay() throws Exception { + public void testCopyStringWay() { final Way way = new Way(123L); assertEquals("way 123", CopyAction.getCopyString(Collections.singleton(way))); } + /** + * Test of {@link CopyAction#getCopyString} method for a way and a relation. + */ @Test - public void testCopyStringWayRelation() throws Exception { + public void testCopyStringWayRelation() { final Way way = new Way(123L); final Relation relation = new Relation(456); Index: /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java (revision 8876) @@ -4,4 +4,5 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.awt.geom.Area; @@ -50,4 +51,6 @@ * I don't know why, but in other tests there are no problem to add selected primitives * but in this case there is a problem with an even listener of selection change. + * @param p primitive + * @param ds data set */ public void addSelected(OsmPrimitive p, DataSet ds) { @@ -60,5 +63,5 @@ } catch (Exception e) { e.printStackTrace(); - assertTrue("Can't add OsmPrimitive to dataset", false); + fail("Can't add OsmPrimitive to dataset: " + e.getMessage()); } } @@ -162,5 +165,5 @@ } catch (Exception e) { e.printStackTrace(); - assertTrue("Impossible to mock left/right hand database", false); + fail("Impossible to mock left/right hand database: " + e.getMessage()); } Index: /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (revision 8876) @@ -42,5 +42,5 @@ */ @Test - public void test11184() throws Exception { + public void testTicket11184() { DataSet dataSet = new DataSet(); OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (revision 8876) @@ -10,5 +10,4 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; -import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -112,9 +111,7 @@ /** * Tests that sending an HTTP request without command results in HTTP 400, with all available commands in error message. - * @throws IOException if an I/O error occurs - * @throws MalformedURLException if HTTP URL is invalid */ @Test - public void testHttpListOfCommands() throws MalformedURLException, IOException { + public void testHttpListOfCommands() { testListOfCommands(httpBase); } @@ -122,30 +119,32 @@ /** * Tests that sending an HTTPS request without command results in HTTP 400, with all available commands in error message. - * @throws IOException if an I/O error occurs - * @throws MalformedURLException if HTTPS URL is invalid */ @Test - public void testHttpsListOfCommands() throws MalformedURLException, IOException { + public void testHttpsListOfCommands() { testListOfCommands(httpsBase); } - private void testListOfCommands(String url) throws MalformedURLException, IOException { - HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); - connection.connect(); - assertEquals(connection.getResponseCode(), HttpURLConnection.HTTP_BAD_REQUEST); - try (InputStream is = connection.getErrorStream()) { - // TODO this code should be refactored somewhere in Utils as it is used in several JOSM classes - StringBuilder responseBody = new StringBuilder(); - try (BufferedReader in = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { - String s; - while ((s = in.readLine()) != null) { - responseBody.append(s); - responseBody.append("\n"); + private void testListOfCommands(String url) { + try { + HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); + connection.connect(); + assertEquals(connection.getResponseCode(), HttpURLConnection.HTTP_BAD_REQUEST); + try (InputStream is = connection.getErrorStream()) { + // TODO this code should be refactored somewhere in Utils as it is used in several JOSM classes + StringBuilder responseBody = new StringBuilder(); + try (BufferedReader in = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { + String s; + while ((s = in.readLine()) != null) { + responseBody.append(s); + responseBody.append("\n"); + } } + assert responseBody.toString().contains(RequestProcessor.getUsageAsHtml()); + } catch (IllegalAccessException | InstantiationException e) { + e.printStackTrace(); + fail(e.getMessage()); } - assert responseBody.toString().contains(RequestProcessor.getUsageAsHtml()); - } catch (IllegalAccessException e) { - fail(e.getMessage()); - } catch (InstantiationException e) { + } catch (IOException e) { + e.printStackTrace(); fail(e.getMessage()); } Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java (revision 8876) @@ -2,7 +2,6 @@ package org.openstreetmap.josm.io.remotecontrol.handler; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; -import org.hamcrest.CoreMatchers; import org.junit.Test; @@ -12,10 +11,12 @@ public class ImportHandlerTest { + /** + * Non-regression test for bug #7434. + */ @Test - public void test7434() throws Exception { - + public void testTicket7434() { final ImportHandler req = new ImportHandler(); req.setUrl("http://localhost:8111/import?url=http://localhost:8888/relations?relations=19711&mode=recursive"); - assertThat(req.args.get("url"), CoreMatchers.is("http://localhost:8888/relations?relations=19711&mode=recursive")); + assertEquals("http://localhost:8888/relations?relations=19711&mode=recursive", req.args.get("url")); } } Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java (revision 8876) @@ -45,4 +45,7 @@ } + /** + * Test request parameter - case 1 + */ @Test public void testRequestParameter1() { @@ -53,10 +56,16 @@ } + /** + * Test request parameter - case 2 + */ @Test - public void testRequestParameter12() { + public void testRequestParameter2() { assertEquals(Collections.singletonMap("query", "a&b==c"), getRequestParameter("http://example.com/?query=a%26b==c")); } + /** + * Test request parameter - case 3 + */ @Test public void testRequestParameter3() { @@ -66,4 +75,5 @@ /** + * Test request parameter - case 4 * @see * What every web developer must know about URL encoding @@ -77,4 +87,7 @@ } + /** + * Test request parameter - case 5 + */ @Test public void testRequestParameter5() { Index: /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (revision 8876) @@ -114,4 +114,9 @@ } + /** + * Tests to read a .jos file containing Bing imagery. + * @throws IOException if any I/O error occurs + * @throws IllegalDataException is the test file is considered as invalid + */ @Test public void testReadImage() throws IOException, IllegalDataException { Index: /trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (revision 8876) @@ -1,4 +1,6 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.io.session; + +import static org.junit.Assert.fail; import java.io.File; @@ -85,5 +87,5 @@ } - private void testWrite(List layers, final boolean zip) throws IOException { + private void testWrite(List layers, final boolean zip) { Map exporters = new HashMap<>(); if (zip) { @@ -101,4 +103,7 @@ try { sw.write(file); + } catch (IOException e) { + e.printStackTrace(); + fail(e.getMessage()); } finally { if (file.exists()) { @@ -135,8 +140,7 @@ /** * Tests to write an empty .jos file. - * @throws IOException if any I/O error occurs - */ - @Test - public void testWriteEmptyJos() throws IOException { + */ + @Test + public void testWriteEmptyJos() { testWrite(Collections.emptyList(), false); } @@ -144,8 +148,7 @@ /** * Tests to write an empty .joz file. - * @throws IOException if any I/O error occurs - */ - @Test - public void testWriteEmptyJoz() throws IOException { + */ + @Test + public void testWriteEmptyJoz() { testWrite(Collections.emptyList(), true); } @@ -153,8 +156,7 @@ /** * Tests to write a .jos file containing OSM data. - * @throws IOException if any I/O error occurs - */ - @Test - public void testWriteOsmJos() throws IOException { + */ + @Test + public void testWriteOsmJos() { testWrite(Collections.singletonList(createOsmLayer()), false); } @@ -162,8 +164,7 @@ /** * Tests to write a .joz file containing OSM data. - * @throws IOException if any I/O error occurs - */ - @Test - public void testWriteOsmJoz() throws IOException { + */ + @Test + public void testWriteOsmJoz() { testWrite(Collections.singletonList(createOsmLayer()), true); } @@ -171,8 +172,7 @@ /** * Tests to write a .jos file containing GPX data. - * @throws IOException if any I/O error occurs - */ - @Test - public void testWriteGpxJos() throws IOException { + */ + @Test + public void testWriteGpxJos() { testWrite(Collections.singletonList(createGpxLayer()), false); } @@ -180,8 +180,7 @@ /** * Tests to write a .joz file containing GPX data. - * @throws IOException if any I/O error occurs - */ - @Test - public void testWriteGpxJoz() throws IOException { + */ + @Test + public void testWriteGpxJoz() { testWrite(Collections.singletonList(createGpxLayer()), true); } @@ -189,8 +188,7 @@ /** * Tests to write a .joz file containing GPX and marker data. - * @throws IOException if any I/O error occurs - */ - @Test - public void testWriteGpxAndMarkerJoz() throws IOException { + */ + @Test + public void testWriteGpxAndMarkerJoz() { GpxLayer gpx = createGpxLayer(); testWrite(Arrays.asList(gpx, createMarkerLayer(gpx)), true); @@ -199,8 +197,7 @@ /** * Tests to write a .joz file containing an imagery layer. - * @throws IOException if any I/O error occurs - */ - @Test - public void testWriteImageryLayer() throws IOException { + */ + @Test + public void testWriteImageryLayer() { final Layer layer = createImageryLayer(); testWrite(Collections.singletonList(layer), true); Index: /trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java (revision 8876) @@ -21,4 +21,7 @@ } + /** + * Test of {@link Geometry#getLineLineIntersection} method. + */ @Test public void testLineLineIntersection() { Index: /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java (revision 8876) @@ -22,4 +22,7 @@ } + /** + * Test key=value. + */ @Test public void testKeyValue() { @@ -40,4 +43,7 @@ } + /** + * Test erroneous value. + */ @Test(expected = OverpassTurboQueryWizard.ParseException.class) public void testErroneous() { Index: /trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (revision 8875) +++ /trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (revision 8876) @@ -10,12 +10,18 @@ */ public class DateUtilsTest { + + /** + * Test to parse date as returned for map data. + */ @Test - public void testMapDate() throws Exception { + public void testMapDate() { assertEquals(1344870637000L, DateUtils.fromString("2012-08-13T15:10:37Z").getTime()); - } + /** + * Test to parse date as returned for note data. + */ @Test - public void testNoteDate() throws Exception { + public void testNoteDate() { assertEquals(1417298930000L, DateUtils.fromString("2014-11-29 22:08:50 UTC").getTime()); }