svn commit: r1394859 - in /pivot/branches/2.0.x: ./ core/test/org/apache/pivot/json/test/JSONSerializerTest.java

[rwhitcomb]

Author: rwhitcomb
Date: Fri Oct  5 23:22:06 2012
New Revision: 1394859

URL: http://svn.apache.org/viewvc?rev=1394859&view=rev
Log:
Related to change for Pivot-875:  Change JSONSerializerTest to query
something besides the "count" because this will no longer retrieve
the actual Map object's "getCount" field.  So, do another field
that is in the "map.json" file.

This is a merge from trunk of revision 1394858.

Modified:
    pivot/branches/2.0.x/   (props changed)
    
pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/JSONSerializerTest.java

Propchange: pivot/branches/2.0.x/
------------------------------------------------------------------------------
  Merged /pivot/trunk:r1394858

Modified: 
pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/JSONSerializerTest.java
URL: 
http://svn.apache.org/viewvc/pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/JSONSerializerTest.java?rev=1394859&r1=1394858&r2=1394859&view=diff
==============================================================================
--- 
pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/JSONSerializerTest.java
 (original)
+++ 
pivot/branches/2.0.x/core/test/org/apache/pivot/json/test/JSONSerializerTest.java
 Fri Oct  5 23:22:06 2012
@@ -132,7 +132,7 @@ public class JSONSerializerTest {
 
         
jsonSerializer.getJSONSerializerListeners().add(jsonSerializerListener);
         Object o1 = 
jsonSerializer.readObject(getClass().getResourceAsStream("map.json"));
-        assertEquals(JSON.get(o1, "count"), 8);
+        assertEquals(JSON.get(o1, "e.g"), 5);
 
         
jsonSerializer.getJSONSerializerListeners().remove(jsonSerializerListener);
         Object o2 = 
jsonSerializer.readObject(getClass().getResourceAsStream("map.json"));