GithubStar/fastjson
1
0
Fork 0
mirror of https://github.com/alibaba/fastjson.git synced 2026-10-27 20:52:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed testcase

Browse Source
This commit is contained in:
wenshao
2013-06-23 18:45:34 +08:00
parent 1d614edd1e
commit 7e06dbe0dd
17 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/alibaba/json/bvt/FloatFieldTest.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class FloatFieldTest extends TestCase {
User user1 = JSON.parseObject(text, User.class);
Assert.assertEquals(user1.getValue(), user.getValue());
Assert.assertTrue(user1.getValue() == user.getValue());
}
public static class User {
src/test/java/com/alibaba/json/bvt/JSONArrayTest.java
+4 -4
View File
@@ -117,11 +117,11 @@ public class JSONArrayTest extends TestCase {
Assert.assertEquals(123, array.getShort(0).shortValue());
Assert.assertEquals(123, array.getShortValue(0));
Assert.assertEquals(123F, array.getFloat(0).floatValue());
Assert.assertEquals(123F, array.getFloatValue(0));
Assert.assertTrue(123F == array.getFloat(0).floatValue());
Assert.assertTrue(123F == array.getFloatValue(0));
Assert.assertEquals(123D, array.getDouble(0).doubleValue());
Assert.assertEquals(123D, array.getDoubleValue(0));
Assert.assertTrue(123D == array.getDouble(0).doubleValue());
Assert.assertTrue(123D == array.getDoubleValue(0));
Assert.assertEquals(123, array.getIntValue(0));
Assert.assertEquals(123, array.getLongValue(0));
src/test/java/com/alibaba/json/bvt/JSONArrayTest2.java
+4 -4
View File
@@ -17,8 +17,8 @@ public class JSONArrayTest2 extends TestCase {
array.add(time);
Assert.assertEquals(0, array.getByteValue(0));
Assert.assertEquals(0, array.getShortValue(0));
Assert.assertEquals(0F, array.getFloatValue(0));
Assert.assertEquals(0D, array.getDoubleValue(0));
Assert.assertTrue(0F == array.getFloatValue(0));
Assert.assertTrue(0D == array.getDoubleValue(0));
Assert.assertEquals(new BigInteger("1"), array.getBigInteger(1));
Assert.assertEquals("1", array.getString(1));
Assert.assertEquals(new java.util.Date(time), array.getDate(2));
@@ -28,8 +28,8 @@ public class JSONArrayTest2 extends TestCase {
JSONArray array2 = (JSONArray) array.clone();
Assert.assertEquals(0, array2.getByteValue(0));
Assert.assertEquals(0, array2.getShortValue(0));
Assert.assertEquals(0F, array2.getFloatValue(0));
Assert.assertEquals(0D, array2.getDoubleValue(0));
Assert.assertTrue(0F == array2.getFloatValue(0));
Assert.assertTrue(0D == array2.getDoubleValue(0));
Assert.assertEquals(new BigInteger("1"), array2.getBigInteger(1));
Assert.assertEquals("1", array2.getString(1));
Assert.assertEquals(new java.util.Date(time), array2.getDate(2));
src/test/java/com/alibaba/json/bvt/JSONObjectTest.java
+4 -4
View File
@@ -156,10 +156,10 @@ public class JSONObjectTest extends TestCase {
Assert.assertEquals(new BigDecimal("222"), array.getBigDecimal("1"));
Assert.assertEquals(true, array.getBooleanValue("4"));
Assert.assertEquals(2.0F, array.getFloat("5").floatValue());
Assert.assertEquals(2.0F, array.getFloatValue("5"));
Assert.assertEquals(2.0D, array.getDouble("5").doubleValue());
Assert.assertEquals(2.0D, array.getDoubleValue("5"));
Assert.assertTrue(2.0F == array.getFloat("5").floatValue());
Assert.assertTrue(2.0F == array.getFloatValue("5"));
Assert.assertTrue(2.0D == array.getDouble("5").doubleValue());
Assert.assertTrue(2.0D == array.getDoubleValue("5"));
}
public void test_getObject_null() throws Exception {
src/test/java/com/alibaba/json/bvt/JSONObjectTest2.java
+2 -2
View File
@@ -31,8 +31,8 @@ public class JSONObjectTest2 extends TestCase {
Assert.assertEquals(obj.getByteValue("d"), 0);
Assert.assertEquals(obj.getShortValue("d"), 0);
Assert.assertEquals(obj.getFloatValue("d"), 0F);
Assert.assertEquals(obj.getDoubleValue("d"), 0D);
Assert.assertTrue(obj.getFloatValue("d") == 0F);
Assert.assertTrue(obj.getDoubleValue("d") == 0D);
Assert.assertEquals(obj.getBigInteger("d"), null);
Assert.assertEquals(obj.getSqlDate("d"), null);
Assert.assertEquals(obj.getTimestamp("d"), null);
src/test/java/com/alibaba/json/bvt/PublicFieldDoubleTest.java
+1 -1
View File
@@ -20,6 +20,6 @@ public class PublicFieldDoubleTest extends TestCase {
VO vo1 = JSON.parseObject(str, VO.class);
Assert.assertEquals(vo1.id, vo.id);
Assert.assertTrue(vo1.id == vo.id);
}
}
src/test/java/com/alibaba/json/bvt/PublicFieldFloatTest.java
+1 -1
View File
@@ -20,6 +20,6 @@ public class PublicFieldFloatTest extends TestCase {
VO vo1 = JSON.parseObject(str, VO.class);
Assert.assertEquals(vo1.id, vo.id);
Assert.assertTrue(vo1.id == vo.id);
}
}
src/test/java/com/alibaba/json/bvt/bug/Bug_for_jiangwei1.java
+4 -4
View File
@@ -7,15 +7,15 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
public class Bug_for_jiangwei1 extends TestCase {
public void test_double() throws Exception {
JSONObject json = JSON.parseObject("{\"val\":12.3}");
Assert.assertEquals(12.3D, json.getDoubleValue("val"));
Assert.assertTrue(12.3D == json.getDoubleValue("val"));
}
public void test_JSONArray_double() throws Exception {
JSONArray json = JSON.parseArray("[12.3]");
Assert.assertEquals(12.3D, json.getDoubleValue(0));
Assert.assertTrue(12.3D == json.getDoubleValue(0));
}
}
src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_double.java
+4 -3
View File
@@ -4,10 +4,10 @@ import java.io.Reader;
import java.io.StringReader;
import java.util.List;
import org.junit.Assert;
import junit.framework.TestCase;
import com.alibaba.fastjson.JSONArray;
import org.junit.Assert;
import com.alibaba.fastjson.parser.DefaultJSONParser;
import com.alibaba.fastjson.parser.JSONReaderScanner;
@@ -31,8 +31,9 @@ public class JSONReaderScannerTest__entity_double extends TestCase {
DefaultJSONParser parser = new DefaultJSONParser(scanner);
List<VO> array = parser.parseArray(VO.class);
for (int i = 0; i < array.size(); ++i) {
Assert.assertEquals((double) i, array.get(i).getId());
Assert.assertTrue((double) i == array.get(i).getId());
}
parser.close();
}
public static class VO {
src/test/java/com/alibaba/json/bvt/parser/JSONReaderScannerTest__entity_float.java
+4 -3
View File
@@ -4,10 +4,10 @@ import java.io.Reader;
import java.io.StringReader;
import java.util.List;
import org.junit.Assert;
import junit.framework.TestCase;
import com.alibaba.fastjson.JSONArray;
import org.junit.Assert;
import com.alibaba.fastjson.parser.DefaultJSONParser;
import com.alibaba.fastjson.parser.JSONReaderScanner;
@@ -31,8 +31,9 @@ public class JSONReaderScannerTest__entity_float extends TestCase {
DefaultJSONParser parser = new DefaultJSONParser(scanner);
List<VO> array = parser.parseArray(VO.class);
for (int i = 0; i < array.size(); ++i) {
Assert.assertEquals((float) i, array.get(i).getId());
Assert.assertTrue((float) i == array.get(i).getId());
}
parser.close();
}
public static class VO {
src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldDouble.java
+6 -6
View File
@@ -11,37 +11,37 @@ public class JSONScannerTest_scanFieldDouble extends TestCase {
public void test_0() throws Exception {
String text = "{\"value\":1.0}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1D, obj.getValue());
Assert.assertTrue(1D == obj.getValue());
}
public void test_1() throws Exception {
String text = "{\"value\":\"1\"}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1D, obj.getValue());
Assert.assertTrue(1D == obj.getValue());
}
public void test_2() throws Exception {
String text = "{\"f1\":2,\"value\":1.0}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1D, obj.getValue());
Assert.assertTrue(1D == obj.getValue());
}
public void test_3() throws Exception {
String text = "{\"value\":1.01}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1.01D, obj.getValue());
Assert.assertTrue(1.01D == obj.getValue());
}
public void test_4() throws Exception {
String text = "{\"value\":1.}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1D, obj.getValue());
Assert.assertTrue(1D == obj.getValue());
}
public void test_5() throws Exception {
String text = "{\"value\":922337203685477580723}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(922337203685477580723D, obj.getValue());
Assert.assertTrue(922337203685477580723D == obj.getValue());
}
public void test_error_2() throws Exception {
src/test/java/com/alibaba/json/bvt/parser/JSONScannerTest_scanFieldFloat.java
+7 -6
View File
@@ -12,9 +12,10 @@ public class JSONScannerTest_scanFieldFloat extends TestCase {
public void test_0() throws Exception {
String text = "{\"value\":1.0}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1F, obj.getValue());
Assert.assertTrue(1F == obj.getValue());
}
@SuppressWarnings("resource")
public void test_isBlank() throws Exception {
String text = " {\"value\":1.0}";
Assert.assertTrue(!new JSONScanner(text).isBlankInput());
@@ -23,31 +24,31 @@ public class JSONScannerTest_scanFieldFloat extends TestCase {
public void test_1() throws Exception {
String text = "{\"value\":\"1\"}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1F, obj.getValue());
Assert.assertTrue(1F == obj.getValue());
}
public void test_2() throws Exception {
String text = "{\"f1\":2,\"value\":1.0}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1F, obj.getValue());
Assert.assertTrue(1F == obj.getValue());
}
public void test_3() throws Exception {
String text = "{\"value\":1.01}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1.01F, obj.getValue());
Assert.assertTrue(1.01F == obj.getValue());
}
public void test_4() throws Exception {
String text = "{\"value\":1.}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(1F, obj.getValue());
Assert.assertTrue(1F == obj.getValue());
}
public void test_error_1() throws Exception {
String text = "{\"value\":922337203685477580723}";
VO obj = JSON.parseObject(text, VO.class);
Assert.assertEquals(922337203685477580723F, obj.getValue());
Assert.assertTrue(922337203685477580723F == obj.getValue());
}
public void test_error_2() throws Exception {
src/test/java/com/alibaba/json/bvt/parser/deser/FactoryTest.java
+2 -2
View File
@@ -14,7 +14,7 @@ public class FactoryTest extends TestCase {
Assert.assertEquals(true, vo.isB());
Assert.assertEquals(33, vo.getI());
Assert.assertEquals(34L, vo.getL());
Assert.assertEquals(45f, vo.getF());
Assert.assertTrue(45f == vo.getF());
JSON.parseObject("{\"b\":1,\"i\":33,\"l\":34,\"f\":45.}", VO.class);
}
@@ -23,7 +23,7 @@ public class FactoryTest extends TestCase {
Assert.assertEquals(true, vo.isB());
Assert.assertEquals(33, vo.getI());
Assert.assertEquals(34L, vo.getL());
Assert.assertEquals(45f, vo.getF());
Assert.assertTrue(45f == vo.getF());
JSON.parseObject("{\"b\":1,\"i\":33,\"l\":34,\"f\":45.}", V1.class);
}
src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_double.java
+1 -1
View File
@@ -12,7 +12,7 @@ public class TestASM_double extends TestCase {
String text = JSON.toJSONString(v);
V0 v1 = JSON.parseObject(text, V0.class);
Assert.assertEquals(v.getValue(), v1.getValue());
Assert.assertTrue(v.getValue() == v1.getValue());
}
public static class V0 {
src/test/java/com/alibaba/json/bvt/parser/deser/TestASM_float.java
+3 -2
View File
@@ -1,8 +1,9 @@
package com.alibaba.json.bvt.parser.deser;
import org.junit.Assert;
import junit.framework.TestCase;
import org.junit.Assert;
import com.alibaba.fastjson.JSON;
public class TestASM_float extends TestCase {
@@ -12,7 +13,7 @@ public class TestASM_float extends TestCase {
String text = JSON.toJSONString(v);
V0 v1 = JSON.parseObject(text, V0.class);
Assert.assertEquals(v.getValue(), v1.getValue());
Assert.assertTrue(v.getValue() == v1.getValue());
}
public static class V0 {
src/test/java/com/alibaba/json/bvt/serializer/DoubleTest.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class DoubleTest extends TestCase {
VO vo1 = JSON.parseObject(text, VO.class);
Assert.assertEquals(vo.getF1(), vo1.getF1());
Assert.assertEquals(vo.getF2(), vo1.getF2());
Assert.assertTrue(vo.getF2() == vo1.getF2());
Assert.assertEquals(vo.getF3(), vo1.getF3());
}