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

Timestamp:

2014-08-04T00:34:17+02:00 (10 years ago)

Author:

Don-vip

Message:

code refactorization for non-regression tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (2 diffs)
• gui/DefaultNameFormatterTest.java (modified) (1 diff)
• gui/tagging/TaggingPresetReaderTest.java (modified) (1 diff)
• tools/ImageProviderTest.java (modified) (2 diffs)

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

@@ -22 +22 @@
     /**
      * Returns the path to test data root directory.
+     * @return path to test data root directory
      */
     public static String getTestDataRoot() {
@@ -30 +31 @@
         }
         return testDataRoot.endsWith("/") ? testDataRoot : testDataRoot + "/";
+    }
+
+    /**
+     * Gets path to test data directory for given ticket id.
+     * @param ticketid Ticket numeric identifier
+     * @return path to test data directory for given ticket id
+     */
+    public static String getRegressionDataDir(int ticketid) {
+        return TestUtils.getTestDataRoot() + "/regress/" + ticketid;
+    }
+
+    /**
+     * Gets path to given file in test data directory for given ticket id.
+     * @param ticketid Ticket numeric identifier
+     * @param filename File name
+     * @return path to given file in test data directory for given ticket id
+     */
+    public static String getRegressionDataFile(int ticketid, String filename) {
+        return getRegressionDataDir(ticketid) + '/' + filename;
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

@@ -55 +55 @@
         Comparator<Relation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
 
-        try (InputStream is = new FileInputStream(TestUtils.getTestDataRoot() + "regress/9632/data.osm.zip")) {
+        try (InputStream is = new FileInputStream(TestUtils.getRegressionDataFile(9632, "data.osm.zip"))) {
             DataSet ds = OsmReader.parseDataSet(Compression.ZIP.getUncompressedInputStream(is), null);
 

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

@@ -32 +32 @@
 
     /**
-     * Gets path to test data directory for given ticketid.
-     * @param ticketid
-     * @return
-     */
-    protected static String getRegressionDataDir(int ticketid) {
-        return TestUtils.getTestDataRoot() + "/regress/" + ticketid;
-    }
-
-    /**
-     * Gets path to given file in test data directory for given ticketid.
-     * @param ticketid
-     * @param filename
-     * @return
-     */
-    protected static String getRegressionDataFile(int ticketid, String filename) {
-        return getRegressionDataDir(ticketid) + '/' + filename;
-    }
-
-    /**
      * #8954 - last checkbox in the preset is not added
      */
     @Test
     public void test8954() throws SAXException, IOException {
-        String presetfile = getRegressionDataFile(8954, "preset.xml");
+        String presetfile = TestUtils.getRegressionDataFile(8954, "preset.xml");
         final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, false);
         Assert.assertEquals("Number of preset items", 1, presets.size());

trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java

@@ -23 +23 @@
     @Test
     public void testTicket9984() throws IOException {
-        File file = new File(TestUtils.getTestDataRoot()+"regress/9984/tile.png");
+        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));
@@ -36 +36 @@
     @Test
     public void testTicket10030() throws IOException {
-        File file = new File(TestUtils.getTestDataRoot()+"regress/10030/tile.jpg");
+        File file = new File(TestUtils.getRegressionDataFile(10030, "tile.jpg"));
         ImageProvider.read(file, true, true);
     }