2 files changed, 47 insertions, 0 deletions
diff --git a/test/java/org/apache/fop/UtilityCodeTestSuite.java b/test/java/org/apache/fop/UtilityCodeTestSuite.java
index cce534e92..09a2ef982 100644
--- a/test/java/org/apache/fop/UtilityCodeTestSuite.java
+++ b/test/java/org/apache/fop/UtilityCodeTestSuite.java
@@ -21,6 +21,7 @@ package org.apache.fop;
 import org.apache.fop.traits.BorderPropsTestCase;
 import org.apache.fop.traits.TraitColorTestCase;
 import org.apache.fop.util.PDFNumberTestCase;
+import org.apache.fop.util.UnitConvTestCase;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -39,6 +40,7 @@ public class UtilityCodeTestSuite {
             "Test suite for FOP's utility classes");
         //$JUnit-BEGIN$
         suite.addTest(new TestSuite(PDFNumberTestCase.class));
+        suite.addTest(new TestSuite(UnitConvTestCase.class));
         suite.addTest(new TestSuite(TraitColorTestCase.class));
         suite.addTest(new TestSuite(BorderPropsTestCase.class));
         //$JUnit-END$
diff --git a/test/java/org/apache/fop/util/UnitConvTestCase.java b/test/java/org/apache/fop/util/UnitConvTestCase.java
new file mode 100644
index 000000000..32d92473d
--- /dev/null
+++ b/test/java/org/apache/fop/util/UnitConvTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.util;
+
+import junit.framework.TestCase;
+
+/**
+ * Test class for UnitConv.
+ */
+public class UnitConvTestCase extends TestCase {
+
+    /**
+     * Test all kinds of unit conversions.
+     * @throws Exception if the test fails
+     */
+    public void testConversions() throws Exception {
+        assertEquals("in2mm", 25.4, UnitConv.in2mm(1), 0.00001);
+        assertEquals("mm2in", 1.0, UnitConv.mm2in(25.4), 0.00001);
+        assertEquals("mm2pt", 841.890, UnitConv.mm2pt(297), 0.001 / 2); //height of an A4 page
+        assertEquals("mm2mpt", 841890, UnitConv.mm2mpt(297), 1.0 / 2);
+        assertEquals("pt2mm", 297, UnitConv.pt2mm(841.890), 0.0001);
+        assertEquals("in2mpt", 792000, UnitConv.in2mpt(11.0), 1.0 / 2); //height of a letter page
+        assertEquals("mpt2in", 11.0, UnitConv.mpt2in(792000), 0.01 / 2); //height of a letter page
+        
+        assertEquals("mm2px/72dpi", 842, UnitConv.mm2px(297, 72), 0.0001);
+        assertEquals("mm2px/300dpi", 3508, UnitConv.mm2px(297, 300), 0.0001);
+    }
+    
+}
+\ No newline at end of file