You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/02/03 14:47:55 UTC
svn commit: r906043 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src:
main/java/org/apache/clerezza/utils/imagemagick/
test/java/org/apache/clerezza/utils/imagemagick/
Author: reto
Date: Wed Feb 3 13:47:54 2010
New Revision: 906043
URL: http://svn.apache.org/viewvc?rev=906043&view=rev
Log:
skipping tests if no valid imagemagick installation found.
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java?rev=906043&r1=906042&r2=906043&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java Wed Feb 3 13:47:54 2010
@@ -170,8 +170,8 @@
logger.warn("ImageMagick version check has been interrupted. " +
"Assuming correct version.");
} catch (IOException ex) {
- logger.warn("ImageMagick version check failed. " +
- "Assuming correct version.");
+ //this occurs when the commands are miising
+ ok = false;
} catch (NullPointerException ex) {
//can occur when output is empty (e.g. imagemagick prints
//only error messages which go to stderror)
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java?rev=906043&r1=906042&r2=906043&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java Wed Feb 3 13:47:54 2010
@@ -39,6 +39,8 @@
import org.apache.clerezza.rdf.ontologies.DC;
import org.apache.clerezza.utils.imageprocessing.metadataprocessing.ExifTagDataSet;
import org.apache.clerezza.utils.imageprocessing.metadataprocessing.IptcDataSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -47,12 +49,14 @@
public class ImageMagickUtilsTest {
private static boolean correctlyInstalled = true;
+ private final static Logger logger = LoggerFactory.getLogger(ImageMagickUtilsTest.class);
@BeforeClass
public static void checkIfImageMagickInstalled() {
try {
- new ImageMagickProvider().checkImageMagickInstallation();
+ new ImageMagickProvider().checkImageMagickInstallation();
} catch (RuntimeException ex) {
+ logger.warn("No valid imagemagick installation found, skipping tests.");
correctlyInstalled = false;
}
}