You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2020/06/25 22:02:37 UTC
[juneau] branch master updated: Tests
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 24c8aa7 Tests
24c8aa7 is described below
commit 24c8aa72bd8fc6f81f4a0b5fd629d68b5b81eb74
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Thu Jun 25 18:02:31 2020 -0400
Tests
---
.../test/java/org/apache/juneau/ComboInput.java | 5 +
.../java/org/apache/juneau/ComboRoundTripTest.java | 10 +
.../java/org/apache/juneau/DynaBeanComboTest.java | 18 +-
.../org/apache/juneau/a/rttests/RoundTripTest.java | 6 +-
.../apache/juneau/dto/html5/Html5ComboTest.java | 382 ++++++++--------
.../juneau/dto/html5/Html5TemplateComboTest.java | 4 +-
.../java/org/apache/juneau/html/BasicHtmlTest.java | 11 +-
.../java/org/apache/juneau/jena/RdfParserTest.java | 3 +-
.../test/java/org/apache/juneau/jena/RdfTest.java | 24 +-
.../org/apache/juneau/testutils/TestUtils.java | 234 ----------
.../testutils/{TestUtils.java => XmlUtils.java} | 505 +++++++++------------
.../juneau/transforms/BeanDictionaryComboTest.java | 50 +-
.../apache/juneau/transforms/BuilderComboTest.java | 26 +-
.../transforms/ByteArrayBase64SwapComboTest.java | 30 +-
.../juneau/transforms/CalendarSwapComboTest.java | 38 +-
.../juneau/transforms/DateSwapComboTest.java | 38 +-
.../java/org/apache/juneau/xml/CommonTest.java | 4 +-
.../java/org/apache/juneau/xml/CommonXmlTest.java | 4 +-
.../org/apache/juneau/xml/XmlCollapsedTest.java | 22 +-
.../test/java/org/apache/juneau/xml/XmlTest.java | 74 +--
.../java/org/apache/juneau/assertions/Verify.java | 117 +++++
21 files changed, 722 insertions(+), 883 deletions(-)
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboInput.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboInput.java
index bb88265..5bd969f 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboInput.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboInput.java
@@ -62,6 +62,11 @@ public class ComboInput<T> {
return this;
}
+ public ComboInput<T> verify(Predicate<T> verify, String msg, Object...args) {
+ this.verify.add(x -> verify.test(x) ? null : StringUtils.format(msg, args));
+ return this;
+ }
+
public ComboInput<T> swaps(Class<?>...c) {
this.swaps.addAll(Arrays.asList(c));
return this;
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
index b55b656..b458d4b 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
@@ -17,6 +17,7 @@ import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.StringAssertion.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
+import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.collections.*;
@@ -38,6 +39,8 @@ import org.junit.*;
@SuppressWarnings({"unchecked","rawtypes"})
public abstract class ComboRoundTripTest {
+ private static final BeanSession BEANSESSION = BeanContext.DEFAULT.createSession();
+
private final ComboInput comboInput;
private Map<Serializer,Serializer> serializerMap = new IdentityHashMap<>();
@@ -47,6 +50,13 @@ public abstract class ComboRoundTripTest {
this.comboInput = comboInput;
}
+ /**
+ * Creates a ClassMeta for the given types.
+ */
+ public static final Type getType(Type type, Type...args) {
+ return BEANSESSION.getClassMeta(type, args);
+ }
+
private Serializer getSerializer(Serializer s) throws Exception {
Serializer s2 = serializerMap.get(s);
if (s2 == null) {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DynaBeanComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DynaBeanComboTest.java
index f6b7cf7..fb922e7 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DynaBeanComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/DynaBeanComboTest.java
@@ -12,7 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.testutils.TestUtils.*;
+import static org.apache.juneau.assertions.Verify.*;
import java.util.*;
@@ -61,7 +61,7 @@ public class DynaBeanComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f1>1</jp:f1>\n<jp:f2a>a</jp:f2a>\n<jp:f2b>b</jp:f2b>\n<jp:f3>3</jp:f3>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f1>1</jp:f1>\n<jp:f2a>a</jp:f2a>\n<jp:f2b>b</jp:f2b>\n<jp:f3>3</jp:f3>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f1>1</jp:f1>\n <jp:f2a>a</jp:f2a>\n <jp:f2b>b</jp:f2b>\n <jp:f3>3</jp:f3>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithDynaField.class, x))
+ .verify(x -> verify(x).isType(BeanWithDynaField.class))
},
{ /* 1 */
new ComboInput<BeanWithDynaMethods>(
@@ -90,7 +90,7 @@ public class DynaBeanComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f1>1</jp:f1>\n<jp:f2a>a</jp:f2a>\n<jp:f2b>b</jp:f2b>\n<jp:f3>3</jp:f3>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f1>1</jp:f1>\n<jp:f2a>a</jp:f2a>\n<jp:f2b>b</jp:f2b>\n<jp:f3>3</jp:f3>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f1>1</jp:f1>\n <jp:f2a>a</jp:f2a>\n <jp:f2b>b</jp:f2b>\n <jp:f3>3</jp:f3>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithDynaMethods.class, x))
+ .verify(x -> verify(x).isType(BeanWithDynaMethods.class))
.verify(x -> x.setterCalled ? null : "Setter not called")
},
{ /* 2 */
@@ -120,7 +120,7 @@ public class DynaBeanComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f1>1</jp:f1>\n<jp:f2a>a</jp:f2a>\n<jp:f2b>b</jp:f2b>\n<jp:f3>3</jp:f3>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f1>1</jp:f1>\n<jp:f2a>a</jp:f2a>\n<jp:f2b>b</jp:f2b>\n<jp:f3>3</jp:f3>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f1>1</jp:f1>\n <jp:f2a>a</jp:f2a>\n <jp:f2b>b</jp:f2b>\n <jp:f3>3</jp:f3>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithDynaGetterOnly.class, x))
+ .verify(x -> verify(x).isType(BeanWithDynaGetterOnly.class))
},
{ /* 3 */
new ComboInput<BeanWithDynaFieldSwapped>(
@@ -149,8 +149,8 @@ public class DynaBeanComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f1a>1901-03-03T18:11:12Z</jp:f1a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f1a>1901-03-03T18:11:12Z</jp:f1a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f1a>1901-03-03T18:11:12Z</jp:f1a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithDynaFieldSwapped.class, x))
- .verify(x -> verifyInstanceOf(Calendar.class, x.f1.get("f1a")))
+ .verify(x -> verify(x).isType(BeanWithDynaFieldSwapped.class))
+ .verify(x -> verify(x.f1.get("f1a")).isType(Calendar.class))
},
{ /* 4 */
new ComboInput<BeanWithDynaFieldStringList>(
@@ -179,7 +179,7 @@ public class DynaBeanComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f1a>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:f1a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f1a>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:f1a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f1a>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:f1a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithDynaFieldStringList.class, x))
+ .verify(x -> verify(x).isType(BeanWithDynaFieldStringList.class))
},
{ /* 5 */
new ComboInput<BeanWithDynaMethodsAndExtraKeys>(
@@ -208,8 +208,8 @@ public class DynaBeanComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f1>1</jp:f1>\n<jp:f2a>a</jp:f2a>\n<jp:f2b>b</jp:f2b>\n<jp:f3>3</jp:f3>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f1>1</jp:f1>\n<jp:f2a>a</jp:f2a>\n<jp:f2b>b</jp:f2b>\n<jp:f3>3</jp:f3>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f1>1</jp:f1>\n <jp:f2a>a</jp:f2a>\n <jp:f2b>b</jp:f2b>\n <jp:f3>3</jp:f3>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithDynaMethodsAndExtraKeys.class, x))
- .verify(x -> x.setterCalled ? null : "Setter not called")
+ .verify(x -> verify(x).isType(BeanWithDynaMethodsAndExtraKeys.class))
+ .verify(x -> x.setterCalled, "Setter not called")
},
});
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
index b995f91..c534ee0 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
@@ -26,7 +26,7 @@ import org.apache.juneau.json.*;
import org.apache.juneau.msgpack.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.testutils.*;
+import org.apache.juneau.testutils.XmlUtils;
import org.apache.juneau.uon.*;
import org.apache.juneau.urlencoding.*;
import org.apache.juneau.xml.*;
@@ -290,10 +290,10 @@ public abstract class RoundTripTest {
System.err.println("Serialized contents from ["+label+"]...\n---START---\n" + (out instanceof byte[] ? StringUtils.toReadableBytes((byte[])out) : out) + "\n---END---\n"); // NOT DEBUG
if (validateXmlWhitespace)
- TestUtils.checkXmlWhitespace(out.toString());
+ XmlUtils.checkXmlWhitespace(out.toString());
if (validateXml)
- TestUtils.validateXml(object, (XmlSerializer)s);
+ XmlUtils.validateXml(object, (XmlSerializer)s);
return out;
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
index 4fb74bc..04705f6 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
@@ -13,7 +13,7 @@
package org.apache.juneau.dto.html5;
import static org.apache.juneau.dto.html5.HtmlBuilder.*;
-import static org.apache.juneau.testutils.TestUtils.*;
+import static org.apache.juneau.assertions.Verify.*;
import java.util.*;
@@ -61,7 +61,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x))
+ .verify(x -> verify(x).isType(A.class))
},
{ /* 1 */
new ComboInput<A[]>(
@@ -90,8 +90,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://baz'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>qux</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://baz'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>qux</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://baz'/>\n </jp:a>\n [...]
- .verify(x -> verifyInstanceOf(A[].class, x))
- .verify(x -> verifyEquals(2, x.length))
+ .verify(x -> verify(x).isType(A[].class))
+ .verify(x -> verify(x.length).is(2))
},
{ /* 2 */
new ComboInput<List<A>>(
@@ -120,9 +120,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://baz'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>qux</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://baz'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>qux</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://baz'/>\n </jp:a>\n [...]
- .verify(x -> verifyEquals(2, x.size()))
- .verify(x -> verifyInstanceOf(A.class, x.get(0)))
- .verify(x -> verifyInstanceOf(A.class, x.get(1)))
+ .verify(x -> verify(x.size()).is(2))
+ .verify(x -> verify(x.get(0)).isType(A.class))
+ .verify(x -> verify(x.get(1)).isType(A.class))
},
{ /* 3 */
new ComboInput<A[][]>(
@@ -151,11 +151,11 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://a'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>b</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://c'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>d</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:li [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://a'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>b</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://c'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>d</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:li>\n<rdf:li>\n<r [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://a'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>b</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:pa [...]
- .verify(x -> verifyInstanceOf(A[][].class, x))
- .verify(x -> verifyEquals(3, x.length))
- .verify(x -> verifyEquals(2, x[0].length))
- .verify(x -> verifyEquals(0, x[1].length))
- .verify(x -> verifyEquals(1, x[2].length))
+ .verify(x -> verify(x).isType(A[][].class))
+ .verify(x -> verify(x.length).is(3))
+ .verify(x -> verify(x[0].length).is(2))
+ .verify(x -> verify(x[1].length).is(0))
+ .verify(x -> verify(x[2].length).is(1))
},
{ /* 4 */
new ComboInput<List<List<A>>>(
@@ -184,7 +184,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://a'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>b</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://c'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>d</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:li [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://a'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>b</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://c'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>d</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:li>\n<rdf:li>\n<r [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://a'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>b</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:pa [...]
- .verify(x -> verifyInstanceOf(A.class, x.get(0).get(0)))
+ .verify(x -> verify(x.get(0).get(0)).isType(A.class))
},
{ /* 5 */
new ComboInput<java.util.Map<String,A>>(
@@ -213,8 +213,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:a>\n<jp:d rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://e'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>f</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:d>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:a>\n<jp:d rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://e'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>f</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:d>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://b'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n </jp:c>\n </jp:a>\n <jp:d rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://e'/>\n </jp:a>\n [...]
- .verify(x -> verifyInstanceOf(A.class, x.get("a")))
- .verify(x -> verifyInstanceOf(A.class, x.get("d")))
+ .verify(x -> verify(x.get("a")).isType(A.class))
+ .verify(x -> verify(x.get("d")).isType(A.class))
},
{ /* 6 */
new ComboInput<java.util.Map<String,A[][]>>(
@@ -243,8 +243,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://d'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>e</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rd [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://d'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>e</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Se [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://b'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n [...]
- .verify(x -> verifyInstanceOf(A.class, x.get("a")[0][0]))
- .verify(x -> verifyInstanceOf(A.class, x.get("f")[0][0]))
+ .verify(x -> verify(x.get("a")[0][0]).isType(A.class))
+ .verify(x -> verify(x.get("f")[0][0]).isType(A.class))
},
{ /* 7 */
new ComboInput<BeanWithAField>(
@@ -273,7 +273,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f1 rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resourc [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f1 rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resour [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f1 rdf:parseType='Resource'>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://b'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n </jp:c>\n </jp:f1>\n <jp:f2>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://b'/>\n </jp:a>\n <jp:c [...]
- .verify(x -> verifyInstanceOf(BeanWithAField.class, x))
+ .verify(x -> verify(x).isType(BeanWithAField.class))
},
{ /* 8 */
new ComboInput<BeanWithAField[]>(
@@ -302,7 +302,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f1 rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n< [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f1 rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:f1 rdf:parseType='Resource'>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://b'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n </jp:c>\n </jp:f1>\n <jp:f2>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:a rdf:parseType='Resource'>\n <jp:href [...]
- .verify(x -> verifyInstanceOf(BeanWithAField[].class, x))
+ .verify(x -> verify(x).isType(BeanWithAField[].class))
},
{ /* 9 */
new ComboInput<List<BeanWithAField>>(
@@ -331,7 +331,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f1 rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n< [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f1 rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://b'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:f1 rdf:parseType='Resource'>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://b'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n </jp:c>\n </jp:f1>\n <jp:f2>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:a rdf:parseType='Resource'>\n <jp:href [...]
- .verify(x -> verifyInstanceOf(BeanWithAField.class, x.get(0)))
+ .verify(x -> verify(x.get(0)).isType(BeanWithAField.class))
},
{ /* 10 */
new ComboInput<A>(
@@ -360,7 +360,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>b</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>b</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bbb</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n [...]
- .verify(x -> verifyInstanceOf(A.class, x))
+ .verify(x -> verify(x).isType(A.class))
},
{ /* 11 */
new ComboInput<A[][]>(
@@ -389,7 +389,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://a'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>b</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>b</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseTy [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://a'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>b</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>b</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:hre [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://a'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>b</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n [...]
- .verify(x -> verifyInstanceOf(A[][].class, x))
+ .verify(x -> verify(x).isType(A[][].class))
},
{ /* 12 */
new ComboInput<A>(
@@ -418,7 +418,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li></rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li></rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li></rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x))
+ .verify(x -> verify(x).isType(A.class))
},
{ /* 13 */
new ComboInput<A>(
@@ -447,7 +447,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>_x0020_</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>_x0020_</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>_x0020_</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x))
+ .verify(x -> verify(x).isType(A.class))
},
{ /* 14 */
new ComboInput<A>(
@@ -476,7 +476,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href rdf:resource='http://foo'/>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x))
+ .verify(x -> verify(x).isType(A.class))
},
{ /* 15 */
new ComboInput<Abbr>(
@@ -505,7 +505,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>abbr</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>abbr</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>abbr</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Abbr.class, x))
+ .verify(x -> verify(x).isType(Abbr.class))
},
{ /* 16 */
new ComboInput<Abbr>(
@@ -534,7 +534,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>abbr</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:title>foo</jp:title>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>b</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>abbr</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:title>foo</jp:title>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>b</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>abbr</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:title>foo</jp:title>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bbb</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c [...]
- .verify(x -> verifyInstanceOf(Abbr.class, x))
+ .verify(x -> verify(x).isType(Abbr.class))
},
{ /* 17 */
new ComboInput<Address>(
@@ -563,7 +563,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>address</jp:_type>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>address</jp:t>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>address</jp:_type>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Address.class, x))
+ .verify(x -> verify(x).isType(Address.class))
},
{ /* 18 */
new ComboInput<Address>(
@@ -592,7 +592,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>address</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li></rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>address</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li></rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>address</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li></rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Address.class, x))
+ .verify(x -> verify(x).isType(Address.class))
},
{ /* 19 */
new ComboInput<Address>(
@@ -621,9 +621,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>address</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href>bar</jp:href>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href>qux</jp:href>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>quux</rdf:li>\n</rdf:Seq>\n< [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>address</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href>bar</jp:href>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href>qux</jp:href>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>quux</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rd [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>address</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href>bar</jp:href>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource [...]
- .verify(x -> verifyInstanceOf(Address.class, x))
- .verify(x -> verifyInstanceOf(A.class, x.getChild(1)))
- .verify(x -> verifyInstanceOf(A.class, x.getChild(2)))
+ .verify(x -> verify(x).isType(Address.class))
+ .verify(x -> verify(x.getChild(1)).isType(A.class))
+ .verify(x -> verify(x.getChild(2)).isType(A.class))
},
{ /* 20 */
new ComboInput<Aside>(
@@ -654,9 +654,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>aside</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>h1</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>header1</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>aside</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>h1</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>header1</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>aside</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h1</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>header1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n [...]
- .verify(x -> verifyInstanceOf(Aside.class, x))
- .verify(x -> verifyInstanceOf(H1.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(P.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Aside.class))
+ .verify(x -> verify(x.getChild(0)).isType(H1.class))
+ .verify(x -> verify(x.getChild(1)).isType(P.class))
},
{ /* 21 */
new ComboInput<Audio>(
@@ -688,9 +688,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>audio</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:controls>controls</jp:controls>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>source</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.ogg</jp:src>\n<jp:type>audio/ogg</jp:type>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>source</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.mp3</jp:src>\n<jp:type>audio/mpeg</jp:typ [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>audio</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:controls>controls</jp:controls>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>source</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.ogg</jp:src>\n<jp:type>audio/ogg</jp:type>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>source</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.mp3</jp:src>\n<jp:type>audio/mpeg</jp:type>\n</jp:a>\n</rdf:li>\ [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>audio</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:controls>controls</jp:controls>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>source</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.ogg</jp:src>\n <jp:type>audio/ogg</jp:type>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n [...]
- .verify(x -> verifyInstanceOf(Audio.class, x))
- .verify(x -> verifyInstanceOf(Source.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Source.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Audio.class))
+ .verify(x -> verify(x.getChild(0)).isType(Source.class))
+ .verify(x -> verify(x.getChild(1)).isType(Source.class))
},
{ /* 22 */
new ComboInput<P>(
@@ -719,8 +719,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>bdi</jp:_type>\n<jp:c>إيان</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>bdi</jp:t>\n<jp:c>إيان</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>bdi</jp:_type>\n <jp:c>إيان</jp:c>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Bdi.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(1)).isType(Bdi.class))
},
{ /* 23 */
new ComboInput<P>(
@@ -749,8 +749,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>bdo</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:dir>rtl</jp:dir>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>bdo</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:dir>rtl</jp:dir>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>bdo</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:dir>rtl</jp:dir>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq [...]
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Bdo.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(1)).isType(Bdo.class))
},
{ /* 24 */
new ComboInput<Blockquote>(
@@ -779,7 +779,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>blockquote</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>blockquote</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>blockquote</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Blockquote.class, x))
+ .verify(x -> verify(x).isType(Blockquote.class))
},
{ /* 25 */
new ComboInput<Br>(
@@ -808,7 +808,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>br</jp:_type>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>br</jp:t>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>br</jp:_type>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Br.class, x))
+ .verify(x -> verify(x).isType(Br.class))
},
{ /* 26 */
new ComboInput<P>(
@@ -837,8 +837,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>br</jp:_type>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>br</jp:t>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>br</jp:_type>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Br.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Br.class))
},
{ /* 27 */
new ComboInput<Button>(
@@ -867,7 +867,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>button</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:type>button</jp:type>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>button</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:type>button</jp:type>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>button</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>button</jp:type>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Button.class, x))
+ .verify(x -> verify(x).isType(Button.class))
},
{ /* 28 */
new ComboInput<Canvas>(
@@ -896,7 +896,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>canvas</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:width>100</jp:width>\n<jp:height>200</jp:height>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>canvas</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:width>100</jp:width>\n<jp:height>200</jp:height>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>canvas</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:width>100</jp:width>\n <jp:height>200</jp:height>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Canvas.class, x))
+ .verify(x -> verify(x).isType(Canvas.class))
},
{ /* 29 */
new ComboInput<P>(
@@ -925,8 +925,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>cite</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>cite</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>cite</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Cite.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Cite.class))
},
{ /* 30 */
new ComboInput<Code>(
@@ -955,7 +955,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>code</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo_x000A__x0009_bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>code</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo_x000A__x0009_bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>code</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo_x000A__x0009_bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Code.class, x))
+ .verify(x -> verify(x).isType(Code.class))
},
{ /* 31 */
new ComboInput<Datalist>(
@@ -987,9 +987,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>datalist</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:id>foo</jp:id>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>option</jp:_type>\n<jp:c>One</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>option</jp:_type>\n<jp:c>Two</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>datalist</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:id>foo</jp:id>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>option</jp:t>\n<jp:c>One</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>option</jp:t>\n<jp:c>Two</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>datalist</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:id>foo</jp:id>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>option</jp:_type>\n <jp:c>One</jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>option</jp:_type>\n <jp:c>Two</jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Descripti [...]
- .verify(x -> verifyInstanceOf(Datalist.class, x))
- .verify(x -> verifyInstanceOf(Option.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Option.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Datalist.class))
+ .verify(x -> verify(x.getChild(0)).isType(Option.class))
+ .verify(x -> verify(x.getChild(1)).isType(Option.class))
},
{ /* 32 */
new ComboInput<Dl>(
@@ -1021,9 +1021,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>dl</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>dt</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>dd</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>dl</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>dt</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>dd</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>dl</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>dt</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>dd</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rd [...]
- .verify(x -> verifyInstanceOf(Dl.class, x))
- .verify(x -> verifyInstanceOf(Dt.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Dd.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Dl.class))
+ .verify(x -> verify(x.getChild(0)).isType(Dt.class))
+ .verify(x -> verify(x.getChild(1)).isType(Dd.class))
},
{ /* 33 */
new ComboInput<P>(
@@ -1052,10 +1052,10 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>del</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>b</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>ins</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>del</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>b</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>ins</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</j [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>del</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bbb</rdf:li>\n </rdf:Seq>\n </j [...]
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Del.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(B.class, x.getChild(Del.class, 0).getChild(1)))
- .verify(x -> verifyInstanceOf(Ins.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Del.class))
+ .verify(x -> verify(x.getChild(Del.class, 0).getChild(1)).isType(B.class))
+ .verify(x -> verify(x.getChild(1)).isType(Ins.class))
},
{ /* 34 */
new ComboInput<P>(
@@ -1084,8 +1084,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>dfn</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>dfn</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>dfn</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Dfn.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Dfn.class))
},
{ /* 35 */
new ComboInput<Div>(
@@ -1114,8 +1114,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>div</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>b</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>div</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>b</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bbb</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>div</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bbb</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Div.class, x))
- .verify(x -> verifyInstanceOf(B.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Div.class))
+ .verify(x -> verify(x.getChild(1)).isType(B.class))
},
{ /* 36 */
new ComboInput<P>(
@@ -1144,8 +1144,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>em</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>em</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>em</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Em.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(1)).isType(Em.class))
},
{ /* 37 */
new ComboInput<Embed>(
@@ -1174,7 +1174,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>embed</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.swf</jp:src>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>embed</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.swf</jp:src>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>embed</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.swf</jp:src>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Embed.class, x))
+ .verify(x -> verify(x).isType(Embed.class))
},
{ /* 38 */
new ComboInput<Form>(
@@ -1211,15 +1211,15 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>form</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:action>bar</jp:action>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>fieldset</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>legend</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo:</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>Name:</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>input</jp:_type>\n<jp:a rdf:parseType='Re [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>form</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:action>bar</jp:action>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>fieldset</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>legend</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo:</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>Name:</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>input</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:type>text</jp:typ [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>form</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:action>bar</jp:action>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>fieldset</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>legend</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>fo [...]
- .verify(x -> verifyInstanceOf(Form.class, x))
- .verify(x -> verifyInstanceOf(Fieldset.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Legend.class, x.getChild(0,0)))
- .verify(x -> verifyInstanceOf(Input.class, x.getChild(0,2)))
- .verify(x -> verifyInstanceOf(Br.class, x.getChild(0,3)))
- .verify(x -> verifyInstanceOf(Input.class, x.getChild(0,5)))
- .verify(x -> verifyInstanceOf(Br.class, x.getChild(0,6)))
- .verify(x -> verifyInstanceOf(Keygen.class, x.getChild(0,8)))
- .verify(x -> verifyInstanceOf(Label.class, x.getChild(0,9)))
+ .verify(x -> verify(x).isType(Form.class))
+ .verify(x -> verify(x.getChild(0)).isType(Fieldset.class))
+ .verify(x -> verify(x.getChild(0,0)).isType(Legend.class))
+ .verify(x -> verify(x.getChild(0,2)).isType(Input.class))
+ .verify(x -> verify(x.getChild(0,3)).isType(Br.class))
+ .verify(x -> verify(x.getChild(0,5)).isType(Input.class))
+ .verify(x -> verify(x.getChild(0,6)).isType(Br.class))
+ .verify(x -> verify(x.getChild(0,8)).isType(Keygen.class))
+ .verify(x -> verify(x.getChild(0,9)).isType(Label.class))
},
{ /* 39 */
new ComboInput<Figure>(
@@ -1251,9 +1251,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>figure</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>img</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.png</jp:src>\n<jp:alt>foo</jp:alt>\n<jp:width>100</jp:width>\n<jp:height>200</jp:height>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>figcaption</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>The caption</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Descripti [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>figure</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>img</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.png</jp:src>\n<jp:alt>foo</jp:alt>\n<jp:width>100</jp:width>\n<jp:height>200</jp:height>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>figcaption</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>The caption</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>figure</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>img</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.png</jp:src>\n <jp:alt>foo</jp:alt>\n <jp:width>100</jp:width>\n <jp:height>200</jp:height>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>figcaption< [...]
- .verify(x -> verifyInstanceOf(Figure.class, x))
- .verify(x -> verifyInstanceOf(Img.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Figcaption.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Figure.class))
+ .verify(x -> verify(x.getChild(0)).isType(Img.class))
+ .verify(x -> verify(x.getChild(1)).isType(Figcaption.class))
},
{ /* 40 */
new ComboInput<Div>(
@@ -1284,13 +1284,13 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>div</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>h1</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>One</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>h2</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>Two</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>h3</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>Three</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rd [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>div</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>h1</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>One</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>h2</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>Two</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>h3</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>Three</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\ [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>div</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h1</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>One</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h2</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Two</rdf:li>\n </r [...]
- .verify(x -> verifyInstanceOf(Div.class, x))
- .verify(x -> verifyInstanceOf(H1.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(H2.class, x.getChild(1)))
- .verify(x -> verifyInstanceOf(H3.class, x.getChild(2)))
- .verify(x -> verifyInstanceOf(H4.class, x.getChild(3)))
- .verify(x -> verifyInstanceOf(H5.class, x.getChild(4)))
- .verify(x -> verifyInstanceOf(H6.class, x.getChild(5)))
+ .verify(x -> verify(x).isType(Div.class))
+ .verify(x -> verify(x.getChild(0)).isType(H1.class))
+ .verify(x -> verify(x.getChild(1)).isType(H2.class))
+ .verify(x -> verify(x.getChild(2)).isType(H3.class))
+ .verify(x -> verify(x.getChild(3)).isType(H4.class))
+ .verify(x -> verify(x.getChild(4)).isType(H5.class))
+ .verify(x -> verify(x.getChild(5)).isType(H6.class))
},
{ /* 41 */
new ComboInput<P>(
@@ -1319,8 +1319,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>hr</jp:_type>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>hr</jp:t>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>hr</jp:_type>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Hr.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Hr.class))
},
{ /* 42 */
new ComboInput<Html>(
@@ -1377,13 +1377,13 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>html</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>head</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>title</jp:_type>\n<jp:c>title</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>base</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href>foo</jp:href>\n<jp:target>_blank</jp:target>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>link</jp:_typ [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>html</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>head</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>title</jp:t>\n<jp:c>title</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>base</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href>foo</jp:href>\n<jp:target>_blank</jp:target>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>link</jp:t>\n<jp:a rdf:parseType='Resource'>\n<j [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>html</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>head</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>title</jp:_type>\n <jp:c>title</jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>base</jp:_type>\n <jp [...]
- .verify(x -> verifyInstanceOf(Html.class, x))
- .verify(x -> verifyInstanceOf(Head.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Title.class, x.getChild(0,0)))
- .verify(x -> verifyInstanceOf(Base.class, x.getChild(0,1)))
- .verify(x -> verifyInstanceOf(Link.class, x.getChild(0,2)))
- .verify(x -> verifyInstanceOf(Meta.class, x.getChild(0,3)))
- .verify(x -> verifyInstanceOf(Body.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Html.class))
+ .verify(x -> verify(x.getChild(0)).isType(Head.class))
+ .verify(x -> verify(x.getChild(0,0)).isType(Title.class))
+ .verify(x -> verify(x.getChild(0,1)).isType(Base.class))
+ .verify(x -> verify(x.getChild(0,2)).isType(Link.class))
+ .verify(x -> verify(x.getChild(0,3)).isType(Meta.class))
+ .verify(x -> verify(x.getChild(1)).isType(Body.class))
},
{ /* 43 */
new ComboInput<P>(
@@ -1412,8 +1412,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>i</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>i</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>i</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(I.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(I.class))
},
{ /* 44 */
new ComboInput<Iframe>(
@@ -1442,7 +1442,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>iframe</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>iframe</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>iframe</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Iframe.class, x))
+ .verify(x -> verify(x).isType(Iframe.class))
},
{ /* 45 */
new ComboInput<P>(
@@ -1471,8 +1471,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>kbd</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>kbd</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>kbd</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Kbd.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Kbd.class))
},
{ /* 46 */
new ComboInput<Main>(
@@ -1507,15 +1507,15 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>main</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>article</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>header</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>h1</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>header1</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>header2</rdf: [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>main</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>article</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>header</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>h1</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>header1</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>header2</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</ [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>main</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>article</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>header</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h1</jp:_type>\n [...]
- .verify(x -> verifyInstanceOf(Main.class, x))
- .verify(x -> verifyInstanceOf(Article.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Header.class, x.getChild(0,0)))
- .verify(x -> verifyInstanceOf(H1.class, x.getChild(0,0,0)))
- .verify(x -> verifyInstanceOf(P.class, x.getChild(0,0,1)))
- .verify(x -> verifyInstanceOf(P.class, x.getChild(0,1)))
- .verify(x -> verifyInstanceOf(Footer.class, x.getChild(0,2)))
- .verify(x -> verifyInstanceOf(H2.class, x.getChild(0,2,0)))
- .verify(x -> verifyInstanceOf(P.class, x.getChild(0,2,1)))
+ .verify(x -> verify(x).isType(Main.class))
+ .verify(x -> verify(x.getChild(0)).isType(Article.class))
+ .verify(x -> verify(x.getChild(0,0)).isType(Header.class))
+ .verify(x -> verify(x.getChild(0,0,0)).isType(H1.class))
+ .verify(x -> verify(x.getChild(0,0,1)).isType(P.class))
+ .verify(x -> verify(x.getChild(0,1)).isType(P.class))
+ .verify(x -> verify(x.getChild(0,2)).isType(Footer.class))
+ .verify(x -> verify(x.getChild(0,2,0)).isType(H2.class))
+ .verify(x -> verify(x.getChild(0,2,1)).isType(P.class))
},
{ /* 47 */
new ComboInput<Map>(
@@ -1544,8 +1544,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>map</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:name>baz</jp:name>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>area</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:shape>rect</jp:shape>\n<jp:coords>0,1,2,3</jp:coords>\n<jp:href>foo</jp:href>\n<jp:alt>bar</jp:alt>\n</jp:a>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>map</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:name>baz</jp:name>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>area</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:shape>rect</jp:shape>\n<jp:coords>0,1,2,3</jp:coords>\n<jp:href>foo</jp:href>\n<jp:alt>bar</jp:alt>\n</jp:a>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>map</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>baz</jp:name>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>area</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:shape>rect</jp:shape>\n <jp:coords>0,1,2,3</jp:coords>\n <jp:href>foo</jp:href>\n <jp:alt>bar</jp:alt>\n </jp:a>\n </rd [...]
- .verify(x -> verifyInstanceOf(Map.class, x))
- .verify(x -> verifyInstanceOf(Area.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(Map.class))
+ .verify(x -> verify(x.getChild(0)).isType(Area.class))
},
{ /* 48 */
new ComboInput<P>(
@@ -1574,8 +1574,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>mark</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>mark</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>mark</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Mark.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Mark.class))
},
{ /* 49 */
new ComboInput<Meter>(
@@ -1604,7 +1604,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>meter</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:value>1</jp:value>\n<jp:min>0</jp:min>\n<jp:max>2</jp:max>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>meter</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:value>1</jp:value>\n<jp:min>0</jp:min>\n<jp:max>2</jp:max>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>meter</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:value>1</jp:value>\n <jp:min>0</jp:min>\n <jp:max>2</jp:max>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Meter.class, x))
+ .verify(x -> verify(x).isType(Meter.class))
},
{ /* 50 */
new ComboInput<Nav>(
@@ -1633,8 +1633,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>nav</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>a</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:href>foo</jp:href>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>nav</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>a</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:href>foo</jp:href>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>nav</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href>foo</jp:href>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Nav.class, x))
- .verify(x -> verifyInstanceOf(A.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(Nav.class))
+ .verify(x -> verify(x.getChild(0)).isType(A.class))
},
{ /* 51 */
new ComboInput<Noscript>(
@@ -1663,7 +1663,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>noscript</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>No script!</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>noscript</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>No script!</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>noscript</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>No script!</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Noscript.class, x))
+ .verify(x -> verify(x).isType(Noscript.class))
},
{ /* 52 */
new ComboInput<Object_>(
@@ -1692,8 +1692,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>object</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:width>1</jp:width>\n<jp:height>2</jp:height>\n<jp:data>foo.swf</jp:data>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>param</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:name>autoplay</jp:name>\n<jp:value>true</jp:value>\n</jp:a>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>object</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:width>1</jp:width>\n<jp:height>2</jp:height>\n<jp:data>foo.swf</jp:data>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>param</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:name>autoplay</jp:name>\n<jp:value>true</jp:value>\n</jp:a>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>object</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:width>1</jp:width>\n <jp:height>2</jp:height>\n <jp:data>foo.swf</jp:data>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>param</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>autoplay</jp:name>\n <jp:value>true</jp:value>\n </jp:a>\n </rdf:l [...]
- .verify(x -> verifyInstanceOf(Object_.class, x))
- .verify(x -> verifyInstanceOf(Param.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(Object_.class))
+ .verify(x -> verify(x.getChild(0)).isType(Param.class))
},
{ /* 53 */
new ComboInput<Ol>(
@@ -1722,8 +1722,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>ol</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>li</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>ol</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>li</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>ol</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>li</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Ol.class, x))
- .verify(x -> verifyInstanceOf(Li.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(Ol.class))
+ .verify(x -> verify(x.getChild(0)).isType(Li.class))
},
{ /* 54 */
new ComboInput<Form>(
@@ -1756,10 +1756,10 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>form</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:action>testform</jp:action>\n<jp:oninput>x.value=parseInt(a.value)+parseInt(b.value)</jp:oninput>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>0</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>input</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:type>range</jp:type>\n<jp:id>a</jp:id>\n<jp:value>50</jp:value>\n</jp:a>\n</rdf:li>\n<rdf:li>+</rdf:li>\n<rdf:li rdf:parseType='Resource'> [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>form</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:action>testform</jp:action>\n<jp:oninput>x.value=parseInt(a.value)+parseInt(b.value)</jp:oninput>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>0</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>input</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:type>range</jp:type>\n<jp:id>a</jp:id>\n<jp:value>50</jp:value>\n</jp:a>\n</rdf:li>\n<rdf:li>+</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>input</ [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>form</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:action>testform</jp:action>\n <jp:oninput>x.value=parseInt(a.value)+parseInt(b.value)</jp:oninput>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>0</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>range</jp:type>\n <jp:id>a</jp:id>\n [...]
- .verify(x -> verifyInstanceOf(Form.class, x))
- .verify(x -> verifyInstanceOf(Input.class, x.getChild(1)))
- .verify(x -> verifyInstanceOf(Input.class, x.getChild(3)))
- .verify(x -> verifyInstanceOf(Output.class, x.getChild(5)))
+ .verify(x -> verify(x).isType(Form.class))
+ .verify(x -> verify(x.getChild(1)).isType(Input.class))
+ .verify(x -> verify(x.getChild(3)).isType(Input.class))
+ .verify(x -> verify(x.getChild(5)).isType(Output.class))
},
{ /* 55 */
new ComboInput<P>(
@@ -1788,7 +1788,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
+ .verify(x -> verify(x).isType(P.class))
},
{ /* 56 */
new ComboInput<P[][]>(
@@ -1817,7 +1817,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>b</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:li>\n<rdf:li>\n<rdf:Seq/>\n</rdf:li>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n< [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>b</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</rdf:li>\n<rdf:li>\n<rdf:Seq/>\n</rdf:li>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</jp:c>\n</r [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>a</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>b</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf: [...]
- .verify(x -> verifyInstanceOf(P[][].class, x))
+ .verify(x -> verify(x).isType(P[][].class))
},
{ /* 57 */
new ComboInput<Pre>(
@@ -1846,7 +1846,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>pre</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo _x000A_ bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>pre</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo _x000A_ bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>pre</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo _x000A_ bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Pre.class, x))
+ .verify(x -> verify(x).isType(Pre.class))
},
{ /* 58 */
new ComboInput<Progress>(
@@ -1875,7 +1875,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>progress</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:value>1</jp:value>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>progress</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:value>1</jp:value>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>progress</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:value>1</jp:value>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Progress.class, x))
+ .verify(x -> verify(x).isType(Progress.class))
},
{ /* 59 */
new ComboInput<P>(
@@ -1904,8 +1904,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>q</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>q</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>q</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Q.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(1)).isType(Q.class))
},
{ /* 60 */
new ComboInput<Ruby>(
@@ -1936,10 +1936,10 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>ruby</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>法</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>rb</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>華</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>経</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>rtc</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>き</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>rp</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>け</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n< [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>ruby</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>法</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>rb</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>華</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>経</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>rtc</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>き</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>rp</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>け</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>ょ</rdf:li>\n</rdf:Seq>\n [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>ruby</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>法</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>rb</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>華</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>経</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>rtc</jp:_type>\n <jp:c>\n <rdf:S [...]
- .verify(x -> verifyInstanceOf(Ruby.class, x))
- .verify(x -> verifyInstanceOf(Rb.class, x.getChild(1)))
- .verify(x -> verifyInstanceOf(Rtc.class, x.getChild(3)))
- .verify(x -> verifyInstanceOf(Rp.class, x.getChild(3,1)))
+ .verify(x -> verify(x).isType(Ruby.class))
+ .verify(x -> verify(x.getChild(1)).isType(Rb.class))
+ .verify(x -> verify(x.getChild(3)).isType(Rtc.class))
+ .verify(x -> verify(x.getChild(3,1)).isType(Rp.class))
},
{ /* 61 */
new ComboInput<P>(
@@ -1968,8 +1968,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>s</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>s</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>baz</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>s</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(S.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(1)).isType(S.class))
},
{ /* 62 */
new ComboInput<Samp>(
@@ -1998,7 +1998,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>samp</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>samp</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>samp</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Samp.class, x))
+ .verify(x -> verify(x).isType(Samp.class))
},
{ /* 63 */
new ComboInput<Script>(
@@ -2027,7 +2027,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>script</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:type>text/javascript</jp:type>\n</jp:a>\n<jp:c>_x000A__x0009_alert('hello world!');_x000A_</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>script</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:type>text/javascript</jp:type>\n</jp:a>\n<jp:c>_x000A__x0009_alert('hello world!');_x000A_</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>script</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>text/javascript</jp:type>\n </jp:a>\n <jp:c>_x000A__x0009_alert('hello world!');_x000A_</jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Script.class, x))
+ .verify(x -> verify(x).isType(Script.class))
},
{ /* 64 */
new ComboInput<Section>(
@@ -2056,9 +2056,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>section</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>h1</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>section</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>h1</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>section</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h1</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n [...]
- .verify(x -> verifyInstanceOf(Section.class, x))
- .verify(x -> verifyInstanceOf(H1.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(P.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Section.class))
+ .verify(x -> verify(x.getChild(0)).isType(H1.class))
+ .verify(x -> verify(x.getChild(1)).isType(P.class))
},
{ /* 65 */
new ComboInput<Select>(
@@ -2087,9 +2087,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>select</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:name>foo</jp:name>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>optgroup</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:label>bar</jp:label>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>option</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:value>o1</jp:value>\n</jp:a>\n<jp:c>v1</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</ [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>select</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:name>foo</jp:name>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>optgroup</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:label>bar</jp:label>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>option</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:value>o1</jp:value>\n</jp:a>\n<jp:c>v1</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</ [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>select</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>foo</jp:name>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>optgroup</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:label>bar</jp:label>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>opti [...]
- .verify(x -> verifyInstanceOf(Select.class, x))
- .verify(x -> verifyInstanceOf(Optgroup.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Option.class, x.getChild(0,0)))
+ .verify(x -> verify(x).isType(Select.class))
+ .verify(x -> verify(x.getChild(0)).isType(Optgroup.class))
+ .verify(x -> verify(x.getChild(0,0)).isType(Option.class))
},
{ /* 66 */
new ComboInput<P>(
@@ -2118,8 +2118,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>small</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>small</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>small</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Small.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Small.class))
},
{ /* 67 */
new ComboInput<P>(
@@ -2148,8 +2148,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>My mother has_x0020_</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>span</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:style>color:blue</jp:style>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>blue</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>_x0020_eyes.</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>My mother has_x0020_</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>span</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:style>color:blue</jp:style>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>blue</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>_x0020_eyes.</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>My mother has_x0020_</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>span</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:style>color:blue</jp:style>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>blue</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li [...]
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Span.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(1)).isType(Span.class))
},
{ /* 68 */
new ComboInput<P>(
@@ -2178,8 +2178,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>strong</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>strong</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>strong</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Strong.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Strong.class))
},
{ /* 69 */
new ComboInput<Head>(
@@ -2208,8 +2208,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>head</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>style</jp:_type>\n<jp:c>_x000A__x0009_h1 {color:red;}_x000A__x0009_p: {color:blue;}_x000A_</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>head</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>style</jp:t>\n<jp:c>_x000A__x0009_h1 {color:red;}_x000A__x0009_p: {color:blue;}_x000A_</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>head</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>style</jp:_type>\n <jp:c>_x000A__x0009_h1 {color:red;}_x000A__x0009_p: {color:blue;}_x000A_</jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Head.class, x))
- .verify(x -> verifyInstanceOf(Style.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(Head.class))
+ .verify(x -> verify(x.getChild(0)).isType(Style.class))
},
{ /* 70 */
new ComboInput<P>(
@@ -2238,8 +2238,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>sub</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>sub</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>sub</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Sub.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Sub.class))
},
{ /* 71 */
new ComboInput<P>(
@@ -2268,8 +2268,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>sup</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>sup</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>sup</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Sup.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Sup.class))
},
{ /* 72 */
new ComboInput<Table>(
@@ -2482,23 +2482,23 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>table</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>caption</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>caption1</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>colgroup</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>col</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:class>foo</jp:class>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\ [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>table</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>caption</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>caption1</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>colgroup</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>col</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:class>foo</jp:class>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>col</jp:t>\n<jp:a rdf:pa [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>table</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>caption</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>caption1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>colgroup</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseTy [...]
- .verify(x -> verifyInstanceOf(Table.class, x))
- .verify(x -> verifyInstanceOf(Caption.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Colgroup.class, x.getChild(1)))
- .verify(x -> verifyInstanceOf(Col.class, x.getChild(1,0)))
- .verify(x -> verifyInstanceOf(Col.class, x.getChild(1,1)))
- .verify(x -> verifyInstanceOf(Thead.class, x.getChild(2)))
- .verify(x -> verifyInstanceOf(Tr.class, x.getChild(2,0)))
- .verify(x -> verifyInstanceOf(Th.class, x.getChild(2,0,0)))
- .verify(x -> verifyInstanceOf(Th.class, x.getChild(2,0,1)))
- .verify(x -> verifyInstanceOf(Tbody.class, x.getChild(3)))
- .verify(x -> verifyInstanceOf(Tr.class, x.getChild(3,0)))
- .verify(x -> verifyInstanceOf(Td.class, x.getChild(3,0,0)))
- .verify(x -> verifyInstanceOf(Td.class, x.getChild(3,0,1)))
- .verify(x -> verifyInstanceOf(Tfoot.class, x.getChild(4)))
- .verify(x -> verifyInstanceOf(Tr.class, x.getChild(4,0)))
- .verify(x -> verifyInstanceOf(Td.class, x.getChild(4,0,0)))
- .verify(x -> verifyInstanceOf(Td.class, x.getChild(4,0,1)))
+ .verify(x -> verify(x).isType(Table.class))
+ .verify(x -> verify(x.getChild(0)).isType(Caption.class))
+ .verify(x -> verify(x.getChild(1)).isType(Colgroup.class))
+ .verify(x -> verify(x.getChild(1,0)).isType(Col.class))
+ .verify(x -> verify(x.getChild(1,1)).isType(Col.class))
+ .verify(x -> verify(x.getChild(2)).isType(Thead.class))
+ .verify(x -> verify(x.getChild(2,0)).isType(Tr.class))
+ .verify(x -> verify(x.getChild(2,0,0)).isType(Th.class))
+ .verify(x -> verify(x.getChild(2,0,1)).isType(Th.class))
+ .verify(x -> verify(x.getChild(3)).isType(Tbody.class))
+ .verify(x -> verify(x.getChild(3,0)).isType(Tr.class))
+ .verify(x -> verify(x.getChild(3,0,0)).isType(Td.class))
+ .verify(x -> verify(x.getChild(3,0,1)).isType(Td.class))
+ .verify(x -> verify(x.getChild(4)).isType(Tfoot.class))
+ .verify(x -> verify(x.getChild(4,0)).isType(Tr.class))
+ .verify(x -> verify(x.getChild(4,0,0)).isType(Td.class))
+ .verify(x -> verify(x.getChild(4,0,1)).isType(Td.class))
},
{ /* 73 */
new ComboInput<Template>(
@@ -2527,8 +2527,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>template</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:id>foo</jp:id>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>div</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>template</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:id>foo</jp:id>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>div</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>template</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:id>foo</jp:id>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>div</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Template.class, x))
- .verify(x -> verifyInstanceOf(Div.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(Template.class))
+ .verify(x -> verify(x.getChild(0)).isType(Div.class))
},
{ /* 74 */
new ComboInput<Textarea>(
@@ -2557,7 +2557,7 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>textarea</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:name>foo</jp:name>\n</jp:a>\n<jp:c>bar</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>textarea</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:name>foo</jp:name>\n</jp:a>\n<jp:c>bar</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>textarea</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>foo</jp:name>\n </jp:a>\n <jp:c>bar</jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Textarea.class, x))
+ .verify(x -> verify(x).isType(Textarea.class))
},
{ /* 75 */
new ComboInput<P>(
@@ -2586,8 +2586,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>I have a date on_x0020_</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>time</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:datetime>2016-02-14 18:00</jp:datetime>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>Valentines day</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>.</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>I have a date on_x0020_</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>time</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:datetime>2016-02-14 18:00</jp:datetime>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li>Valentines day</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n<rdf:li>.</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>I have a date on_x0020_</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>time</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:datetime>2016-02-14 18:00</jp:datetime>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Valentines day</rdf:li>\n </rdf:Seq>\n </jp:c>\n < [...]
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Time.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(1)).isType(Time.class))
},
{ /* 76 */
new ComboInput<P>(
@@ -2616,8 +2616,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>u</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>u</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>u</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(U.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(U.class))
},
{ /* 77 */
new ComboInput<Ul>(
@@ -2646,8 +2646,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>ul</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>li</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>ul</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>li</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>ul</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>li</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Ul.class, x))
- .verify(x -> verifyInstanceOf(Li.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(Ul.class))
+ .verify(x -> verify(x.getChild(0)).isType(Li.class))
},
{ /* 78 */
new ComboInput<P>(
@@ -2676,8 +2676,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>var</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>var</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>var</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Var.class, x.getChild(0)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(0)).isType(Var.class))
},
{ /* 79 */
new ComboInput<Video>(
@@ -2709,9 +2709,9 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>video</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:width>100</jp:width>\n<jp:height>200</jp:height>\n<jp:controls>controls</jp:controls>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>source</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.mp4</jp:src>\n<jp:type>video/mp4</jp:type>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>track</jp:_type>\n<jp:a rdf:parseType='Resource'>\n [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>video</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:width>100</jp:width>\n<jp:height>200</jp:height>\n<jp:controls>controls</jp:controls>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>source</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:src>foo.mp4</jp:src>\n<jp:type>video/mp4</jp:type>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>track</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:src>subtitles_en.vt [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>video</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:width>100</jp:width>\n <jp:height>200</jp:height>\n <jp:controls>controls</jp:controls>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>source</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.mp4</jp:src>\n <jp:type>video/mp4</jp:type>\n </jp:a>\n [...]
- .verify(x -> verifyInstanceOf(Video.class, x))
- .verify(x -> verifyInstanceOf(Source.class, x.getChild(0)))
- .verify(x -> verifyInstanceOf(Track.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(Video.class))
+ .verify(x -> verify(x.getChild(0)).isType(Source.class))
+ .verify(x -> verify(x.getChild(1)).isType(Track.class))
},
{ /* 80 */
new ComboInput<P>(
@@ -2740,8 +2740,8 @@ public class Html5ComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>wbr</jp:_type>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>wbr</jp:t>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>wbr</jp:_type>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(P.class, x))
- .verify(x -> verifyInstanceOf(Wbr.class, x.getChild(1)))
+ .verify(x -> verify(x).isType(P.class))
+ .verify(x -> verify(x.getChild(1)).isType(Wbr.class))
},
});
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
index a8614b1..f892873 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
@@ -13,7 +13,7 @@
package org.apache.juneau.dto.html5;
import static org.apache.juneau.dto.html5.HtmlBuilder.*;
-import static org.apache.juneau.testutils.TestUtils.*;
+import static org.apache.juneau.assertions.Verify.*;
import java.util.*;
@@ -59,7 +59,7 @@ public class Html5TemplateComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a rdf:parseType='Resource'>\n<jp:action rdf:resource='http://myaction'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>input</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:type>text</jp:type>\n<jp:name>v1</jp:name>\n<jp:value>123</jp:value>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>input</jp:_type>\n<jp:a rdf:parseType='Resource'>\n<jp:type>text</jp:type>\n<jp:name>v2</jp:name>\n<jp:value [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a rdf:parseType='Resource'>\n<jp:action rdf:resource='http://myaction'/>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>input</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:type>text</jp:type>\n<jp:name>v1</jp:name>\n<jp:value>123</jp:value>\n</jp:a>\n</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>input</jp:t>\n<jp:a rdf:parseType='Resource'>\n<jp:type>text</jp:type>\n<jp:name>v2</jp:name>\n<jp:value>true</jp:value [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a rdf:parseType='Resource'>\n <jp:action rdf:resource='http://myaction'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>text</jp:type>\n <jp:name>v1</jp:name>\n <jp:value>123</jp:value>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n [...]
- .verify(x -> verifyInstanceOf(FormTemplate.class, x))
+ .verify(x -> verify(x).isType(FormTemplate.class))
},
});
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/BasicHtmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
index 761b95b..bbe8541 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
@@ -14,13 +14,13 @@ package org.apache.juneau.html;
import static org.apache.juneau.assertions.ObjectAssertion.*;
import static org.apache.juneau.html.annotation.HtmlFormat.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
import java.lang.reflect.*;
import java.util.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.xml.annotation.*;
@@ -3021,6 +3021,15 @@ public class BasicHtmlTest {
});
}
+ private static final BeanSession BEANSESSION = BeanContext.DEFAULT.createSession();
+
+ /**
+ * Creates a ClassMeta for the given types.
+ */
+ public static final Type getType(Type type, Type...args) {
+ return BEANSESSION.getClassMeta(type, args);
+ }
+
private Input input;
public BasicHtmlTest(Input input) throws Exception {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
index 9c47a0a..e852fd1 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfParserTest.java
@@ -14,7 +14,6 @@ package org.apache.juneau.jena;
import static org.apache.juneau.assertions.ObjectAssertion.*;
import static org.apache.juneau.jena.RdfCommon.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -79,7 +78,7 @@ public class RdfParserTest {
+ "\n</rdf:RDF>";
String rdfXml = s.serialize(a);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
A a2 = RdfXmlParser.DEFAULT.parse(rdfXml, A.class);
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
index 5f79540..5b786ef 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
@@ -14,7 +14,6 @@ package org.apache.juneau.jena;
import static org.apache.juneau.assertions.ObjectAssertion.*;
import static org.apache.juneau.jena.RdfCommon.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.junit.runners.MethodSorters.*;
import java.net.*;
@@ -23,6 +22,7 @@ import java.util.*;
import org.apache.juneau.jena.annotation.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
+import org.apache.juneau.testutils.*;
import org.junit.*;
@SuppressWarnings({"serial"})
@@ -63,7 +63,7 @@ public class RdfTest {
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
rdfXml = s.build().serialize(a);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
a2 = p.parse(rdfXml, A.class);
assertObject(a).sameAs(a2);
@@ -91,7 +91,7 @@ public class RdfTest {
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
rdfXml = s.build().serialize(a);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
a2 = p.parse(rdfXml, A.class);
assertObject(a).sameAs(a2);
@@ -119,7 +119,7 @@ public class RdfTest {
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
rdfXml = s.build().serialize(a);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
a2 = p.parse(rdfXml, A.class);
assertObject(a).sameAs(a2);
@@ -149,7 +149,7 @@ public class RdfTest {
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
rdfXml = s.build().serialize(a);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
a2 = p.parse(rdfXml, A.class);
assertObject(a).sameAs(a2);
@@ -169,7 +169,7 @@ public class RdfTest {
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
rdfXml = s.build().serialize(a);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
// Note - Must specify collection format on parser for it to be able to understand this layout.
p = RdfParser.create().xml().collectionFormat(RdfCollectionFormat.MULTI_VALUED).build();
@@ -266,7 +266,7 @@ public class RdfTest {
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
rdfXml = s.build().serialize(b);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
b2 = p.parse(rdfXml, B.class);
assertObject(b).sameAsSorted(b2);
@@ -337,7 +337,7 @@ public class RdfTest {
+ "\n</rdf:RDF>";
rdfXml = s.build().serialize(b);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
b2 = p.parse(rdfXml, B.class);
assertObject(b).sameAsSorted(b2);
@@ -500,7 +500,7 @@ public class RdfTest {
+ "\n</rdf:RDF>";
rdfXml = s.build().serialize(c);
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
c2 = p.parse(rdfXml, C.class);
assertObject(c).sameAsSorted(c2);
@@ -547,7 +547,7 @@ public class RdfTest {
+ "\n <jp:f3 resource='http://localhost/f3/1'/>"
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
l = p.parse(rdfXml, LinkedList.class, D.class);
D[] da = l.toArray(new D[l.size()]);
@@ -563,7 +563,7 @@ public class RdfTest {
+ "\n <jp:f3 resource='http://localhost/f3/1'/>"
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
da = p.parse(rdfXml, D[].class);
rdfXml = s.serialize(da);
@@ -578,7 +578,7 @@ public class RdfTest {
+ "\n <jp:f3 resource='http://localhost/f3/1'/>"
+ "\n </rdf:Description>"
+ "\n</rdf:RDF>";
- assertXmlEquals(expected, rdfXml);
+ XmlUtils.assertXmlEquals(expected, rdfXml);
}
public static class D {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
index 5e4e3ee..10674f8 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
@@ -12,218 +12,11 @@
// ***************************************************************************************************************************
package org.apache.juneau.testutils;
-import java.io.*;
-import java.lang.reflect.*;
import java.util.*;
-import java.util.regex.*;
-
-import javax.xml.parsers.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.utils.*;
-import org.apache.juneau.xml.*;
-import org.junit.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
@SuppressWarnings({})
public class TestUtils {
- private static final BeanSession beanSession = BeanContext.DEFAULT.createSession();
-
- /**
- * Validates that the whitespace is correct in the specified XML.
- */
- public static final void checkXmlWhitespace(String out) throws SerializeException {
- if (out.indexOf('\u0000') != -1) {
- for (String s : out.split("\u0000"))
- checkXmlWhitespace(s);
- return;
- }
-
- int indent = -1;
- Pattern startTag = Pattern.compile("^(\\s*)<[^/>]+(\\s+\\S+=['\"]\\S*['\"])*\\s*>$");
- Pattern endTag = Pattern.compile("^(\\s*)</[^>]+>$");
- Pattern combinedTag = Pattern.compile("^(\\s*)<[^>/]+(\\s+\\S+=['\"]\\S*['\"])*\\s*/>$");
- Pattern contentOnly = Pattern.compile("^(\\s*)[^\\s\\<]+$");
- Pattern tagWithContent = Pattern.compile("^(\\s*)<[^>]+>.*</[^>]+>$");
- String[] lines = out.split("\n");
- try {
- for (int i = 0; i < lines.length; i++) {
- String line = lines[i];
- Matcher m = startTag.matcher(line);
- if (m.matches()) {
- indent++;
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on start tag line ''{0}''", i+1);
- continue;
- }
- m = endTag.matcher(line);
- if (m.matches()) {
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on end tag line ''{0}''", i+1);
- indent--;
- continue;
- }
- m = combinedTag.matcher(line);
- if (m.matches()) {
- indent++;
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on combined tag line ''{0}''", i+1);
- indent--;
- continue;
- }
- m = contentOnly.matcher(line);
- if (m.matches()) {
- indent++;
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on content-only line ''{0}''", i+1);
- indent--;
- continue;
- }
- m = tagWithContent.matcher(line);
- if (m.matches()) {
- indent++;
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on tag-with-content line ''{0}''", i+1);
- indent--;
- continue;
- }
- throw new SerializeException("Unmatched whitespace line at line number ''{0}''", i+1);
- }
- if (indent != -1)
- throw new SerializeException("Possible unmatched tag. indent=''{0}''", indent);
- } catch (SerializeException e) {
- printLines(lines);
- throw e;
- }
- }
-
- private static final void printLines(String[] lines) {
- for (int i = 0; i < lines.length; i++)
- System.err.println(String.format("%4s:" + lines[i], i+1)); // NOT DEBUG
- }
-
- public static final void validateXml(Object o) throws Exception {
- validateXml(o, XmlSerializer.DEFAULT_NS_SQ);
- }
-
- /**
- * Test whitespace and generated schema.
- */
- public static void validateXml(Object o, XmlSerializer s) throws Exception {
- s = s.builder().ws().ns().addNamespaceUrisToRoot().build();
- String xml = s.serialize(o);
-
- try {
- TestUtils.checkXmlWhitespace(xml);
- } catch (Exception e) {
- System.err.println("---XML---"); // NOT DEBUG
- System.err.println(xml); // NOT DEBUG
- throw e;
- }
- }
-
- /**
- * Sort an XML document by element and attribute names.
- * This method is primarily meant for debugging purposes.
- */
- private static final String sortXml(String xml) throws Exception {
- xml = xml.replaceAll("\\w+\\:", "").replaceAll(">\\s+<", "><"); // Strip out all namespaces and whitespace.
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse(new InputSource(new StringReader(xml)));
-
- SortedNode n = new SortedNode(doc.getDocumentElement());
- return n.toString();
- }
-
- /**
- * A sorted node in a DOM tree.
- */
- private static class SortedNode implements Comparable<SortedNode> {
- public String name, text="", attrs="";
- public List<SortedNode> children = new LinkedList<>();
-
- SortedNode(Element e) {
- this.name = e.getNodeName();
- NamedNodeMap attrs = e.getAttributes();
- if (attrs != null) {
- StringBuilder sb = new StringBuilder();
- Set<String> attrNames = new TreeSet<>();
- for (int i = 0; i < attrs.getLength(); i++)
- attrNames.add(attrs.item(i).getNodeName());
- for (String n : attrNames) {
- Node node = attrs.getNamedItem(n);
- sb.append(" ").append(n).append("='").append(node.getNodeValue()).append("'");
- }
- this.attrs = sb.toString();
- }
- NodeList nl = e.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++) {
- Node n = nl.item(i);
- if (n instanceof Element)
- children.add(new SortedNode((Element)nl.item(i)));
- if (n instanceof Text)
- this.text += ((Text)n).getNodeValue();
- }
- Collections.sort(children);
- }
-
- @Override
- public int compareTo(SortedNode n) {
- int i = name.compareTo(n.name);
- if (i != 0)
- return i;
- i = attrs.compareTo(n.attrs);
- if (i != 0)
- return i;
- i = text.compareTo(n.text);
- if (i != 0)
- return i;
- return 0;
- }
-
- @Override
- public String toString() {
- return toString(0, new StringBuilder()).toString();
- }
-
- public StringBuilder toString(int depth ,StringBuilder sb) {
- indent(depth, sb).append("<").append(name).append(attrs);
- if (children.isEmpty() && text.isEmpty()) {
- sb.append("/>\n");
- return sb;
- }
- sb.append(">\n");
- if (! text.isEmpty())
- indent(depth+1, sb).append(text).append("\n");
- for (SortedNode c : children) {
- c.toString(depth+1, sb);
- }
- indent(depth, sb).append("</").append(name).append(">\n");
- return sb;
- }
- }
-
- private static StringBuilder indent(int depth, StringBuilder sb) {
- for (int i = 0; i < depth; i++)
- sb.append("\t");
- return sb;
- }
-
- /**
- * Compares two XML documents for equality.
- * Namespaces are stripped from each and elements/attributes are ordered in alphabetical order,
- * then a simple string comparison is performed.
- */
- public static final void assertXmlEquals(String expected, String actual) throws Exception {
- Assert.assertEquals(sortXml(expected), sortXml(actual));
- }
-
private static ThreadLocal<TimeZone> systemTimeZone = new ThreadLocal<>();
private static ThreadLocal<Locale> systemLocale = new ThreadLocal<>();
@@ -256,31 +49,4 @@ public class TestUtils {
public static final void unsetLocale() {
Locale.setDefault(systemLocale.get());
}
-
- /**
- * Creates a ClassMeta for the given types.
- */
- public static final Type getType(Type type, Type...args) {
- return beanSession.getClassMeta(type, args);
- }
-
- public static final String verifyInstanceOf(Class<?> type, Object o) {
- if (type.isInstance(o))
- return null;
- return new StringMessage("Expected type {0} but was {1}", type, (o == null ? null : o.getClass())).toString();
- }
-
- public static final String verifyEquals(Object expected, Object actual) {
- if (expected == actual)
- return null;
- if (expected == null || actual == null)
- return StringUtils.format("Expected {0} but was {1}", expected, actual);
- if (! expected.equals(actual))
- return StringUtils.format("Expected {0} but was {1}", expected, actual);
- return null;
- }
-
- public static final String verifyTrue(boolean b) {
- return verifyEquals(true, b);
- }
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/XmlUtils.java
similarity index 72%
copy from juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
copy to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/XmlUtils.java
index 5e4e3ee..7f4b74f 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/XmlUtils.java
@@ -1,286 +1,219 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
-// * *
-// * http://www.apache.org/licenses/LICENSE-2.0 *
-// * *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
-// * specific language governing permissions and limitations under the License. *
-// ***************************************************************************************************************************
-package org.apache.juneau.testutils;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.regex.*;
-
-import javax.xml.parsers.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.utils.*;
-import org.apache.juneau.xml.*;
-import org.junit.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-@SuppressWarnings({})
-public class TestUtils {
-
- private static final BeanSession beanSession = BeanContext.DEFAULT.createSession();
-
- /**
- * Validates that the whitespace is correct in the specified XML.
- */
- public static final void checkXmlWhitespace(String out) throws SerializeException {
- if (out.indexOf('\u0000') != -1) {
- for (String s : out.split("\u0000"))
- checkXmlWhitespace(s);
- return;
- }
-
- int indent = -1;
- Pattern startTag = Pattern.compile("^(\\s*)<[^/>]+(\\s+\\S+=['\"]\\S*['\"])*\\s*>$");
- Pattern endTag = Pattern.compile("^(\\s*)</[^>]+>$");
- Pattern combinedTag = Pattern.compile("^(\\s*)<[^>/]+(\\s+\\S+=['\"]\\S*['\"])*\\s*/>$");
- Pattern contentOnly = Pattern.compile("^(\\s*)[^\\s\\<]+$");
- Pattern tagWithContent = Pattern.compile("^(\\s*)<[^>]+>.*</[^>]+>$");
- String[] lines = out.split("\n");
- try {
- for (int i = 0; i < lines.length; i++) {
- String line = lines[i];
- Matcher m = startTag.matcher(line);
- if (m.matches()) {
- indent++;
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on start tag line ''{0}''", i+1);
- continue;
- }
- m = endTag.matcher(line);
- if (m.matches()) {
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on end tag line ''{0}''", i+1);
- indent--;
- continue;
- }
- m = combinedTag.matcher(line);
- if (m.matches()) {
- indent++;
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on combined tag line ''{0}''", i+1);
- indent--;
- continue;
- }
- m = contentOnly.matcher(line);
- if (m.matches()) {
- indent++;
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on content-only line ''{0}''", i+1);
- indent--;
- continue;
- }
- m = tagWithContent.matcher(line);
- if (m.matches()) {
- indent++;
- if (m.group(1).length() != indent)
- throw new SerializeException("Wrong indentation detected on tag-with-content line ''{0}''", i+1);
- indent--;
- continue;
- }
- throw new SerializeException("Unmatched whitespace line at line number ''{0}''", i+1);
- }
- if (indent != -1)
- throw new SerializeException("Possible unmatched tag. indent=''{0}''", indent);
- } catch (SerializeException e) {
- printLines(lines);
- throw e;
- }
- }
-
- private static final void printLines(String[] lines) {
- for (int i = 0; i < lines.length; i++)
- System.err.println(String.format("%4s:" + lines[i], i+1)); // NOT DEBUG
- }
-
- public static final void validateXml(Object o) throws Exception {
- validateXml(o, XmlSerializer.DEFAULT_NS_SQ);
- }
-
- /**
- * Test whitespace and generated schema.
- */
- public static void validateXml(Object o, XmlSerializer s) throws Exception {
- s = s.builder().ws().ns().addNamespaceUrisToRoot().build();
- String xml = s.serialize(o);
-
- try {
- TestUtils.checkXmlWhitespace(xml);
- } catch (Exception e) {
- System.err.println("---XML---"); // NOT DEBUG
- System.err.println(xml); // NOT DEBUG
- throw e;
- }
- }
-
- /**
- * Sort an XML document by element and attribute names.
- * This method is primarily meant for debugging purposes.
- */
- private static final String sortXml(String xml) throws Exception {
- xml = xml.replaceAll("\\w+\\:", "").replaceAll(">\\s+<", "><"); // Strip out all namespaces and whitespace.
-
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.parse(new InputSource(new StringReader(xml)));
-
- SortedNode n = new SortedNode(doc.getDocumentElement());
- return n.toString();
- }
-
- /**
- * A sorted node in a DOM tree.
- */
- private static class SortedNode implements Comparable<SortedNode> {
- public String name, text="", attrs="";
- public List<SortedNode> children = new LinkedList<>();
-
- SortedNode(Element e) {
- this.name = e.getNodeName();
- NamedNodeMap attrs = e.getAttributes();
- if (attrs != null) {
- StringBuilder sb = new StringBuilder();
- Set<String> attrNames = new TreeSet<>();
- for (int i = 0; i < attrs.getLength(); i++)
- attrNames.add(attrs.item(i).getNodeName());
- for (String n : attrNames) {
- Node node = attrs.getNamedItem(n);
- sb.append(" ").append(n).append("='").append(node.getNodeValue()).append("'");
- }
- this.attrs = sb.toString();
- }
- NodeList nl = e.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++) {
- Node n = nl.item(i);
- if (n instanceof Element)
- children.add(new SortedNode((Element)nl.item(i)));
- if (n instanceof Text)
- this.text += ((Text)n).getNodeValue();
- }
- Collections.sort(children);
- }
-
- @Override
- public int compareTo(SortedNode n) {
- int i = name.compareTo(n.name);
- if (i != 0)
- return i;
- i = attrs.compareTo(n.attrs);
- if (i != 0)
- return i;
- i = text.compareTo(n.text);
- if (i != 0)
- return i;
- return 0;
- }
-
- @Override
- public String toString() {
- return toString(0, new StringBuilder()).toString();
- }
-
- public StringBuilder toString(int depth ,StringBuilder sb) {
- indent(depth, sb).append("<").append(name).append(attrs);
- if (children.isEmpty() && text.isEmpty()) {
- sb.append("/>\n");
- return sb;
- }
- sb.append(">\n");
- if (! text.isEmpty())
- indent(depth+1, sb).append(text).append("\n");
- for (SortedNode c : children) {
- c.toString(depth+1, sb);
- }
- indent(depth, sb).append("</").append(name).append(">\n");
- return sb;
- }
- }
-
- private static StringBuilder indent(int depth, StringBuilder sb) {
- for (int i = 0; i < depth; i++)
- sb.append("\t");
- return sb;
- }
-
- /**
- * Compares two XML documents for equality.
- * Namespaces are stripped from each and elements/attributes are ordered in alphabetical order,
- * then a simple string comparison is performed.
- */
- public static final void assertXmlEquals(String expected, String actual) throws Exception {
- Assert.assertEquals(sortXml(expected), sortXml(actual));
- }
-
- private static ThreadLocal<TimeZone> systemTimeZone = new ThreadLocal<>();
- private static ThreadLocal<Locale> systemLocale = new ThreadLocal<>();
-
- /**
- * Temporarily sets the default system timezone to the specified timezone ID.
- * Use {@link #unsetTimeZone()} to unset it.
- *
- * @param name
- */
- public synchronized static final void setTimeZone(String name) {
- systemTimeZone.set(TimeZone.getDefault());
- TimeZone.setDefault(TimeZone.getTimeZone(name));
- }
-
- public synchronized static final void unsetTimeZone() {
- TimeZone.setDefault(systemTimeZone.get());
- }
-
- /**
- * Temporarily sets the default system locale to the specified locale.
- * Use {@link #unsetLocale()} to unset it.
- *
- * @param name
- */
- public static final void setLocale(Locale locale) {
- systemLocale.set(Locale.getDefault());
- Locale.setDefault(locale);
- }
-
- public static final void unsetLocale() {
- Locale.setDefault(systemLocale.get());
- }
-
- /**
- * Creates a ClassMeta for the given types.
- */
- public static final Type getType(Type type, Type...args) {
- return beanSession.getClassMeta(type, args);
- }
-
- public static final String verifyInstanceOf(Class<?> type, Object o) {
- if (type.isInstance(o))
- return null;
- return new StringMessage("Expected type {0} but was {1}", type, (o == null ? null : o.getClass())).toString();
- }
-
- public static final String verifyEquals(Object expected, Object actual) {
- if (expected == actual)
- return null;
- if (expected == null || actual == null)
- return StringUtils.format("Expected {0} but was {1}", expected, actual);
- if (! expected.equals(actual))
- return StringUtils.format("Expected {0} but was {1}", expected, actual);
- return null;
- }
-
- public static final String verifyTrue(boolean b) {
- return verifyEquals(true, b);
- }
-}
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
+// * with the License. You may obtain a copy of the License at *
+// * *
+// * http://www.apache.org/licenses/LICENSE-2.0 *
+// * *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
+// * specific language governing permissions and limitations under the License. *
+// ***************************************************************************************************************************
+package org.apache.juneau.testutils;
+
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+
+import javax.xml.parsers.*;
+
+import org.apache.juneau.serializer.*;
+import org.apache.juneau.xml.*;
+import org.junit.*;
+import org.w3c.dom.*;
+import org.xml.sax.*;
+
+public class XmlUtils {
+
+ /**
+ * A sorted node in a DOM tree.
+ */
+ static class SortedNode implements Comparable<SortedNode> {
+ public String name, text="", attrs="";
+ public List<SortedNode> children = new LinkedList<>();
+
+ SortedNode(Element e) {
+ this.name = e.getNodeName();
+ NamedNodeMap attrs = e.getAttributes();
+ if (attrs != null) {
+ StringBuilder sb = new StringBuilder();
+ Set<String> attrNames = new TreeSet<>();
+ for (int i = 0; i < attrs.getLength(); i++)
+ attrNames.add(attrs.item(i).getNodeName());
+ for (String n : attrNames) {
+ Node node = attrs.getNamedItem(n);
+ sb.append(" ").append(n).append("='").append(node.getNodeValue()).append("'");
+ }
+ this.attrs = sb.toString();
+ }
+ NodeList nl = e.getChildNodes();
+ for (int i = 0; i < nl.getLength(); i++) {
+ Node n = nl.item(i);
+ if (n instanceof Element)
+ children.add(new SortedNode((Element)nl.item(i)));
+ if (n instanceof Text)
+ this.text += ((Text)n).getNodeValue();
+ }
+ Collections.sort(children);
+ }
+
+ @Override
+ public int compareTo(SortedNode n) {
+ int i = name.compareTo(n.name);
+ if (i != 0)
+ return i;
+ i = attrs.compareTo(n.attrs);
+ if (i != 0)
+ return i;
+ i = text.compareTo(n.text);
+ if (i != 0)
+ return i;
+ return 0;
+ }
+
+ @Override
+ public String toString() {
+ return toString(0, new StringBuilder()).toString();
+ }
+
+ public StringBuilder toString(int depth ,StringBuilder sb) {
+ XmlUtils.indent(depth, sb).append("<").append(name).append(attrs);
+ if (children.isEmpty() && text.isEmpty()) {
+ sb.append("/>\n");
+ return sb;
+ }
+ sb.append(">\n");
+ if (! text.isEmpty())
+ XmlUtils.indent(depth+1, sb).append(text).append("\n");
+ for (SortedNode c : children) {
+ c.toString(depth+1, sb);
+ }
+ XmlUtils.indent(depth, sb).append("</").append(name).append(">\n");
+ return sb;
+ }
+ }
+
+ /**
+ * Validates that the whitespace is correct in the specified XML.
+ */
+ public static final void checkXmlWhitespace(String out) throws SerializeException {
+ if (out.indexOf('\u0000') != -1) {
+ for (String s : out.split("\u0000"))
+ checkXmlWhitespace(s);
+ return;
+ }
+
+ int indent = -1;
+ Pattern startTag = Pattern.compile("^(\\s*)<[^/>]+(\\s+\\S+=['\"]\\S*['\"])*\\s*>$");
+ Pattern endTag = Pattern.compile("^(\\s*)</[^>]+>$");
+ Pattern combinedTag = Pattern.compile("^(\\s*)<[^>/]+(\\s+\\S+=['\"]\\S*['\"])*\\s*/>$");
+ Pattern contentOnly = Pattern.compile("^(\\s*)[^\\s\\<]+$");
+ Pattern tagWithContent = Pattern.compile("^(\\s*)<[^>]+>.*</[^>]+>$");
+ String[] lines = out.split("\n");
+ try {
+ for (int i = 0; i < lines.length; i++) {
+ String line = lines[i];
+ Matcher m = startTag.matcher(line);
+ if (m.matches()) {
+ indent++;
+ if (m.group(1).length() != indent)
+ throw new SerializeException("Wrong indentation detected on start tag line ''{0}''", i+1);
+ continue;
+ }
+ m = endTag.matcher(line);
+ if (m.matches()) {
+ if (m.group(1).length() != indent)
+ throw new SerializeException("Wrong indentation detected on end tag line ''{0}''", i+1);
+ indent--;
+ continue;
+ }
+ m = combinedTag.matcher(line);
+ if (m.matches()) {
+ indent++;
+ if (m.group(1).length() != indent)
+ throw new SerializeException("Wrong indentation detected on combined tag line ''{0}''", i+1);
+ indent--;
+ continue;
+ }
+ m = contentOnly.matcher(line);
+ if (m.matches()) {
+ indent++;
+ if (m.group(1).length() != indent)
+ throw new SerializeException("Wrong indentation detected on content-only line ''{0}''", i+1);
+ indent--;
+ continue;
+ }
+ m = tagWithContent.matcher(line);
+ if (m.matches()) {
+ indent++;
+ if (m.group(1).length() != indent)
+ throw new SerializeException("Wrong indentation detected on tag-with-content line ''{0}''", i+1);
+ indent--;
+ continue;
+ }
+ throw new SerializeException("Unmatched whitespace line at line number ''{0}''", i+1);
+ }
+ if (indent != -1)
+ throw new SerializeException("Possible unmatched tag. indent=''{0}''", indent);
+ } catch (SerializeException e) {
+ XmlUtils.printLines(lines);
+ throw e;
+ }
+ }
+
+ public static final void validateXml(Object o) throws Exception {
+ XmlUtils.validateXml(o, XmlSerializer.DEFAULT_NS_SQ);
+ }
+
+ /**
+ * Test whitespace and generated schema.
+ */
+ public static void validateXml(Object o, XmlSerializer s) throws Exception {
+ s = s.builder().ws().ns().addNamespaceUrisToRoot().build();
+ String xml = s.serialize(o);
+
+ try {
+ checkXmlWhitespace(xml);
+ } catch (Exception e) {
+ System.err.println("---XML---"); // NOT DEBUG
+ System.err.println(xml); // NOT DEBUG
+ throw e;
+ }
+ }
+
+ /**
+ * Sort an XML document by element and attribute names.
+ * This method is primarily meant for debugging purposes.
+ */
+ private static final String sortXml(String xml) throws Exception {
+ xml = xml.replaceAll("\\w+\\:", "").replaceAll(">\\s+<", "><"); // Strip out all namespaces and whitespace.
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document doc = db.parse(new InputSource(new StringReader(xml)));
+
+ XmlUtils.SortedNode n = new XmlUtils.SortedNode(doc.getDocumentElement());
+ return n.toString();
+ }
+
+ /**
+ * Compares two XML documents for equality.
+ * Namespaces are stripped from each and elements/attributes are ordered in alphabetical order,
+ * then a simple string comparison is performed.
+ */
+ public static final void assertXmlEquals(String expected, String actual) throws Exception {
+ Assert.assertEquals(sortXml(expected), sortXml(actual));
+ }
+
+ private static StringBuilder indent(int depth, StringBuilder sb) {
+ for (int i = 0; i < depth; i++)
+ sb.append("\t");
+ return sb;
+ }
+
+ private static final void printLines(String[] lines) {
+ for (int i = 0; i < lines.length; i++)
+ System.err.println(String.format("%4s:" + lines[i], i+1)); // NOT DEBUG
+ }
+}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
index 742cb57..4a7cdf5 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
@@ -12,7 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.transforms;
-import static org.apache.juneau.testutils.TestUtils.*;
+import static org.apache.juneau.assertions.Verify.*;
import java.util.*;
@@ -58,7 +58,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x))
+ .verify(x -> verify(x).isType(A.class))
},
{ /* 1 */
new ComboInput<A[]>(
@@ -87,7 +87,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x[0]))
+ .verify(x -> verify(x[0]).isType(A.class))
},
{ /* 2 */
new ComboInput<A[][][]>(
@@ -116,7 +116,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <r [...]
- .verify(x -> verifyInstanceOf(A.class, x[0][0][0]))
+ .verify(x -> verify(x[0][0][0]).isType(A.class))
},
{ /* 3 */
new ComboInput<List<A[][][]>>(
@@ -145,7 +145,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http: [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www. [...]
- .verify(x -> verifyInstanceOf(A.class, x.get(0)[0][0][0]))
+ .verify(x -> verify(x.get(0)[0][0][0]).isType(A.class))
},
{ /* 4 */
new ComboInput<Map<String,A[][][]>>(
@@ -174,7 +174,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:x>\n</rdf:Descriptio [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:x>\n</rdf:Description>\n</r [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:x>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http: [...]
- .verify(x -> verifyInstanceOf(A.class, x.get("x")[0][0][0]))
+ .verify(x -> verify(x.get("x")[0][0][0]).isType(A.class))
},
{ /* 5 */
new ComboInput<Map<String,List<A[][][]>>>(
@@ -204,7 +204,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:x>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n [...]
)
- .verify(x -> verifyInstanceOf(A.class, x.get("x").get(0)[0][0][0]))
+ .verify(x -> verify(x.get("x").get(0)[0][0][0]).isType(A.class))
},
{ /* 6 */
new ComboInput<IA>(
@@ -233,7 +233,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x))
+ .verify(x -> verify(x).isType(A.class))
},
{ /* 7 */
new ComboInput<IA[]>(
@@ -262,7 +262,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x[0]))
+ .verify(x -> verify(x[0]).isType(A.class))
},
{ /* 8 */
new ComboInput<IA[][][]>(
@@ -291,7 +291,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <r [...]
- .verify(x -> verifyInstanceOf(A.class, x[0][0][0]))
+ .verify(x -> verify(x[0][0][0]).isType(A.class))
},
{ /* 9 */
new ComboInput<List<IA[][][]>>(
@@ -320,7 +320,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http: [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www. [...]
- .verify(x -> verifyInstanceOf(A.class, x.get(0)[0][0][0]))
+ .verify(x -> verify(x.get(0)[0][0][0]).isType(A.class))
},
{ /* 10 */
new ComboInput<Map<String,IA[][][]>>(
@@ -349,7 +349,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:x>\n</rdf:Descriptio [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:x>\n</rdf:Description>\n</r [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:x>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http: [...]
- .verify(x -> verifyInstanceOf(A.class, x.get("x")[0][0][0]))
+ .verify(x -> verify(x.get("x")[0][0][0]).isType(A.class))
},
{ /* 11 */
new ComboInput<Map<String,List<IA[][][]>>>(
@@ -378,7 +378,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>A</jp:_type>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rd [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>A</jp:t>\n<jp:a>1</jp:a>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:x>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>A</jp:_type>\n <jp:a>1</jp:a>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n [...]
- .verify(x -> verifyInstanceOf(A.class, x.get("x").get(0)[0][0][0]))
+ .verify(x -> verify(x.get("x").get(0)[0][0][0]).isType(A.class))
},
{ /* 12 */
new ComboInput<B>(
@@ -407,7 +407,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(B.class, x))
+ .verify(x -> verify(x).isType(B.class))
},
{ /* 13 */
new ComboInput<B[]>(
@@ -436,7 +436,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(B.class, x[0]))
+ .verify(x -> verify(x[0]).isType(B.class))
},
{ /* 14 */
new ComboInput<B[][][]>(
@@ -465,7 +465,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rd [...]
- .verify(x -> verifyInstanceOf(B.class, x[0][0][0]))
+ .verify(x -> verify(x[0][0][0]).isType(B.class))
},
{ /* 15 */
new ComboInput<List<B[][][]>>(
@@ -494,7 +494,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http:/ [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http: [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1 [...]
- .verify(x -> verifyInstanceOf(B.class, x.get(0)[0][0][0]))
+ .verify(x -> verify(x.get(0)[0][0][0]).isType(B.class))
},
{ /* 16 */
new ComboInput<Map<String,B[][][]>>(
@@ -523,7 +523,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:x>\n</rdf:Description>\n</rd [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:x>\n</rdf:Description>\n</r [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:x>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3 [...]
- .verify(x -> verifyInstanceOf(B.class, x.get("x")[0][0][0]))
+ .verify(x -> verify(x.get("x")[0][0][0]).isType(B.class))
},
{ /* 17 */
new ComboInput<Map<String,List<B[][][]>>>(
@@ -552,7 +552,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n< [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:x>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </r [...]
- .verify(x -> verifyInstanceOf(B.class, x.get("x").get(0)[0][0][0]))
+ .verify(x -> verify(x.get("x").get(0)[0][0][0]).isType(B.class))
},
{ /* 18 */
new ComboInput<IB>(
@@ -581,7 +581,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(B.class, x))
+ .verify(x -> verify(x).isType(B.class))
},
{ /* 19 */
new ComboInput<IB[]>(
@@ -610,7 +610,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(B.class, x[0]))
+ .verify(x -> verify(x[0]).isType(B.class))
},
{ /* 20 */
new ComboInput<IB[][][]>(
@@ -639,7 +639,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rd [...]
- .verify(x -> verifyInstanceOf(B.class, x[0][0][0]))
+ .verify(x -> verify(x[0][0][0]).isType(B.class))
},
{ /* 21 */
new ComboInput<List<IB[][][]>>(
@@ -668,7 +668,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http:/ [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http: [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1 [...]
- .verify(x -> verifyInstanceOf(B.class, x.get(0)[0][0][0]))
+ .verify(x -> verify(x.get(0)[0][0][0]).isType(B.class))
},
{ /* 22 */
new ComboInput<Map<String,IB[][][]>>(
@@ -697,7 +697,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:x>\n</rdf:Description>\n</rd [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:x>\n</rdf:Description>\n</r [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:x>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3 [...]
- .verify(x -> verifyInstanceOf(B.class, x.get("x")[0][0][0]))
+ .verify(x -> verify(x.get("x")[0][0][0]).isType(B.class))
},
{ /* 23 */
new ComboInput<Map<String,List<IB[][][]>>>(
@@ -726,7 +726,7 @@ public class BeanDictionaryComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n< [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:x>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:z>B</jp:z>\n<jp:b>1</jp:b>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:li>\n [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:x>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:z>B</jp:z>\n <jp:b>1</jp:b>\n </rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </r [...]
- .verify(x -> verifyInstanceOf(B.class, x.get("x").get(0)[0][0][0]))
+ .verify(x -> verify(x.get("x").get(0)[0][0][0]).isType(B.class))
},
});
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
index 520f3b7..d5db2ad 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/BuilderComboTest.java
@@ -12,7 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.transforms;
-import static org.apache.juneau.testutils.TestUtils.*;
+import static org.apache.juneau.assertions.Verify.*;
import java.util.*;
@@ -57,8 +57,8 @@ public class BuilderComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a>1</jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(A.class, x))
- .verify(x -> verifyTrue(x.createdByBuilder))
+ .verify(x -> verify(x).isType(A.class))
+ .verify(x -> verify(x.createdByBuilder).isTrue())
},
{ /* 1 */
new ComboInput<B>(
@@ -87,8 +87,8 @@ public class BuilderComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a>1</jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(B.class, x))
- .verify(x -> verifyTrue(x.createdByBuilder))
+ .verify(x -> verify(x).isType(B.class))
+ .verify(x -> verify(x.createdByBuilder).isTrue())
},
{ /* 2 */
new ComboInput<C>(
@@ -117,8 +117,8 @@ public class BuilderComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a>1</jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(C.class, x))
- .verify(x -> verifyTrue(x.createdByBuilder))
+ .verify(x -> verify(x).isType(C.class))
+ .verify(x -> verify(x.createdByBuilder).isTrue())
},
{ /* 3 */
new ComboInput<D>(
@@ -147,8 +147,8 @@ public class BuilderComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a>1</jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(D.class, x))
- .verify(x -> verifyTrue(x.createdByBuilder))
+ .verify(x -> verify(x).isType(D.class))
+ .verify(x -> verify(x.createdByBuilder).isTrue())
},
{ /* 4 */
new ComboInput<E>(
@@ -177,8 +177,8 @@ public class BuilderComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a>1</jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(E.class, x))
- .verify(x -> verifyTrue(x.createdByBuilder))
+ .verify(x -> verify(x).isType(E.class))
+ .verify(x -> verify(x.createdByBuilder).isTrue())
},
{ /* 5 */
new ComboInput<H>(
@@ -207,8 +207,8 @@ public class BuilderComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:fooBar>1</jp:fooBar>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:fooBar>1</jp:fooBar>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:fooBar>1</jp:fooBar>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(H.class, x))
- .verify(x -> verifyTrue(x.createdByBuilder))
+ .verify(x -> verify(x).isType(H.class))
+ .verify(x -> verify(x.createdByBuilder).isTrue())
},
});
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
index 3d64751..c3ca986 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
@@ -12,7 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.transforms;
-import static org.apache.juneau.testutils.TestUtils.*;
+import static org.apache.juneau.assertions.Verify.*;
import java.util.*;
@@ -57,7 +57,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>AQID</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>AQID</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>AQID</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(byte[].class, x))
+ .verify(x -> verify(x).isType(byte[].class))
},
{ /* 1 */
new ComboInput<byte[][]>(
@@ -86,7 +86,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>AQID</rdf:li>\n <rdf:li>BAUG</rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(byte[][].class, x))
+ .verify(x -> verify(x).isType(byte[][].class))
},
{ /* 2 */
new ComboInput<List<byte[]>>(
@@ -115,8 +115,8 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>AQID</rdf:li>\n <rdf:li>BAUG</rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(List.class, x))
- .verify(x -> verifyInstanceOf(byte[].class, x.get(0)))
+ .verify(x -> verify(x).isType(List.class))
+ .verify(x -> verify(x.get(0)).isType(byte[].class))
},
{ /* 3 */
new ComboInput<Map<String,byte[]>>(
@@ -145,9 +145,9 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>AQID</jp:foo>\n<jp:bar rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n<jp:_x0000_>BAUG</jp:_x0000_>\n<jp:null>BwgJ</jp:null>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>AQID</jp:foo>\n<jp:bar rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n<jp:_x0000_>BAUG</jp:_x0000_>\n<jp:null>BwgJ</jp:null>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>AQID</jp:foo>\n <jp:bar rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n <jp:_x0000_>BAUG</jp:_x0000_>\n <jp:null>BwgJ</jp:null>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Map.class, x))
- .verify(x -> verifyInstanceOf(String.class, x.keySet().iterator().next()))
- .verify(x -> verifyInstanceOf(byte[].class, x.values().iterator().next()))
+ .verify(x -> verify(x).isType(Map.class))
+ .verify(x -> verify(x.keySet().iterator().next()).isType(String.class))
+ .verify(x -> verify(x.values().iterator().next()).isType(byte[].class))
},
{ /* 4 */
new ComboInput<BeanWithByteArrayField>(
@@ -176,7 +176,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f>AQID</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f>AQID</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f>AQID</jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithByteArrayField.class, x))
+ .verify(x -> verify(x).isType(BeanWithByteArrayField.class))
},
{ /* 5 */
new ComboInput<BeanWithByteArray2dField>(
@@ -205,7 +205,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f>\n <rdf:Seq>\n <rdf:li>AQID</rdf:li>\n <rdf:li>BAUG</rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithByteArray2dField.class, x))
+ .verify(x -> verify(x).isType(BeanWithByteArray2dField.class))
},
{ /* 6 */
new ComboInput<BeanWithByteArrayNullField>(
@@ -234,7 +234,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithByteArrayNullField.class, x))
+ .verify(x -> verify(x).isType(BeanWithByteArrayNullField.class))
},
{ /* 7 */
new ComboInput<BeanWithByteArrayListField>(
@@ -263,7 +263,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f>\n <rdf:Seq>\n <rdf:li>AQID</rdf:li>\n <rdf:li>BAUG</rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithByteArrayListField.class, x))
+ .verify(x -> verify(x).isType(BeanWithByteArrayListField.class))
},
{ /* 8 */
new ComboInput<BeanWithByteArrayMapField>(
@@ -292,7 +292,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:parseType='Resource'>\n<jp:foo>AQID</jp:foo>\n<jp:bar rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n<jp:_x0000_>BAUG</jp:_x0000_>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:parseType='Resource'>\n<jp:foo>AQID</jp:foo>\n<jp:bar rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n<jp:_x0000_>BAUG</jp:_x0000_>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f rdf:parseType='Resource'>\n <jp:foo>AQID</jp:foo>\n <jp:bar rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n <jp:_x0000_>BAUG</jp:_x0000_>\n </jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(BeanWithByteArrayMapField.class, x))
+ .verify(x -> verify(x).isType(BeanWithByteArrayMapField.class))
},
{ /* 9 */
new ComboInput<BeanWithByteArrayBeanListField>(
@@ -321,7 +321,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f1>AQID</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:f2>\n<jp:f3 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n<jp:f4>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</ [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f1>AQID</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:f2>\n<jp:f3 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n<jp:f4>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n< [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:f1>AQID</jp:f1>\n <jp:f2>\n <rdf:Seq>\n <rdf:li>AQID</rdf:li>\n <rdf:li>BAUG</rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </jp:f2>\n <jp:f3 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n <jp: [...]
- .verify(x -> verifyInstanceOf(BeanWithByteArrayBeanListField.class, x))
+ .verify(x -> verify(x).isType(BeanWithByteArrayBeanListField.class))
},
{ /* 10 */
new ComboInput<BeanWithByteArrayBeanMapField>(
@@ -350,7 +350,7 @@ public class ByteArrayBase64SwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:parseType='Resource'>\n<jp:foo rdf:parseType='Resource'>\n<jp:f1>AQID</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:f2>\n<jp:f3 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n<jp:f4>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax [...]
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:parseType='Resource'>\n<jp:foo rdf:parseType='Resource'>\n<jp:f1>AQID</jp:f1>\n<jp:f2>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Seq>\n</jp:f2>\n<jp:f3 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n<jp:f4>\n<rdf:Seq>\n<rdf:li>AQID</rdf:li>\n<rdf:li>BAUG</rdf:li>\n<rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-synta [...]
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f rdf:parseType='Resource'>\n <jp:foo rdf:parseType='Resource'>\n <jp:f1>AQID</jp:f1>\n <jp:f2>\n <rdf:Seq>\n <rdf:li>AQID</rdf:li>\n <rdf:li>BAUG</rdf:li>\n <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </jp:f2>\n <jp:f3 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n <jp:f4>\n [...]
- .verify(x -> verifyInstanceOf(BeanWithByteArrayBeanMapField.class, x))
+ .verify(x -> verify(x).isType(BeanWithByteArrayBeanMapField.class))
},
});
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
index 9d6714a..9e1e385 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
@@ -12,7 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.transforms;
-import static org.apache.juneau.testutils.TestUtils.*;
+import static org.apache.juneau.assertions.Verify.*;
import java.util.*;
@@ -72,7 +72,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>Sun Mar 03 10:11:12 PST 1901</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>Sun Mar 03 10:11:12 PST 1901</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>Sun Mar 03 10:11:12 PST 1901</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x))
+ .verify(x -> verify(x).isType(Calendar.class))
},
{ /* 1 */
new ComboInput<Calendar[]>(
@@ -102,7 +102,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Sun Mar 03 10:11:12 PST 1901</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Sun Mar 03 10:11:12 PST 1901</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>Sun Mar 03 10:11:12 PST 1901</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Calendar.class))
},
{ /* 2 */
new ComboInput<OMap>(
@@ -132,7 +132,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Sun Mar 03 10:11:12 PST 1901</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Sun Mar 03 10:11:12 PST 1901</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>Sun Mar 03 10:11:12 PST 1901</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Calendar.class))
},
{ /* 3 */
new ComboInput<Calendar>(
@@ -162,7 +162,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>1901-03-03T10:11:12-08:00</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>1901-03-03T10:11:12-08:00</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>1901-03-03T10:11:12-08:00</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x))
+ .verify(x -> verify(x).isType(Calendar.class))
},
{ /* 4 */
new ComboInput<Calendar[]>(
@@ -192,7 +192,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>1901-03-03T10:11:12-08:00</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>1901-03-03T10:11:12-08:00</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>1901-03-03T10:11:12-08:00</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Calendar.class))
},
{ /* 5 */
new ComboInput<OMap>(
@@ -222,7 +222,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>1901-03-03T10:11:12-08:00</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>1901-03-03T10:11:12-08:00</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>1901-03-03T10:11:12-08:00</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Calendar.class))
},
{ /* 6 */
new ComboInput<Calendar>(
@@ -252,7 +252,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>Sun, 03 Mar 1901 18:11:12 GMT</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>Sun, 03 Mar 1901 18:11:12 GMT</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>Sun, 03 Mar 1901 18:11:12 GMT</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x))
+ .verify(x -> verify(x).isType(Calendar.class))
},
{ /* 7 */
new ComboInput<Calendar[]>(
@@ -282,7 +282,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Sun, 03 Mar 1901 18:11:12 GMT</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Sun, 03 Mar 1901 18:11:12 GMT</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>Sun, 03 Mar 1901 18:11:12 GMT</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Calendar.class))
},
{ /* 8 */
new ComboInput<OMap>(
@@ -312,7 +312,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Sun, 03 Mar 1901 18:11:12 GMT</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Sun, 03 Mar 1901 18:11:12 GMT</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>Sun, 03 Mar 1901 18:11:12 GMT</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Calendar.class))
},
{ /* 9 */
new ComboInput<Calendar>(
@@ -342,7 +342,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>-2172116928000</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>-2172116928000</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>-2172116928000</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x))
+ .verify(x -> verify(x).isType(Calendar.class))
},
{ /* 10 */
new ComboInput<Calendar[]>(
@@ -372,7 +372,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>-2172116928000</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>-2172116928000</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>-2172116928000</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Calendar.class))
},
{ /* 11 */
new ComboInput<OMap>(
@@ -402,7 +402,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>-2172116928000</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>-2172116928000</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>-2172116928000</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Calendar.class))
},
{ /* 12 */
new ComboInput<Calendar>(
@@ -432,7 +432,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:time>-2172116928000</jp:time>\n<jp:timeZone>PST</jp:timeZone>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:time>-2172116928000</jp:time>\n<jp:timeZone>PST</jp:timeZone>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:time>-2172116928000</jp:time>\n <jp:timeZone>PST</jp:timeZone>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x))
+ .verify(x -> verify(x).isType(Calendar.class))
},
{ /* 13 */
new ComboInput<Calendar[]>(
@@ -462,7 +462,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:time>-2172116928000</jp:time>\n<jp:timeZone>PST</jp:timeZone>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:time>-2172116928000</jp:time>\n<jp:timeZone>PST</jp:timeZone>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:time>-2172116928000</jp:time>\n <jp:timeZone>PST</jp:timeZone>\n </rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Calendar.class))
},
{ /* 14 */
new ComboInput<OMap>(
@@ -492,7 +492,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo rdf:parseType='Resource'>\n<jp:time>-2172116928000</jp:time>\n<jp:timeZone>PST</jp:timeZone>\n</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo rdf:parseType='Resource'>\n<jp:time>-2172116928000</jp:time>\n<jp:timeZone>PST</jp:timeZone>\n</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo rdf:parseType='Resource'>\n <jp:time>-2172116928000</jp:time>\n <jp:timeZone>PST</jp:timeZone>\n </jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Calendar.class))
},
{ /* 15 */
new ComboInput<Calendar>(
@@ -522,7 +522,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>Mar 3, 1901</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>Mar 3, 1901</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>Mar 3, 1901</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x))
+ .verify(x -> verify(x).isType(Calendar.class))
},
{ /* 16 */
new ComboInput<Calendar[]>(
@@ -552,7 +552,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Mar 3, 1901</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Mar 3, 1901</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>Mar 3, 1901</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Calendar.class))
},
{ /* 17 */
new ComboInput<OMap>(
@@ -582,7 +582,7 @@ public class CalendarSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Mar 3, 1901</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Mar 3, 1901</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>Mar 3, 1901</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Calendar.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Calendar.class))
},
});
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
index 4ae2621..8bff3c3 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
@@ -12,7 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.transforms;
-import static org.apache.juneau.testutils.TestUtils.*;
+import static org.apache.juneau.assertions.Verify.*;
import java.util.*;
@@ -68,7 +68,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>Sun Mar 03 10:11:12 PST 1901</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>Sun Mar 03 10:11:12 PST 1901</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>Sun Mar 03 10:11:12 PST 1901</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x))
+ .verify(x -> verify(x).isType(Date.class))
},
{ /* 1 */
new ComboInput<Date[]>(
@@ -98,7 +98,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Sun Mar 03 10:11:12 PST 1901</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Sun Mar 03 10:11:12 PST 1901</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>Sun Mar 03 10:11:12 PST 1901</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Date.class))
},
{ /* 2 */
new ComboInput<OMap>(
@@ -128,7 +128,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Sun Mar 03 10:11:12 PST 1901</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Sun Mar 03 10:11:12 PST 1901</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>Sun Mar 03 10:11:12 PST 1901</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Date.class))
},
{ /* 3 */
new ComboInput<Date>(
@@ -158,7 +158,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>1901-03-03T10:11:12-08:00</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>1901-03-03T10:11:12-08:00</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>1901-03-03T10:11:12-08:00</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x))
+ .verify(x -> verify(x).isType(Date.class))
},
{ /* 4 */
new ComboInput<Date[]>(
@@ -188,7 +188,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>1901-03-03T10:11:12-08:00</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>1901-03-03T10:11:12-08:00</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>1901-03-03T10:11:12-08:00</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Date.class))
},
{ /* 5 */
new ComboInput<OMap>(
@@ -218,7 +218,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>1901-03-03T10:11:12-08:00</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>1901-03-03T10:11:12-08:00</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>1901-03-03T10:11:12-08:00</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Date.class))
},
{ /* 6 */
new ComboInput<Date>(
@@ -248,7 +248,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>Sun, 03 Mar 1901 18:11:12 GMT</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>Sun, 03 Mar 1901 18:11:12 GMT</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>Sun, 03 Mar 1901 18:11:12 GMT</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x))
+ .verify(x -> verify(x).isType(Date.class))
},
{ /* 7 */
new ComboInput<Date[]>(
@@ -278,7 +278,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Sun, 03 Mar 1901 18:11:12 GMT</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Sun, 03 Mar 1901 18:11:12 GMT</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>Sun, 03 Mar 1901 18:11:12 GMT</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Date.class))
},
{ /* 8 */
new ComboInput<OMap>(
@@ -308,7 +308,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Sun, 03 Mar 1901 18:11:12 GMT</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Sun, 03 Mar 1901 18:11:12 GMT</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>Sun, 03 Mar 1901 18:11:12 GMT</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Date.class))
},
{ /* 9 */
new ComboInput<Date>(
@@ -338,7 +338,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>-2172116928000</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>-2172116928000</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>-2172116928000</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x))
+ .verify(x -> verify(x).isType(Date.class))
},
{ /* 10 */
new ComboInput<Date[]>(
@@ -368,7 +368,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>-2172116928000</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>-2172116928000</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>-2172116928000</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Date.class))
},
{ /* 11 */
new ComboInput<OMap>(
@@ -398,7 +398,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>-2172116928000</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>-2172116928000</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>-2172116928000</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Date.class))
},
{ /* 12 */
new ComboInput<Date>(
@@ -428,7 +428,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:time>-2172116928000</jp:time>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:time>-2172116928000</jp:time>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:time>-2172116928000</jp:time>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x))
+ .verify(x -> verify(x).isType(Date.class))
},
{ /* 13 */
new ComboInput<Date[]>(
@@ -458,7 +458,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:time>-2172116928000</jp:time>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:time>-2172116928000</jp:time>\n</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:time>-2172116928000</jp:time>\n </rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Date.class))
},
{ /* 14 */
new ComboInput<OMap>(
@@ -488,7 +488,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo rdf:parseType='Resource'>\n<jp:time>-2172116928000</jp:time>\n</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo rdf:parseType='Resource'>\n<jp:time>-2172116928000</jp:time>\n</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo rdf:parseType='Resource'>\n <jp:time>-2172116928000</jp:time>\n </jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Date.class))
},
{ /* 15 */
new ComboInput<Date>(
@@ -518,7 +518,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<j:value>Mar 3, 1901</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<j:value>Mar 3, 1901</j:value>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <j:value>Mar 3, 1901</j:value>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x))
+ .verify(x -> verify(x).isType(Date.class))
},
{ /* 16 */
new ComboInput<Date[]>(
@@ -548,7 +548,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Mar 3, 1901</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>Mar 3, 1901</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>Mar 3, 1901</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x[0]))
+ .verify(x -> verify(x[0]).isType(Date.class))
},
{ /* 17 */
new ComboInput<OMap>(
@@ -578,7 +578,7 @@ public class DateSwapComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Mar 3, 1901</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:foo>Mar 3, 1901</jp:foo>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:foo>Mar 3, 1901</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n")
- .verify(x -> verifyInstanceOf(Date.class, x.get("foo")))
+ .verify(x -> verify(x.get("foo")).isType(Date.class))
},
});
}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
index 1ac8056..ca8764a 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
@@ -25,7 +25,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.testutils.*;
+import org.apache.juneau.testutils.XmlUtils;
import org.apache.juneau.xml.annotation.*;
import org.junit.*;
@@ -181,7 +181,7 @@ public class CommonTest {
+"<x6><object><f1 _type='number'>1</f1></object></x6>"
+"</object>",
r);
- TestUtils.validateXml(t);
+ XmlUtils.validateXml(t);
}
public static class E1 {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
index 25f8d51..904cb1e 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/CommonXmlTest.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.xml;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.apache.juneau.xml.annotation.XmlFormat.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -20,6 +19,7 @@ import static org.junit.runners.MethodSorters.*;
import java.net.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.testutils.XmlUtils;
import org.apache.juneau.xml.annotation.*;
import org.junit.*;
@@ -43,7 +43,7 @@ public class CommonXmlTest {
assertEquals(123, t.id);
assertEquals("bar", t.name);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
@Bean(bpi="url,id,name")
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
index 437da94..63cb507 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.xml;
import static org.apache.juneau.assertions.ObjectAssertion.*;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.apache.juneau.xml.annotation.XmlFormat.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -22,6 +21,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.testutils.XmlUtils;
import org.apache.juneau.xml.annotation.*;
import org.junit.*;
@@ -51,7 +51,7 @@ public class XmlCollapsedTest {
assertEquals("f3a", t.f3.get(0));
assertEquals("f4a", t.f4[0]);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
public static class A {
@@ -91,7 +91,7 @@ public class XmlCollapsedTest {
assertEquals("f3a", t.f3.get(0));
assertEquals("f4a", t.f4[0]);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
public static class B {
@@ -137,7 +137,7 @@ public class XmlCollapsedTest {
assertEquals("f4a", t.f4[0]);
assertEquals("f4b", t.f4[1]);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
public static class C {
@@ -179,7 +179,7 @@ public class XmlCollapsedTest {
assertEquals("f3a", t.f3.get(0));
assertEquals("f4a", t.f4[0]);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
@Bean(bpi="f1,f2,f3,f4")
@@ -235,7 +235,7 @@ public class XmlCollapsedTest {
assertEquals("f1a", t.f1.get(0));
assertEquals("f2a", t.f2.get(0));
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
@Bean(bpi="f1,f2")
@@ -275,14 +275,14 @@ public class XmlCollapsedTest {
assertEquals("<object><xf1>x1</xf1><xf1>x2</xf1></object>", r);
t2 = p.parse(r, FA.class);
assertObject(t1).sameAs(t2);
- validateXml(t1, s);
+ XmlUtils.validateXml(t1, s);
t1 = FB.newInstance();
r = s.serialize(t1);
assertEquals("<object><xf1>x1</xf1><xf1>x2</xf1></object>", r);
t2 = p.parse(r, FB.class);
assertObject(t1).sameAs(t2);
- validateXml(t1, s);
+ XmlUtils.validateXml(t1, s);
}
public static class FA {
@@ -344,7 +344,7 @@ public class XmlCollapsedTest {
t2 = p.parse(xml, G.class);
assertObject(t).sameAs(t2);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
public static class G {
@@ -378,7 +378,7 @@ public class XmlCollapsedTest {
t2 = p.parse(xml, H.class);
assertObject(t).sameAs(t2);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
public static class H {
@@ -417,7 +417,7 @@ public class XmlCollapsedTest {
t2 = p.parse(xml, G.class);
assertObject(t).sameAs(t2);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
public static class I {
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
index 7c88d37..7d8721f 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.xml;
-import static org.apache.juneau.testutils.TestUtils.*;
import static org.apache.juneau.xml.annotation.XmlFormat.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -24,6 +23,7 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.jena.annotation.*;
import org.apache.juneau.json.*;
+import org.apache.juneau.testutils.XmlUtils;
import org.apache.juneau.xml.annotation.*;
import org.apache.juneau.xml.xml1a.*;
import org.apache.juneau.xml.xml1b.*;
@@ -197,7 +197,7 @@ public class XmlTest {
A t = new A();
String r = s.serialize(t);
assertEquals("<foo><f1>1</f1></foo>", r);
- validateXml(t);
+ XmlUtils.validateXml(t);
}
@Bean(typeName="foo")
@@ -214,7 +214,7 @@ public class XmlTest {
B2 t = new B2();
String r = s.serialize(t);
assertEquals("<foo><f1>1</f1></foo>", r);
- validateXml(t);
+ XmlUtils.validateXml(t);
}
public static class B1 extends A {}
@@ -229,7 +229,7 @@ public class XmlTest {
C3 t = new C3();
String r = s.serialize(t);
assertEquals("<foo><f1>1</f1></foo>", r);
- validateXml(t);
+ XmlUtils.validateXml(t);
}
@Bean(typeName="foo")
@@ -250,7 +250,7 @@ public class XmlTest {
String r = s.serialize(t);
assertEquals("<_x007E__x0021__x0040__x0023__x0024__x0025__x005E__x0026__x002A__x0028__x0029___x002B__x0060_-_x003D__x007B__x007D__x007C__x005B__x005D__x005C__x003A__x0022__x003B__x0027__x003C__x003E__x003F__x002C_._x000A__x000D__x0009__x0008_><f1>1</f1></_x007E__x0021__x0040__x0023__x0024__x0025__x005E__x0026__x002A__x0028__x0029___x002B__x0060_-_x003D__x007B__x007D__x007C__x005B__x005D__x005C__x003A__x0022__x003B__x0027__x003C__x003E__x003F__x002C_._x000A__x000D__x0009__x0008_>", r);
t = p.parse(r, D.class);
- validateXml(t);
+ XmlUtils.validateXml(t);
}
@Bean(typeName="~!@#$%^&*()_+`-={}|[]\\:\";'<>?,.\n\r\t\b")
@@ -271,7 +271,7 @@ public class XmlTest {
String r = s.serialize(t);
assertEquals("<bar><foo _name='f1'><string>bar</string></foo></bar>", r);
t = p.parse(r, G.class);
- validateXml(t);
+ XmlUtils.validateXml(t);
}
@Bean(typeName="foo")
@@ -339,7 +339,7 @@ public class XmlTest {
assertEquals(4, t.f1);
assertEquals(5, t.f2);
assertEquals(6, t.f3);
- validateXml(t);
+ XmlUtils.validateXml(t);
}
public static class L {
@@ -368,7 +368,7 @@ public class XmlTest {
assertEquals(4, t.f1);
assertEquals(5, t.f2);
assertEquals(6, t.f3);
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
@Xml(prefix="bar", namespace="http://bar")
@@ -438,7 +438,7 @@ public class XmlTest {
assertEquals(123, t.id);
assertEquals("bar", t.name);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
@Bean(bpi="url,id,name")
@@ -471,7 +471,7 @@ public class XmlTest {
assertEquals(123, t.id);
assertEquals("bar", t.name);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
@Bean(bpi="url2,id2,name")
@@ -504,7 +504,7 @@ public class XmlTest {
assertEquals(123, t.id);
assertEquals("bar", t.name);
- validateXml(t, s);
+ XmlUtils.validateXml(t, s);
}
@Bean(bpi="url2,id2,name")
@@ -552,7 +552,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz'><foo:f1>1</foo:f1><bar:f2>2</bar:f2><foo:f3>3</foo:f3><baz:f4>4</baz:f4></object>", r);
assertTrue(t.equals(p.parse(r, T1.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
// Auto-detect namespaces.
s = XmlSerializer.create().sq();
@@ -569,7 +569,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz'><foo:f1>1</foo:f1><bar:f2>2</bar:f2><foo:f3>3</foo:f3><baz:f4>4</baz:f4></object>", r);
assertTrue(t.equals(p.parse(r, T1.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
//====================================================================================================
@@ -604,7 +604,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<foo:T2 xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz'><foo:f1>1</foo:f1><bar:f2>2</bar:f2><foo:f3>3</foo:f3><baz:f4>4</baz:f4></foo:T2>", r);
assertTrue(t.equals(p.parse(r, T2.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
// Auto-detect namespaces.
s = XmlSerializer.create().sq();
@@ -619,7 +619,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<foo:T2 xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz'><foo:f1>1</foo:f1><bar:f2>2</bar:f2><foo:f3>3</foo:f3><baz:f4>4</baz:f4></foo:T2>", r);
assertTrue(t.equals(p.parse(r, T2.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
@@ -635,7 +635,7 @@ public class XmlTest {
String r = s.build().serialize(t);
assertEquals("<object><f1>1</f1><f2>2</f2><f3>3</f3><f4>4</f4></object>", r);
assertTrue(t.equals(p.parse(r, T3.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.enableNamespaces();
r = s.build().serialize(t);
@@ -657,7 +657,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:p1='http://p1' xmlns:bar='http://bar' xmlns:baz='http://baz'><p1:f1>1</p1:f1><bar:f2>2</bar:f2><p1:f3>3</p1:f3><baz:f4>4</baz:f4></object>", r);
assertTrue(t.equals(p.parse(r, T3.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
// Auto-detect namespaces.
s = XmlSerializer.create().sq();
@@ -672,7 +672,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:p1='http://p1' xmlns:bar='http://bar' xmlns:baz='http://baz'><p1:f1>1</p1:f1><bar:f2>2</bar:f2><p1:f3>3</p1:f3><baz:f4>4</baz:f4></object>", r);
assertTrue(t.equals(p.parse(r, T3.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
//====================================================================================================
@@ -708,7 +708,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<p1:T4 xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz' xmlns:p1='http://p1'><p1:f1>1</p1:f1><bar:f2>2</bar:f2><p1:f3>3</p1:f3><baz:f4>4</baz:f4></p1:T4>", r);
assertTrue(t.equals(p.parse(r, T4.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
// Auto-detect namespaces.
s = XmlSerializer.create().sq();
@@ -723,7 +723,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<p1:T4 xmlns='http://www.apache.org/2013/Juneau' xmlns:p1='http://p1' xmlns:bar='http://bar' xmlns:baz='http://baz'><p1:f1>1</p1:f1><bar:f2>2</bar:f2><p1:f3>3</p1:f3><baz:f4>4</baz:f4></p1:T4>", r);
assertTrue(t.equals(p.parse(r, T4.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
//====================================================================================================
@@ -738,7 +738,7 @@ public class XmlTest {
String r = s.build().serialize(t);
assertEquals("<T5><f1>1</f1><f2>2</f2><f3>3</f3><f4>4</f4></T5>", r);
assertTrue(t.equals(p.parse(r, T5.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.ns().dontAutoDetectNamespaces();
r = s.build().serialize(t);
@@ -759,24 +759,24 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<foo:T5 xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz'><foo:f1>1</foo:f1><bar:f2>2</bar:f2><foo:f3>3</foo:f3><baz:f4>4</baz:f4></foo:T5>", r);
assertTrue(t.equals(p.parse(r, T5.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
// Auto-detect namespaces.
s = XmlSerializer.create().sq();
r = s.build().serialize(t);
assertEquals("<T5><f1>1</f1><f2>2</f2><f3>3</f3><f4>4</f4></T5>", r);
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.addNamespaceUrisToRoot();
r = s.build().serialize(t);
assertEquals("<T5><f1>1</f1><f2>2</f2><f3>3</f3><f4>4</f4></T5>", r);
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.ns();
r = s.build().serialize(t);
assertEquals("<foo:T5 xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz'><foo:f1>1</foo:f1><bar:f2>2</bar:f2><foo:f3>3</foo:f3><baz:f4>4</baz:f4></foo:T5>", r);
assertTrue(t.equals(p.parse(r, T5.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
//====================================================================================================
@@ -811,24 +811,24 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz'><foo:f1>1</foo:f1><bar:f2>2</bar:f2><foo:f3>3</foo:f3><baz:f4>4</baz:f4></object>", r);
assertTrue(t.equals(p.parse(r, T6.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
// Auto-detect namespaces.
s = XmlSerializer.create().sq();
r = s.build().serialize(t);
assertEquals("<object><f1>1</f1><f2>2</f2><f3>3</f3><f4>4</f4></object>", r);
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.addNamespaceUrisToRoot();
r = s.build().serialize(t);
assertEquals("<object><f1>1</f1><f2>2</f2><f3>3</f3><f4>4</f4></object>", r);
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.ns();
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:foo='http://foo' xmlns:bar='http://bar' xmlns:baz='http://baz'><foo:f1>1</foo:f1><bar:f2>2</bar:f2><foo:f3>3</foo:f3><baz:f4>4</baz:f4></object>", r);
assertTrue(t.equals(p.parse(r, T6.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
//====================================================================================================
@@ -877,7 +877,7 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:p1='http://p1' xmlns:bar='http://bar' xmlns:baz='http://baz'><p1:g1>1</p1:g1><bar:g2>2</bar:g2><p1:g3>3</p1:g3><baz:g4>4</baz:g4></object>", r);
assertTrue(t.equals(p.parse(r, T7.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
//====================================================================================================
@@ -917,18 +917,18 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<object><f1>1</f1><f2>2</f2><f3>3</f3><f4>4</f4></object>", r);
assertTrue(t.equals(p.parse(r, T8.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.addNamespaceUrisToRoot();
r = s.build().serialize(t);
assertEquals("<object><f1>1</f1><f2>2</f2><f3>3</f3><f4>4</f4></object>", r);
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.ns();
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:p2='http://p2' xmlns:p1='http://p1' xmlns:c1='http://c1' xmlns:f1='http://f1'><p2:f1>1</p2:f1><p1:f2>2</p1:f2><c1:f3>3</c1:f3><f1:f4>4</f1:f4></object>", r);
assertTrue(t.equals(p.parse(r, T8.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
//====================================================================================================
@@ -968,18 +968,18 @@ public class XmlTest {
r = s.build().serialize(t);
assertEquals("<object><f1>1</f1></object>", r);
assertTrue(t.equals(p.parse(r, T9.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.addNamespaceUrisToRoot();
r = s.build().serialize(t);
assertEquals("<object><f1>1</f1></object>", r);
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
s.ns();
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:p1='http://p1'><p1:f1>1</p1:f1></object>", r);
assertTrue(t.equals(p.parse(r, T9.class)));
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
}
//====================================================================================================
@@ -1005,7 +1005,7 @@ public class XmlTest {
s.ns().addNamespaceUrisToRoot();
r = s.build().serialize(t);
assertEquals("<object xmlns='http://www.apache.org/2013/Juneau' xmlns:ns='http://ns' xmlns:nsf1='http://nsf1' xmlns:nsf3='http://nsf3' nsf1:f1='http://xf1' ns:f2='xf2' nsf3:x3='xf3'/>", r);
- validateXml(t, s.build());
+ XmlUtils.validateXml(t, s.build());
t = p.parse(r, Q.class);
assertEquals("http://xf1", t.f1.toString());
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Verify.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Verify.java
new file mode 100644
index 0000000..9413e2d
--- /dev/null
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Verify.java
@@ -0,0 +1,117 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
+// * with the License. You may obtain a copy of the License at *
+// * *
+// * http://www.apache.org/licenses/LICENSE-2.0 *
+// * *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
+// * specific language governing permissions and limitations under the License. *
+// ***************************************************************************************************************************
+package org.apache.juneau.assertions;
+
+import java.util.function.*;
+
+import org.apache.juneau.internal.*;
+
+/**
+ * Utility class for performing simple validations on objects.
+ *
+ * <p>
+ * Verifications that pass return a null string. Verifications that don't pass return a string with a useful
+ * error message.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <jc>// Validates that our POJO is of type MyBean.</jc>
+ * String errorMessage = <jsm>verify</jsm>(myPojo).isType(MyBean.<jk>class</jk>);
+ * <jk>if</jk> (errorMessage != <jk>null</jk>)
+ * <jk>throw new</jk> RuntimeException(errorMessage);
+ * </p>
+ */
+public class Verify {
+
+ private final Object o;
+ private Supplier<String> msg;
+
+ /**
+ * Create a new verifier object.
+ *
+ * @param o The object being verified.
+ * @return A new verifier object.
+ */
+ public static Verify verify(Object o) {
+ return new Verify(o);
+ }
+
+ /**
+ * Create a new verifier object.
+ *
+ * @param o The object being verified.
+ */
+ protected Verify(Object o) {
+ this.o = o;
+ }
+
+ /**
+ * Overrides the default error message produced by the verification.
+ *
+ * @param msg The error message.
+ * @param args Optional message arguments.
+ * @return This object (for method chaining).
+ */
+ public Verify msg(String msg, Object args) {
+ this.msg = () -> StringUtils.format(msg, args);
+ return this;
+ }
+
+ /**
+ * Verifies that this object is of the specified type.
+ *
+ * @param type The type to test against.
+ * @return An error message if the object is not of the specified type, otherwise <jk>null</jk>.
+ */
+ public String isType(Class<?> type) {
+ if (type.isInstance(o))
+ return null;
+ if (msg == null)
+ msg = () -> StringUtils.format("Expected type {0} but was {1}", type, (o == null ? null : o.getClass()));
+ return msg.get();
+ }
+
+ /**
+ * Verifies that this object is equal to the specified object.
+ *
+ * @param expected The object to test against for equality.
+ * @return An error message if the object is not equal to the specified object, otherwise <jk>null</jk>.
+ */
+ public String is(Object expected) {
+ if (expected == o)
+ return null;
+ if (expected == null || o == null)
+ return StringUtils.format("Expected {0} but was {1}", expected, o);
+ if (! expected.equals(o))
+ return StringUtils.format("Expected {0} but was {1}", expected, o);
+ return null;
+ }
+
+ /**
+ * Verifies that this object is equal to {@link Boolean#TRUE}.
+ *
+ * @return An error message if the object is not true, otherwise <jk>null</jk>.
+ */
+ public String isTrue() {
+ return is(true);
+ }
+
+ /**
+ * Verifies that this object is equal to {@link Boolean#FALSE}.
+ *
+ * @return An error message if the object is not false, otherwise <jk>null</jk>.
+ */
+ public String isFalse() {
+ return is(false);
+ }
+}