[Geotools-commits] svn - r38418 - branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/io

[<svn...@os...>]

Author: aaime
Date: 2011-12-13 01:40:29 -0800 (Tue, 13 Dec 2011)
New Revision: 38418

Modified:
   branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/io/GridCoverageProgressAdapterTest.java
Log:
[GEOT-3980] GridCoverageProgressAdapterTest fails if native JAI ImageIO is installed

Modified: branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/io/GridCoverageProgressAdapterTest.java
===================================================================
--- branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/io/GridCoverageProgressAdapterTest.java	2011-12-13 09:40:15 UTC (rev 38417)
+++ branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/io/GridCoverageProgressAdapterTest.java	2011-12-13 09:40:29 UTC (rev 38418)
@@ -29,6 +29,7 @@
 import org.geotools.TestData;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.image.ImageWorkerTest;
+import org.geotools.resources.image.ImageUtilities;
 import org.geotools.util.DefaultProgressListener;
 import org.geotools.util.logging.Logging;
 import org.junit.Assert;
@@ -36,7 +37,9 @@
 import org.opengis.util.InternationalString;
 import org.opengis.util.ProgressListener;
 
+import com.sun.media.imageioimpl.common.PackageUtil;
 
+
 /**
  * @author Simone Giannecchini, GeoSolutions SAS
  *
@@ -161,7 +164,10 @@
         image.flush();
         image=null;
         
-        assertFalse(adaptee.isCompleted());
+        // this particular test does not work if CLIB is available
+        if(!PackageUtil.isCodecLibAvailable()) {
+            assertFalse(adaptee.isCompleted());
+        }
         assertTrue(adaptee.isStarted());
         assertTrue(adaptee.isCanceled());
     }