[Japi-cvs] SF.net SVN: japi:[867] libs/argparser/trunk/src/tst/test/net/sf/japi/io/ args/converter

[<chr...@us...>]

Revision: 867
          http://japi.svn.sourceforge.net/japi/?rev=867&view=rev
Author:   christianhujer
Date:     2009-02-15 11:06:41 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
Fixed incompatible types in assertEquals().

Modified Paths:
--------------
    libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/ByteConverterTest.java
    libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/DoubleConverterTest.java
    libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/FloatConverterTest.java
    libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/LongConverterTest.java
    libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/ShortConverterTest.java

Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/ByteConverterTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/ByteConverterTest.java	2009-02-15 02:54:59 UTC (rev 866)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/ByteConverterTest.java	2009-02-15 11:06:41 UTC (rev 867)
@@ -89,9 +89,9 @@
      */
     @Test
     public void testConvertHexadecimalNumbers() throws Exception {
-        Assert.assertEquals(0x50, getConverter().convert("0x50"));
-        Assert.assertEquals(0x50, getConverter().convert("0X50"));
-        Assert.assertEquals(0x50, getConverter().convert("#50"));
+        Assert.assertEquals((byte) 0x50, getConverter().convert("0x50"));
+        Assert.assertEquals((byte) 0x50, getConverter().convert("0X50"));
+        Assert.assertEquals((byte) 0x50, getConverter().convert("#50"));
     }
 
     /**
@@ -100,7 +100,7 @@
      */
     @Test
     public void testConvertOctalNumbers() throws Exception {
-        Assert.assertEquals(0xf, getConverter().convert("017"));
+        Assert.assertEquals((byte) 0xf, (byte) getConverter().convert("017"));
     }
 
 } // class ByteConverterTest

Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/DoubleConverterTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/DoubleConverterTest.java	2009-02-15 02:54:59 UTC (rev 866)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/DoubleConverterTest.java	2009-02-15 11:06:41 UTC (rev 867)
@@ -89,7 +89,7 @@
      */
     @Test
     public void testConvertHexadecimalNumbers() throws Exception {
-        Assert.assertEquals(50000, getConverter().convert("50000.0"));
+        Assert.assertEquals(50000.0, getConverter().convert("50000.0"));
     }
 
     /**
@@ -98,7 +98,7 @@
      */
     @Test
     public void testConvertOctalNumbers() throws Exception {
-        Assert.assertEquals(777, getConverter().convert("0777"));
+        Assert.assertEquals(777.0, getConverter().convert("0777"));
     }
 
 } // class DoubleConverterTest

Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/FloatConverterTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/FloatConverterTest.java	2009-02-15 02:54:59 UTC (rev 866)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/FloatConverterTest.java	2009-02-15 11:06:41 UTC (rev 867)
@@ -89,7 +89,7 @@
      */
     @Test
     public void testConvertHexadecimalNumbers() throws Exception {
-        Assert.assertEquals(50000, getConverter().convert("50000.0"));
+        Assert.assertEquals(50000.0f, getConverter().convert("50000.0"));
     }
 
     /**
@@ -98,7 +98,7 @@
      */
     @Test
     public void testConvertOctalNumbers() throws Exception {
-        Assert.assertEquals(777, getConverter().convert("0777"));
+        Assert.assertEquals(777.0f, getConverter().convert("0777"));
     }
 
 } // class FloatConverterTest

Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/LongConverterTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/LongConverterTest.java	2009-02-15 02:54:59 UTC (rev 866)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/LongConverterTest.java	2009-02-15 11:06:41 UTC (rev 867)
@@ -89,9 +89,9 @@
      */
     @Test
     public void testConvertHexadecimalNumbers() throws Exception {
-        Assert.assertEquals(0x50000, getConverter().convert("0x50000"));
-        Assert.assertEquals(0x50000, getConverter().convert("0X50000"));
-        Assert.assertEquals(0x50000, getConverter().convert("#50000"));
+        Assert.assertEquals(0x50000L, getConverter().convert("0x50000"));
+        Assert.assertEquals(0x50000L, getConverter().convert("0X50000"));
+        Assert.assertEquals(0x50000L, getConverter().convert("#50000"));
     }
 
     /**
@@ -100,7 +100,7 @@
      */
     @Test
     public void testConvertOctalNumbers() throws Exception {
-        Assert.assertEquals(0x1ff, getConverter().convert("0777"));
+        Assert.assertEquals(0x1ffL, getConverter().convert("0777"));
     }
 
 } // class LongConverterTest

Modified: libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/ShortConverterTest.java
===================================================================
--- libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/ShortConverterTest.java	2009-02-15 02:54:59 UTC (rev 866)
+++ libs/argparser/trunk/src/tst/test/net/sf/japi/io/args/converter/ShortConverterTest.java	2009-02-15 11:06:41 UTC (rev 867)
@@ -89,9 +89,9 @@
      */
     @Test
     public void testConvertHexadecimalNumbers() throws Exception {
-        Assert.assertEquals(0x5000, getConverter().convert("0x5000"));
-        Assert.assertEquals(0x5000, getConverter().convert("0X5000"));
-        Assert.assertEquals(0x5000, getConverter().convert("#5000"));
+        Assert.assertEquals((short) 0x5000, getConverter().convert("0x5000"));
+        Assert.assertEquals((short) 0x5000, getConverter().convert("0X5000"));
+        Assert.assertEquals((short) 0x5000, getConverter().convert("#5000"));
     }
 
     /**
@@ -100,7 +100,7 @@
      */
     @Test
     public void testConvertOctalNumbers() throws Exception {
-        Assert.assertEquals(0x1ff, getConverter().convert("0777"));
+        Assert.assertEquals((short) 0x1ff, getConverter().convert("0777"));
     }
 
 } // class ShortConverterTest


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.