X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fjp%2Fsfjp%2Fmikutoga%2Fxml%2FDomUtilsTest.java;h=f319a31d66bdd6a00be939a17c201cef94b713f5;hp=496a87e66d812aa9039d315307cf3e45ec59a01c;hb=3193f200dcd2871b680b2bafed200b035b1a8908;hpb=b5257a6f7325857c1bb9d788cd10e5aae1cf557c

diff --git a/src/test/java/jp/sfjp/mikutoga/xml/DomUtilsTest.java b/src/test/java/jp/sfjp/mikutoga/xml/DomUtilsTest.java
index 496a87e..f319a31 100644
--- a/src/test/java/jp/sfjp/mikutoga/xml/DomUtilsTest.java
+++ b/src/test/java/jp/sfjp/mikutoga/xml/DomUtilsTest.java
@@ -4,7 +4,6 @@
 
 package jp.sfjp.mikutoga.xml;
 
-import javax.xml.bind.DatatypeConverter;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -19,7 +18,6 @@ import org.w3c.dom.Element;
 
 /**
  *
- * @author silva
  */
 public class DomUtilsTest {
 
@@ -90,22 +88,18 @@ public class DomUtilsTest {
         result = DomUtils.getBooleanAttr(elem, TESTATTR);
         assertTrue(result);
 
-        elem = getTestAttredElem(null);
-        result = DomUtils.getBooleanAttr(elem, TESTATTR);
-        assertFalse(result); // Why?
-
-        elem = getTestAttredElem("X");
-        result = DomUtils.getBooleanAttr(elem, TESTATTR);
-        assertFalse(result); // Why?
-
-        elem = getTestAttredElem("");
-        result = DomUtils.getBooleanAttr(elem, TESTATTR);
-        assertFalse(result); // Why?
-
         elem = getTestAttredElem("\n\rtrue\u0020\t");
         result = DomUtils.getBooleanAttr(elem, TESTATTR);
         assertTrue(result);
 
+        elem = getTestAttredElem("?");
+        try{
+            DomUtils.getBooleanAttr(elem, TESTATTR);
+            fail();
+        }catch(TogaXmlException e){
+            assert true;
+        }
+
         return;
     }
 
@@ -131,14 +125,6 @@ public class DomUtilsTest {
         result = DomUtils.getIntegerAttr(elem, TESTATTR);
         assertEquals(-1, result);
 
-        elem = getTestAttredElem("-0");
-        result = DomUtils.getIntegerAttr(elem, TESTATTR);
-        assertEquals(0, result);
-
-        elem = getTestAttredElem("+1");
-        result = DomUtils.getIntegerAttr(elem, TESTATTR);
-        assertEquals(1, result);
-
         elem = getTestAttredElem("999");
         result = DomUtils.getIntegerAttr(elem, TESTATTR);
         assertEquals(999, result);
@@ -147,19 +133,11 @@ public class DomUtilsTest {
         result = DomUtils.getIntegerAttr(elem, TESTATTR);
         assertEquals(-9999, result);
 
-        elem = getTestAttredElem("-2147483648");
-        result = DomUtils.getIntegerAttr(elem, TESTATTR);
-        assertEquals(Integer.MIN_VALUE, result);
-
-        elem = getTestAttredElem("2147483647");
-        result = DomUtils.getIntegerAttr(elem, TESTATTR);
-        assertEquals(Integer.MAX_VALUE, result);
-
         elem = getTestAttredElem("\n\r999\u0020\t");
         result = DomUtils.getIntegerAttr(elem, TESTATTR);
         assertEquals(999, result);
 
-        elem = getTestAttredElem("X");
+        elem = getTestAttredElem("?");
         try{
             result = DomUtils.getIntegerAttr(elem, TESTATTR);
             fail();
@@ -189,10 +167,6 @@ public class DomUtilsTest {
         assertEquals(0.0f, result, 0.0f);
         assertEquals("-0.0", Float.toString(result));
 
-        elem = getTestAttredElem("+0.0");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(0.0f, result, 0.0f);
-
         elem = getTestAttredElem("-123.456");
         result = DomUtils.getFloatAttr(elem, TESTATTR);
         assertEquals(-123.456f, result, 0.0f);
@@ -201,62 +175,21 @@ public class DomUtilsTest {
         result = DomUtils.getFloatAttr(elem, TESTATTR);
         assertEquals(654.321f, result, 0.0f);
 
-        elem = getTestAttredElem("2.718281828459045");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals((float)StrictMath.E, result, 0.0f);
-
-        elem = getTestAttredElem("3.141592653589793");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals((float)StrictMath.PI, result, 0.0f);
-
-        elem = getTestAttredElem("1.401298464324817E-45");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(Float.MIN_VALUE, result, 0.0f);
-
-        elem = getTestAttredElem("1.1754943508222875E-38");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(Float.MIN_NORMAL, result, 0.0f);
-
-        elem = getTestAttredElem("3.4028234663852886E38");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(Float.MAX_VALUE, result, 0.0f);
-
-        elem = getTestAttredElem("2E3");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(2000.0f, result, 0.0f);
-
         elem = getTestAttredElem("2.3E4");
         result = DomUtils.getFloatAttr(elem, TESTATTR);
         assertEquals(23000.0f, result, 0.0f);
 
-        elem = getTestAttredElem("2.3e4");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(23000.0f, result, 0.0f);
-
-        elem = getTestAttredElem("2.3E+4");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(23000.0f, result, 0.0f);
-
-        elem = getTestAttredElem("2.3E-4");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(0.00023f, result, 0.0f);
-
         elem = getTestAttredElem("INF");
         result = DomUtils.getFloatAttr(elem, TESTATTR);
         assertEquals(Float.POSITIVE_INFINITY, result, 0.0f);
 
-        elem = getTestAttredElem("-INF");
-        result = DomUtils.getFloatAttr(elem, TESTATTR);
-        assertEquals(Float.NEGATIVE_INFINITY, result, 0.0f);
-
         elem = getTestAttredElem("+INF");
         try{
-            result = DomUtils.getFloatAttr(elem, TESTATTR);
+            DomUtils.getFloatAttr(elem, TESTATTR);
             fail();
         }catch(TogaXmlException e){
             assert true;
         }
-        //assertEquals(Float.POSITIVE_INFINITY, result, 0.0f);
 
         elem = getTestAttredElem("NaN");
         result = DomUtils.getFloatAttr(elem, TESTATTR);
@@ -266,9 +199,9 @@ public class DomUtilsTest {
         result = DomUtils.getFloatAttr(elem, TESTATTR);
         assertEquals(123.456f, result, 0.0f);
 
-        elem = getTestAttredElem("X");
+        elem = getTestAttredElem("?");
         try{
-            result = DomUtils.getFloatAttr(elem, TESTATTR);
+            DomUtils.getFloatAttr(elem, TESTATTR);
             fail();
         }catch(TogaXmlException e){
             assert true;
@@ -277,46 +210,4 @@ public class DomUtilsTest {
         return;
     }
 
-    private static byte parseByte(String str){
-        byte result;
-        result = DatatypeConverter.parseByte(str);
-        return result;
-    }
-
-    /**
-     * Test of parseByte method, of class DomUtils.
-     */
-    @Test
-    public void testparseByte() throws TogaXmlException {
-        System.out.println("prseByte");
-
-        byte result;
-
-        result = parseByte("0");
-        assertEquals((byte)0, result);
-
-        result = parseByte("-1");
-        assertEquals((byte)-1, result);
-
-        result = parseByte("1");
-        assertEquals((byte)1, result);
-
-        result = parseByte("-0");
-        assertEquals((byte)0, result);
-
-        result = parseByte("+1");
-        assertEquals((byte)1, result);
-
-        result = parseByte("-128");
-        assertEquals((byte)-128, result);
-
-        result = parseByte("127");
-        assertEquals((byte)127, result);
-
-        result = parseByte("\n\r99\u0020\t");
-        assertEquals((byte)99, result);
-
-        return;
-    }
-
 }