Changeset 11974 in josm

Timestamp:

2017-04-22T17:57:11+02:00 (7 years ago)

Author:

Don-vip

Message:

add unit tests, javadoc

Location:

trunk

Files:

• src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/ac (added)
• test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java (added)
• test/unit/org/openstreetmap/josm/io/imagery (added)
• test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (added)
• test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -144 +144 @@
     }
 
+    static final class PluginInformationAction extends AbstractAction {
+        private final PluginInformation info;
+
+        PluginInformationAction(PluginInformation info) {
+            super(tr("Information"));
+            this.info = info;
+        }
+
+        /**
+         * Returns plugin information text.
+         * @return plugin information text
+         */
+        public String getText() {
+            StringBuilder b = new StringBuilder();
+            for (Entry<String, String> e : info.attr.entrySet()) {
+                b.append(e.getKey());
+                b.append(": ");
+                b.append(e.getValue());
+                b.append('\n');
+            }
+            return b.toString();
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent event) {
+            String text = getText();
+            JosmTextArea a = new JosmTextArea(10, 40);
+            a.setEditable(false);
+            a.setText(text);
+            a.setCaretPosition(0);
+            if (!GraphicsEnvironment.isHeadless()) {
+                JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a), tr("Plugin information"),
+                        JOptionPane.INFORMATION_MESSAGE);
+            }
+        }
+    }
+
     /**
      * Description of a deprecated plugin
@@ -1408 +1445 @@
             pluginTab.add(new JLabel(name), GBC.std());
             pluginTab.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
-            pluginTab.add(new JButton(new AbstractAction(tr("Information")) {
-                @Override
-                public void actionPerformed(ActionEvent event) {
-                    StringBuilder b = new StringBuilder();
-                    for (Entry<String, String> e : info.attr.entrySet()) {
-                        b.append(e.getKey());
-                        b.append(": ");
-                        b.append(e.getValue());
-                        b.append('\n');
-                    }
-                    JosmTextArea a = new JosmTextArea(10, 40);
-                    a.setEditable(false);
-                    a.setText(b.toString());
-                    a.setCaretPosition(0);
-                    JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a), tr("Plugin information"),
-                            JOptionPane.INFORMATION_MESSAGE);
-                }
-            }), GBC.eol());
+            pluginTab.add(new JButton(new PluginInformationAction(info)), GBC.eol());
 
             JosmTextArea description = new JosmTextArea(info.description == null ? tr("no description available")

trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.Way;
 
+/**
+ * The context switch offers possibility to use tags of referenced primitive when constructing primitive name.
+ * @author jttt
+ * @since 4546
+ */
 public class ContextSwitchTemplate implements TemplateEntry {
 
@@ -244 +249 @@
     }
 
+    /**
+     * Constructs a new {@code ContextSwitchTemplate}.
+     * @param match match
+     * @param template template
+     * @param searchExpressionPosition search expression position
+     * @throws ParseError if a parse error occurs, or if the match transformation returns the same primitive
+     */
     public ContextSwitchTemplate(Match match, TemplateEntry template, int searchExpressionPosition) throws ParseError {
         Match m = transform(match, searchExpressionPosition);

trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
+import org.openstreetmap.josm.plugins.PluginException;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
@@ -41 +42 @@
 
     /**
+     * Returns a dummy plugin information.
+     * @return a dummy plugin information
+     * @throws PluginException if an error occurs
+     */
+    public static PluginInformation getDummyPluginInformation() throws PluginException {
+        return new PluginInformation(
+                new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin");
+    }
+
+    /**
      * Unit test of {@link PluginPreference#buildDownloadSummary}.
      * @throws Exception if an error occurs
@@ -46 +57 @@
     @Test
     public void testBuildDownloadSummary() throws Exception {
-        final PluginInformation dummy = new PluginInformation(
-                new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin");
+        final PluginInformation dummy = getDummyPluginInformation();
         assertEquals("", PluginPreference.buildDownloadSummary(
                 new PluginDownloadTask(NullProgressMonitor.INSTANCE, Collections.<PluginInformation>emptyList(), "")));

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java

@@ -15 +15 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferenceTest;
 import org.openstreetmap.josm.plugins.PluginHandler.DeprecatedPlugin;
+import org.openstreetmap.josm.plugins.PluginHandler.PluginInformationAction;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -84 +86 @@
         assertFalse(plugins.contains("gpsbabelgui"));
     }
+
+    /**
+     * Unit test of {@link PluginInformationAction} class.
+     * @throws PluginException if an error occurs
+     */
+    @Test
+    public void testPluginInformationAction() throws PluginException {
+        PluginInformationAction action = new PluginInformationAction(PluginPreferenceTest.getDummyPluginInformation());
+        assertEquals(
+                "Ant-Version: Apache Ant 1.9.6\n" +
+                "Author: Don-vip\n" +
+                "Created-By: 1.7.0_91-b02 (Oracle Corporation)\n" +
+                "Manifest-Version: 1.0\n" +
+                "Plugin-Canloadatruntime: true\n" +
+                "Plugin-Class: org.openstreetmap.josm.plugins.fr.epci.EpciPlugin\n" +
+                "Plugin-Date: 2015-11-19T08:21:07.645033Z\n" +
+                "Plugin-Description: Handling of French EPCIs (boundary=local_authority)\n" +
+                "Plugin-Early: true\n" +
+                "Plugin-Link: http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/EPCI-fr\n" +
+                "Plugin-Mainversion: 7001\n" +
+                "Plugin-Version: 31772\n", action.getText());
+        action.actionPerformed(null);
+    }
 }

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

@@ -237 +237 @@
 
     @Test
+    public void testSetAnd() throws ParseError {
+        TemplateParser parser = new TemplateParser("!{(parent(type=child) type=parent) & (parent type=child subtype=parent) '{name}'}");
+        DatasetFactory ds = new DatasetFactory();
+        Relation parent1 = ds.addRelation(1);
+        parent1.put("type", "parent");
+        parent1.put("subtype", "parent");
+        parent1.put("name", "name_parent1");
+        Node child = ds.addNode(1);
+        child.put("type", "child");
+        parent1.addMember(new RelationMember("", child));
+
+        StringBuilder sb = new StringBuilder();
+        TemplateEntry entry = parser.parse();
+        entry.appendText(sb, child);
+
+        Assert.assertEquals("name_parent1", sb.toString());
+    }
+
+    @Test
     public void testSetOr() throws ParseError {
         TemplateParser parser = new TemplateParser("!{(parent(type=type1) type=parent1) | (parent type=type2 type=parent2) '{name}'}");