Author: michiel
Date: 2010-02-08 18:30:21 +0100 (Mon, 08 Feb 2010)
New Revision: 40912
Added:
mmbase/trunk/applications/resources/src/test/java/org/mmbase/util/images/MoreImagingTest.java
Modified:
mmbase/trunk/applications/resources/src/test/java/org/mmbase/util/images/ImagingTest.java
Log:
s(<x>x<y>@) doesn't make much sense. And indeed GraphicsMagick doesn't get it.
Lets not test for that.
Modified:
mmbase/trunk/applications/resources/src/test/java/org/mmbase/util/images/ImagingTest.java
===================================================================
---
mmbase/trunk/applications/resources/src/test/java/org/mmbase/util/images/ImagingTest.java
2010-02-08 17:03:55 UTC (rev 40911)
+++
mmbase/trunk/applications/resources/src/test/java/org/mmbase/util/images/ImagingTest.java
2010-02-08 17:30:21 UTC (rev 40912)
@@ -38,26 +38,26 @@
new Object[] {"s(100x60)+f(jpeg)", IM | JAI},
new Object[] {"part(10x10x30x50)", IM | JAI},
new Object[] {"part(10x10x2000x2000)", IM | JAI},
- new Object[] {"s(10000@)", IM},
- new Object[] {"s(100x100@)", IM},
- new Object[] {"s(10000x2000>)", IM | JAI},
+ new Object[] {"s(10000@)", IM},
+ //new Object[] {"s(100x100@)", IM}, // Makes no sense and
graphicsmagick indeed does not understand it
+ new Object[] {"s(10000x2000>)", IM | JAI},
new Object[] {"s(100000x2000<)", IM | JAI},
- new Object[] {"s(4x5<)", IM | JAI},
+ new Object[] {"s(4x5<)", IM | JAI},
new Object[] {"s(4x5>)", IM | JAI},
- new Object[] {"r(90)", IM},
- new Object[] {"r(45)", IM},
- new Object[] {"r(198)", IM},
+ new Object[] {"r(90)", IM},
+ new Object[] {"r(45)", IM},
+ new Object[] {"r(198)", IM},
new Object[] {"r(-30)", IM},
- new Object[] {"border(5)", IM},
+ new Object[] {"border(5)", IM},
new Object[] {"border(5x8)", IM},
new Object[] {"r(45)+border(10x20)", IM},
new Object[] {"flip", IM | JAI},
- new Object[] {"s(100)", IM | JAI},
- new Object[] {"s(x100)", IM | JAI},
+ new Object[] {"s(100)", IM | JAI},
+ new Object[] {"s(x100)", IM | JAI},
new Object[] {"s(10x70)", IM | JAI},
- new Object[] {"s(70x10)", IM | JAI},
- new Object[] {"s(60x70!)", IM},
- new Object[] {"s(80%x150%)", IM},
+ new Object[] {"s(70x10)", IM | JAI},
+ new Object[] {"s(60x70!)", IM},
+ new Object[] {"s(80%x150%)", IM},
new Object[] {"s(100x100>)", IM},
//new Object[] "s(100x100>)", Fails
new Object[] {"s(x100)", IM | JAI},
@@ -74,7 +74,7 @@
}
return data;
}
-
+
private static ImageMagickImageConverter imageMagick = new
ImageMagickImageConverter();
@BeforeClass
public static void setUp() {
@@ -105,9 +105,9 @@
protected void test(ImageConverter converter) throws IOException {
byte[] ba = bytes();
- ImageInformer informer = new ImageMagickImageInformer();
+ ImageInformer informer = new ImageMagickImageInformer();
Dimension originalSize = informer.getDimension(ba);
-
+
final List<String> params = Imaging.parseTemplate(template);
Dimension predictedSize = Imaging.predictDimension(originalSize,
params);
@@ -115,7 +115,7 @@
assertNotNull(info(), converted);
assertFalse(info(), converted.length == 0);
Dimension convertSize = informer.getDimension(converted);
- assertTrue(info() + ":" + originalSize + "->" + predictedSize + " != "
+ convertSize,
+ assertTrue(info() + ":" + originalSize + "->" + predictedSize + " != "
+ convertSize,
predictedSize.equalsIgnoreRound(convertSize, 1));
}
@Test
@@ -131,5 +131,5 @@
assumeTrue(imageMagick.validFormats.size() > 0);
test(imageMagick);
}
-
+
}
Added:
mmbase/trunk/applications/resources/src/test/java/org/mmbase/util/images/MoreImagingTest.java
===================================================================
---
mmbase/trunk/applications/resources/src/test/java/org/mmbase/util/images/MoreImagingTest.java
(rev 0)
+++
mmbase/trunk/applications/resources/src/test/java/org/mmbase/util/images/MoreImagingTest.java
2010-02-08 17:30:21 UTC (rev 40912)
@@ -0,0 +1,37 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
+See http://www.MMBase.org/license
+
+*/
+package org.mmbase.util.images;
+
+import java.io.*;
+import java.util.*;
+import org.mmbase.util.*;
+
+import org.junit.*;
+import org.junit.runner.*;
+import org.junit.runners.*;
+import static org.junit.Assert.*;
+import static org.junit.Assume.*;
+
+/**
+ *
+ * @author Michiel Meeuwissen
+ */
+
+
+public class MoreImagingTest {
+
+ @Test
+ public void testPredictDimension() {
+ assertEquals(new Dimension(300, 150), Imaging.predictDimension(new
Dimension(600, 300), Arrays.asList(new String[] {"s(300x300)"})));
+ assertEquals(new Dimension(300, 300), Imaging.predictDimension(new
Dimension(600, 300), Arrays.asList(new String[] {"s(300x300!)"})));
+ assertEquals(new Dimension(30, 30), Imaging.predictDimension(new
Dimension(300, 300), Arrays.asList(new String[] {"s(900@)"})));
+ }
+
+}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
