You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2017/05/26 20:19:35 UTC
svn commit: r1796337 - in /pivot/trunk: core/test/org/apache/pivot/json/test/
demos/src/org/apache/pivot/demos/rest/ tests/src/org/apache/pivot/tests/
Author: rwhitcomb
Date: Fri May 26 20:19:35 2017
New Revision: 1796337
URL: http://svn.apache.org/viewvc?rev=1796337&view=rev
Log:
In preparation for switching to Java 8 for "trunk" builds, fix a couple
of the core tests that were failing in this configuration due to stricter
type checking with the JUnit methods.
In particular, use "(Integer)" casts where there was a conflict between
the (Object, Object) and (long, long) "assertEquals" methods. Also
add casts on a couple other tests that were in conflict in other
ways.
Modified:
pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java
pivot/trunk/core/test/org/apache/pivot/json/test/JSONSerializerTest.java
pivot/trunk/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/NamespaceTest.java
Modified: pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java?rev=1796337&r1=1796336&r2=1796337&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/json/test/BindTest.java Fri May 26 20:19:35 2017
@@ -71,7 +71,7 @@ public class BindTest {
Object item0 = typedList.get(0);
assertTrue(item0 instanceof SampleBean2);
- assertEquals(typedList.get(0).getA(), JSON.get(list, "[0].a"));
+ assertEquals((Integer)typedList.get(0).getA(), (Integer)JSON.get(list, "[0].a"));
}
/**
@@ -94,7 +94,7 @@ public class BindTest {
Object item0 = typedList.get(0);
assertTrue(item0 instanceof SampleBean2);
- assertEquals(typedList.get(0).getA(), JSON.get(list, "[0].a"));
+ assertEquals((Integer)typedList.get(0).getA(), (Integer)JSON.get(list, "[0].a"));
}
/**
@@ -118,7 +118,7 @@ public class BindTest {
Object item0 = sequence.get(0);
assertNotNull(item0);
// assertTrue(item0 instanceof SampleBean2); // true but superfluous
- assertEquals(sequence.get(0).getA(), JSON.get(list, "[0].a"));
+ assertEquals((Integer)sequence.get(0).getA(), (Integer)JSON.get(list, "[0].a"));
}
/**
@@ -212,15 +212,15 @@ public class BindTest {
SampleBean1 typedMap = (SampleBean1) beanSerializer.readObject(getClass().getResourceAsStream(
"map.json"));
- assertEquals(typedMap.getA(), JSON.get(map, "a"));
+ assertEquals((Integer)typedMap.getA(), (Integer)JSON.get(map, "a"));
assertEquals(typedMap.getB(), JSON.get(map, "b"));
assertEquals(typedMap.getC(), JSON.get(map, "c"));
assertEquals(typedMap.getD(), JSON.get(map, "d"));
assertEquals(typedMap.getE(), JSON.get(map, "e"));
- assertEquals(typedMap.getI().getA(), JSON.get(map, "i.a"));
+ assertEquals((Integer)typedMap.getI().getA(), (Integer)JSON.get(map, "i.a"));
Object k0 = typedMap.getK().get(0);
assertTrue(k0 instanceof SampleBean2);
- assertEquals(typedMap.getK().get(0).getA(), JSON.get(map, "k[0].a"));
+ assertEquals((Integer)typedMap.getK().get(0).getA(), (Integer)JSON.get(map, "k[0].a"));
}
}
Modified: pivot/trunk/core/test/org/apache/pivot/json/test/JSONSerializerTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/json/test/JSONSerializerTest.java?rev=1796337&r1=1796336&r2=1796337&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/json/test/JSONSerializerTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/json/test/JSONSerializerTest.java Fri May 26 20:19:35 2017
@@ -133,21 +133,22 @@ public class JSONSerializerTest {
jsonSerializer.getJSONSerializerListeners().add(jsonSerializerListener);
Object o1 = jsonSerializer.readObject(getClass().getResourceAsStream("map.json"));
- assertEquals(JSON.get(o1, "a"), 100);
+
+ assertEquals((Integer)JSON.get(o1, "a"), (Integer)100);
assertEquals(JSON.get(o1, "b"), "Hello");
assertEquals(JSON.get(o1, "c"), false);
- assertEquals(JSON.get(o1, "e.g"), 5);
- assertEquals(JSON.get(o1, "i.a"), 200);
+ assertEquals((Integer)JSON.get(o1, "e.g"), (Integer)5);
+ assertEquals((Integer)JSON.get(o1, "i.a"), (Integer)200);
assertEquals(JSON.get(o1, "i.c"), true);
assertEquals(JSON.get(o1, "m"), "Hello\r\n\tWorld!");
jsonSerializer.getJSONSerializerListeners().remove(jsonSerializerListener);
Object o2 = jsonSerializer.readObject(getClass().getResourceAsStream("map.json"));
- assertEquals(JSON.get(o2, "k[1].a"), 10);
- assertEquals(JSON.get(o2, "k[2].a"), 100);
- assertEquals(JSON.get(o2, "k[2].b"), 200);
+ assertEquals((Integer)JSON.get(o2, "k[1].a"), (Integer)10);
+ assertEquals((Integer)JSON.get(o2, "k[2].a"), (Integer)100);
+ assertEquals((Integer)JSON.get(o2, "k[2].b"), (Integer)200);
assertEquals(JSON.get(o2, "k[2].c"), "300");
- assertEquals(JSON.get(o2, "j"), 200);
+ assertEquals((Integer)JSON.get(o2, "j"), (Integer)200);
assertEquals(JSON.get(o2, "n"), "This is a \"test\" of the 'quoting' in \\JSON\\");
assertTrue(o1.equals(o2));
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java?rev=1796337&r1=1796336&r2=1796337&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/rest/RESTDemoTest.java Fri May 26 20:19:35 2017
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.demos.rest;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -66,7 +67,7 @@ public class RESTDemoTest {
GetQuery getQuery = new GetQuery(hostname, port, path, secure);
Object result = getQuery.execute();
- assertEquals(JSON.get(contact, "address.street"), JSON.get(result, "address.street"));
+ assertArrayEquals((Object[])JSON.get(contact, "address.street"), (Object[])JSON.get(result, "address.street"));
assertEquals(contact, result);
// Update
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/NamespaceTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/NamespaceTest.java?rev=1796337&r1=1796336&r2=1796337&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/NamespaceTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/NamespaceTest.java Fri May 26 20:19:35 2017
@@ -31,8 +31,8 @@ public class NamespaceTest extends Appli
public void startup(Display display, Map<String, String> properties) throws Exception {
BXMLSerializer bxmlSerializer = new BXMLSerializer();
window = (Window) bxmlSerializer.readObject(NamespaceTest.class, "namespace_test.bxml");
- System.out.println(JSON.get(bxmlSerializer.getNamespace(), "content.text"));
- System.out.println(JSON.get(bxmlSerializer.getNamespace(), "content['text']"));
+ System.out.println((String)JSON.get(bxmlSerializer.getNamespace(), "content.text"));
+ System.out.println((String)JSON.get(bxmlSerializer.getNamespace(), "content['text']"));
window.open(display);
}