You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2011/04/15 02:45:17 UTC
svn commit: r1092556 - in
/pivot/trunk/core/test/org/apache/pivot/beans/test: BeanAdapterTest.java
BeanAdapterTestObject.java
Author: smartini
Date: Fri Apr 15 00:45:16 2011
New Revision: 1092556
URL: http://svn.apache.org/viewvc?rev=1092556&view=rev
Log:
JUnit Test case for PIVOT-704, refactoring and add other tests
Modified:
pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTest.java
pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTestObject.java
Modified: pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTest.java?rev=1092556&r1=1092555&r2=1092556&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTest.java Fri Apr 15 00:45:16 2011
@@ -22,6 +22,7 @@ import static org.junit.Assert.fail;
import java.io.StringReader;
import java.io.StringWriter;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.math.MathContext;
import java.util.Random;
@@ -34,8 +35,13 @@ import org.junit.Test;
public class BeanAdapterTest {
- private static Random rnd = null;
+ private static Random rnd;
+ BeanAdapterTestObject src_test;
+ JSONSerializer jsonSerializer;
+ StringWriter writer;
+ StringReader reader;
+ BeanAdapterTestObject target_test;
@BeforeClass
public static void setUpClass() throws Exception {
@@ -49,38 +55,112 @@ public class BeanAdapterTest {
@Before
public void setUp() {
+ src_test = new BeanAdapterTestObject();
+ jsonSerializer = new JSONSerializer(BeanAdapterTestObject.class);
+ writer = new StringWriter();
}
@After
public void tearDown() {
+ src_test = null;
+ jsonSerializer = null;
+ writer = null;
+ reader = null;
+ target_test = null;
}
@Test
public void testSerializeBigDecimal()
{
+ System.out.println("testSerializeBigDecimal");
+
double random_double = rnd.nextDouble();
System.out.println("random_double = " + random_double);
- BeanAdapterTestObject src_test = new BeanAdapterTestObject();
- src_test.setBd1(new BigDecimal(random_double, new MathContext(4)));
+ src_test.setBd(new BigDecimal(random_double, new MathContext(4)));
+
+ try {
+ jsonSerializer.writeObject(src_test, writer);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ return;
+ }
+
+ System.out.println("json string from src_test = " + writer.toString());
+ System.out.println("src_test.getBd() = " + src_test.getBd());
+
+ reader = new StringReader(writer.toString());
+
+ try {
+ target_test = (BeanAdapterTestObject) jsonSerializer.readObject(reader);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ return;
+ }
+
+ System.out.println("target_test.getBd() = " + target_test.getBd());
+ assertEquals(src_test.getBd(), target_test.getBd());
+ }
+
+ @Test
+ public void testSerializeBigInteger()
+ {
+ System.out.println("testSerializeBigInteger");
+
+ int random_int = rnd.nextInt();
+ System.out.println("random_int = " + random_int);
+
+ src_test.setBi(new BigInteger(String.valueOf(random_int)));
+
+ try {
+ jsonSerializer.writeObject(src_test, writer);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ return;
+ }
+
+ System.out.println("json string from src_test = " + writer.toString());
+ System.out.println("src_test.getBi() = " + src_test.getBi());
+
+ reader = new StringReader(writer.toString());
+
+ try {
+ target_test = (BeanAdapterTestObject) jsonSerializer.readObject(reader);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ return;
+ }
+
+ System.out.println("target_test.getBi() = " + target_test.getBi());
+ assertEquals(src_test.getBi(), target_test.getBi());
+ }
+
+ @Test
+ public void testSerializeString()
+ {
+ System.out.println("testSerializeString");
+
+ String value = "A test String";
+ System.out.println("value = \"" + value + "\"");
- Object object = src_test;
- JSONSerializer jsonSerializer = new JSONSerializer(BeanAdapterTestObject.class);
- StringWriter writer = new StringWriter();
+ src_test.setString(value);
try {
- jsonSerializer.writeObject(object, writer);
+ jsonSerializer.writeObject(src_test, writer);
} catch (Exception e) {
e.printStackTrace();
fail();
return;
}
- System.out.println("s = " + writer.toString());
- System.out.println("src_test.getBd1() = " + src_test.getBd1());
+ System.out.println("json string from src_test = " + writer.toString());
+ System.out.println("src_test.getString() = \"" + src_test.getString() + "\"");
- StringReader reader = new StringReader(writer.toString());
- BeanAdapterTestObject target_test;
+ reader = new StringReader(writer.toString());
try {
target_test = (BeanAdapterTestObject) jsonSerializer.readObject(reader);
@@ -90,8 +170,8 @@ public class BeanAdapterTest {
return;
}
- System.out.println("target_test.getBd1() = " + target_test.getBd1());
- assertEquals(src_test.getBd1(), target_test.getBd1());
+ System.out.println("target_test.getString() = " + target_test.getString());
+ assertEquals(src_test.getString(), target_test.getString());
}
}
Modified: pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTestObject.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTestObject.java?rev=1092556&r1=1092555&r2=1092556&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTestObject.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/beans/test/BeanAdapterTestObject.java Fri Apr 15 00:45:16 2011
@@ -17,17 +17,36 @@
package org.apache.pivot.beans.test;
import java.math.BigDecimal;
+import java.math.BigInteger;
public class BeanAdapterTestObject {
- private BigDecimal bd1;
+ private BigDecimal bd;
+ private BigInteger bi;
+ private String string;
- public BigDecimal getBd1() {
- return bd1;
+ public BigDecimal getBd() {
+ return bd;
}
- public void setBd1(BigDecimal bd1) {
- this.bd1 = bd1;
+ protected BigInteger getBi() {
+ return bi;
+ }
+
+ protected void setBi(BigInteger bi) {
+ this.bi = bi;
+ }
+
+ protected void setBd(BigDecimal bd) {
+ this.bd = bd;
+ }
+
+ protected String getString() {
+ return string;
+ }
+
+ protected void setString(String string) {
+ this.string = string;
}
}