Changeset 14332 in josm for trunk/test/unit/org/openstreetmap/josm/testutils/mockers

Timestamp:

2018-10-14T17:30:28+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16841 - MergeLayerActionTest, DownloadWmsAlongTrackActionTest: fix for non-headless mode by properly mocking dialogs (patch by ris)

Location:

trunk/test/unit/org/openstreetmap/josm/testutils/mockers

Files:

• ExtendedDialogMocker.java (modified) (4 diffs)
• HelpAwareOptionPaneMocker.java (modified) (2 diffs)
• JOptionPaneSimpleMocker.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java

@@ -11 +11 @@
 import java.util.WeakHashMap;
 
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.Logging;
@@ -108 +109 @@
     }
 
+    /**
+     * Target for overriding, similar to {@link #getMockResult} except with the implication it will only
+     * be invoked once per dialog display, therefore ideal opportunity to perform any mutating actions,
+     * e.g. making a selection on a widget.
+     * @param instance dialog instance
+     */
+    protected void act(final ExtendedDialog instance) {
+        // Override in sub-classes
+    }
+
     protected Object[] getInvocationLogEntry(final ExtendedDialog instance, final int mockResult) {
         return new Object[] {
@@ -114 +125 @@
             instance.getTitle()
         };
+    }
+
+    /**
+     * A convenience method to access {@link ExtendedDialog#content} without exception-catching boilerplate
+     * @param instance dialog instance
+     * @return dialog content component
+     */
+    protected Component getContent(final ExtendedDialog instance) {
+        try {
+            return (Component) TestUtils.getPrivateField(instance, "content");
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
     }
 
@@ -130 +154 @@
             try {
                 final ExtendedDialog instance = invocation.getInvokedInstance();
+                this.act(instance);
                 final int mockResult = this.getMockResult(instance);
                 // TODO check validity of mockResult?

trunk/test/unit/org/openstreetmap/josm/testutils/mockers/HelpAwareOptionPaneMocker.java

@@ -76 +76 @@
         }
         return this.getMockResultMap().get(messageString);
+    }
+
+    /**
+     * Target for overriding, similar to {@link #getMockResultForMessage} except with the implication it
+     * will only be invoked once per dialog display, therefore ideal opportunity to perform any mutating
+     * actions, e.g. making a selection on a widget.
+     * @param message message
+     */
+    protected void act(final Object message) {
+        // Override in sub-classes
     }
 
@@ -134 +144 @@
     ) {
         try {
+            this.act(msg);
             final Object result = this.getMockResultForMessage(msg);
 

trunk/test/unit/org/openstreetmap/josm/testutils/mockers/JOptionPaneSimpleMocker.java

@@ -134 +134 @@
     }
 
+    /**
+     * Target for overriding, similar to {@link #getMockResultForMessage} except with the implication it
+     * will only be invoked once per dialog display, therefore ideal opportunity to perform any mutating
+     * actions, e.g. making a selection on a widget.
+     * @param message message
+     */
+    protected void act(final Object message) {
+        // Override in sub-classes
+    }
+
     protected Object[] getInvocationLogEntry(
         final Object message,
@@ -162 +172 @@
     ) {
         try {
+            this.act(message);
             final Object result = this.getMockResultForMessage(message);
             if (selectionValues == null) {
@@ -216 +227 @@
     ) {
         try {
+            this.act(message);
             // why look up a "result" for a message dialog which can only have one possible result? it's
             // a good opportunity to assert its contents
@@ -263 +275 @@
     ) {
         try {
+            this.act(message);
             final Object result = this.getMockResultForMessage(message);
             if (!(result instanceof Integer && Ints.contains(optionTypePermittedResults.get(optionType), (int) result))) {