Changeset 10299 in josm for trunk/test/unit/org

Timestamp:

2016-05-29T16:33:08+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - Performance - Method passes constant String of length 1 to character overridden method + add unit tests/javadoc

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilterTest.java (modified) (2 diffs)
• actions/search/SearchCompilerTest.java (modified) (1 diff)
• data/AutosaveTaskTest.java (added)

trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
-import nl.jqno.equalsverifier.EqualsVerifier;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
 
 /**
@@ -10 +12 @@
  */
 public class ExtensionFileFilterTest {
+
+    private static void test(String extensions, String defaultExtension, String description, boolean addArchiveExtensionsToDescription,
+            String expectedExtensions, String expectedDescription) {
+        ExtensionFileFilter ext = ExtensionFileFilter.newFilterWithArchiveExtensions(
+                extensions, defaultExtension, description, addArchiveExtensionsToDescription);
+        assertEquals(expectedExtensions, ext.getExtensions());
+        assertEquals(defaultExtension, ext.getDefaultExtension());
+        assertEquals(expectedDescription, ext.getDescription());
+    }
+
+    /**
+     * Unit test of method {@link ExtensionFileFilter#newFilterWithArchiveExtensions}.
+     */
+    @Test
+    public void testNewFilterWithArchiveExtensions() {
+        test("ext1", "ext1", "description", true,
+                "ext1,ext1.gz,ext1.bz2", "description (*.ext1, *.ext1.gz, *.ext1.bz2)");
+        test("ext1", "ext1", "description", false,
+                "ext1,ext1.gz,ext1.bz2", "description (*.ext1)");
+        test("ext1,ext2", "ext1", "description", true,
+                "ext1,ext1.gz,ext1.bz2,ext2,ext2.gz,ext2.bz2", "description (*.ext1, *.ext1.gz, *.ext1.bz2, *.ext2, *.ext2.gz, *.ext2.bz2)");
+        test("ext1,ext2", "ext1", "description", false,
+                "ext1,ext1.gz,ext1.bz2,ext2,ext2.gz,ext2.bz2", "description (*.ext1, *.ext2)");
+    }
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java

@@ -427 +427 @@
         final SearchCompiler.Match c4 = SearchCompiler.compile("foo1 OR (bar1 bar2 baz1 XOR baz2) OR foo2");
         assertEquals("foo1 || (bar1 && bar2 && (baz1 ^ baz2)) || foo2", c4.toString());
+        final SearchCompiler.Match c5 = SearchCompiler.compile("foo1 XOR (baz1 XOR (bar baz))");
+        assertEquals("foo1 ^ baz1 ^ (bar && baz)", c5.toString());
+        final SearchCompiler.Match c6 = SearchCompiler.compile("foo1 XOR ((baz1 baz2) XOR (bar OR baz))");
+        assertEquals("foo1 ^ (baz1 && baz2) ^ (bar || baz)", c6.toString());
     }