Changeset 6683

Timestamp:

07/09/10 10:10:40 (9 years ago)

Author:

curtis

Message:

Backport r6682 to 4.2 branch.

Location:

branches/4.2

Files:

• . (modified) (1 prop)
• components/loci-plugins (modified) (1 prop)
• components/loci-plugins/src/loci/plugins (modified) (1 prop)
• components/loci-plugins/src/loci/plugins/in/Calibrator.java (modified) (1 prop)
• components/loci-plugins/test/loci/plugins/in/ImporterTest.java (modified) (2 diffs)
• components/ome-xml (modified) (1 prop)

branches/4.2/components/loci-plugins/test/loci/plugins/in/ImporterTest.java

@@ -97 +97 @@
   /** Whether to log debugging messages to stdout. */
   static final boolean DEBUG = false;
+
+  /**
+   * Whether to run tests with special requirements.
+   * This flag is mainly to disable the testDatasetOpenFilesIndividually test
+   * on systems without the required Bio-Rad PIC sample data available.
+   */
+  static final boolean RUN_SPECIAL_TESTS = false;
 
   private enum Axis {Z,C,T};
@@ -2119 +2126 @@
   public void testDatasetOpenFilesIndividually()
   {
-    for (boolean virtual : BOOLEAN_STATES)
-      datasetOpenFilesIndividuallyTester(virtual);
+    if (RUN_SPECIAL_TESTS) {
+      for (boolean virtual : BOOLEAN_STATES)
+        datasetOpenFilesIndividuallyTester(virtual);
+    }
   }