Removed comments on previously failing asserts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/61d3f3a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/61d3f3a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/61d3f3a9 Branch: refs/heads/master Commit: 61d3f3a9c1d89d466c23938c834b099aa875cdad Parents: e52628c Author: Peter Haumer <[email protected]> Authored: Wed Aug 3 16:13:19 2016 -0700 Committer: Peter Haumer <[email protected]> Committed: Wed Aug 3 16:13:19 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/juneau/CT_Visibility.java | 4 +- .../java/org/apache/juneau/html/CT_Common.java | 24 +++++------ .../java/org/apache/juneau/jena/CT_Rdf.java | 6 +-- .../org/apache/juneau/utils/CT_PojoQuery.java | 44 ++++++++++---------- 4 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/61d3f3a9/org.apache.juneau/src/test/java/org/apache/juneau/CT_Visibility.java ---------------------------------------------------------------------- diff --git a/org.apache.juneau/src/test/java/org/apache/juneau/CT_Visibility.java b/org.apache.juneau/src/test/java/org/apache/juneau/CT_Visibility.java index 049b15c..f72ea51 100755 --- a/org.apache.juneau/src/test/java/org/apache/juneau/CT_Visibility.java +++ b/org.apache.juneau/src/test/java/org/apache/juneau/CT_Visibility.java @@ -118,7 +118,7 @@ public class CT_Visibility { assertEquals("{f1:1,f2:2,f3:3,f4:4,a2:{f1:1,f2:2,f3:3,f4:4,f5:5},a3:{f1:1,f2:2,f3:3,f4:4,f5:5},a4:{f1:1,f2:2,f3:3,f4:4,f5:5},a5:'A5',f5:5}", r); r = s4.serialize(a1); - // TODO: assertEquals("{f1:1,f2:2,f3:3,f4:4,a2:{f1:1,f2:2,f3:3,f4:4,f5:5},a3:{f1:1,f2:2,f3:3,f4:4,f5:5},a4:{f1:1,f2:2,f3:3,f4:4,f5:5},a5:{f1:1,f2:2,f3:3,f4:4,f5:5},f5:5}", r); + assertEquals("{f1:1,f2:2,f3:3,f4:4,a2:{f1:1,f2:2,f3:3,f4:4,f5:5},a3:{f1:1,f2:2,f3:3,f4:4,f5:5},a4:{f1:1,f2:2,f3:3,f4:4,f5:5},a5:{f1:1,f2:2,f3:3,f4:4,f5:5},f5:5}", r); s1.setProperty(BEAN_methodVisibility, NONE); s2.setProperty(BEAN_methodVisibility, NONE); @@ -143,7 +143,7 @@ public class CT_Visibility { s4.setProperty(BEAN_methodVisibility, PROTECTED); r = s1.serialize(a1); - // TODO: fails with Java 8: assertEquals("{f1:1,f2:2,f3:3,f4:4,a2:{f1:1,f2:2,f3:3,f4:4,f5:5,f6:6},a3:'A3',a4:'A4',a5:'A5',f5:5,f6:6}", r); + assertEquals("{f1:1,f2:2,f3:3,f4:4,a2:{f1:1,f2:2,f3:3,f4:4,f5:5,f6:6},a3:'A3',a4:'A4',a5:'A5',f5:5,f6:6}", r); r = s2.serialize(a1); assertEquals("{f1:1,f2:2,f3:3,f4:4,a2:{f1:1,f2:2,f3:3,f4:4,f5:5,f6:6},a3:{f1:1,f2:2,f3:3,f4:4,f5:5,f6:6},a4:'A4',a5:'A5',f5:5,f6:6}", r); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/61d3f3a9/org.apache.juneau/src/test/java/org/apache/juneau/html/CT_Common.java ---------------------------------------------------------------------- diff --git a/org.apache.juneau/src/test/java/org/apache/juneau/html/CT_Common.java b/org.apache.juneau/src/test/java/org/apache/juneau/html/CT_Common.java index db3115e..d6d9197 100755 --- a/org.apache.juneau/src/test/java/org/apache/juneau/html/CT_Common.java +++ b/org.apache.juneau/src/test/java/org/apache/juneau/html/CT_Common.java @@ -110,15 +110,15 @@ public class CT_Common { s.setProperty(SERIALIZER_trimEmptyLists, false); r = s.serialize(t1); - // TODO: fail with Java 8: assertEquals("<table type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>f1</string></td><td><ul></ul></td></tr><tr><td><string>f2</string></td><td><table type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td><string>s2</string></td></tr></table></td></tr></table>", r); - //t2 = p.parse(r, C.class); - //assertEqualObjects(t1, t2); + assertEquals("<table type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>f1</string></td><td><ul></ul></td></tr><tr><td><string>f2</string></td><td><table type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td><string>s2</string></td></tr></table></td></tr></table>", r); + t2 = p.parse(r, C.class); + assertEqualObjects(t1, t2); s.setProperty(SERIALIZER_trimEmptyLists, true); r = s.serialize(t1); - // TODO: fail with Java 8: assertEquals("<table type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>f2</string></td><td><table type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td><string>s2</string></td></tr></table></td></tr></table>", r); - // t2 = p.parse(r, C.class); - // assertNull(t2.f1); + assertEquals("<table type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>f2</string></td><td><table type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td><string>s2</string></td></tr></table></td></tr></table>", r); + t2 = p.parse(r, C.class); + assertNull(t2.f1); } public static class C { @@ -144,15 +144,15 @@ public class CT_Common { s.setProperty(SERIALIZER_trimEmptyLists, false); r = s.serialize(t1); - // TODO: fail with Java 8: assertEquals("<table type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>f1</string></td><td><ul></ul></td></tr><tr><td><string>f2</string></td><td><table type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td><string>s2</string></td></tr></table></td></tr></table>", r); - //t2 = p.parse(r, D.class); - //assertEqualObjects(t1, t2); + assertEquals("<table type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>f1</string></td><td><ul></ul></td></tr><tr><td><string>f2</string></td><td><table type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td><string>s2</string></td></tr></table></td></tr></table>", r); + t2 = p.parse(r, D.class); + assertEqualObjects(t1, t2); s.setProperty(SERIALIZER_trimEmptyLists, true); r = s.serialize(t1); - // TODO: fail with Java 8: assertEquals("<table type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>f2</string></td><td><table type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td><string>s2</string></td></tr></table></td></tr></table>", r); - //t2 = p.parse(r, D.class); - //assertNull(t2.f1); + assertEquals("<table type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>f2</string></td><td><table type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td><string>s2</string></td></tr></table></td></tr></table>", r); + t2 = p.parse(r, D.class); + assertNull(t2.f1); } public static class D { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/61d3f3a9/org.apache.juneau/src/test/java/org/apache/juneau/jena/CT_Rdf.java ---------------------------------------------------------------------- diff --git a/org.apache.juneau/src/test/java/org/apache/juneau/jena/CT_Rdf.java b/org.apache.juneau/src/test/java/org/apache/juneau/jena/CT_Rdf.java index 18114c1..54ca8b8 100755 --- a/org.apache.juneau/src/test/java/org/apache/juneau/jena/CT_Rdf.java +++ b/org.apache.juneau/src/test/java/org/apache/juneau/jena/CT_Rdf.java @@ -548,7 +548,7 @@ public class CT_Rdf { + "\n <jp:f3 resource='http://localhost/f3/1'/>" + "\n </rdf:Description>" + "\n</rdf:RDF>"; - // TODO: fails with Java 8: assertXmlEquals(expected, rdfXml); + // TODO: https://issues.apache.org/jira/browse/JUNEAU-2 assertXmlEquals(expected, rdfXml); l = p.parseCollection(rdfXml, LinkedList.class, D.class); D[] da = l.toArray(new D[l.size()]); @@ -564,7 +564,7 @@ public class CT_Rdf { + "\n <jp:f3 resource='http://localhost/f3/1'/>" + "\n </rdf:Description>" + "\n</rdf:RDF>"; - // TODO: fails with Java 8: assertXmlEquals(expected, rdfXml); + // TODO: https://issues.apache.org/jira/browse/JUNEAU-2 assertXmlEquals(expected, rdfXml); da = p.parse(rdfXml, D[].class); rdfXml = s.serialize(da); @@ -579,7 +579,7 @@ public class CT_Rdf { + "\n <jp:f3 resource='http://localhost/f3/1'/>" + "\n </rdf:Description>" + "\n</rdf:RDF>"; - // TODO: fails with Java 8: assertXmlEquals(expected, rdfXml); + // TODO: https://issues.apache.org/jira/browse/JUNEAU-2assertXmlEquals(expected, rdfXml); } public static class D { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/61d3f3a9/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_PojoQuery.java ---------------------------------------------------------------------- diff --git a/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_PojoQuery.java b/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_PojoQuery.java index 62b935c..bfb98af 100755 --- a/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_PojoQuery.java +++ b/org.apache.juneau/src/test/java/org/apache/juneau/utils/CT_PojoQuery.java @@ -404,19 +404,19 @@ public class CT_PojoQuery { view = new ObjectList("['f1']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fails with Java 8: assertObjectEquals("[{f1:'foo'},{f1:'bar'},{f1:'baz'}]", results); + assertObjectEquals("[{f1:'foo'},{f1:'bar'},{f1:'baz'}]", results); view = new ObjectList("['f2']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertObjectEquals("[{f2:1},{f2:2},{f2:3}]", results); + assertObjectEquals("[{f2:1},{f2:2},{f2:3}]", results); view = new ObjectList("['f3']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertObjectEquals("[{f3:true},{f3:false},{f3:true}]", results); + assertObjectEquals("[{f3:true},{f3:false},{f3:true}]", results); view = new ObjectList("['f3','f2','f1']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertObjectEquals("[{f3:true,f2:1,f1:'foo'},{f3:false,f2:2,f1:'bar'},{f3:true,f2:3,f1:'baz'}]", results); + assertObjectEquals("[{f3:true,f2:1,f1:'foo'},{f3:false,f2:2,f1:'bar'},{f3:true,f2:3,f1:'baz'}]", results); } public class E { @@ -457,15 +457,15 @@ public class CT_PojoQuery { view = new ObjectList("['f1']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fails with Java 8: assertObjectEquals("[{f1:'foo'},{f1:'bar'},{f1:'baz'}]", results); + assertObjectEquals("[{f1:'foo'},{f1:'bar'},{f1:'baz'}]", results); view = new ObjectList("[{f2:['f1']}]"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertObjectEquals("[{f2:{f1:'f2_foo'}},{f2:{f1:'f2_bar'}},{f2:{f1:'f2_baz'}}]", results); + assertObjectEquals("[{f2:{f1:'f2_foo'}},{f2:{f1:'f2_bar'}},{f2:{f1:'f2_baz'}}]", results); view = new ObjectList("['f1',{f3:['f1']}]"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertObjectEquals("[{f1:'foo',f3:[{f1:'f31_foo'},{f1:'f32_foo'}]},{f1:'bar',f3:[{f1:'f31_bar'},{f1:'f32_bar'}]},{f1:'baz',f3:[{f1:'f31_baz'},{f1:'f32_baz'}]}]", results); + assertObjectEquals("[{f1:'foo',f3:[{f1:'f31_foo'},{f1:'f32_foo'}]},{f1:'bar',f3:[{f1:'f31_bar'},{f1:'f32_bar'}]},{f1:'baz',f3:[{f1:'f31_baz'},{f1:'f32_baz'}]}]", results); } public class F1 { @@ -511,15 +511,15 @@ public class CT_PojoQuery { view = new ObjectList("['f1']"); results = filter.filterMap(view); - // TODO: fail with Java 8: assertObjectEquals("{f1:'foo'}", results); + assertObjectEquals("{f1:'foo'}", results); view = new ObjectList("['f2']"); results = filter.filterMap(view); - // TODO: fail with Java 8: assertObjectEquals("{f2:1}", results); + assertObjectEquals("{f2:1}", results); view = new ObjectList("['f3','f1']"); results = filter.filterMap(view); - // TODO: fail with Java 8: assertObjectEquals("{f3:true,f1:'foo'}", results); + assertObjectEquals("{f3:true,f1:'foo'}", results); } public class G { @@ -551,15 +551,15 @@ public class CT_PojoQuery { view = new ObjectList("['f1']"); results = filter.filterMap(view); - // TODO: fail with Java 8: assertObjectEquals("{f1:'foo'}", results); + assertObjectEquals("{f1:'foo'}", results); view = new ObjectList("[{f2:['f1']}]"); results = filter.filterMap(view); - // TODO: fail with Java 8: assertObjectEquals("{f2:{f1:'f2_foo'}}", results); + assertObjectEquals("{f2:{f1:'f2_foo'}}", results); view = new ObjectList("['f1',{f3:['f1']}]"); results = filter.filterMap(view); - // TODO: fail with Java 8: assertObjectEquals("{f1:'foo',f3:[{f1:'f31_foo'},{f1:'f32_foo'}]}", results); + assertObjectEquals("{f1:'foo',f3:[{f1:'f31_foo'},{f1:'f32_foo'}]}", results); } public class H1 { @@ -617,49 +617,49 @@ public class CT_PojoQuery { sort = new ObjectList("['f2']"); view = new ObjectList("['f1','f2']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:2,f2:'bar'},{f1:3,f2:'baz'},{f1:1,f2:'foo'}]", s.serialize(results)); + assertEquals("[{f1:2,f2:'bar'},{f1:3,f2:'baz'},{f1:1,f2:'foo'}]", s.serialize(results)); sort = new ObjectList("[{f2:'d'}]"); view = new ObjectList("['f1','f2']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:1,f2:'foo'},{f1:3,f2:'baz'},{f1:2,f2:'bar'}]", s.serialize(results)); + assertEquals("[{f1:1,f2:'foo'},{f1:3,f2:'baz'},{f1:2,f2:'bar'}]", s.serialize(results)); sort = new ObjectList("['f3']"); view = new ObjectList("['f1','f3']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:2,f3:false},{f1:1,f3:true},{f1:3,f3:true}]", s.serialize(results)); + assertEquals("[{f1:2,f3:false},{f1:1,f3:true},{f1:3,f3:true}]", s.serialize(results)); sort = new ObjectList("['f3',{f1:'a'}]"); view = new ObjectList("['f1','f3']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:2,f3:false},{f1:1,f3:true},{f1:3,f3:true}]", s.serialize(results)); + assertEquals("[{f1:2,f3:false},{f1:1,f3:true},{f1:3,f3:true}]", s.serialize(results)); sort = new ObjectList("['f3',{f1:'d'}]"); view = new ObjectList("['f1','f3']"); results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:2,f3:false},{f1:3,f3:true},{f1:1,f3:true}]", s.serialize(results)); + assertEquals("[{f1:2,f3:false},{f1:3,f3:true},{f1:1,f3:true}]", s.serialize(results)); sort = new ObjectList("['f1']"); view = new ObjectList("['f1']"); limit = 1; pos = 0; results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:1}]", s.serialize(results)); + assertEquals("[{f1:1}]", s.serialize(results)); limit = 3; pos = 0; results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:1},{f1:2},{f1:3}]", s.serialize(results)); + assertEquals("[{f1:1},{f1:2},{f1:3}]", s.serialize(results)); limit = 1; pos = 2; results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:3}]", s.serialize(results)); + assertEquals("[{f1:3}]", s.serialize(results)); limit = 100; pos = 2; results = filter.filterCollection(query, view, sort, pos, limit, ignoreCase); - // TODO: fail with Java 8: assertEquals("[{f1:3}]", s.serialize(results)); + assertEquals("[{f1:3}]", s.serialize(results)); } public class I {
