* Updated xmlgraphics-commons-14svn.jar to reflect UnitConv additions.

* Removed UnitConv and its unit test case (now resides in commons).
* Updated all fop util package references fpr UnitConv to xmlgraphics commons util package.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@687369 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 50 deletions

diff --git a/test/java/org/apache/fop/UtilityCodeTestSuite.java b/test/java/org/apache/fop/UtilityCodeTestSuite.java
index af467102c..6611f532e 100644
--- a/test/java/org/apache/fop/UtilityCodeTestSuite.java
+++ b/test/java/org/apache/fop/UtilityCodeTestSuite.java
@@ -22,14 +22,13 @@ package org.apache.fop;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.fop.pdf.PDFObjectTestCase;
 import org.apache.fop.events.BasicEventTestCase;
+import org.apache.fop.pdf.PDFObjectTestCase;
 import org.apache.fop.traits.BorderPropsTestCase;
+import org.apache.fop.util.ColorUtilTestCase;
 import org.apache.fop.util.DataURIResolverTestCase;
 import org.apache.fop.util.ElementListUtilsTestCase;
 import org.apache.fop.util.PDFNumberTestCase;
-import org.apache.fop.util.ColorUtilTestCase;
-import org.apache.fop.util.UnitConvTestCase;
 import org.apache.fop.util.XMLResourceBundleTestCase;
 
 /**
@@ -47,7 +46,6 @@ public class UtilityCodeTestSuite {
         //$JUnit-BEGIN$
         suite.addTest(new TestSuite(PDFNumberTestCase.class));
         suite.addTest(new TestSuite(PDFObjectTestCase.class));
-        suite.addTest(new TestSuite(UnitConvTestCase.class));
         suite.addTest(new TestSuite(ColorUtilTestCase.class));
         suite.addTest(new TestSuite(BorderPropsTestCase.class));
         suite.addTest(new TestSuite(ElementListUtilsTestCase.class));
diff --git a/test/java/org/apache/fop/util/UnitConvTestCase.java b/test/java/org/apache/fop/util/UnitConvTestCase.java
deleted file mode 100644
index a10619199..000000000
--- a/test/java/org/apache/fop/util/UnitConvTestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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", 841.8897764234434, UnitConv.mm2px(297.0, 72), 0);
-        assertEquals("mm2px/300dpi", 3507.8740684310146, UnitConv.mm2px(297.0, 300), 0);
-    }
-
-}
\ No newline at end of file