From a1b865f8b539206383d0eadd382c186d1631b93d Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 28 Jul 2018 17:43:05 +0100
Subject: [PATCH v1 1/2] HelpAwareOptionPaneMocker: remove idea of result
 option indexing being 1-based

I don't know where I got this idea from.
---
 .../josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java   | 4 ++--
 .../josm/testutils/mockers/HelpAwareOptionPaneMocker.java            | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java
index 876e0bfcd..10348fa20 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java
@@ -231,7 +231,7 @@ public class PluginPreferenceHighLevelTest {
 
         assertEquals(1, haMocker.getInvocationLog().size());
         Object[] invocationLogEntry = haMocker.getInvocationLog().get(0);
-        assertEquals(2, (int) invocationLogEntry[0]);
+        assertEquals(1, (int) invocationLogEntry[0]);
         assertEquals("Restart", invocationLogEntry[2]);
 
         // dummy_plugin jar shouldn't have been updated
@@ -353,7 +353,7 @@ public class PluginPreferenceHighLevelTest {
 
         assertEquals(1, haMocker.getInvocationLog().size());
         Object[] invocationLogEntry = haMocker.getInvocationLog().get(0);
-        assertEquals(2, (int) invocationLogEntry[0]);
+        assertEquals(1, (int) invocationLogEntry[0]);
         assertEquals("Restart", invocationLogEntry[2]);
 
         // dummy_plugin jar shouldn't have been updated
diff --git a/test/unit/org/openstreetmap/josm/testutils/mockers/HelpAwareOptionPaneMocker.java b/test/unit/org/openstreetmap/josm/testutils/mockers/HelpAwareOptionPaneMocker.java
index 9eb7bbf41..9acef814a 100644
--- a/test/unit/org/openstreetmap/josm/testutils/mockers/HelpAwareOptionPaneMocker.java
+++ b/test/unit/org/openstreetmap/josm/testutils/mockers/HelpAwareOptionPaneMocker.java
@@ -100,8 +100,7 @@ public class HelpAwareOptionPaneMocker extends BaseDialogMockUp<HelpAwareOptionP
                     Arrays.toString(Arrays.stream(options).map((buttonSpec) -> buttonSpec.text).toArray())
                 ));
             }
-            // buttons are numbered with 1-based indexing
-            return optIndex.getAsInt() + 1;
+            return optIndex.getAsInt();
         }
     }
 
@@ -161,7 +160,7 @@ public class HelpAwareOptionPaneMocker extends BaseDialogMockUp<HelpAwareOptionP
                     + "JOptionPane.OK_OPTION for closed windows if that was the intent)",
                     retval
                 ));
-            } else if (retval > (options == null ? 0 : options.length)) {  // NOTE 1-based indexing
+            } else if (retval > (options == null ? 0 : options.length-1)) {
                 fail(String.format(
                     "Invalid result for HelpAwareOptionPane: %s (in call with options = %s)",
                     retval,
-- 
2.11.0