Merged Chris John's changes to fix 'Missing all data when one out-of-range extent' Issue #19

Author: Bob Simons

WEB-INF/classes/gov/noaa/pfel/erddap/dataset/EDDGrid.java

@@ -14745,51 +14745,6 @@ public String findTimeGaps() {
         return times.findTimeGaps();
     }
 
-    /**
-     * This runs all of the interactive or not interactive tests for this class.
-     *
-     * @param errorSB        all caught exceptions are logged to this.
-     * @param interactive    If true, this runs all of the interactive tests;
-     *                       otherwise, this runs all of the non-interactive
-     *                       tests.
-     * @param doSlowTestsToo If true, this runs the slow tests, too.
-     * @param firstTest      The first test to be run (0...). Test numbers may
-     *                       change.
-     * @param lastTest       The last test to be run, inclusive (0..., or -1 for
-     *                       the last test). Test numbers may change.
-     */
-    public static void test(StringBuilder errorSB, boolean interactive,
-            boolean doSlowTestsToo, int firstTest, int lastTest) {
-        if (lastTest < 0)
-            lastTest = interactive ? -1 : 0;
-        String msg = "\n^^^ EDDGrid.test(" + interactive + ") test=";
-
-        for (int test = firstTest; test <= lastTest; test++) {
-            try {
-                long time = System.currentTimeMillis();
-                String2.log(msg + test);
-
-                if (interactive) {
-                    // if (test == 0) ...;
-
-                } else {
-                    if (test == 0)
-                        testSaveAsImage();
-                }
-
-                String2.log(msg + test + " finished successfully in "
-                        + (System.currentTimeMillis() - time) + " ms.");
-            } catch (Throwable testThrowable) {
-                String eMsg = msg + test + " caught throwable:\n"
-                        + MustBe.throwableToString(testThrowable);
-                errorSB.append(eMsg);
-                String2.log(eMsg);
-                if (interactive)
-                    String2.pressEnterToContinue("");
-            }
-        }
-    }
-
     /**
      * Test saveAsImage, specifically to make sure a transparent png that's
      * partially outside of the range of the dataset still returns the image for
@@ -14916,4 +14871,50 @@ private static void testSaveAsImageVsExpected(EDDGrid eddGrid, String dir,
             throw new RuntimeException(ex);
         }
     }
+
+    /**
+     * This runs all of the interactive or not interactive tests for this class.
+     *
+     * @param errorSB        all caught exceptions are logged to this.
+     * @param interactive    If true, this runs all of the interactive tests;
+     *                       otherwise, this runs all of the non-interactive
+     *                       tests.
+     * @param doSlowTestsToo If true, this runs the slow tests, too.
+     * @param firstTest      The first test to be run (0...). Test numbers may
+     *                       change.
+     * @param lastTest       The last test to be run, inclusive (0..., or -1 for
+     *                       the last test). Test numbers may change.
+     */
+    public static void test(StringBuilder errorSB, boolean interactive,
+            boolean doSlowTestsToo, int firstTest, int lastTest) {
+        if (lastTest < 0)
+            lastTest = interactive ? -1 : 0;
+        String msg = "\n^^^ EDDGrid.test(" + interactive + ") test=";
+
+        for (int test = firstTest; test <= lastTest; test++) {
+            try {
+                long time = System.currentTimeMillis();
+                String2.log(msg + test);
+
+                if (interactive) {
+                    // if (test == 0) ...;
+
+                } else {
+                    if (test == 0)
+                        testSaveAsImage();
+                }
+
+                String2.log(msg + test + " finished successfully in "
+                        + (System.currentTimeMillis() - time) + " ms.");
+            } catch (Throwable testThrowable) {
+                String eMsg = msg + test + " caught throwable:\n"
+                        + MustBe.throwableToString(testThrowable);
+                errorSB.append(eMsg);
+                String2.log(eMsg);
+                if (interactive)
+                    String2.pressEnterToContinue("");
+            }
+        }
+    }
+
 }