Changeset 8540 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2015-06-27T21:43:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix remaining checkstyle issues

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• JOSMFixture.java (modified) (1 diff)
• data/projection/ProjectionRegressionTest.java (modified) (1 diff)
• data/projection/SwissGridTest.java (modified) (2 diffs)
• gui/dialogs/LatLonDialogTest.java (modified) (2 diffs)
• gui/tagging/PresetClassificationsTest.java (modified) (1 diff)
• io/remotecontrol/handler/RequestHandlerTest.java (modified) (1 diff)
• tools/template_engine/TemplateEngineTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -74 +74 @@
             if (!f.exists() || !f.canRead()) {
                 fail(MessageFormat.format(
+                        // CHECKSTYLE.OFF: LineLength
                         "property ''{0}'' points to ''{1}'' which is either not existing ({2}) or not readable ({3}). Current directory is ''{4}''.",
+                        // CHECKSTYLE.ON: LineLength
                         "josm.home", josmHome, f.exists(), f.canRead(), Paths.get("").toAbsolutePath()));
             }

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -83 +83 @@
 
         Random rand = new Random();
-        try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(PROJECTION_DATA_FILE), StandardCharsets.UTF_8))) {
+        try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
+                new FileOutputStream(PROJECTION_DATA_FILE), StandardCharsets.UTF_8))) {
             out.write("# Data for test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java\n");
             out.write("# Format: 1. Projection code; 2. lat/lon; 3. lat/lon projected -> east/north; 4. east/north (3.) inverse projected\n");

trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java

@@ -23 +23 @@
         Main.setProjection(Projections.getProjectionByCode(SWISS_EPSG_CODE)); // Swiss grid
     }
+
+    // CHECKSTYLE.OFF: LineLength
 
     /**
@@ -34 +36 @@
             new ProjData("Monte Generoso",  d(9, 1, 16.389053), d(45, 55, 45.438020), 1685.027, 722758.810, 87649.670, 1636.600) };
 
+    // CHECKSTYLE.ON: LineLength
+
     private double d(double deg, double min, double sec) {
         return deg + min / 60. + sec / 3600.;

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java

@@ -36 +36 @@
     @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)));
+        assertThat(LatLonDialog.parseLatLon("N 49°29'04\" E 19°24'43\""),
+                is(new LatLon(49 + 29. / 60 + 04. / 3600, 19 + 24. / 60 + 43. / 3600)));
     }
 
@@ -46 +47 @@
     @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)));
+        assertThat(LatLonDialog.parseLatLon("49°29'21\" N 19°24'38\" E"),
+                is(new LatLon(49 + 29. / 60 + 21. / 3600, 19 + 24. / 60 + 38. / 3600)));
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/tagging/PresetClassificationsTest.java

@@ -36 +36 @@
 
     private List<TaggingPresetSelector.PresetClassification> getMatchingPresets(String searchText, OsmPrimitive w) {
-        return classifications.getMatchingPresets(searchText, true, true, EnumSet.of(TaggingPresetType.forPrimitive(w)), Collections.singleton(w));
+        return classifications.getMatchingPresets(searchText, true, true, EnumSet.of(TaggingPresetType.forPrimitive(w)),
+                Collections.singleton(w));
     }
 

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java

@@ -71 +71 @@
     public void testRequestParameter4() {
         assertThat(getRequestParameter(
+                // CHECKSTYLE.OFF: LineLength
                 "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$'()*+,;=/?:@-._~!$'()*+,;==#/?:@-._~!$&'()*+,;="),
+                // CHECKSTYLE.ON: LineLength
                 is(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;==")));
     }

trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java

@@ -217 +217 @@
     @Test
     public void testMultilevel() throws ParseError {
-        TemplateParser parser = new TemplateParser("!{(parent(parent(type=type1)) type=grandparent) | (parent type=type2 type=parent2) '{name}'}");
+        TemplateParser parser = new TemplateParser(
+                "!{(parent(parent(type=type1)) type=grandparent) | (parent type=type2 type=parent2) '{name}'}");
         DatasetFactory ds = new DatasetFactory();
         Relation parent1 = ds.addRelation(1);