Changeset 10222 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation

Timestamp:

2016-05-15T21:14:06+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - fix/suppress most of warnings reported in unit tests + enable low confidence warnings for core

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation

Files:

• routines/DomainValidatorTestIT.java (modified) (5 diffs)
• routines/EmailValidatorTest.java (modified) (1 diff)
• routines/UrlValidatorTest.java (modified) (1 diff)
• tests/MultipolygonTestTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java

@@ -48 +48 @@
 import org.junit.Test;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Integration tests for the DomainValidator.
@@ -82 +84 @@
         download(htmlFile, "http://www.iana.org/domains/root/db", timestamp);
 
-        BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(txtFile), StandardCharsets.UTF_8));
-        String line;
-        final String header;
-        line = br.readLine(); // header
-        if (line != null && line.startsWith("# Version ")) {
-            header = line.substring(2);
-        } else {
-            br.close();
-            throw new IOException("File does not have expected Version header");
-        }
-        final boolean generateUnicodeTlds = false; // Change this to generate Unicode TLDs as well
-
-        // Parse html page to get entries
-        Map<String, String[]> htmlInfo = getHtmlInfo(htmlFile);
-        Map<String, String> missingTLD = new TreeMap<>(); // stores entry and comments as String[]
-        Map<String, String> missingCC = new TreeMap<>();
-        while ((line = br.readLine()) != null) {
-            if (!line.startsWith("#")) {
-                final String unicodeTld; // only different from asciiTld if that was punycode
-                final String asciiTld = line.toLowerCase(Locale.ENGLISH);
-                if (line.startsWith("XN--")) {
-                    unicodeTld = IDN.toUnicode(line);
-                } else {
-                    unicodeTld = asciiTld;
-                }
-                if (!dv.isValidTld(asciiTld)) {
-                    String[] info = htmlInfo.get(asciiTld);
-                    if (info != null) {
-                        String type = info[0];
-                        String comment = info[1];
-                        if ("country-code".equals(type)) { // Which list to use?
-                            missingCC.put(asciiTld, unicodeTld + " " + comment);
-                            if (generateUnicodeTlds) {
-                                missingCC.put(unicodeTld, asciiTld + " " + comment);
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(txtFile), StandardCharsets.UTF_8))) {
+            String line;
+            final String header;
+            line = br.readLine(); // header
+            if (line != null && line.startsWith("# Version ")) {
+                header = line.substring(2);
+            } else {
+                throw new IOException("File does not have expected Version header");
+            }
+            final boolean generateUnicodeTlds = false; // Change this to generate Unicode TLDs as well
+
+            // Parse html page to get entries
+            Map<String, String[]> htmlInfo = getHtmlInfo(htmlFile);
+            Map<String, String> missingTLD = new TreeMap<>(); // stores entry and comments as String[]
+            Map<String, String> missingCC = new TreeMap<>();
+            while ((line = br.readLine()) != null) {
+                if (!line.startsWith("#")) {
+                    final String unicodeTld; // only different from asciiTld if that was punycode
+                    final String asciiTld = line.toLowerCase(Locale.ENGLISH);
+                    if (line.startsWith("XN--")) {
+                        unicodeTld = IDN.toUnicode(line);
+                    } else {
+                        unicodeTld = asciiTld;
+                    }
+                    if (!dv.isValidTld(asciiTld)) {
+                        String[] info = htmlInfo.get(asciiTld);
+                        if (info != null) {
+                            String type = info[0];
+                            String comment = info[1];
+                            if ("country-code".equals(type)) { // Which list to use?
+                                missingCC.put(asciiTld, unicodeTld + " " + comment);
+                                if (generateUnicodeTlds) {
+                                    missingCC.put(unicodeTld, asciiTld + " " + comment);
+                                }
+                            } else {
+                                missingTLD.put(asciiTld, unicodeTld + " " + comment);
+                                if (generateUnicodeTlds) {
+                                    missingTLD.put(unicodeTld, asciiTld + " " + comment);
+                                }
                             }
                         } else {
-                            missingTLD.put(asciiTld, unicodeTld + " " + comment);
-                            if (generateUnicodeTlds) {
-                                missingTLD.put(unicodeTld, asciiTld + " " + comment);
-                            }
-                        }
+                            System.err.println("Expected to find HTML info for "+ asciiTld);
+                        }
+                    }
+                    ianaTlds.add(asciiTld);
+                    // Don't merge these conditions; generateUnicodeTlds is final so needs to be separate to avoid a warning
+                    if (generateUnicodeTlds) {
+                        if (!unicodeTld.equals(asciiTld)) {
+                            ianaTlds.add(unicodeTld);
+                        }
+                    }
+                }
+            }
+            // List html entries not in TLD text list
+            for (String key : (new TreeMap<>(htmlInfo)).keySet()) {
+                if (!ianaTlds.contains(key)) {
+                    if (isNotInRootZone(key)) {
+                        System.out.println("INFO: HTML entry not yet in root zone: "+key);
                     } else {
-                        System.err.println("Expected to find HTML info for "+ asciiTld);
-                    }
-                }
-                ianaTlds.add(asciiTld);
-                // Don't merge these conditions; generateUnicodeTlds is final so needs to be separate to avoid a warning
-                if (generateUnicodeTlds) {
-                    if (!unicodeTld.equals(asciiTld)) {
-                        ianaTlds.add(unicodeTld);
-                    }
-                }
-            }
-        }
-        br.close();
-        // List html entries not in TLD text list
-        for (String key : (new TreeMap<>(htmlInfo)).keySet()) {
-            if (!ianaTlds.contains(key)) {
-                if (isNotInRootZone(key)) {
-                    System.out.println("INFO: HTML entry not yet in root zone: "+key);
-                } else {
-                    System.err.println("WARN: Expected to find text entry for html: "+key);
-                }
-            }
-        }
-        if (!missingTLD.isEmpty()) {
-            printMap(header, missingTLD, "TLD");
-            fail("missing TLD");
-        }
-        if (!missingCC.isEmpty()) {
-            printMap(header, missingCC, "CC");
-            fail("missing CC");
+                        System.err.println("WARN: Expected to find text entry for html: "+key);
+                    }
+                }
+            }
+            if (!missingTLD.isEmpty()) {
+                printMap(header, missingTLD, "TLD");
+                fail("missing TLD");
+            }
+            if (!missingCC.isEmpty()) {
+                printMap(header, missingCC, "CC");
+                fail("missing CC");
+            }
         }
         // Check if internal tables contain any additional entries
@@ -175 +176 @@
     }
 
+    @SuppressFBWarnings(value = "PERFORMANCE")
     private static Map<String, String[]> getHtmlInfo(final File f) throws IOException {
         final Map<String, String[]> info = new HashMap<>();
@@ -186 +188 @@
         final Pattern comment = Pattern.compile("\\s+<td>([^<]+)</td>");
 
-        final BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(f), StandardCharsets.UTF_8));
-        String line;
-        while ((line = br.readLine()) != null) {
-            Matcher m = domain.matcher(line);
-            if (m.lookingAt()) {
-                String dom = m.group(1);
-                String typ = "??";
-                String com = "??";
-                line = br.readLine();
-                while (line != null && line.matches("^\\s*$")) { // extra blank lines introduced
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(f), StandardCharsets.UTF_8))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                Matcher m = domain.matcher(line);
+                if (m.lookingAt()) {
+                    String dom = m.group(1);
+                    String typ = "??";
+                    String com = "??";
                     line = br.readLine();
-                }
-                Matcher t = type.matcher(line);
-                if (t.lookingAt()) {
-                    typ = t.group(1);
-                    line = br.readLine();
-                    if (line != null && line.matches("\\s+<!--.*")) {
-                        while (line != null && !line.matches(".*-->.*")) {
+                    while (line != null && line.matches("^\\s*$")) { // extra blank lines introduced
+                        line = br.readLine();
+                    }
+                    Matcher t = type.matcher(line);
+                    if (t.lookingAt()) {
+                        typ = t.group(1);
+                        line = br.readLine();
+                        if (line != null && line.matches("\\s+<!--.*")) {
+                            while (line != null && !line.matches(".*-->.*")) {
+                                line = br.readLine();
+                            }
                             line = br.readLine();
                         }
-                        line = br.readLine();
-                    }
-                    // Should have comment; is it wrapped?
-                    while (line != null && !line.matches(".*</td>.*")) {
-                        line += " " +br.readLine();
-                    }
-                    Matcher n = comment.matcher(line);
-                    if (n.lookingAt()) {
-                        com = n.group(1);
-                    }
-                    // Don't save unused entries
-                    if (com.contains("Not assigned") || com.contains("Retired") || typ.equals("test")) {
-//                        System.out.println("Ignored: " + typ + " " + dom + " " +com);
+                        // Should have comment; is it wrapped?
+                        while (line != null && !line.matches(".*</td>.*")) {
+                            line += " " +br.readLine();
+                        }
+                        Matcher n = comment.matcher(line);
+                        if (n.lookingAt()) {
+                            com = n.group(1);
+                        }
+                        // Don't save unused entries
+                        if (com.contains("Not assigned") || com.contains("Retired") || typ.equals("test")) {
+    //                        System.out.println("Ignored: " + typ + " " + dom + " " +com);
+                        } else {
+                            info.put(dom.toLowerCase(Locale.ENGLISH), new String[]{typ, com});
+    //                        System.out.println("Storing: " + typ + " " + dom + " " +com);
+                        }
                     } else {
-                        info.put(dom.toLowerCase(Locale.ENGLISH), new String[]{typ, com});
-//                        System.out.println("Storing: " + typ + " " + dom + " " +com);
-                    }
-                } else {
-                    System.err.println("Unexpected type: " + line);
-                }
-            }
-        }
-        br.close();
+                        System.err.println("Unexpected type: " + line);
+                    }
+                }
+            }
+        }
         return info;
     }
@@ -262 +264 @@
             System.out.println("Downloading " + tldurl);
             byte[] buff = new byte[1024];
-            InputStream is = hc.getInputStream();
-
-            FileOutputStream fos = new FileOutputStream(f);
-            int len;
-            while ((len = is.read(buff)) != -1) {
-                fos.write(buff, 0, len);
-            }
-            fos.close();
-            is.close();
+            try (InputStream is = hc.getInputStream();
+                 FileOutputStream fos = new FileOutputStream(f)) {
+                int len;
+                while ((len = is.read(buff)) != -1) {
+                    fos.write(buff, 0, len);
+                }
+            }
             System.out.println("Done");
         }

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java

@@ -37 +37 @@
      * rules from the xml file.
      */
-    protected static String FORM_KEY = "emailForm";
+    protected static final String FORM_KEY = "emailForm";
 
     /**
      * The key used to retrieve the validator action.
      */
-    protected static String ACTION = "email";
+    protected static final String ACTION = "email";
 
     private EmailValidator validator;

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java

@@ -31 +31 @@
 public class UrlValidatorTest {
 
-   private final boolean printStatus = false;
-   private final boolean printIndex = false; //print index that indicates current scheme,host,port,path, query test were using.
+   private static final boolean printStatus = false;
+   private static final boolean printIndex = false; //print index that indicates current scheme,host,port,path, query test were using.
 
    /**

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java

@@ -65 +65 @@
         MULTIPOLYGON_TEST.startTest(null);
 
-        List<Node> nodes = new ArrayList<>();
-        nodes.add(new Node(new LatLon(0, 1)));
-        nodes.add(new Node(new LatLon(0, 2)));
-
         // Erroneous tag
         Way w = createUnclosedWay("amenity=parking");