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 2017/06/21 17:57:38 UTC
[1/4] incubator-juneau git commit: Code cleanup.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 7a39c7cc7 -> 7231baab1
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java
index 0872206..8f1ed5a 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingSerializerTest.java
@@ -447,48 +447,48 @@ public class UrlEncodingSerializerTest {
String e = "f1=bar&f2=bar&f2=baz";
assertEquals(e, r);
}
-
+
@Test
public void testParseParameterObjectMap() throws Exception {
String in = "(name='foo bar')";
-
+
ObjectMap r = UrlEncodingParser.DEFAULT.parse(PartType.QUERY, in, BeanContext.DEFAULT.createSession().getClassMeta(ObjectMap.class));
-
+
assertEquals("{name:'foo bar'}", JsonSerializer.DEFAULT_LAX.toString(r));
}
-
+
//====================================================================================================
// Test URLENC_paramFormat == PLAINTEXT.
//====================================================================================================
@Test
public void testPlainTextParams() throws Exception {
WriterSerializer s = UrlEncodingSerializer.DEFAULT.builder().plainTextParams().build();
-
+
assertEquals("_value=foo", s.serialize("foo"));
assertEquals("_value='foo'", s.serialize("'foo'"));
assertEquals("_value=(foo)", s.serialize("(foo)"));
assertEquals("_value=@(foo)", s.serialize("@(foo)"));
-
+
Map<String,Object> m = new AMap<String,Object>()
.append("foo", "foo")
.append("'foo'", "'foo'")
.append("(foo)", "(foo)")
.append("@(foo)", "@(foo)");
assertEquals("foo=foo&'foo'='foo'&(foo)=(foo)&@(foo)=@(foo)", s.serialize(m));
-
+
List<String> l = new AList<String>().appendAll("foo", "'foo'", "(foo)", "@(foo)");
assertEquals("0=foo&1='foo'&2=(foo)&3=@(foo)", s.serialize(l));
-
+
A a = new A();
assertEquals("'foo'='foo'&(foo)=(foo)&@(foo)=@(foo)&foo=foo", s.serialize(a));
}
-
+
@Bean(sort=true)
public static class A {
-
+
@BeanProperty(name="foo")
public String f1 = "foo";
-
+
@BeanProperty(name="'foo'")
public String f2 = "'foo'";
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java
index 9c003d9..dd268e2 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/utils/ClassUtilsTest.java
@@ -120,13 +120,13 @@ public class ClassUtilsTest {
public void getClassFromReadableName() throws Exception {
fail("Not implemented");
}
-
+
//====================================================================================================
// findPublicMethod
//====================================================================================================
@Test
public void testFindPublicMethod() {
-
+
assertNotNull(findPublicMethod(B.class, "m1", void.class));
assertNull(findPublicMethod(B.class, "m1", int.class));
@@ -134,21 +134,21 @@ public class ClassUtilsTest {
assertNull(findPublicMethod(B.class, "m3", void.class));
assertNotNull(findPublicMethod(B.class, "m3", int.class));
-
+
assertNotNull(findPublicMethod(B.class, "m4", CharSequence.class));
assertNotNull(findPublicMethod(B.class, "m4", Object.class));
assertNull(findPublicMethod(B.class, "m4", String.class));
-
+
assertNotNull(findPublicMethod(B.class, "m5", void.class, int.class, CharSequence.class));
assertNotNull(findPublicMethod(B.class, "m5", void.class, int.class, String.class));
assertNull(findPublicMethod(B.class, "m5", void.class, int.class, Object.class));
-
+
assertNull(findPublicMethod(B.class, "m5", void.class, int.class));
assertNull(findPublicMethod(B.class, "m5", void.class, int.class, CharSequence.class, CharSequence.class));
}
-
+
public static class B {
-
+
public void m1() {};
protected void m2() {};
public int m3() { return 0; }
@@ -156,8 +156,8 @@ public class ClassUtilsTest {
public void m5(int f1, CharSequence f2) {}
}
-
-
+
+
//====================================================================================================
// getMethodAnnotation
//====================================================================================================
@@ -168,7 +168,7 @@ public class ClassUtilsTest {
assertEquals("a3", getMethodAnnotation(TestAnnotation.class, CI3.class.getMethod("a3", CharSequence.class)).value());
assertEquals("a4", getMethodAnnotation(TestAnnotation.class, CI3.class.getMethod("a4")).value());
}
-
+
public static interface CI1 {
@TestAnnotation("a1")
void a1();
@@ -176,15 +176,19 @@ public class ClassUtilsTest {
void a2();
@TestAnnotation("a3")
void a3(CharSequence foo);
-
+
void a4();
}
-
+
public static class CI2 implements CI1 {
+ @Override
public void a1() {}
+ @Override
@TestAnnotation("a2b")
public void a2() {}
+ @Override
public void a3(CharSequence s) {}
+ @Override
public void a4() {}
}
@@ -192,10 +196,11 @@ public class ClassUtilsTest {
@Override
public void a1() {}
@Override public void a2() {}
+ @Override
@TestAnnotation("a4")
public void a4() {}
}
-
+
@Target(METHOD)
@Retention(RUNTIME)
public @interface TestAnnotation {
@@ -213,7 +218,7 @@ public class ClassUtilsTest {
s.add(c.getSimpleName());
}
assertObjectEquals("['CA1','CA2','CA3','CB','CC','CD']", s);
-
+
s = new TreeSet<String>();
for (Iterator<Class<?>> i = ClassUtils.getParentClasses(CD.class, true, false); i.hasNext();) {
Class<?> c = i.next();
@@ -227,7 +232,7 @@ public class ClassUtilsTest {
s.add(c.getSimpleName());
}
assertObjectEquals("['CA1','CA2','CA3','CB','CC','CD']", s);
-
+
s = new TreeSet<String>();
for (Iterator<Class<?>> i = ClassUtils.getParentClasses(CD.class, false, false); i.hasNext();) {
Class<?> c = i.next();
@@ -235,7 +240,7 @@ public class ClassUtilsTest {
}
assertObjectEquals("['CB','CC','CD']", s);
}
-
+
static interface CA1 {}
static interface CA2 extends CA1 {}
static interface CA3 {}
@@ -250,18 +255,18 @@ public class ClassUtilsTest {
@Test
public void getParentMethodsParentFirst() throws Exception {
Set<String> s = new TreeSet<String>();
- for (Method m : ClassUtils.getAllMethods(DD.class, true))
+ for (Method m : ClassUtils.getAllMethods(DD.class, true))
if (! m.getName().startsWith("$"))
s.add(m.getDeclaringClass().getSimpleName() + '.' + m.getName());
assertObjectEquals("['DA1.da1','DA2.da2','DB.da1','DB.db','DC.da2','DC.dc','DD.da2','DD.dd']", s);
s = new TreeSet<String>();
- for (Method m : ClassUtils.getAllMethods(DD.class, false))
+ for (Method m : ClassUtils.getAllMethods(DD.class, false))
if (! m.getName().startsWith("$"))
s.add(m.getDeclaringClass().getSimpleName() + '.' + m.getName());
assertObjectEquals("['DA1.da1','DA2.da2','DB.da1','DB.db','DC.da2','DC.dc','DD.da2','DD.dd']", s);
}
-
+
static interface DA1 {
void da1();
}
@@ -271,14 +276,17 @@ public class ClassUtilsTest {
static interface DA3 {}
static interface DA4 {}
static abstract class DB implements DA1, DA2 {
+ @Override
public void da1() {}
public void db() {}
}
static class DC extends DB implements DA3 {
+ @Override
public void da2() {}
public void dc() {}
}
static class DD extends DC {
+ @Override
public void da2() {}
public void dd() {}
}
@@ -302,7 +310,7 @@ public class ClassUtilsTest {
}
assertObjectEquals("['EA.a1','EB.a1','EB.b1']", s);
}
-
+
static class EA {
int a1;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoQueryTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoQueryTest.java b/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoQueryTest.java
index 5ed3609..bb8e11b 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoQueryTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/utils/PojoQueryTest.java
@@ -261,7 +261,7 @@ public class PojoQueryTest {
BeanSession session = BeanContext.DEFAULT.createSession();
SearchArgs sa;
List results;
-
+
List<C> in = new AList<C>()
.append(new C(1))
.append(new C(2))
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
index 243c905..2f0aec3 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/utils/StringUtilsTest.java
@@ -717,7 +717,7 @@ public class StringUtilsTest {
assertObjectEquals("{'a=':'1'}", splitMap("a\\==1", ',', '=', true));
assertObjectEquals("{'a\\\\':'1'}", splitMap("a\\\\=1", ',', '=', true));
}
-
+
//====================================================================================================
// isAbsoluteUri(String)
//====================================================================================================
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java b/juneau-core-test/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
index 14d9ed5..364e233 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
@@ -231,7 +231,7 @@ public class StringVarResolverTest {
}
VarResolver vr = vrb.build();
-
+
// These should all be unchanged.
in = "$@{foobar}";
assertEquals(in, vr.resolve(in));
@@ -280,7 +280,7 @@ public class StringVarResolverTest {
vrb.vars(AlwaysNullVar.class);
vr = vrb.build();
-
+
in = "$A{xxx}";
assertEquals("", vr.resolve(in));
in = "x$A{xxx}";
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java
index d5fd0f4..8e3b43b 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextResolutionComboTest.java
@@ -83,7 +83,7 @@ public class UriContextResolutionComboTest {
{ /* 3 */
"Happy-4",
input(
- "http://host:port","/context","/resource","/path",
+ "http://host:port","/context","/resource","/path",
"/"
),
results(
@@ -98,7 +98,7 @@ public class UriContextResolutionComboTest {
{ /* 4 */
"Happy-5",
input(
- "http://host:port","/context","/resource","/path",
+ "http://host:port","/context","/resource","/path",
"foobar"
),
results(
@@ -113,7 +113,7 @@ public class UriContextResolutionComboTest {
{ /* 5 */
"Happy-6",
input(
- "http://host:port","/context","/resource","/path",
+ "http://host:port","/context","/resource","/path",
""
),
results(
@@ -128,7 +128,7 @@ public class UriContextResolutionComboTest {
{ /* 6 */
"Happy-7",
input(
- "http://host:port","/context","/resource","/path",
+ "http://host:port","/context","/resource","/path",
"context:/foo"
),
results(
@@ -143,7 +143,7 @@ public class UriContextResolutionComboTest {
{ /* 7 */
"Happy-8",
input(
- "http://host:port","/context","/resource","/path",
+ "http://host:port","/context","/resource","/path",
"context:/"
),
results(
@@ -158,7 +158,7 @@ public class UriContextResolutionComboTest {
{ /* 8 */
"Happy-9",
input(
- "http://host:port","/context","/resource","/path",
+ "http://host:port","/context","/resource","/path",
"servlet:/foo"
),
results(
@@ -173,7 +173,7 @@ public class UriContextResolutionComboTest {
{ /* 9 */
"Happy-10",
input(
- "http://host:port","/context","/resource","/path",
+ "http://host:port","/context","/resource","/path",
"servlet:/"
),
results(
@@ -185,7 +185,7 @@ public class UriContextResolutionComboTest {
"/context/resource"
)
},
-
+
// Multiple context and resource parts
{ /* 10 */
"MultiContextResource-1",
@@ -337,7 +337,7 @@ public class UriContextResolutionComboTest {
"/c1/c2/r1/r2"
)
},
-
+
// No authority given
{ /* 20 */
"NoAuthority-1",
@@ -489,7 +489,7 @@ public class UriContextResolutionComboTest {
"/context/resource"
)
},
-
+
// No authority or context given
{ /* 30 */
"NoAuthorityOrContext-1",
@@ -793,7 +793,7 @@ public class UriContextResolutionComboTest {
"/"
)
},
-
+
// No context or resource given.
{ /* 50 */
"NoContextOrResource-1",
@@ -945,13 +945,13 @@ public class UriContextResolutionComboTest {
"/"
)
},
- });
+ });
}
-
+
public static Input input(String authority, String context, String resource, String path, String uri) {
return new Input(authority, context, resource, path, uri);
}
-
+
public static Results results(String eAbsResource, String eAbsPathInfo, String eRrResource, String eRrPathInfo, String eNoneResource, String eNonePathInfo) {
return new Results(eAbsResource, eAbsPathInfo, eRrResource, eRrPathInfo, eNoneResource, eNonePathInfo);
}
@@ -959,7 +959,7 @@ public class UriContextResolutionComboTest {
public static class Input {
private final String uri;
private final String authority, context, resource, path;
-
+
public Input(String authority, String context, String resource, String path, String uri) {
this.authority = authority;
this.context = context;
@@ -968,10 +968,10 @@ public class UriContextResolutionComboTest {
this.uri = uri;
}
}
-
+
public static class Results {
private final String aResource, aPathInfo, rrResource, rrPathInfo, nResource, nPathInfo;
-
+
public Results(String aResource, String aPathInfo, String rrResource, String rrPathInfo, String nResource, String nPathInfo) {
this.aResource = aResource;
this.aPathInfo = aPathInfo;
@@ -981,32 +981,32 @@ public class UriContextResolutionComboTest {
this.nPathInfo = nPathInfo;
}
}
-
+
private String label;
private Input in;
private Results r;
-
+
public UriContextResolutionComboTest(String label, Input in, Results r) throws Exception {
this.label = label;
this.in = in;
this.r = r;
}
-
+
@Test
public void a01_testAbsoluteResource() {
assertEquals(r.aResource, new UriResolver(ABSOLUTE, RESOURCE, new UriContext(in.authority, in.context, in.resource, in.path)).resolve(in.uri), "{0}: testAbsolute() failed", label);
- }
-
+ }
+
@Test
public void a02_testAppendAbsoluteResource() {
assertEquals(r.aResource, new UriResolver(ABSOLUTE, RESOURCE, new UriContext(in.authority, in.context, in.resource, in.path)).append(new StringBuilder(), in.uri).toString(), "{0}: testAbsolute() failed", label);
}
-
+
@Test
public void a03_testAbsolutePathInfo() {
assertEquals(r.aPathInfo, new UriResolver(ABSOLUTE, PATH_INFO, new UriContext(in.authority, in.context, in.resource, in.path)).resolve(in.uri), "{0}: testAbsolute() failed", label);
- }
-
+ }
+
@Test
public void a04_testAppendAbsolutePathInfo() {
assertEquals(r.aPathInfo, new UriResolver(ABSOLUTE, PATH_INFO, new UriContext(in.authority, in.context, in.resource, in.path)).append(new StringBuilder(), in.uri).toString(), "{0}: testAbsolute() failed", label);
@@ -1015,8 +1015,8 @@ public class UriContextResolutionComboTest {
@Test
public void a05_testRootRelativeResource() {
assertEquals(r.rrResource, new UriResolver(ROOT_RELATIVE, RESOURCE, new UriContext(in.authority, in.context, in.resource, in.path)).resolve(in.uri), "{0}: testAbsolute() failed", label);
- }
-
+ }
+
@Test
public void a06_testAppendRootRelativeResource() {
assertEquals(r.rrResource, new UriResolver(ROOT_RELATIVE, RESOURCE, new UriContext(in.authority, in.context, in.resource, in.path)).append(new StringBuilder(), in.uri).toString(), "{0}: testAbsolute() failed", label);
@@ -1025,8 +1025,8 @@ public class UriContextResolutionComboTest {
@Test
public void a07_testRootRelativePathInfo() {
assertEquals(r.rrPathInfo, new UriResolver(ROOT_RELATIVE, PATH_INFO, new UriContext(in.authority, in.context, in.resource, in.path)).resolve(in.uri), "{0}: testAbsolute() failed", label);
- }
-
+ }
+
@Test
public void a08_testAppendRootRelativePathInfo() {
assertEquals(r.rrPathInfo, new UriResolver(ROOT_RELATIVE, PATH_INFO, new UriContext(in.authority, in.context, in.resource, in.path)).append(new StringBuilder(), in.uri).toString(), "{0}: testAbsolute() failed", label);
@@ -1035,8 +1035,8 @@ public class UriContextResolutionComboTest {
@Test
public void a09_testNoneResource() {
assertEquals(r.nResource, new UriResolver(NONE, RESOURCE, new UriContext(in.authority, in.context, in.resource, in.path)).resolve(in.uri), "{0}: testAbsolute() failed", label);
- }
-
+ }
+
@Test
public void a10_testAppendNoneResource() {
assertEquals(r.nResource, new UriResolver(NONE, RESOURCE, new UriContext(in.authority, in.context, in.resource, in.path)).append(new StringBuilder(), in.uri).toString(), "{0}: testAbsolute() failed", label);
@@ -1045,8 +1045,8 @@ public class UriContextResolutionComboTest {
@Test
public void a11_testNonePathInfo() {
assertEquals(r.nPathInfo, new UriResolver(NONE, PATH_INFO, new UriContext(in.authority, in.context, in.resource, in.path)).resolve(in.uri), "{0}: testAbsolute() failed", label);
- }
-
+ }
+
@Test
public void a12_testAppendNonePathInfo() {
assertEquals(r.nPathInfo, new UriResolver(NONE, PATH_INFO, new UriContext(in.authority, in.context, in.resource, in.path)).append(new StringBuilder(), in.uri).toString(), "{0}: testAbsolute() failed", label);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java
index 9b94944..408c594 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/utils/UriContextUriComboTest.java
@@ -183,30 +183,30 @@ public class UriContextUriComboTest {
"/"
)
},
- });
+ });
}
-
+
public static Input input(String authority, String context, String resource, String path) {
return new Input(authority, context, resource, path);
}
-
- public static Results results(String eAbsoluteAuthority, String eAbsoluteContext, String eAbsoluteResource, String eAbsolutePath,
+
+ public static Results results(String eAbsoluteAuthority, String eAbsoluteContext, String eAbsoluteResource, String eAbsolutePath,
String eRootRelativeContext, String eRootRelativeResource, String eRootRelativePath) {
return new Results(eAbsoluteAuthority, eAbsoluteContext, eAbsoluteResource, eAbsolutePath, eRootRelativeContext, eRootRelativeResource, eRootRelativePath);
}
public static class Input {
private final UriContext uriContext;
-
+
public Input(String authority, String context, String resource, String path) {
this.uriContext = new UriContext(authority, context, resource, path);
}
}
-
+
public static class Results {
private final String eAbsoluteAuthority, eAbsoluteContext, eAbsoluteResource, eAbsolutePath, eRootRelativeContext, eRootRelativeResource, eRootRelativePath;
-
- public Results(String eAbsoluteAuthority, String eAbsoluteContext, String eAbsoluteResource, String eAbsolutePath,
+
+ public Results(String eAbsoluteAuthority, String eAbsoluteContext, String eAbsoluteResource, String eAbsolutePath,
String eRootRelativeContext, String eRootRelativeResource, String eRootRelativePath) {
this.eAbsoluteAuthority = eAbsoluteAuthority;
this.eAbsoluteContext = eAbsoluteContext;
@@ -221,13 +221,13 @@ public class UriContextUriComboTest {
private String label;
private Input in;
private Results r;
-
+
public UriContextUriComboTest(String label, Input in, Results r) throws Exception {
this.label = label;
this.in = in;
this.r = r;
}
-
+
@Test
public void a1_testAbsoluteAuthority() {
assertEquals(r.eAbsoluteAuthority, in.uriContext.getAbsoluteAuthority(), "{0}: testAbsoluteAuthority() failed", label);
@@ -237,27 +237,27 @@ public class UriContextUriComboTest {
public void a2_testAbsoluteContext() {
assertEquals(r.eAbsoluteContext, in.uriContext.getAbsoluteContextRoot(), "{0}: testAbsoluteContext() failed", label);
}
-
+
@Test
public void a3_testAbsoluteResource() {
assertEquals(r.eAbsoluteResource, in.uriContext.getAbsoluteServletPath(), "{0}: testAbsoluteResource() failed", label);
}
-
+
@Test
public void a4_testAbsolutePath() {
assertEquals(r.eAbsolutePath, in.uriContext.getAbsolutePathInfo(), "{0}: testAbsolutePath() failed", label);
}
-
+
@Test
public void a5_testRootRelativeContext() {
assertEquals(r.eRootRelativeContext, in.uriContext.getRootRelativeContextRoot(), "{0}: testRootRelativeContext() failed", label);
}
-
+
@Test
public void a6_testRootRelativeResource() {
assertEquals(r.eRootRelativeResource, in.uriContext.getRootRelativeServletPath(), "{0}: testRootRelativeResource() failed", label);
}
-
+
@Test
public void a7_testRootRelativePath() {
assertEquals(r.eRootRelativePath, in.uriContext.getRootRelativePathInfo(), "{0}: testRootRelativePath() failed", label);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/xml/BasicXmlTest.java b/juneau-core-test/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
index ec7bcf4..8ca9c37 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/xml/BasicXmlTest.java
@@ -1659,21 +1659,21 @@ public class BasicXmlTest {
return this;
}
}
-
+
public static class BeanWithWhitespaceTextFields {
@Xml(format=XmlFormat.TEXT)
public String a;
-
+
public BeanWithWhitespaceTextFields init(String s) {
a = s;
return this;
}
}
-
+
public static class BeanWithWhitespaceTextPwsFields {
@Xml(format=XmlFormat.TEXT_PWS)
public String a;
-
+
public BeanWithWhitespaceTextPwsFields init(String s) {
a = s;
return this;
@@ -1683,7 +1683,7 @@ public class BasicXmlTest {
public static class BeanWithWhitespaceMixedFields {
@Xml(format=XmlFormat.MIXED)
public String[] a;
-
+
public BeanWithWhitespaceMixedFields init(String[] s) {
a = s;
return this;
@@ -1693,7 +1693,7 @@ public class BasicXmlTest {
public static class BeanWithWhitespaceMixedPwsFields {
@Xml(format=XmlFormat.MIXED_PWS)
public String[] a;
-
+
public BeanWithWhitespaceMixedPwsFields init(String[] s) {
a = s;
return this;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java
index 73e1e4e1..becaff9 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/xml/CommonParserTest.java
@@ -166,7 +166,7 @@ public class CommonParserTest {
// XML parser may or may not support line numbers.
assertTrue(MyParserListener.events.get(0).startsWith("unknownProperty,"));
}
-
+
public static class MyParserListener extends ParserListener {
final static List<String> events = new LinkedList<String>();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlTest.java b/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlTest.java
index c9a4fbe..ffcca5a 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/xml/XmlTest.java
@@ -296,7 +296,7 @@ public class XmlTest {
public static class J1 {
@BeanProperty(properties="f2") public List<J2> f1 = new AList<J2>().append(new J2());
}
-
+
@Bean(typeName="bar")
public static class J2 {
public int f2 = 2;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java
index ede24f2..72c1473 100755
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/AddressBook.java
@@ -35,7 +35,7 @@ public class AddressBook extends LinkedList<Person> implements IAddressBook {
public AddressBook(URI uri) throws Exception {
this.uri = uri;
}
-
+
@Override /* IAddressBook */
public void init() throws Exception {
clear();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/IAddressBook.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/IAddressBook.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/IAddressBook.java
index e120a67..983ecb1 100755
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/IAddressBook.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/IAddressBook.java
@@ -22,7 +22,7 @@ import org.apache.juneau.remoteable.*;
*/
@Remoteable
public interface IAddressBook {
-
+
/** Initialize this address book with preset entries */
void init() throws Exception;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
index 31a845c..4147570 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
@@ -50,7 +50,7 @@ import org.apache.juneau.utils.*;
public class DirectoryResource extends Resource {
private static final long serialVersionUID = 1L;
-
+
private File rootDir; // The root directory
// Settings enabled through servlet init parameters
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/FileSpaceResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/FileSpaceResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/FileSpaceResource.java
index 8cd48ce..e985f72 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/FileSpaceResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/FileSpaceResource.java
@@ -49,7 +49,7 @@ public class FileSpaceResource extends Resource {
new FileSpace("E:", 100000000, 97500000),
new FileSpace("F:", 100000000, 5000000)
};
-
+
/**
* Our bean class being serialized.
* Properties are listed to ensure order across all JVMs.
@@ -59,7 +59,7 @@ public class FileSpaceResource extends Resource {
private final String drive;
private final long total, available;
-
+
public FileSpace(String drive, long total, long available) {
this.drive = drive;
this.total = total;
@@ -83,7 +83,7 @@ public class FileSpaceResource extends Resource {
public float getPctFull() {
return ((100 * available) / total);
}
-
+
@Html(render=FileSpaceStatusRender.class)
public FileSpaceStatus getStatus() {
float pf = getPctFull();
@@ -94,11 +94,11 @@ public class FileSpaceResource extends Resource {
return FileSpaceStatus.SEVERE;
}
}
-
+
public static enum FileSpaceStatus {
OK, WARNING, SEVERE;
}
-
+
public static class FileSpacePctRender extends HtmlRender<Float> {
@Override
@@ -112,15 +112,15 @@ public class FileSpaceResource extends Resource {
@Override
public Object getContent(SerializerSession session, Float value) {
- if (value >= 90)
+ if (value >= 90)
return div(
- String.format("%.0f%%", value),
+ String.format("%.0f%%", value),
style("@keyframes color_change { from { background-color: red; } to { background-color: yellow; }")
);
return String.format("%.0f%%", value);
}
}
-
+
public static class FileSpaceStatusRender extends HtmlRender<FileSpaceStatus> {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
index 8c4bd8c..df23b15 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
@@ -39,7 +39,7 @@ import org.apache.juneau.utils.*;
)
public class MethodExampleResource extends Resource {
private static final long serialVersionUID = 1L;
-
+
private static final UUID SAMPLE_UUID = UUID.fromString("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee");
private static final String SAMPLE_UUID_STRING = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";
@@ -53,7 +53,7 @@ public class MethodExampleResource extends Resource {
};
}
- /**
+ /**
* Methodology #1 - GET request using annotated attributes.
* This approach uses annotated parameters for retrieving input.
*/
@@ -87,7 +87,7 @@ public class MethodExampleResource extends Resource {
.append("header-doNotTrack", doNotTrack);
}
- /**
+ /**
* Methodology #2 - GET request using methods on RestRequest and RestResponse.
* This approach uses low-level request/response objects to perform the same as above.
*/
@@ -96,7 +96,7 @@ public class MethodExampleResource extends Resource {
RestRequest req, // A direct subclass of HttpServletRequest.
RestResponse res // A direct subclass of HttpServletResponse.
) throws Exception {
-
+
// HTTP method.
String method = req.getMethod();
@@ -136,7 +136,7 @@ public class MethodExampleResource extends Resource {
res.setOutput(m);
}
- /**
+ /**
* Methodology #3 - GET request using special objects.
* This approach uses intermediate-level APIs.
* The framework recognizes the parameter types and knows how to resolve them.
@@ -180,5 +180,5 @@ public class MethodExampleResource extends Resource {
.append("header-lang", lang)
.append("header-accept", accept)
.append("header-doNotTrack", doNotTrack);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
index a24e6ee..9702326 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
@@ -54,19 +54,19 @@ public class PetStoreResource extends Resource {
// Our database.
private Map<Integer,Pet> petDB;
-
+
@Override /* Servlet */
public synchronized void init(RestConfig config) throws Exception {
// Load our database from a local JSON file.
petDB = JsonParser.DEFAULT.parse(getClass().getResourceAsStream("PetStore.json"), LinkedHashMap.class, Integer.class, Pet.class);
super.init(config);
}
-
+
// Exclude the 'breed' and 'getsAlongWith' properties from the beans.
@RestMethod(
- name="GET",
- path="/",
- summary="The complete list of pets in the store",
+ name="GET",
+ path="/",
+ summary="The complete list of pets in the store",
bpExcludes="{Pet:'breed,getsAlongWith'}",
converters=Queryable.class
)
@@ -82,33 +82,33 @@ public class PetStoreResource extends Resource {
// Our bean class.
public static class Pet {
-
+
@Html(link="servlet:/{id}") // Creates a hyperlink in HTML view.
@NameProperty // Links the parent key to this bean.
public int id;
-
+
public String name;
public Kind kind;
public String breed;
public List<Kind> getsAlongWith;
-
+
@BeanProperty(format="$%.2f") // Renders price in dollars.
public float price;
-
+
@BeanProperty(swap=DateSwap.RFC2822D.class) // Renders dates in RFC2822 format.
public Date birthDate;
-
+
public int getAge() {
Calendar c = new GregorianCalendar();
c.setTime(birthDate);
- return new GregorianCalendar().get(Calendar.YEAR) - c.get(Calendar.YEAR);
+ return new GregorianCalendar().get(Calendar.YEAR) - c.get(Calendar.YEAR);
}
}
-
+
@Html(render=KindRender.class) // Render as an icon in HTML.
public static enum Kind {
- CAT,
- DOG,
+ CAT,
+ DOG,
BIRD,
FISH,
MOUSE,
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
index 0121c84..b56f55b 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
@@ -107,7 +107,7 @@ public class PhotosResource extends Resource {
photos.put(id, new Photo(id, image));
return "OK";
}
-
+
/** POST request handler */
@RestMethod(name="POST", path="/", parsers=ImageParser.class, summary="Add a photo")
public Photo setPhoto(@Body BufferedImage image) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
index 54a5415..9406e88 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
@@ -60,7 +60,7 @@ public class SqlQueryResource extends Resource {
allowUpdates = cf.getBoolean("SqlQueryResource/allowUpdates", false);
allowTempUpdates = cf.getBoolean("SqlQueryResource/allowTempUpdates", false);
includeRowNums = cf.getBoolean("SqlQueryResource/includeRowNums", false);
-
+
try {
Class.forName(driver).newInstance();
} catch (Exception e) {
@@ -120,7 +120,7 @@ public class SqlQueryResource extends Resource {
// Don't try to submit empty input.
if (isEmpty(in.sql))
return results;
-
+
if (in.pos < 1 || in.pos > 10000)
throw new RestException(SC_BAD_REQUEST, "Invalid value for position. Must be between 1-10000");
if (in.limit < 1 || in.limit > 10000)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
index 1adb401..3b97926 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
@@ -2,7 +2,7 @@
// * 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 *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -27,12 +27,12 @@ import org.apache.juneau.rest.annotation.Body;
@RestResource(
path="/systemProperties",
-
+
// Title and description that show up on HTML rendition page.
// Also used in Swagger doc.
title="System properties resource",
description="REST interface for performing CRUD operations on system properties.",
-
+
// Links on the HTML rendition page.
// "request:/..." URIs are relative to the request URI.
// "servlet:/..." URIs are relative to the servlet URI.
@@ -45,19 +45,19 @@ import org.apache.juneau.rest.annotation.Body;
+ "</div>",
css="aside {display:table-caption;}"
),
-
+
// Properties that get applied to all serializers and parsers.
properties={
// Use single quotes.
@Property(name=SERIALIZER_quoteChar, value="'")
},
-
+
// Our stylesheet for the HTML rendition.
stylesheet="styles/devops.css",
-
+
// Support GZIP encoding on Accept-Encoding header.
encoders=GzipEncoder.class,
-
+
swagger=@ResourceSwagger(
contact="{name:'John Smith',email:'john@smith.com'}",
license="{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}",
@@ -106,7 +106,7 @@ public class SystemPropertiesResource extends Resource {
public String getSystemProperty(@Path String propertyName) throws Throwable {
return System.getProperty(propertyName);
}
-
+
@RestMethod(
name="PUT", path="/{propertyName}",
summary="Replace system property",
@@ -122,7 +122,7 @@ public class SystemPropertiesResource extends Resource {
headers={
@Parameter(name="Location", description="The root URL of this resource.")
}
- ),
+ ),
@Response(value=403, description="User is not an admin.")
}
)
@@ -147,7 +147,7 @@ public class SystemPropertiesResource extends Resource {
headers={
@Parameter(name="Location", description="The root URL of this resource.")
}
- ),
+ ),
@Response(value=403, description="Unauthorized: User is not an admin.")
}
)
@@ -171,7 +171,7 @@ public class SystemPropertiesResource extends Resource {
headers={
@Parameter(name="Location", description="The root URL of this resource.")
}
- ),
+ ),
@Response(value=403, description="Unauthorized: User is not an admin")
}
)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
index 2e98fdf..ea84e95 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
@@ -35,7 +35,7 @@ import org.apache.juneau.rest.client.*;
)
public class TumblrParserResource extends Resource {
private static final long serialVersionUID = 1L;
-
+
private static final int MAX_POSTS = 100;
@RestMethod(name="GET", path="/", summary="Get the instructions page")
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
index 81278b2..0bade0e 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
@@ -42,7 +42,7 @@ import org.apache.juneau.utils.*;
@RestResource(
path="/addressBook",
messages="nls/AddressBookResource",
-
+
// Links on the HTML rendition page.
// "request:/..." URIs are relative to the request URI.
// "servlet:/..." URIs are relative to the servlet URI.
@@ -63,41 +63,41 @@ import org.apache.juneau.utils.*;
+ "</div>",
footer="$W{poweredByJuneau}"
),
-
+
// Widgets for $W variables above.
widgets={
PoweredByJuneauWidget.class,
ContentTypeLinksColumnWidget.class
},
-
+
// Properties that get applied to all serializers and parsers.
properties={
-
+
// Allow INIT as a method parameter.
@Property(name=REST_allowMethodParam, value="*"),
// Use single quotes.
@Property(name=SERIALIZER_quoteChar, value="'"),
-
+
// Make RDF/XML readable.
@Property(name=RDF_rdfxml_tab, value="5"),
-
+
// Make RDF parsable by adding a root node.
@Property(name=RDF_addRootProperty, value="true"),
-
+
// Make URIs absolute so that we can easily reference them on the client side.
@Property(name=SERIALIZER_uriResolution, value="ABSOLUTE"),
-
+
// Make the anchor text on URLs be just the path relative to the servlet.
@Property(name=HTML_uriAnchorText, value="SERVLET_RELATIVE")
},
-
+
// Our stylesheet for the HTML rendition.
stylesheet="styles/devops.css",
-
+
// Support GZIP encoding on Accept-Encoding header.
encoders=GzipEncoder.class,
-
+
// Swagger info.
swagger=@ResourceSwagger(
contact="{name:'John Smith',email:'john@smith.com'}",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java
index a9093cf..99829f7 100644
--- a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java
+++ b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/AddressBookResourceTest.java
@@ -71,7 +71,7 @@ public class AddressBookResourceTest extends RestTestcase {
}
}
-
+
//====================================================================================================
// Get AddressBookResource as JSON
//====================================================================================================
@@ -91,7 +91,7 @@ public class AddressBookResourceTest extends RestTestcase {
+"\n isCurrent: false"
+"\n }"
+"\n ]"
- +"\n}";
+ +"\n}";
JsonParser p = new JsonParserBuilder().pojoSwaps(CalendarSwap.DateMedium.class).build();
Person person = p.parse(in, Person.class);
if (debug) System.err.println(person);
@@ -270,7 +270,7 @@ public class AddressBookResourceTest extends RestTestcase {
List<Person> people;
IAddressBook ab = client.getRemoteableProxy(IAddressBook.class, "/addressBook/proxy");
-
+
// Reinitialize the resource
ab.init();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java
index b0ac910..24d3f8a 100644
--- a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java
+++ b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootResourcesTest.java
@@ -64,7 +64,7 @@ public class RootResourcesTest extends RestTestcase {
String s = x2.getObjectMap("info").getString("description");
if (debug) System.err.println(s);
assertTrue(s, s.startsWith("Example of a router resource page"));
-
+
client.closeQuietly();
}
@@ -84,7 +84,7 @@ public class RootResourcesTest extends RestTestcase {
String s = x2.getObjectMap("info").getString("description");
if (debug) System.err.println(s);
assertTrue(s, s.startsWith("Example of a router resource page"));
-
+
client.closeQuietly();
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRemoteableServicesResourceTest.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRemoteableServicesResourceTest.java b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRemoteableServicesResourceTest.java
index cbdce58..9fd8d5b 100644
--- a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRemoteableServicesResourceTest.java
+++ b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SampleRemoteableServicesResourceTest.java
@@ -27,7 +27,7 @@ import org.junit.*;
public class SampleRemoteableServicesResourceTest extends RestTestcase {
static RestClient[] clients;
-
+
private static String path = SamplesMicroservice.getURI().getPath() + "/addressBook/proxy";
@BeforeClass
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
index 21538ed..a9af029 100644
--- a/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
+++ b/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/SamplesMicroservice.java
@@ -2,7 +2,7 @@
// * 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 *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -66,7 +66,7 @@ public class SamplesMicroservice {
startMicroservice();
return microserviceURI;
}
-
+
/**
* Stops the microservice.
*/
@@ -80,7 +80,7 @@ public class SamplesMicroservice {
System.err.println(e); // NOT DEBUG
}
}
-
+
/**
* Create a new HTTP client.
*/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java
index 4ca8551..12c0a9d 100755
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -95,7 +95,7 @@ public abstract class Microservice {
private static Args args;
private static ConfigFile cf;
private static ManifestFile mf;
-
+
private String cfPath;
/**
@@ -107,7 +107,7 @@ public abstract class Microservice {
protected Microservice(String...args) throws Exception {
Microservice.args = new Args(args);
}
-
+
/**
* Specifies the path of the config file for this microservice.
* <p>
@@ -119,7 +119,7 @@ public abstract class Microservice {
* (e.g. <js>"java -jar myjar.jar"</js> will look for <js>"myjar.cfg"</js>).
* </ol>
* If this path does not exist, a {@link FileNotFoundException} will be thrown from the {@link #start()} command.
- *
+ *
* @param cfPath The absolute or relative path of the config file.
* @param create Create the file if it doesn't exist.
* @return This object (for method chaining).
@@ -136,7 +136,7 @@ public abstract class Microservice {
this.cfPath = cfPath;
return this;
}
-
+
/**
* Specifies the config file for this microservice.
* <p>
@@ -161,7 +161,7 @@ public abstract class Microservice {
* is located in the project root.
* <li>Using the class loader for this class to find the file at the URL <js>"META-INF/MANIFEST.MF"</js>.
* </ol>
- *
+ *
* @param mf The manifest file of this microservice.
* @return This object (for method chaining).
*/
@@ -172,7 +172,7 @@ public abstract class Microservice {
/**
* Convenience method for specifying the manifest contents directly.
- *
+ *
* @param contents The lines in the manifest file.
* @return This object (for method chaining).
* @throws IOException
@@ -185,7 +185,7 @@ public abstract class Microservice {
/**
* Same as {@link #setManifest(Manifest)} except specified through a {@link File} object.
- *
+ *
* @param f The manifest file of this microservice.
* @return This object (for method chaining).
* @throws IOException If a problem occurred while trying to read the manifest file.
@@ -197,7 +197,7 @@ public abstract class Microservice {
/**
* Same as {@link #setManifest(Manifest)} except finds and loads the manifest file of the jar file that the specified class is contained within.
- *
+ *
* @param c The class whose jar file contains the manifest to use for this microservice.
* @return This object (for method chaining).
* @throws IOException If a problem occurred while trying to read the manifest file.
@@ -223,7 +223,7 @@ public abstract class Microservice {
* </ul>
* <p>
* Subclasses can override this method to provide their own variables.
- *
+ *
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
* <jd>/**
@@ -295,7 +295,7 @@ public abstract class Microservice {
* String variables defined by {@link #createVarResolver()} are automatically resolved when using this method.
* <p>
* This method can be called from the class constructor.
- *
+ *
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
* <cc>#--------------------------</cc>
@@ -373,7 +373,7 @@ public abstract class Microservice {
* and entries converted to simple strings.
* <p>
* This method can be called from the class constructor.
- *
+ *
* <h5 class='section'>Example:</h5>
* <p class='bcode'>
* <jc>// Get Main-Class from manifest file.</jc>
@@ -389,7 +389,7 @@ public abstract class Microservice {
return mf;
}
-
+
//--------------------------------------------------------------------------------
// Abstract lifecycle methods.
//--------------------------------------------------------------------------------
@@ -405,7 +405,7 @@ public abstract class Microservice {
* @throws Exception
*/
public Microservice start() throws Exception {
-
+
// --------------------------------------------------------------------------------
// Try to get the manifest file if it wasn't already set.
// --------------------------------------------------------------------------------
@@ -443,7 +443,7 @@ public abstract class Microservice {
ConfigFileBuilder cfb = new ConfigFileBuilder();
if (cfPath != null)
cf = cfb.build(cfPath).getResolving(createVarResolver().build());
-
+
// --------------------------------------------------------------------------------
// Find config file.
// Can either be passed in as first parameter, or we discover it using
@@ -493,7 +493,7 @@ public abstract class Microservice {
onConfigChange(cf, changes);
}
});
-
+
// --------------------------------------------------------------------------------
// Add exit listeners.
// --------------------------------------------------------------------------------
@@ -544,7 +544,7 @@ public abstract class Microservice {
* Default implementation simply calls {@link #onStop()}.
* <p>
* Overridden methods MUST call this method LAST so that the {@link #onStop()} method is called.
- *
+ *
* @return This object (for method chaining).
*/
public Microservice stop() {
@@ -560,7 +560,7 @@ public abstract class Microservice {
System.exit(2);
}
-
+
//--------------------------------------------------------------------------------
// Lifecycle listener methods.
// Subclasses can override these methods to run code on certain events.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
index 931d4d9..6765849 100755
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java
@@ -99,7 +99,7 @@ public class RestMicroservice extends Microservice {
super(args);
}
-
+
//--------------------------------------------------------------------------------
// Methods implemented on Microservice API
//--------------------------------------------------------------------------------
@@ -147,11 +147,11 @@ public class RestMicroservice extends Microservice {
return this;
}
-
+
//--------------------------------------------------------------------------------
// RestMicroservice API methods.
//--------------------------------------------------------------------------------
-
+
/**
* Returns the port that this microservice started up on.
* @return The port that this microservice started up on.
@@ -342,7 +342,7 @@ public class RestMicroservice extends Microservice {
ConfigFile cf = getConfig();
ObjectMap mf = getManifest();
-
+
int[] ports = cf.getObjectWithDefault("REST/port", mf.get(int[].class, "Rest-Port", new int[]{8000}), int[].class);
port = findOpenPort(ports);
@@ -350,7 +350,7 @@ public class RestMicroservice extends Microservice {
System.err.println("Open port not found. Tried " + JsonSerializer.DEFAULT_LAX.toString(ports));
System.exit(1);
}
-
+
contextPath = cf.getString("REST/contextPath", mf.getString("Rest-ContextPath", "/"));
if (cf.getBoolean("REST/useSsl")) {
@@ -397,7 +397,7 @@ public class RestMicroservice extends Microservice {
return server;
}
-
+
private static int findOpenPort(int[] ports) {
for (int port : ports) {
try {
@@ -416,7 +416,7 @@ public class RestMicroservice extends Microservice {
* Method used to start the Jetty server created by {@link #createServer()}.
* <p>
* Subclasses can override this method to customize server startup.
- *
+ *
* @return The port that this server started on.
* @throws Exception
*/
@@ -544,7 +544,7 @@ public class RestMicroservice extends Microservice {
}
}
-
+
//--------------------------------------------------------------------------------
// Lifecycle listener methods.
//--------------------------------------------------------------------------------
@@ -584,17 +584,17 @@ public class RestMicroservice extends Microservice {
*/
protected void onPostStopServer() {}
-
+
//--------------------------------------------------------------------------------
// Overridden methods.
//--------------------------------------------------------------------------------
-
+
@Override /* Microservice */
public RestMicroservice setConfig(String cfPath, boolean create) throws IOException {
super.setConfig(cfPath, create);
return this;
}
-
+
@Override /* Microservice */
public RestMicroservice setConfig(ConfigFile cf) {
super.setConfig(cf);
@@ -624,7 +624,7 @@ public class RestMicroservice extends Microservice {
super.setManifest(c);
return this;
}
-
+
//--------------------------------------------------------------------------------
// Other methods.
//--------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index b2353b0..3bee423 100755
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -63,12 +63,12 @@ public class LogsResource extends Resource {
return f.isDirectory() || f.getName().endsWith(".log");
}
};
-
+
@Override /* RestServlet */
public synchronized void init(RestConfig config) throws Exception {
super.init(config);
ConfigFile cf = config.getConfigFile();
-
+
logDir = new File(cf.getString("Logging/logDir", "."));
leFormatter = new LogEntryFormatter(
cf.getString("Logging/format", "[{date} {level}] {msg}%n"),
@@ -88,12 +88,12 @@ public class LogsResource extends Resource {
* @throws Exception
*/
@RestMethod(
- name="GET",
- path="/*",
+ name="GET",
+ path="/*",
swagger=@MethodSwagger(
responses={@Response(200),@Response(404)}
)
- )
+ )
public Object getFileOrDirectory(RestRequest req, RestResponse res, @Properties ObjectMap properties, @PathRemainder String path) throws Exception {
File f = getFile(path);
@@ -132,7 +132,7 @@ public class LogsResource extends Resource {
* @throws Exception
*/
@RestMethod(
- name="VIEW",
+ name="VIEW",
path="/*",
swagger=@MethodSwagger(
responses={@Response(200),@Response(404)}
@@ -211,9 +211,9 @@ public class LogsResource extends Resource {
* @throws Exception
*/
@RestMethod(
- name="PARSE",
- path="/*",
- converters=Queryable.class,
+ name="PARSE",
+ path="/*",
+ converters=Queryable.class,
swagger=@MethodSwagger(
responses={@Response(200),@Response(404)}
)
@@ -238,8 +238,8 @@ public class LogsResource extends Resource {
* @throws Exception
*/
@RestMethod(
- name="DOWNLOAD",
- path="/*",
+ name="DOWNLOAD",
+ path="/*",
swagger=@MethodSwagger(
responses={@Response(200),@Response(404)}
)
@@ -264,7 +264,7 @@ public class LogsResource extends Resource {
* @throws Exception
*/
@RestMethod(
- name="DELETE",
+ name="DELETE",
path="/*",
swagger=@MethodSwagger(
responses={@Response(200),@Response(404)}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
----------------------------------------------------------------------
diff --git a/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java b/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
index 6e0e008..7ec2633 100644
--- a/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
+++ b/juneau-rest-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
@@ -47,7 +47,7 @@ public class BaseProvider implements MessageBodyReader<Object>, MessageBodyWrite
try {
properties = new ObjectMap();
JuneauProvider jp = getClass().getAnnotation(JuneauProvider.class);
-
+
for (Property p : jp.properties())
properties.put(p.name(), p.value());
for (String p : jp.flags())
@@ -66,7 +66,7 @@ public class BaseProvider implements MessageBodyReader<Object>, MessageBodyWrite
.pojoSwaps(jp.pojoSwaps())
.properties(properties)
.build();
-
+
} catch (Exception e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/SwappedPojoSwap.java
----------------------------------------------------------------------
diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/SwappedPojoSwap.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/SwappedPojoSwap.java
index 0fdcb58..53c3e93 100644
--- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/SwappedPojoSwap.java
+++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/SwappedPojoSwap.java
@@ -2,7 +2,7 @@
// * 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 *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/TestEnum.java
----------------------------------------------------------------------
diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/TestEnum.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/TestEnum.java
index 8061b6d..06facf7 100644
--- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/TestEnum.java
+++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/pojos/TestEnum.java
@@ -2,7 +2,7 @@
// * 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 *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
index a77766d..e631bbe 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -248,10 +248,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
public ObjectMap getProperties() {
return this.properties;
}
-
+
/**
* Shortcut for calling <code>getProperties().append(name, value);</code> fluently.
- *
+ *
* @param name The property name.
* @param value The property value.
* @return This object (for method chaining).
[3/4] incubator-juneau git commit: Code cleanup.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
index 62e3c15..9a74cd9 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java
@@ -27,7 +27,7 @@ import org.junit.runners.*;
@RunWith(Parameterized.class)
@SuppressWarnings({"javadoc"})
public class Html5ComboTest extends ComboTest {
-
+
private static final B btag = b("bbb");
@Parameterized.Parameters
@@ -61,6 +61,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(A o) {
assertType(A.class, o);
}
@@ -94,6 +95,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(A o) {
assertType(A.class, o);
}
@@ -127,6 +129,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(A o) {
assertType(A.class, o);
}
@@ -160,6 +163,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(A o) {
assertType(A.class, o);
}
@@ -193,6 +197,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(A o) {
assertType(A.class, o);
}
@@ -226,6 +231,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Abbr o) {
assertType(Abbr.class, o);
}
@@ -259,6 +265,7 @@ public class Html5ComboTest extends ComboTest {
/* 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>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Abbr o) {
assertType(Abbr.class, o);
}
@@ -292,6 +299,7 @@ public class Html5ComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>address</jp:_type>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Address o) {
assertType(Address.class, o);
}
@@ -325,6 +333,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Address o) {
assertType(Address.class, o);
}
@@ -358,6 +367,7 @@ public class Html5ComboTest extends ComboTest {
/* 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'>\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 </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Address o) {
assertType(Address.class, o);
assertType(A.class, o.getChild(1));
@@ -395,6 +405,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Aside o) {
assertType(Aside.class, o);
assertType(H1.class, o.getChild(0));
@@ -433,6 +444,7 @@ public class Html5ComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>audio</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:controls>true</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:type>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Audio o) {
assertType(Audio.class, o);
assertType(Source.class, o.getChild(0));
@@ -466,8 +478,9 @@ public class Html5ComboTest extends ComboTest {
/* 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"
- )
+ )
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Bdi.class, o.getChild(1));
@@ -502,6 +515,7 @@ public class Html5ComboTest extends ComboTest {
/* 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>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Bdo.class, o.getChild(1));
@@ -536,6 +550,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Blockquote o) {
assertType(Blockquote.class, o);
}
@@ -569,6 +584,7 @@ public class Html5ComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>br</jp:_type>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Br o) {
assertType(Br.class, o);
}
@@ -602,6 +618,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Br.class, o.getChild(0));
@@ -636,6 +653,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Button o) {
assertType(Button.class, o);
}
@@ -669,6 +687,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Canvas o) {
assertType(Canvas.class, o);
}
@@ -702,6 +721,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Cite.class, o.getChild(0));
@@ -736,6 +756,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Code o) {
assertType(Code.class, o);
}
@@ -772,6 +793,7 @@ public class Html5ComboTest extends ComboTest {
/* 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:a rdf:parseType='Resource'>\n <jp:value>One</jp:value>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>option</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:value>Two</jp:value>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Datalist o) {
assertType(Datalist.class, o);
assertType(Option.class, o.getChild(0));
@@ -810,6 +832,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Dl o) {
assertType(Dl.class, o);
assertType(Dt.class, o.getChild(0));
@@ -845,6 +868,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 </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:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Del.class, o.getChild(0));
@@ -881,6 +905,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Dfn.class, o.getChild(0));
@@ -915,6 +940,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Div o) {
assertType(Div.class, o);
assertType(B.class, o.getChild(1));
@@ -949,6 +975,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Em.class, o.getChild(1));
@@ -983,6 +1010,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Embed o) {
assertType(Embed.class, o);
}
@@ -1024,6 +1052,7 @@ public class Html5ComboTest extends ComboTest {
/* 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>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='Resource'>\n <jp:type>text</jp:type>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>br</jp:_type>\n </rdf:li>\n <rdf
:li>Email:</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:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>br</jp:_type>\n </rdf:li>\n <rdf:li>X:</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>keygen</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>X</jp:name>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>label</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:for>Name</jp:for>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>label</rdf:li>\n </rdf:Seq>\n </jp:c>
\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Form o) {
assertType(Form.class, o);
assertType(Fieldset.class, o.getChild(0));
@@ -1068,6 +1097,7 @@ public class Html5ComboTest extends ComboTest {
/* 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</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:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Figure o) {
assertType(Figure.class, o);
assertType(Img.class, o.getChild(0));
@@ -1105,6 +1135,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 </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 <rdf:li rdf:parseType='Resource'>\n <jp:_type>h4</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Four</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li
rdf:parseType='Resource'>\n <jp:_type>h5</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Five</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h6</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Six</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Div o) {
assertType(Div.class, o);
assertType(H1.class, o.getChild(0));
@@ -1144,6 +1175,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Hr.class, o.getChild(0));
@@ -1170,7 +1202,7 @@ public class Html5ComboTest extends ComboTest {
/* JsonR */ "{\n\t_type: 'html',\n\tc: [\n\t\t{\n\t\t\t_type: 'head',\n\t\t\tc: [\n\t\t\t\t{\n\t\t\t\t\t_type: 'title',\n\t\t\t\t\tc: 'title'\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t_type: 'base',\n\t\t\t\t\ta: {\n\t\t\t\t\t\thref: 'foo',\n\t\t\t\t\t\ttarget: '_blank'\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t_type: 'link',\n\t\t\t\t\ta: {\n\t\t\t\t\t\trel: 'stylesheet',\n\t\t\t\t\t\ttype: 'text/css',\n\t\t\t\t\t\thref: 'theme.css'\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t_type: 'meta',\n\t\t\t\t\ta: {\n\t\t\t\t\t\tcharset: 'UTF-8'\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t]\n\t\t},\n\t\t{\n\t\t\t_type: 'body',\n\t\t\tc: [\n\t\t\t\t'bar'\n\t\t\t]\n\t\t}\n\t]\n}",
/* Xml */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>",
/* XmlT */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>",
- /* XmlR */
+ /* XmlR */
"<html>\n"
+" <head>\n"
+" <title>title</title>\n"
@@ -1183,7 +1215,7 @@ public class Html5ComboTest extends ComboTest {
/* XmlNs */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>",
/* Html */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>",
/* HtmlT */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>",
- /* HtmlR */
+ /* HtmlR */
"<html>\n"
+" <head>\n"
+" <title>title</title>\n"
@@ -1206,6 +1238,7 @@ public class Html5ComboTest extends ComboTest {
/* 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: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:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:rel>stylesheet</jp:rel>\n <jp:type>text/css</jp:type>\n <jp:href>theme.css</jp:href>\n </jp:a>\n </rdf:
li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>meta</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:charset>UTF-8</jp:charset>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>body</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"
)
{
+ @Override
public void verify(Html o) {
assertType(Html.class, o);
assertType(Head.class, o.getChild(0));
@@ -1245,6 +1278,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(I.class, o.getChild(0));
@@ -1279,6 +1313,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Iframe o) {
assertType(Iframe.class, o);
}
@@ -1312,6 +1347,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Kbd.class, o.getChild(0));
@@ -1352,6 +1388,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 <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:li>\n </rdf:Seq>\n </jp:c>\n
</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>content</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>footer</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h2</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>footer1</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>footer2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Main o) {
assertType(Main.class, o);
assertType(Article.class, o.getChild(0));
@@ -1393,6 +1430,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map o) {
assertType(Map.class, o);
assertType(Area.class, o.getChild(0));
@@ -1427,6 +1465,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Mark.class, o.getChild(0));
@@ -1461,6 +1500,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Meter o) {
assertType(Meter.class, o);
}
@@ -1494,6 +1534,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Nav o) {
assertType(Nav.class, o);
assertType(A.class, o.getChild(0));
@@ -1528,6 +1569,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Noscript o) {
assertType(Noscript.class, o);
}
@@ -1561,6 +1603,7 @@ public class Html5ComboTest extends ComboTest {
/* 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:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Object2 o) {
assertType(Object2.class, o);
assertType(Param.class, o.getChild(0));
@@ -1595,6 +1638,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Ol o) {
assertType(Ol.class, o);
assertType(Li.class, o.getChild(0));
@@ -1633,6 +1677,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 <jp:value>50</jp:value>\n </jp:a>\n </rdf:li>\n <rdf:li>+</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>number</jp:type>\n <jp:id>b</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:_type>output</jp:_type>\n <jp:a rdf
:parseType='Resource'>\n <jp:name>x</jp:name>\n <jp:for>a b</jp:for>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Form o) {
assertType(Form.class, o);
assertType(Input.class, o.getChild(1));
@@ -1669,6 +1714,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
}
@@ -1702,6 +1748,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Pre o) {
assertType(Pre.class, o);
}
@@ -1735,6 +1782,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Progress o) {
assertType(Progress.class, o);
}
@@ -1768,6 +1816,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Q.class, o.getChild(1));
@@ -1804,6 +1853,7 @@ public class Html5ComboTest extends ComboTest {
/* 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: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 <rdf:li>ょ</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Ruby o) {
assertType(Ruby.class, o);
assertType(Rb.class, o.getChild(1));
@@ -1840,6 +1890,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(S.class, o.getChild(1));
@@ -1874,6 +1925,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Samp o) {
assertType(Samp.class, o);
}
@@ -1907,6 +1959,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Script o) {
assertType(Script.class, o);
}
@@ -1940,6 +1993,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Section o) {
assertType(Section.class, o);
assertType(H1.class, o.getChild(0));
@@ -1975,6 +2029,7 @@ public class Html5ComboTest extends ComboTest {
/* 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>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 </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Select o) {
assertType(Select.class, o);
assertType(Optgroup.class, o.getChild(0));
@@ -2010,6 +2065,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Small.class, o.getChild(0));
@@ -2044,6 +2100,7 @@ public class Html5ComboTest extends ComboTest {
/* 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>_x0020_eyes.</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Span.class, o.getChild(1));
@@ -2078,6 +2135,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Strong.class, o.getChild(0));
@@ -2112,6 +2170,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Head o) {
assertType(Head.class, o);
assertType(Style.class, o.getChild(0));
@@ -2146,6 +2205,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Sub.class, o.getChild(0));
@@ -2180,6 +2240,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Sup.class, o.getChild(0));
@@ -2398,6 +2459,7 @@ public class Html5ComboTest extends ComboTest {
/* 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: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'>\n <jp:_type>col</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:class>bar</jp:class>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n
<rdf:li rdf:parseType='Resource'>\n <jp:_type>thead</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tr</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>th</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>th</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n
</jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tbody</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tr</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>td</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>v1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>td</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>v2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:l
i>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tfoot</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tr</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>td</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>f1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>td</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>f2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n
</jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Table o) {
assertType(Table.class, o);
assertType(Caption.class, o.getChild(0));
@@ -2447,6 +2509,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Template o) {
assertType(Template.class, o);
assertType(Div.class, o.getChild(0));
@@ -2481,12 +2544,13 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Textarea o) {
assertType(Textarea.class, o);
}
}
},
- { /* 64 */
+ { /* 64 */
new ComboInput<P>(
"Time",
P.class,
@@ -2514,6 +2578,7 @@ public class Html5ComboTest extends ComboTest {
/* 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 </rdf:li>\n <rdf:li>.</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Time.class, o.getChild(1));
@@ -2548,6 +2613,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(U.class, o.getChild(0));
@@ -2582,6 +2648,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Ul o) {
assertType(Ul.class, o);
assertType(Li.class, o.getChild(0));
@@ -2616,6 +2683,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Var.class, o.getChild(0));
@@ -2653,6 +2721,7 @@ public class Html5ComboTest extends ComboTest {
/* 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>true</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 <jp:src>subtitles_en.vtt</jp:src>\n <jp:kind>subtitles</jp:kind>\n <jp:srclang>en</jp:srclang>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Video o) {
assertType(Video.class, o);
assertType(Source.class, o.getChild(0));
@@ -2688,6 +2757,7 @@ public class Html5ComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(P o) {
assertType(P.class, o);
assertType(Wbr.class, o.getChild(1));
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
index 65e4dcb..7fad0fb 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java
@@ -61,6 +61,7 @@ public class Html5TemplateComboTest extends ComboTest {
/* 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 <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>true</jp:value>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(FormTemplate o) {
assertType(FormTemplate.class, o);
}
@@ -69,26 +70,26 @@ public class Html5TemplateComboTest extends ComboTest {
});
}
-
+
@Bean(beanDictionary=HtmlBeanDictionary.class)
public static class FormTemplate {
-
+
private String action;
private int value1;
private boolean value2;
-
+
public FormTemplate(Form f) {
this.action = f.getAttr("action");
this.value1 = f.getChild(Input.class, 0).getAttr(int.class, "value");
this.value2 = f.getChild(Input.class, 1).getAttr(boolean.class, "value");
}
-
+
public FormTemplate(String action, int value1, boolean value2) {
this.action = action;
this.value1 = value1;
this.value2 = value2;
}
-
+
public Form swap(BeanSession session) {
return form(action,
input("text").name("v1").value(value1),
@@ -96,7 +97,7 @@ public class Html5TemplateComboTest extends ComboTest {
);
}
}
-
+
public Html5TemplateComboTest(ComboInput<?> comboInput) {
super(comboInput);
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java b/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
index 1700106..19d95e9 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java
@@ -189,7 +189,7 @@ public class JsonSchemaTest {
.setNot(new SchemaRef("http://not"))
;
}
-
+
/** Bean with other possible property value types not covered in test1 */
public static Schema getTest2() {
return new Schema()
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java b/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java
index e6e2ec1..3a0e026 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java
@@ -24,7 +24,7 @@ public class EncoderGroupTest {
//====================================================================================================
@Test
public void testEncoderGroupMatching() throws Exception {
-
+
EncoderGroup g = new EncoderGroupBuilder().append(Encoder1.class, Encoder2.class, Encoder3.class).build();
assertType(Encoder1.class, g.getEncoder("gzip1"));
assertType(Encoder2.class, g.getEncoder("gzip2"));
@@ -36,14 +36,14 @@ public class EncoderGroupTest {
assertType(Encoder3.class, g.getEncoder("gzip2;q=0.9,gzip1;q=0.1,gzip3"));
assertType(Encoder2.class, g.getEncoder("gzip1;q=0.9,gzip3;q=0.1,gzip2"));
}
-
+
public static class Encoder1 extends GzipEncoder {
@Override /* Encoder */
public String[] getCodings() {
return new String[]{"gzip1"};
}
}
-
+
public static class Encoder2 extends GzipEncoder {
@Override /* Encoder */
public String[] getCodings() {
@@ -57,7 +57,7 @@ public class EncoderGroupTest {
return new String[]{"gzip3","gzip3a"};
}
}
-
+
//====================================================================================================
// Test inheritence
//====================================================================================================
@@ -65,11 +65,11 @@ public class EncoderGroupTest {
public void testInheritence() throws Exception {
EncoderGroupBuilder gb = null;
EncoderGroup g = null;
-
+
gb = new EncoderGroupBuilder().append(E1.class, E2.class);
g = gb.build();
assertObjectEquals("['E1','E2','E2a']", g.getSupportedEncodings());
-
+
gb = new EncoderGroupBuilder(g).append(E3.class, E4.class);
g = gb.build();
assertObjectEquals("['E3','E4','E4a','E1','E2','E2a']", g.getSupportedEncodings());
@@ -78,14 +78,14 @@ public class EncoderGroupTest {
g = gb.build();
assertObjectEquals("['E5','E3','E4','E4a','E1','E2','E2a']", g.getSupportedEncodings());
}
-
+
public static class E1 extends GzipEncoder {
@Override /* Encoder */
public String[] getCodings() {
return new String[]{"E1"};
}
}
-
+
public static class E2 extends GzipEncoder {
@Override /* Encoder */
public String[] getCodings() {
@@ -99,14 +99,14 @@ public class EncoderGroupTest {
return new String[]{"E3"};
}
}
-
+
public static class E4 extends GzipEncoder {
@Override /* Encoder */
public String[] getCodings() {
return new String[]{"E4","E4a"};
}
}
-
+
public static class E5 extends GzipEncoder {
@Override /* Encoder */
public String[] getCodings() {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java b/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
index 5745237..18eb41a 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java
@@ -51,6 +51,7 @@ public class BasicHtmlTest {
"<string>foo</string>"
)
{
+ @Override
public void verify(String o) {
assertType(String.class, o);
}
@@ -66,6 +67,7 @@ public class BasicHtmlTest {
"<boolean>true</boolean>"
)
{
+ @Override
public void verify(Boolean o) {
assertType(Boolean.class, o);
}
@@ -81,6 +83,7 @@ public class BasicHtmlTest {
"<number>123</number>"
)
{
+ @Override
public void verify(Integer o) {
assertType(Integer.class, o);
}
@@ -96,6 +99,7 @@ public class BasicHtmlTest {
"<number>1.23</number>"
)
{
+ @Override
public void verify(Float o) {
assertType(Float.class, o);
}
@@ -121,6 +125,7 @@ public class BasicHtmlTest {
"<ul><li>foo</li></ul>"
)
{
+ @Override
public void verify(String[] o) {
assertType(String.class, o[0]);
}
@@ -146,6 +151,7 @@ public class BasicHtmlTest {
"<ul><li>foo</li><li><number>123</number></li><li><boolean>true</boolean></li></ul>"
)
{
+ @Override
public void verify(Object[] o) {
assertType(String.class, o[0]);
assertType(Integer.class, o[1]);
@@ -163,6 +169,7 @@ public class BasicHtmlTest {
"<ul><li>123</li></ul>"
)
{
+ @Override
public void verify(int[] o) {
assertType(int[].class, o);
}
@@ -178,6 +185,7 @@ public class BasicHtmlTest {
"<ul><li>true</li></ul>"
)
{
+ @Override
public void verify(boolean[] o) {
assertType(boolean[].class, o);
}
@@ -193,6 +201,7 @@ public class BasicHtmlTest {
"<ul><li><ul><li>foo</li></ul></li></ul>"
)
{
+ @Override
public void verify(String[][] o) {
assertType(String[][].class, o);
}
@@ -213,7 +222,7 @@ public class BasicHtmlTest {
+"<td><null/></td>"
+"</tr>"
+"</table>",
-
+
"<table>\n"
+"\t<tr>\n"
+"\t\t<td>k1</td>\n"
@@ -224,7 +233,7 @@ public class BasicHtmlTest {
+"\t\t<td><null/></td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>k1</td>"
@@ -237,6 +246,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(Map<String,String> o) {
assertType(String.class, o.get("k1"));
}
@@ -261,7 +271,7 @@ public class BasicHtmlTest {
+"<td><null/></td>"
+"</tr>"
+"</table>",
-
+
"<table>\n"
+"\t<tr>\n"
+"\t\t<td>k1</td>\n"
@@ -276,7 +286,7 @@ public class BasicHtmlTest {
+"\t\t<td><null/></td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>k1</td>"
@@ -293,6 +303,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(Map<String,Number> o) {
assertType(Number.class, o.get("k1"));
}
@@ -325,7 +336,7 @@ public class BasicHtmlTest {
+"<td><null/></td>"
+"</tr>"
+"</table>",
-
+
"<table>\n"
+"\t<tr>\n"
+"\t\t<td>k1</td>\n"
@@ -348,7 +359,7 @@ public class BasicHtmlTest {
+"\t\t<td><null/></td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>k1</td>"
@@ -373,6 +384,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(Map<String,Object> o) {
assertType(String.class, o.get("k1"));
assertType(Integer.class, o.get("k2"));
@@ -391,6 +403,7 @@ public class BasicHtmlTest {
"<ul><li>foo</li><li><null/></li></ul>"
)
{
+ @Override
public void verify(List<String> o) {
assertType(String.class, o.get(0));
}
@@ -406,6 +419,7 @@ public class BasicHtmlTest {
"<ul><li>123</li><li>1.23</li><li><null/></li></ul>"
)
{
+ @Override
public void verify(List<Number> o) {
assertType(Integer.class, o.get(0));
assertType(Float.class, o.get(1));
@@ -422,6 +436,7 @@ public class BasicHtmlTest {
"<ul><li>foo</li><li><number>123</number></li><li><number>1.23</number></li><li><boolean>true</boolean></li><li><null/></li></ul>"
)
{
+ @Override
public void verify(List<Object> o) {
assertType(String.class, o.get(0));
assertType(Integer.class, o.get(1));
@@ -480,7 +495,7 @@ public class BasicHtmlTest {
+"</td>"
+"</tr>"
+"</table>",
-
+
"<table>\n"
+"\t<tr>\n"
+"\t\t<td>a</td>\n"
@@ -526,7 +541,7 @@ public class BasicHtmlTest {
+"\t\t</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>a</td>"
@@ -574,6 +589,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithNormalProperties o) {
assertType(String.class, o.c);
assertType(Integer.class, o.d);
@@ -633,7 +649,7 @@ public class BasicHtmlTest {
+"</td>"
+"</tr>"
+"</table>",
-
+
"<table>\n"
+"\t<tr>\n"
+"\t\t<td>a</td>\n"
@@ -681,7 +697,7 @@ public class BasicHtmlTest {
+"\t\t</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>a</td>"
@@ -731,6 +747,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithMapProperties o) {
assertType(String.class, o.a.get("k1"));
assertType(Integer.class, o.b.get("k2"));
@@ -755,7 +772,7 @@ public class BasicHtmlTest {
+"<td>foo</td>"
+"</tr>"
+"</table>",
-
+
"<table _type='X'>\n"
+"\t<tr>\n"
+"\t\t<td>a</td>\n"
@@ -766,7 +783,7 @@ public class BasicHtmlTest {
+"\t\t<td>foo</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>a</td>"
@@ -779,6 +796,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithTypeName o) {
assertType(BeanWithTypeName.class, o);
}
@@ -813,7 +831,7 @@ public class BasicHtmlTest {
+"</td>"
+"</tr>"
+"</table>",
-
+
"<table>\n"
+"\t<tr>\n"
+"\t\t<td>b1</td>\n"
@@ -838,7 +856,7 @@ public class BasicHtmlTest {
+"\t\t</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>b1</td>"
@@ -865,6 +883,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithPropertiesWithTypeNames o) {
assertType(B.class, o.b2);
}
@@ -916,7 +935,7 @@ public class BasicHtmlTest {
+"</td>"
+"</tr>"
+"</table>",
-
+
"<table>\n"
+"\t<tr>\n"
+"\t\t<td>b1</td>\n"
@@ -958,7 +977,7 @@ public class BasicHtmlTest {
+"\t\t</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>b1</td>"
@@ -1002,6 +1021,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithPropertiesWithArrayTypeNames o) {
assertType(B.class, o.b2[0]);
assertType(B.class, o.b3[0]);
@@ -1176,6 +1196,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithPropertiesWith2dArrayTypeNames o) {
assertType(B.class, o.b2[0][0]);
assertType(B.class, o.b3[0][0]);
@@ -1264,7 +1285,7 @@ public class BasicHtmlTest {
+"\t\t</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>b1</td>"
@@ -1305,6 +1326,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithPropertiesWithMapTypeNames o) {
assertType(B.class, o.b1.get("k1"));
assertType(B.class, o.b2.get("k2"));
@@ -1321,6 +1343,7 @@ public class BasicHtmlTest {
"<a href='http://apache.org'>foo</a>"
)
{
+ @Override
public void verify(LinkBean o) {
assertType(LinkBean.class, o);
}
@@ -1336,6 +1359,7 @@ public class BasicHtmlTest {
"<ul><li><a href='http://apache.org'>foo</a></li><li><a href='http://apache.org'>foo</a></li></ul>"
)
{
+ @Override
public void verify(LinkBean[] o) {
assertType(LinkBean.class, o[0]);
}
@@ -1351,6 +1375,7 @@ public class BasicHtmlTest {
"<ul><li><a href='http://apache.org'>foo</a></li><li><a href='http://apache.org'>foo</a></li></ul>"
)
{
+ @Override
public void verify(List<LinkBean> o) {
assertType(LinkBean.class, o.get(0));
}
@@ -1412,7 +1437,7 @@ public class BasicHtmlTest {
+"\t\t</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>a</td>"
@@ -1440,6 +1465,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithLinkBeanProperties o) {
assertType(LinkBean.class, o.a);
assertType(LinkBean.class, o.b.get(0));
@@ -1457,6 +1483,7 @@ public class BasicHtmlTest {
"<table><tr><td>a</td><td><sp> </sp> <bs/><ff/><br/><sp> </sp> <sp> </sp></td></tr></table>"
)
{
+ @Override
public void verify(BeanWithSpecialCharacters o) {
assertType(BeanWithSpecialCharacters.class, o);
}
@@ -1475,10 +1502,11 @@ public class BasicHtmlTest {
+" <td><sp> </sp> <bs/><ff/><br/><sp> </sp> <sp> </sp></td>\n"
+" </tr>\n"
+"</table>\n",
-
+
"<table><tr><td>a</td><td><sp> </sp> <bs/><ff/><br/><sp> </sp> <sp> </sp></td></tr></table>"
)
{
+ @Override
public void verify(BeanWithSpecialCharacters o) {
assertType(BeanWithSpecialCharacters.class, o);
}
@@ -1494,6 +1522,7 @@ public class BasicHtmlTest {
"<table></table>"
)
{
+ @Override
public void verify(BeanWithNullProperties o) {
assertType(BeanWithNullProperties.class, o);
}
@@ -1597,7 +1626,7 @@ public class BasicHtmlTest {
+"\t\t</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>a</td>"
@@ -1646,6 +1675,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithAbstractFields o) {
assertType(A.class, o.a);
assertType(A.class, o.ia);
@@ -1942,6 +1972,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithAbstractArrayFields o) {
assertType(A.class, o.a[0]);
assertType(A.class, o.ia1[0]);
@@ -2071,7 +2102,7 @@ public class BasicHtmlTest {
+"\t\t</td>\n"
+"\t</tr>\n"
+"</table>\n",
-
+
"<table>"
+"<tr>"
+"<td>a</td>"
@@ -2130,6 +2161,7 @@ public class BasicHtmlTest {
+"</table>"
)
{
+ @Override
public void verify(BeanWithAbstractMapFields o) {
assertType(A.class, o.a.get("k1"));
assertType(A.class, o.b.get("k2"));
@@ -2147,6 +2179,7 @@ public class BasicHtmlTest {
"<object></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextFields o) {
assertType(BeanWithWhitespaceTextFields.class, o);
}
@@ -2162,6 +2195,7 @@ public class BasicHtmlTest {
"<object><sp/></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextFields o) {
assertType(BeanWithWhitespaceTextFields.class, o);
}
@@ -2177,6 +2211,7 @@ public class BasicHtmlTest {
"<object><sp> </sp></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextFields o) {
assertType(BeanWithWhitespaceTextFields.class, o);
}
@@ -2192,6 +2227,7 @@ public class BasicHtmlTest {
"<object><sp> </sp><sp> </sp></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextFields o) {
assertType(BeanWithWhitespaceTextFields.class, o);
}
@@ -2207,6 +2243,7 @@ public class BasicHtmlTest {
"<object><sp> </sp> foobar <sp> </sp></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextFields o) {
assertType(BeanWithWhitespaceTextFields.class, o);
}
@@ -2222,6 +2259,7 @@ public class BasicHtmlTest {
"<object></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextPwsFields o) {
assertType(BeanWithWhitespaceTextPwsFields.class, o);
}
@@ -2237,6 +2275,7 @@ public class BasicHtmlTest {
"<object><sp/></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextPwsFields o) {
assertType(BeanWithWhitespaceTextPwsFields.class, o);
}
@@ -2252,6 +2291,7 @@ public class BasicHtmlTest {
"<object> </object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextPwsFields o) {
assertType(BeanWithWhitespaceTextPwsFields.class, o);
}
@@ -2267,6 +2307,7 @@ public class BasicHtmlTest {
"<object> </object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextPwsFields o) {
assertType(BeanWithWhitespaceTextPwsFields.class, o);
}
@@ -2282,6 +2323,7 @@ public class BasicHtmlTest {
"<object> foobar </object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceTextPwsFields o) {
assertType(BeanWithWhitespaceTextPwsFields.class, o);
}
@@ -2297,6 +2339,7 @@ public class BasicHtmlTest {
"<object></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedFields o) {
assertType(BeanWithWhitespaceMixedFields.class, o);
}
@@ -2312,6 +2355,7 @@ public class BasicHtmlTest {
"<object></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedFields o) {
assertType(BeanWithWhitespaceMixedFields.class, o);
}
@@ -2327,6 +2371,7 @@ public class BasicHtmlTest {
"<object><sp/></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedFields o) {
assertType(BeanWithWhitespaceMixedFields.class, o);
}
@@ -2342,6 +2387,7 @@ public class BasicHtmlTest {
"<object><sp> </sp></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedFields o) {
assertType(BeanWithWhitespaceMixedFields.class, o);
}
@@ -2357,6 +2403,7 @@ public class BasicHtmlTest {
"<object><sp> </sp><sp> </sp></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedFields o) {
assertType(BeanWithWhitespaceMixedFields.class, o);
}
@@ -2372,6 +2419,7 @@ public class BasicHtmlTest {
"<object><sp> </sp> foobar <sp> </sp></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedFields o) {
assertType(BeanWithWhitespaceMixedFields.class, o);
}
@@ -2387,6 +2435,7 @@ public class BasicHtmlTest {
"<object></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedPwsFields o) {
assertType(BeanWithWhitespaceMixedPwsFields.class, o);
}
@@ -2402,6 +2451,7 @@ public class BasicHtmlTest {
"<object></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedPwsFields o) {
assertType(BeanWithWhitespaceMixedPwsFields.class, o);
}
@@ -2417,6 +2467,7 @@ public class BasicHtmlTest {
"<object><sp/></object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedPwsFields o) {
assertType(BeanWithWhitespaceMixedPwsFields.class, o);
}
@@ -2432,6 +2483,7 @@ public class BasicHtmlTest {
"<object> </object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedPwsFields o) {
assertType(BeanWithWhitespaceMixedPwsFields.class, o);
}
@@ -2447,6 +2499,7 @@ public class BasicHtmlTest {
"<object> </object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedPwsFields o) {
assertType(BeanWithWhitespaceMixedPwsFields.class, o);
}
@@ -2462,6 +2515,7 @@ public class BasicHtmlTest {
"<object> foobar </object>"
)
{
+ @Override
public void verify(BeanWithWhitespaceMixedPwsFields o) {
assertType(BeanWithWhitespaceMixedPwsFields.class, o);
}
@@ -2475,12 +2529,12 @@ public class BasicHtmlTest {
public BasicHtmlTest(Input input) throws Exception {
this.input = input;
}
-
+
public static class Input<T> {
private final String label, e1, e2, e3;
private final Type type;
private final Object in;
-
+
public Input(String label, Type type, T in, String e1, String e2, String e3) {
this.label = label;
this.type = type;
@@ -2489,7 +2543,7 @@ public class BasicHtmlTest {
this.e2 = e2;
this.e3 = e3;
}
-
+
public void verify(T o) {}
}
@@ -2831,7 +2885,7 @@ public class BasicHtmlTest {
return this;
}
}
-
+
public static class BeanWithNullProperties {
public String a;
public String[] b;
@@ -2915,23 +2969,23 @@ public class BasicHtmlTest {
return this;
}
}
-
+
@Html(asXml=true)
public static class BeanWithWhitespaceTextFields {
@Xml(format=XmlFormat.TEXT)
public String a;
-
+
public BeanWithWhitespaceTextFields init(String s) {
a = s;
return this;
}
}
-
+
@Html(asXml=true)
public static class BeanWithWhitespaceTextPwsFields {
@Xml(format=XmlFormat.TEXT_PWS)
public String a;
-
+
public BeanWithWhitespaceTextPwsFields init(String s) {
a = s;
return this;
@@ -2942,7 +2996,7 @@ public class BasicHtmlTest {
public static class BeanWithWhitespaceMixedFields {
@Xml(format=XmlFormat.MIXED)
public String[] a;
-
+
public BeanWithWhitespaceMixedFields init(String[] s) {
a = s;
return this;
@@ -2953,7 +3007,7 @@ public class BasicHtmlTest {
public static class BeanWithWhitespaceMixedPwsFields {
@Xml(format=XmlFormat.MIXED_PWS)
public String[] a;
-
+
public BeanWithWhitespaceMixedPwsFields init(String[] s) {
a = s;
return this;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
index 8e4a059..865ab54 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java
@@ -149,7 +149,7 @@ public class CommonParserTest {
assertEquals(1, MyParserListener.events.size());
assertEquals("unknown,-1,-1", MyParserListener.events.get(0));
}
-
+
public static class MyParserListener extends ParserListener {
final static List<String> events = new LinkedList<String>();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java
index 6a7b0d3..c2759d4 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java
@@ -30,7 +30,7 @@ public class AcceptExtensionsTest {
public void testExtensions() throws Exception {
Accept accept;
MediaTypeRange mr;
-
+
accept = Accept.forString("text/json");
mr = accept.asRanges().get(0);
assertTextEquals("text/json", mr);
@@ -62,7 +62,7 @@ public class AcceptExtensionsTest {
assertObjectEquals("{a:['1']}", mr.getMediaType().getParameters());
assertTextEquals("0.9", mr.getQValue());
assertObjectEquals("{b:['2']}", mr.getExtensions());
-
+
accept = Accept.forString("text/json;a=1;a=2;q=0.9;b=3;b=4");
mr = accept.asRanges().get(0);
assertTextEquals("text/json;a=1;a=2;q=0.9;b=3;b=4", mr);
@@ -86,7 +86,7 @@ public class AcceptExtensionsTest {
assertObjectEquals("{a:['1']}", mr.getMediaType().getParameters());
assertTextEquals("1.0", mr.getQValue());
assertObjectEquals("{}", mr.getExtensions());
-
+
accept = Accept.forString("text/json;q=0.9");
mr = accept.asRanges().get(0);
assertTextEquals("text/json;q=0.9", mr);
@@ -103,7 +103,7 @@ public class AcceptExtensionsTest {
assertTextEquals("0.9", mr.getQValue());
assertObjectEquals("{}", mr.getExtensions());
}
-
+
//--------------------------------------------------------------------------------
// Tests the Accept.hasSubtypePart() method.
//--------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java b/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java
index 8a2b174..6f44506 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java
@@ -29,20 +29,20 @@ public class AcceptTest {
@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
return Arrays.asList(new Object[][] {
-
+
// label, accept-header, media-types, expected-index
-
+
// Simple matches
{ "SimpleMatch-1", "text/json", "['text/json']", 0 },
{ "SimpleMatch-2", "text/json", "['text/json','text/foo']", 0 },
{ "SimpleMatch-3", "text/json", "['text/foo','text/json']", 1 },
-
+
// Simple no-matches
{ "SimpleNoMatch-1", "text/jsonx", "['text/json']", -1 },
{ "SimpleNoMatch-2", "text/jso", "['text/json']", -1 },
{ "SimpleNoMatch-3", "text/json", "['application/json']", -1 },
{ "SimpleNoMatch-4", "text/json", "[]", -1 },
-
+
// Meta-character matches
{ "MetaMatch-1", "text/*", "['text/a','text/b+c','text/b+d+e']", 2 },
{ "MetaMatch-2", "text/b+*", "['text/a','text/b+c','text/b+d+e']", 2 },
@@ -59,7 +59,7 @@ public class AcceptTest {
{ "RevMetaMatch-1", "text/a", "['text/*']", 0 },
{ "RevMetaMatch-3", "text/a", "['*/a']", 0 },
{ "RevMetaMatch-3", "text/a", "['*/*']", 0 },
-
+
// Meta-character mixture matches
{ "MixedMetaMatch-1", "text/*", "['text/*','text/a','text/a+b','text/b+c','text/d+*']", 0 },
{ "MixedMetaMatch-2", "*/a", "['text/*','text/a','text/a+b','text/b+c','text/d+*']", 1 },
@@ -89,7 +89,7 @@ public class AcceptTest {
{ "Fuzzy-10", "text/1+2+3+4", "['text/1+2+3','text/1+2']", 0 },
{ "Fuzzy-11", "text/4+2+3+1", "['text/1+2+3','text/1+2']", 0 },
{ "Fuzzy-12", "text/4+2+3+1", "['text/1+2','text/1+2+3']", 1 },
-
+
// Q metrics
{ "Q-1", "text/A;q=0.9,text/B;q=0.1", "['text/A','text/B']", 0 },
{ "Q-2", "text/A;q=0.9,text/B;q=0.1", "['text/B','text/A']", 1 },
@@ -100,23 +100,23 @@ public class AcceptTest {
// Test q=0
{ "Q0-1", "text/A;q=0,text/B;q=0.1", "['text/A','text/B']", 1 },
{ "Q0-2", "text/A;q=0,text/B;q=0.1", "['text/A','text/A+1']", -1 },
-
+
// Test media types with parameters
{ "Parms-1", "text/A", "['text/A;foo=bar','text/B']", 0 },
{ "Parms-2", "text/A;foo=bar", "['text/A','text/B']", 0 },
});
}
-
+
private String label, accept, mediaTypes;
private int expected;
-
+
public AcceptTest(String label, String accept, String mediaTypes, int expected) {
this.label = label;
this.accept = accept;
this.mediaTypes = mediaTypes;
this.expected = expected;
}
-
+
@Test
public void test() throws Exception {
Accept accept = Accept.forString(this.accept);
[2/4] incubator-juneau git commit: Code cleanup.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/https/MediaRangeTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/https/MediaRangeTest.java b/juneau-core-test/src/test/java/org/apache/juneau/https/MediaRangeTest.java
index afeb782..8ba7acb 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/https/MediaRangeTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/https/MediaRangeTest.java
@@ -49,15 +49,15 @@ public class MediaRangeTest {
{ "16", "foo/bar/baz", "['foo/bar/baz']" },
});
}
-
+
private String label, mediaRange, expected;
-
+
public MediaRangeTest(String label, String mediaRange, String expected) {
this.label = label;
this.mediaRange = mediaRange;
this.expected = expected;
}
-
+
@Test
public void test() {
MediaTypeRange[] r = MediaTypeRange.parse(mediaRange);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileBuilderTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileBuilderTest.java b/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileBuilderTest.java
index b0d4e2e..f780f64 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileBuilderTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileBuilderTest.java
@@ -42,7 +42,7 @@ public class ConfigFileBuilderTest {
}
/**
- *
+ *
* @throws Exception
*/
@Test
@@ -70,7 +70,7 @@ public class ConfigFileBuilderTest {
cf = b1.build("TestGet.cfg");
assertObjectEquals("{'default':{},Test:{A:'a'}}", cf);
}
-
+
/**
* Retrieving config file should fail if the file doesn't exist and createIfNotExist == false.
*/
@@ -82,9 +82,9 @@ public class ConfigFileBuilderTest {
b = new ConfigFileBuilder().paths().createIfNotExists();
try { b.build("TestGet.cfg"); fail(); } catch (FileNotFoundException e) {}
- }
+ }
+
-
//====================================================================================================
// loadIfModified()
//====================================================================================================
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileInterfaceTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileInterfaceTest.java b/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileInterfaceTest.java
index 4d34568..6aea780 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileInterfaceTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileInterfaceTest.java
@@ -26,32 +26,32 @@ public class ConfigFileInterfaceTest {
ConfigFile cf;
ConfigInterface proxy;
-
+
public ConfigFileInterfaceTest() throws Exception {
ConfigFileBuilder configFileBuilder = new ConfigFileBuilder();
cf = configFileBuilder.build();
proxy = cf.getSectionAsInterface("A", ConfigInterface.class);
}
-
-
+
+
//====================================================================================================
// getSectionAsInterface(String,Class)
//====================================================================================================
-
+
@Test
public void testString() throws Exception {
proxy.setString("foo");
assertEquals("foo", proxy.getString());
assertEquals("foo", cf.get("A", "string"));
}
-
+
@Test
public void testInt() throws Exception {
proxy.setInt(1);
assertEquals(1, proxy.getInt());
assertEquals("1", cf.get("A", "int"));
}
-
+
@Test
public void testInteger() throws Exception {
proxy.setInteger(2);
@@ -66,7 +66,7 @@ public class ConfigFileInterfaceTest {
assertEquals(true, proxy.isBoolean());
assertEquals("true", cf.get("A", "boolean"));
}
-
+
@Test
public void testBooleanObject() throws Exception {
proxy.setBooleanObject(true);
@@ -81,7 +81,7 @@ public class ConfigFileInterfaceTest {
assertTrue(1f == proxy.getFloat());
assertEquals("1.0", cf.get("A", "float"));
}
-
+
@Test
public void testFloatObject() throws Exception {
proxy.setFloatObject(1f);
@@ -120,7 +120,7 @@ public class ConfigFileInterfaceTest {
assertEquals("[1,null]", cf.get("A", "integerList"));
assertType(Integer.class, proxy.getIntegerList().get(0));
}
-
+
@Test
public void testInteger3dList() throws Exception {
proxy.setInteger3dList(
@@ -144,7 +144,7 @@ public class ConfigFileInterfaceTest {
assertEquals("[[[[1,null],null],null],null]", cf.get("A", "integer1d3dList"));
assertType(Integer.class, proxy.getInteger1d3dList().get(0)[0][0][0]);
}
-
+
@Test
public void testInt1d3dList() throws Exception {
proxy.setInt1d3dList(new AList<int[][][]>().append(new int[][][]{{{1,2},null},null}).append(null));
@@ -152,7 +152,7 @@ public class ConfigFileInterfaceTest {
assertEquals("[[[[1,2],null],null],null]", cf.get("A", "int1d3dList"));
assertType(int[][][].class, proxy.getInt1d3dList().get(0));
}
-
+
@Test
public void testStringList() throws Exception {
proxy.setStringList(Arrays.asList("foo","bar",null));
@@ -161,7 +161,7 @@ public class ConfigFileInterfaceTest {
}
// Beans
-
+
@Test
public void testBean() throws Exception {
proxy.setBean(new ABean().init());
@@ -227,7 +227,7 @@ public class ConfigFileInterfaceTest {
}
// Typed beans
-
+
@Test
public void testTypedBean() throws Exception {
proxy.setTypedBean(new TypedBeanImpl().init());
@@ -293,7 +293,7 @@ public class ConfigFileInterfaceTest {
}
// Swapped POJOs
-
+
@Test
public void testSwappedPojo() throws Exception {
proxy.setSwappedPojo(new SwappedPojo());
@@ -329,7 +329,7 @@ public class ConfigFileInterfaceTest {
}
// Implicit swapped POJOs
-
+
@Test
public void testImplicitSwappedPojo() throws Exception {
proxy.setImplicitSwappedPojo(new ImplicitSwappedPojo());
@@ -365,7 +365,7 @@ public class ConfigFileInterfaceTest {
}
// Enums
-
+
@Test
public void testEnum() throws Exception {
proxy.setEnum(TestEnum.TWO);
@@ -449,22 +449,22 @@ public class ConfigFileInterfaceTest {
public String getString();
public void setString(String x);
-
+
public int getInt();
public void setInt(int x);
-
+
public Integer getInteger();
public void setInteger(Integer x);
public boolean isBoolean();
public void setBoolean(boolean x);
-
+
public Boolean getBooleanObject();
public void setBooleanObject(Boolean x);
public float getFloat();
public void setFloat(float x);
-
+
public Float getFloatObject();
public void setFloatObject(Float x);
@@ -479,121 +479,121 @@ public class ConfigFileInterfaceTest {
public List<Integer> getIntegerList();
public void setIntegerList(List<Integer> x);
-
+
public List<List<List<Integer>>> getInteger3dList();
public void setInteger3dList(List<List<List<Integer>>> x);
public List<Integer[][][]> getInteger1d3dList();
public void setInteger1d3dList(List<Integer[][][]> x);
-
+
public List<int[][][]> getInt1d3dList();
public void setInt1d3dList(List<int[][][]> x);
-
+
public List<String> getStringList();
- public void setStringList(List<String> x);
+ public void setStringList(List<String> x);
// Beans
-
+
public ABean getBean();
- public void setBean(ABean x);
+ public void setBean(ABean x);
public ABean[][][] getBean3dArray();
- public void setBean3dArray(ABean[][][] x);
+ public void setBean3dArray(ABean[][][] x);
public List<ABean> getBeanList();
- public void setBeanList(List<ABean> x);
+ public void setBeanList(List<ABean> x);
public List<ABean[][][]> getBean1d3dList();
- public void setBean1d3dList(List<ABean[][][]> x);
+ public void setBean1d3dList(List<ABean[][][]> x);
public Map<String,ABean> getBeanMap();
- public void setBeanMap(Map<String,ABean> x);
+ public void setBeanMap(Map<String,ABean> x);
public Map<String,List<ABean>> getBeanListMap();
- public void setBeanListMap(Map<String,List<ABean>> x);
+ public void setBeanListMap(Map<String,List<ABean>> x);
public Map<String,List<ABean[][][]>> getBean1d3dListMap();
- public void setBean1d3dListMap(Map<String,List<ABean[][][]>> x);
+ public void setBean1d3dListMap(Map<String,List<ABean[][][]>> x);
public Map<Integer,List<ABean>> getBeanListMapIntegerKeys();
- public void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x);
+ public void setBeanListMapIntegerKeys(Map<Integer,List<ABean>> x);
// Typed beans
-
+
public TypedBean getTypedBean();
- public void setTypedBean(TypedBean x);
+ public void setTypedBean(TypedBean x);
public TypedBean[][][] getTypedBean3dArray();
- public void setTypedBean3dArray(TypedBean[][][] x);
+ public void setTypedBean3dArray(TypedBean[][][] x);
public List<TypedBean> getTypedBeanList();
- public void setTypedBeanList(List<TypedBean> x);
+ public void setTypedBeanList(List<TypedBean> x);
public List<TypedBean[][][]> getTypedBean1d3dList();
- public void setTypedBean1d3dList(List<TypedBean[][][]> x);
+ public void setTypedBean1d3dList(List<TypedBean[][][]> x);
public Map<String,TypedBean> getTypedBeanMap();
- public void setTypedBeanMap(Map<String,TypedBean> x);
+ public void setTypedBeanMap(Map<String,TypedBean> x);
public Map<String,List<TypedBean>> getTypedBeanListMap();
- public void setTypedBeanListMap(Map<String,List<TypedBean>> x);
+ public void setTypedBeanListMap(Map<String,List<TypedBean>> x);
public Map<String,List<TypedBean[][][]>> getTypedBean1d3dListMap();
- public void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x);
+ public void setTypedBean1d3dListMap(Map<String,List<TypedBean[][][]>> x);
public Map<Integer,List<TypedBean>> getTypedBeanListMapIntegerKeys();
- public void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x);
+ public void setTypedBeanListMapIntegerKeys(Map<Integer,List<TypedBean>> x);
// Swapped POJOs
-
+
public SwappedPojo getSwappedPojo();
- public void setSwappedPojo(SwappedPojo x);
+ public void setSwappedPojo(SwappedPojo x);
public SwappedPojo[][][] getSwappedPojo3dArray();
- public void setSwappedPojo3dArray(SwappedPojo[][][] x);
+ public void setSwappedPojo3dArray(SwappedPojo[][][] x);
public Map<SwappedPojo,SwappedPojo> getSwappedPojoMap();
- public void setSwappedPojoMap(Map<SwappedPojo,SwappedPojo> x);
+ public void setSwappedPojoMap(Map<SwappedPojo,SwappedPojo> x);
public Map<SwappedPojo,SwappedPojo[][][]> getSwappedPojo3dMap();
- public void setSwappedPojo3dMap(Map<SwappedPojo,SwappedPojo[][][]> x);
+ public void setSwappedPojo3dMap(Map<SwappedPojo,SwappedPojo[][][]> x);
// Implicit swapped POJOs
-
+
public ImplicitSwappedPojo getImplicitSwappedPojo();
- public void setImplicitSwappedPojo(ImplicitSwappedPojo x);
+ public void setImplicitSwappedPojo(ImplicitSwappedPojo x);
public ImplicitSwappedPojo[][][] getImplicitSwappedPojo3dArray();
- public void setImplicitSwappedPojo3dArray(ImplicitSwappedPojo[][][] x);
+ public void setImplicitSwappedPojo3dArray(ImplicitSwappedPojo[][][] x);
public Map<ImplicitSwappedPojo,ImplicitSwappedPojo> getImplicitSwappedPojoMap();
- public void setImplicitSwappedPojoMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x);
+ public void setImplicitSwappedPojoMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo> x);
public Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> getImplicitSwappedPojo3dMap();
- public void setImplicitSwappedPojo3dMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x);
+ public void setImplicitSwappedPojo3dMap(Map<ImplicitSwappedPojo,ImplicitSwappedPojo[][][]> x);
// Enums
-
+
public TestEnum getEnum();
- public void setEnum(TestEnum x);
+ public void setEnum(TestEnum x);
public TestEnum[][][] getEnum3d();
- public void setEnum3d(TestEnum[][][] x);
+ public void setEnum3d(TestEnum[][][] x);
public List<TestEnum> getEnumList();
- public void setEnumList(List<TestEnum> x);
+ public void setEnumList(List<TestEnum> x);
public List<List<List<TestEnum>>> getEnum3dList();
- public void setEnum3dList(List<List<List<TestEnum>>> x);
+ public void setEnum3dList(List<List<List<TestEnum>>> x);
public List<TestEnum[][][]> getEnum1d3dList();
- public void setEnum1d3dList(List<TestEnum[][][]> x);
+ public void setEnum1d3dList(List<TestEnum[][][]> x);
public Map<TestEnum,TestEnum> getEnumMap();
- public void setEnumMap(Map<TestEnum,TestEnum> x);
+ public void setEnumMap(Map<TestEnum,TestEnum> x);
public Map<TestEnum,TestEnum[][][]> getEnum3dArrayMap();
- public void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x);
+ public void setEnum3dArrayMap(Map<TestEnum,TestEnum[][][]> x);
public Map<TestEnum,List<TestEnum[][][]>> getEnum1d3dListMap();
public void setEnum1d3dListMap(Map<TestEnum,List<TestEnum[][][]>> x);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileTest.java b/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileTest.java
index 683d2fc..dfd3572 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/ini/ConfigFileTest.java
@@ -34,7 +34,7 @@ import org.junit.*;
public class ConfigFileTest {
private ConfigFileBuilder configFileBuilder = new ConfigFileBuilder();
-
+
private File getFreshFile() {
String tempDir = System.getProperty("java.io.tmpdir");
File f = new File(tempDir, "Test.cfg");
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
index d7f2c0a..cac45d5 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/jena/CommonParserTest.java
@@ -193,7 +193,7 @@ public class CommonParserTest {
assertEquals(1, MyParserListener.events.size());
assertEquals("unknownProperty,-1,-1", MyParserListener.events.get(0));
}
-
+
public static class MyParserListener extends ParserListener {
final static List<String> events = new LinkedList<String>();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
index c9734a9..d16329d 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/json/CommonParserTest.java
@@ -168,7 +168,7 @@ public class CommonParserTest {
assertEquals(1, MyParserListener.events.size());
assertEquals("unknownProperty,1,5", MyParserListener.events.get(0));
}
-
+
public static class MyParserListener extends ParserListener {
final static List<String> events = new LinkedList<String>();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserGroupTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserGroupTest.java b/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserGroupTest.java
index 79d3b11..32c22de 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserGroupTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/parser/ParserGroupTest.java
@@ -27,7 +27,7 @@ public class ParserGroupTest {
//====================================================================================================
@Test
public void testParserGroupMatching() throws Exception {
-
+
ParserGroup g = new ParserGroupBuilder().append(Parser1.class, Parser2.class, Parser3.class).build();
assertType(Parser1.class, g.getParser("text/foo"));
assertType(Parser1.class, g.getParser("text/foo_a"));
@@ -44,15 +44,15 @@ public class ParserGroupTest {
assertType(Parser3.class, g.getParser("text/yyy+baz"));
assertType(Parser3.class, g.getParser("text/yyy+baz_a"));
}
-
-
+
+
@Consumes("text/foo,text/foo_a")
public static class Parser1 extends JsonParser {
public Parser1(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
@Consumes("text/foo+bar,text/foo+bar_a")
public static class Parser2 extends JsonParser {
public Parser2(PropertyStore propertyStore) {
@@ -66,7 +66,7 @@ public class ParserGroupTest {
super(propertyStore);
}
}
-
+
//====================================================================================================
// Test inheritence
//====================================================================================================
@@ -74,11 +74,11 @@ public class ParserGroupTest {
public void testInheritence() throws Exception {
ParserGroupBuilder gb = null;
ParserGroup g = null;
-
+
gb = new ParserGroupBuilder().append(P1.class, P2.class);
g = gb.build();
assertObjectEquals("['text/1','text/2','text/2a']", g.getSupportedMediaTypes());
-
+
gb = new ParserGroupBuilder(g).append(P3.class, P4.class);
g = gb.build();
assertObjectEquals("['text/3','text/4','text/4a','text/1','text/2','text/2a']", g.getSupportedMediaTypes());
@@ -87,14 +87,14 @@ public class ParserGroupTest {
g = gb.build();
assertObjectEquals("['text/5','text/3','text/4','text/4a','text/1','text/2','text/2a']", g.getSupportedMediaTypes());
}
-
+
@Consumes("text/1")
public static class P1 extends JsonParser {
public P1(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
@Consumes("text/2,text/2a")
public static class P2 extends JsonParser {
public P2(PropertyStore propertyStore) {
@@ -108,14 +108,14 @@ public class ParserGroupTest {
super(propertyStore);
}
}
-
+
@Consumes("text/4,text/4a")
public static class P4 extends JsonParser {
public P4(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
@Consumes("text/5")
public static class P5 extends JsonParser {
public P5(PropertyStore propertyStore) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java b/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java
index 2bcf413..ef0d788 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/serializer/SerializerGroupTest.java
@@ -27,7 +27,7 @@ public class SerializerGroupTest {
//====================================================================================================
@Test
public void testSerializerGroupMatching() throws Exception {
-
+
SerializerGroup sg = new SerializerGroupBuilder().append(SA1.class, SA2.class, SA3.class).build();
assertType(SA1.class, sg.getSerializer("text/foo"));
assertType(SA1.class, sg.getSerializer("text/foo_a"));
@@ -45,19 +45,19 @@ public class SerializerGroupTest {
assertType(SA3.class, sg.getSerializer("text/baz_a+yyy"));
assertType(SA3.class, sg.getSerializer("text/yyy+baz"));
assertType(SA3.class, sg.getSerializer("text/yyy+baz_a"));
-
+
assertType(SA1.class, sg.getSerializer("text/foo;q=0.9,text/foo+bar;q=0.8"));
assertType(SA2.class, sg.getSerializer("text/foo;q=0.8,text/foo+bar;q=0.9"));
}
-
-
+
+
@Produces("text/foo,text/foo_a")
public static class SA1 extends JsonSerializer {
public SA1(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
@Produces("text/foo+bar,text/foo+bar_a")
public static class SA2 extends JsonSerializer {
public SA2(PropertyStore propertyStore) {
@@ -79,11 +79,11 @@ public class SerializerGroupTest {
public void testInheritence() throws Exception {
SerializerGroupBuilder gb = null;
SerializerGroup g = null;
-
+
gb = new SerializerGroupBuilder().append(SB1.class, SB2.class);
g = gb.build();
assertObjectEquals("['text/1','text/2','text/2a']", g.getSupportedMediaTypes());
-
+
gb = new SerializerGroupBuilder(g).append(SB3.class, SB4.class);
g = gb.build();
assertObjectEquals("['text/3','text/4','text/4a','text/1','text/2','text/2a']", g.getSupportedMediaTypes());
@@ -92,14 +92,14 @@ public class SerializerGroupTest {
g = gb.build();
assertObjectEquals("['text/5','text/3','text/4','text/4a','text/1','text/2','text/2a']", g.getSupportedMediaTypes());
}
-
+
@Produces("text/1")
public static class SB1 extends JsonSerializer {
public SB1(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
@Produces("text/2,text/2a")
public static class SB2 extends JsonSerializer {
public SB2(PropertyStore propertyStore) {
@@ -113,21 +113,21 @@ public class SerializerGroupTest {
super(propertyStore);
}
}
-
+
@Produces("text/4,text/4a")
public static class SB4 extends JsonSerializer {
public SB4(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
@Produces("text/5")
public static class SB5 extends JsonSerializer {
public SB5(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
//====================================================================================================
// Test media type with meta-characters
//====================================================================================================
@@ -135,28 +135,28 @@ public class SerializerGroupTest {
public void testMediaTypesWithMetaCharacters() throws Exception {
SerializerGroupBuilder gb = null;
SerializerGroup g = null;
-
+
gb = new SerializerGroupBuilder().append(SC1.class, SC2.class, SC3.class);
g = gb.build();
assertType(SC1.class, g.getSerializer("text/foo"));
assertType(SC2.class, g.getSerializer("foo/json"));
assertType(SC3.class, g.getSerializer("foo/foo"));
}
-
+
@Produces("text/*")
public static class SC1 extends JsonSerializer {
public SC1(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
@Produces("*/json")
public static class SC2 extends JsonSerializer {
public SC2(PropertyStore propertyStore) {
super(propertyStore);
}
}
-
+
@Produces("*/*")
public static class SC3 extends JsonSerializer {
public SC3(PropertyStore propertyStore) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/serializer/TestURI.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/serializer/TestURI.java b/juneau-core-test/src/test/java/org/apache/juneau/serializer/TestURI.java
index eb48e99..80c1b61 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/serializer/TestURI.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/serializer/TestURI.java
@@ -22,7 +22,7 @@ import org.apache.juneau.xml.annotation.*;
@SuppressWarnings("javadoc")
@Bean(sort=true)
public class TestURI {
-
+
// String annotated as a URI
@org.apache.juneau.annotation.URI
@Rdf(beanUri=true)
@@ -30,7 +30,7 @@ public class TestURI {
public String f0 = "f0/x0";
// URI properties
- public URI
+ public URI
f1a = URI.create("http://www.apache.org/f1a"),
f1b = URI.create("/f1b"),
f1c = URI.create("/f1c/x/y"),
@@ -46,7 +46,7 @@ public class TestURI {
f1m = URI.create("context:/"),
f1n = URI.create("context:/.."),
fio = null;
-
+
// Strings annotated with @URI properties
@org.apache.juneau.annotation.URI
public String
@@ -72,10 +72,10 @@ public class TestURI {
f3a = "http://www.apache.org/f3a/x?label=MY_LABEL&foo=bar",
f3b = XmlUtils.urlEncode("<>&'\""),
f3c = "<>&'\""; // Invalid URI, but should produce parsable output.
-
+
// @URI on bean
public TestURIb f4 = new TestURIb();
-
+
// @URI on bean property method.
@org.apache.juneau.annotation.URI
public String getF5() {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java b/juneau-core-test/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java
index ab30ef5..5faf84c 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/serializer/UriResolutionTest.java
@@ -37,7 +37,7 @@ public class UriResolutionTest {
private final String label;
private final Input input;
private final Results results;
-
+
//------------------------------------------------------------------------------------------------------------------
// Input
//------------------------------------------------------------------------------------------------------------------
@@ -45,24 +45,24 @@ public class UriResolutionTest {
private final UriContext context;
private final UriResolution resolution;
private final UriRelativity relativity;
-
+
public Input(UriResolution resolution, UriRelativity relativity, String authority, String context, String resource, String path) {
this.resolution = resolution;
this.relativity = relativity;
this.context = new UriContext(authority, context, resource, path);
}
}
-
+
private static Input input(UriResolution uriResolution, UriRelativity uriRelativity, String authority, String context, String resource, String path) {
return new Input(uriResolution, uriRelativity, authority, context, resource, path);
}
-
+
//------------------------------------------------------------------------------------------------------------------
// Output
//------------------------------------------------------------------------------------------------------------------
private static class Results {
final String json, xml, html, uon, urlEncoding, msgPack, rdfXml;
-
+
Results(String json, String xml, String html, String uon, String urlEncoding, String msgPack, String rdfXml) {
this.json = json;
this.xml = xml;
@@ -73,17 +73,17 @@ public class UriResolutionTest {
this.rdfXml = rdfXml;
}
}
-
+
private static Results results(String json, String xml, String html, String uon, String urlEncoding, String msgPack, String rdfXml) {
return new Results(json, xml, html, uon, urlEncoding, msgPack, rdfXml);
}
-
+
public UriResolutionTest(String label, Input input, Results results) {
this.label = label;
this.input = input;
this.results = results;
}
-
+
@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
return Arrays.asList(new Object[][] {
@@ -541,31 +541,31 @@ public class UriResolutionTest {
},
});
};
-
+
private void testSerialize(Serializer s, String expected) throws Exception {
try {
boolean isRdf = s instanceof RdfSerializer;
-
+
String r = s.isWriterSerializer() ? ((WriterSerializer)s).serialize(new TestURI()) : ((OutputStreamSerializer)s).serializeToHex(new TestURI());
-
+
// Can't control RdfSerializer output well, so manually remove namespace declarations
// double-quotes with single-quotes, and spaces with tabs.
// Also because RDF sucks really bad and can't be expected to produce consistent testable results,
// we must also do an expensive sort-then-compare operation to verify the results.
if (isRdf)
r = r.replaceAll("<rdf:RDF[^>]*>", "<rdf:RDF>").replace('"', '\'');
-
+
// Specifying "xxx" in the expected results will spit out what we should populate the field with.
if (expected.equals("xxx")) {
System.out.println(label + "/" + s.getClass().getSimpleName() + "=\n" + r.replaceAll("\t", "\\\\t").replaceAll("\\\\", "\\\\\\\\").replaceAll("\\\"", "\\\\\\\"").replaceAll("\n", "\\\\n")); // NOT DEBUG
System.out.println(r);
}
-
+
if (isRdf)
TestUtils.assertEqualsAfterSort(expected, r, "{0}/{1} serialize-normal failed", label, s.getClass().getSimpleName());
else
TestUtils.assertEquals(expected, r, "{0}/{1} serialize-normal failed", label, s.getClass().getSimpleName());
-
+
} catch (AssertionError e) {
throw e;
} catch (Exception e) {
@@ -573,16 +573,16 @@ public class UriResolutionTest {
throw new AssertionError(label + "/" + s.getClass().getSimpleName() + " failed. exception=" + e.getLocalizedMessage());
}
}
-
+
private void testParse(Serializer s, Parser p) throws Exception {
try {
String r = s.isWriterSerializer() ? ((WriterSerializer)s).serialize(new TestURI()) : ((OutputStreamSerializer)s).serializeToHex(new TestURI());
TreeMap<String,String> m = p.parse(r, TreeMap.class, String.class, String.class);
-
+
String r2 = JsonSerializer.DEFAULT_LAX.toString(m);
TestUtils.assertEquals(results.json, r2, "{0}/{1} parse failed", label, s.getClass().getSimpleName());
-
+
} catch (AssertionError e) {
throw e;
} catch (Exception e) {
@@ -596,25 +596,25 @@ public class UriResolutionTest {
Serializer s = new JsonSerializerBuilder().simple().sq().uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
testSerialize(s, results.json);
}
-
+
@Test
public void a2_testJsonParse() throws Exception {
Serializer s = new JsonSerializerBuilder().simple().sq().uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
testParse(s, JsonParser.DEFAULT);
}
-
+
@Test
public void b1_testXmlSerialize() throws Exception {
Serializer s = new XmlSerializerBuilder().sq().uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
testSerialize(s, results.xml);
}
-
+
@Test
public void b2_testXmlParse() throws Exception {
Serializer s = new XmlSerializerBuilder().sq().uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
testParse(s, XmlParser.DEFAULT);
}
-
+
@Test
public void c1_testHtmlSerialize() throws Exception {
Serializer s = new HtmlSerializerBuilder().sq().lookForLabelParameters(true).uriAnchorText(HtmlSerializerContext.LAST_TOKEN).uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
@@ -626,7 +626,7 @@ public class UriResolutionTest {
Serializer s = new HtmlSerializerBuilder().sq().lookForLabelParameters(true).uriAnchorText(HtmlSerializerContext.LAST_TOKEN).uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
testParse(s, HtmlParser.DEFAULT);
}
-
+
@Test
public void d1_testUonSerialize() throws Exception {
Serializer s = new UonSerializerBuilder().uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
@@ -638,7 +638,7 @@ public class UriResolutionTest {
Serializer s = new UonSerializerBuilder().uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
testParse(s, UonParser.DEFAULT);
}
-
+
@Test
public void e1_testUrlEncodingSerialize() throws Exception {
Serializer s = new UrlEncodingSerializerBuilder().uriContext(input.context).uriResolution(input.resolution).uriRelativity(input.relativity).build();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java b/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
index e81c826..41f67b7 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/IfVarTest.java
@@ -26,7 +26,7 @@ public class IfVarTest {
@Test
public void test() throws Exception {
VarResolver vr = new VarResolverBuilder().vars(IfVar.class, SystemPropertiesVar.class).build();
-
+
for (String test : new String[]{"","0","false","FALSE","f","F","foobar"}) {
System.setProperty("IfVarTest.test", test);
assertEquals("NO", vr.resolve("$IF{$S{IfVarTest.test},YES,NO}"));
@@ -34,7 +34,7 @@ public class IfVarTest {
assertEquals("", vr.resolve("$IF{$S{IfVarTest.test},YES}"));
assertEquals("x x", vr.resolve("x $IF{ $S{ IfVarTest.test } , YES } x"));
}
-
+
for (String test : new String[]{"1","true","TRUE","t","T"}) {
System.setProperty("IfVarTest.test", test);
assertEquals("YES", vr.resolve("$IF{$S{IfVarTest.test},YES,NO}"));
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java b/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java
index ab6d154..decd342 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/svl/vars/SwitchVarTest.java
@@ -26,9 +26,9 @@ public class SwitchVarTest {
@Test
public void test() throws Exception {
VarResolver vr = new VarResolverBuilder().vars(SwitchVar.class, SystemPropertiesVar.class).build();
-
+
System.setProperty("SwitchVarTest.test", "foobar");
-
+
assertEquals("YES", vr.resolve("$SWITCH{$S{SwitchVarTest.test},foobar,YES}"));
assertEquals("YES", vr.resolve("$SWITCH{ $S{ SwitchVarTest.test } , foobar , YES }"));
assertEquals("", vr.resolve("$SWITCH{$S{SwitchVarTest.test},foobar2,YES}"));
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojoSwap.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojoSwap.java b/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojoSwap.java
index 6284898..950b754 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojoSwap.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/SwappedPojoSwap.java
@@ -2,7 +2,7 @@
// * 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 *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TestEnum.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TestEnum.java b/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TestEnum.java
index 0f4a39a..63368a4 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TestEnum.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/test/pojos/TestEnum.java
@@ -2,7 +2,7 @@
// * 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 *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
index 03aaab7..3ab7ec2 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/transforms/BeanDictionaryComboTest.java
@@ -62,6 +62,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(A o) {
assertType(A.class, o);
}
@@ -95,6 +96,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(A[] o) {
assertType(A.class, o[0]);
}
@@ -128,6 +130,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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 <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(A[][][] o) {
assertType(A.class, o[0][0][0]);
}
@@ -161,6 +164,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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.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"
)
{
+ @Override
public void verify(List<A[][][]> o) {
assertType(A.class, o.get(0)[0][0][0]);
}
@@ -194,6 +198,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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://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</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map<String,A[][][]> o) {
assertType(A.class, o.get("x")[0][0][0]);
}
@@ -227,6 +232,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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 </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://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </jp:x>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map<String,List<A[][][]>> o) {
assertType(A.class, o.get("x").get(0)[0][0][0]);
}
@@ -260,6 +266,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(IA o) {
assertType(A.class, o);
}
@@ -293,6 +300,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(IA[] o) {
assertType(A.class, o[0]);
}
@@ -326,6 +334,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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 <rdf:li rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(IA[][][] o) {
assertType(A.class, o[0][0][0]);
}
@@ -359,6 +368,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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.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"
)
{
+ @Override
public void verify(List<IA[][][]> o) {
assertType(A.class, o.get(0)[0][0][0]);
}
@@ -392,6 +402,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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://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</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map<String,IA[][][]> o) {
assertType(A.class, o.get("x")[0][0][0]);
}
@@ -425,6 +436,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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 </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://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </jp:x>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map<String,List<IA[][][]>> o) {
assertType(A.class, o.get("x").get(0)[0][0][0]);
}
@@ -458,6 +470,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(B o) {
assertType(B.class, o);
}
@@ -491,6 +504,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(B[] o) {
assertType(B.class, o[0]);
}
@@ -524,6 +538,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(B[][][] o) {
assertType(B.class, o[0][0][0]);
}
@@ -557,6 +572,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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/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"
)
{
+ @Override
public void verify(List<B[][][]> o) {
assertType(B.class, o.get(0)[0][0][0]);
}
@@ -590,6 +606,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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.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</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map<String,B[][][]> o) {
assertType(B.class, o.get("x")[0][0][0]);
}
@@ -623,6 +640,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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 </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://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </jp:x>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map<String,List<B[][][]>> o) {
assertType(B.class, o.get("x").get(0)[0][0][0]);
}
@@ -656,6 +674,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(IB o) {
assertType(B.class, o);
}
@@ -689,6 +708,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(IB[] o) {
assertType(B.class, o[0]);
}
@@ -722,6 +742,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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 rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(IB[][][] o) {
assertType(B.class, o[0][0][0]);
}
@@ -755,6 +776,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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/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"
)
{
+ @Override
public void verify(List<IB[][][]> o) {
assertType(B.class, o.get(0)[0][0][0]);
}
@@ -788,6 +810,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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.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</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map<String,IB[][][]> o) {
assertType(B.class, o.get("x")[0][0][0]);
}
@@ -821,6 +844,7 @@ public class BeanDictionaryComboTest extends ComboTest {
/* 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 </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://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Seq>\n </jp:x>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Map<String,List<IB[][][]>> o) {
assertType(B.class, o.get("x").get(0)[0][0][0]);
}
@@ -828,28 +852,28 @@ public class BeanDictionaryComboTest extends ComboTest {
},
});
}
-
+
public BeanDictionaryComboTest(ComboInput<?> comboInput) {
super(comboInput);
}
-
+
@Override
protected Serializer applySettings(Serializer s) throws Exception {
return s.builder().trimNullProperties(false).build();
}
-
+
@Override
protected Parser applySettings(Parser p) throws Exception {
return p.builder().build();
}
-
+
@Bean(beanDictionary={A.class})
public static interface IA {}
-
+
@Bean(typeName="A")
public static class A implements IA {
public int a;
-
+
public A init() {
a = 1;
return this;
@@ -858,11 +882,11 @@ public class BeanDictionaryComboTest extends ComboTest {
@Bean(beanDictionary={B.class}, typePropertyName="z")
public static interface IB {}
-
+
@Bean(typeName="B")
public static class B implements IB {
public int b;
-
+
public B init() {
b = 1;
return this;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
index 8c025c8..cf580f8 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/transforms/ByteArrayBase64SwapComboTest.java
@@ -61,6 +61,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <j:value>AQID</j:value>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(byte[] o) {
assertType(byte[].class, o);
}
@@ -94,6 +95,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(byte[][] o) {
assertType(byte[][].class, o);
}
@@ -131,6 +133,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(List<byte[]> o) {
assertType(List.class, o);
assertType(byte[].class, o.get(0));
@@ -170,6 +173,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Map<String,byte[]> o) {
assertType(Map.class, o);
assertType(String.class, o.keySet().iterator().next());
@@ -205,6 +209,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:f>AQID</jp:f>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(BeanWithByteArrayField o) {
assertType(BeanWithByteArrayField.class, o);
}
@@ -238,6 +243,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(BeanWithByteArray2dField o) {
assertType(BeanWithByteArray2dField.class, o);
}
@@ -271,6 +277,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(BeanWithByteArrayNullField o) {
assertType(BeanWithByteArrayNullField.class, o);
}
@@ -304,6 +311,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(BeanWithByteArrayListField o) {
assertType(BeanWithByteArrayListField.class, o);
}
@@ -337,6 +345,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(BeanWithByteArrayMapField o) {
assertType(BeanWithByteArrayMapField.class, o);
}
@@ -370,6 +379,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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: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 </rdf:Seq>\n </jp:f4>\n <jp:f5 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:f5>\n </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"
)
{
+ @Override
public void verify(BeanWithByteArrayBeanListField o) {
assertType(BeanWithByteArrayBeanListField.class, o);
}
@@ -403,6 +413,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
/* 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 <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:f4>\n <jp:f5 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:f5>\n </jp:foo>\n <jp:bar rdf:resource='http://www.w3.org/1999/02/22-r
df-syntax-ns#nil'/>\n <jp:_x0000_ 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 </rdf:Seq>\n </jp:f4>\n <jp:f5 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:f5>\n </jp:_x0000_>\n </jp:f>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(BeanWithByteArrayBeanMapField o) {
assertType(BeanWithByteArrayBeanMapField.class, o);
}
@@ -410,21 +421,21 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
},
});
}
-
+
public ByteArrayBase64SwapComboTest(ComboInput<?> comboInput) {
super(comboInput);
}
-
+
@Override
protected Serializer applySettings(Serializer s) throws Exception {
return s.builder().pojoSwaps(ByteArrayBase64Swap.class).trimNullProperties(false).build();
}
-
+
@Override
protected Parser applySettings(Parser p) throws Exception {
return p.builder().pojoSwaps(ByteArrayBase64Swap.class).build();
}
-
+
public static class BeanWithByteArrayField {
public byte[] f;
public BeanWithByteArrayField init() {
@@ -440,7 +451,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
return this;
}
}
-
+
public static class BeanWithByteArrayNullField {
public byte[] f;
public BeanWithByteArrayNullField init() {
@@ -448,7 +459,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
return this;
}
}
-
+
public static class BeanWithByteArrayListField {
public List<byte[]> f;
public BeanWithByteArrayListField init() {
@@ -460,7 +471,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
return this;
}
}
-
+
public static class BeanWithByteArrayMapField {
public Map<String,byte[]> f;
public BeanWithByteArrayMapField init() {
@@ -472,7 +483,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
return this;
}
}
-
+
public static class BeanWithByteArrayBeanListField {
public List<B> f;
public BeanWithByteArrayBeanListField init() {
@@ -483,7 +494,7 @@ public class ByteArrayBase64SwapComboTest extends ComboTest {
return this;
}
}
-
+
public static class BeanWithByteArrayBeanMapField {
public Map<String,B> f;
public BeanWithByteArrayBeanMapField init() {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
index 180ed34..9aa0b1d 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/transforms/CalendarSwapComboTest.java
@@ -36,11 +36,11 @@ public class CalendarSwapComboTest extends ComboTest {
singleDate.setTimeInMillis(0);
singleDate.set(1901, 2, 3, 10, 11, 12);
}
-
+
private static Calendar[] dateArray = new Calendar[]{singleDate};
-
+
private static ObjectMap dateMap = new ObjectMap().append("foo", singleDate);
-
+
@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
@@ -74,6 +74,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Calendar o) {
assertType(Calendar.class, o);
}
@@ -108,6 +109,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Calendar[] o) {
assertType(Calendar.class, o[0]);
}
@@ -142,6 +144,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Calendar.class, o.get("foo"));
}
@@ -176,6 +179,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Calendar o) {
assertType(Calendar.class, o);
}
@@ -210,6 +214,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Calendar[] o) {
assertType(Calendar.class, o[0]);
}
@@ -244,6 +249,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Calendar.class, o.get("foo"));
}
@@ -278,6 +284,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Calendar o) {
assertType(Calendar.class, o);
}
@@ -312,6 +319,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Calendar[] o) {
assertType(Calendar.class, o[0]);
}
@@ -346,6 +354,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Calendar.class, o.get("foo"));
}
@@ -380,6 +389,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <j:value>-2172116928000</j:value>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Calendar o) {
assertType(Calendar.class, o);
}
@@ -414,6 +424,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Seq>\n <rdf:li>-2172116928000</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Calendar[] o) {
assertType(Calendar.class, o[0]);
}
@@ -448,6 +459,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:foo>-2172116928000</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Calendar.class, o.get("foo"));
}
@@ -482,6 +494,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Calendar o) {
assertType(Calendar.class, o);
}
@@ -516,6 +529,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Calendar[] o) {
assertType(Calendar.class, o[0]);
}
@@ -550,6 +564,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Calendar.class, o.get("foo"));
}
@@ -584,6 +599,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <j:value>Mar 3, 1901</j:value>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Calendar o) {
assertType(Calendar.class, o);
}
@@ -618,6 +634,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Seq>\n <rdf:li>Mar 3, 1901</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Calendar[] o) {
assertType(Calendar.class, o[0]);
}
@@ -652,6 +669,7 @@ public class CalendarSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:foo>Mar 3, 1901</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Calendar.class, o.get("foo"));
}
@@ -661,15 +679,15 @@ public class CalendarSwapComboTest extends ComboTest {
}
private final Class<?> swapClass;
-
+
public CalendarSwapComboTest(ComboInput2<?> comboInput) {
super(comboInput);
this.swapClass = comboInput.swapClass;
}
-
+
public static class ComboInput2<T> extends ComboInput<T> {
private final Class<?> swapClass;
-
+
public ComboInput2(
String label,
Type type,
@@ -701,24 +719,24 @@ public class CalendarSwapComboTest extends ComboTest {
this.swapClass = swapClass;
}
}
-
+
@BeforeClass
public static void beforeClass() {
TestUtils.setTimeZone("PST");
TestUtils.setLocale(Locale.US);
}
-
+
@AfterClass
public static void afterClass() {
TestUtils.unsetTimeZone();
TestUtils.unsetLocale();
}
-
+
@Override
protected Serializer applySettings(Serializer s) throws Exception {
return s.builder().pojoSwaps(swapClass).build();
}
-
+
@Override
protected Parser applySettings(Parser p) throws Exception {
return p.builder().pojoSwaps(swapClass).build();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
index 9bdd575..2c24884 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/transforms/DateSwapComboTest.java
@@ -32,11 +32,11 @@ import org.junit.runners.*;
public class DateSwapComboTest extends ComboTest {
private static Date singleDate = CalendarSwapTest.testDate.getTime();
-
+
private static Date[] dateArray = new Date[]{singleDate};
-
+
private static ObjectMap dateMap = new ObjectMap().append("foo", singleDate);
-
+
@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
@@ -70,6 +70,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Date o) {
assertType(Date.class, o);
}
@@ -104,6 +105,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Date[] o) {
assertType(Date.class, o[0]);
}
@@ -138,6 +140,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Date.class, o.get("foo"));
}
@@ -172,6 +175,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Date o) {
assertType(Date.class, o);
}
@@ -206,6 +210,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Date[] o) {
assertType(Date.class, o[0]);
}
@@ -240,6 +245,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Date.class, o.get("foo"));
}
@@ -274,6 +280,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Date o) {
assertType(Date.class, o);
}
@@ -308,6 +315,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Date[] o) {
assertType(Date.class, o[0]);
}
@@ -342,6 +350,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Date.class, o.get("foo"));
}
@@ -376,6 +385,7 @@ public class DateSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <j:value>-2172116928000</j:value>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Date o) {
assertType(Date.class, o);
}
@@ -410,6 +420,7 @@ public class DateSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Seq>\n <rdf:li>-2172116928000</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Date[] o) {
assertType(Date.class, o[0]);
}
@@ -444,6 +455,7 @@ public class DateSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:foo>-2172116928000</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Date.class, o.get("foo"));
}
@@ -478,6 +490,7 @@ public class DateSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:time>-2172116928000</jp:time>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Date o) {
assertType(Date.class, o);
}
@@ -512,6 +525,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(Date[] o) {
assertType(Date.class, o[0]);
}
@@ -546,6 +560,7 @@ public class DateSwapComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Date.class, o.get("foo"));
}
@@ -580,6 +595,7 @@ public class DateSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <j:value>Mar 3, 1901</j:value>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Date o) {
assertType(Date.class, o);
}
@@ -614,6 +630,7 @@ public class DateSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Seq>\n <rdf:li>Mar 3, 1901</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(Date[] o) {
assertType(Date.class, o[0]);
}
@@ -648,6 +665,7 @@ public class DateSwapComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:foo>Mar 3, 1901</jp:foo>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(ObjectMap o) {
assertType(Date.class, o.get("foo"));
}
@@ -655,17 +673,17 @@ public class DateSwapComboTest extends ComboTest {
},
});
}
-
+
private final Class<?> swapClass;
-
+
public DateSwapComboTest(ComboInput2<?> comboInput) {
super(comboInput);
this.swapClass = comboInput.swapClass;
}
-
+
public static class ComboInput2<T> extends ComboInput<T> {
private final Class<?> swapClass;
-
+
public ComboInput2(
String label,
Type type,
@@ -697,24 +715,24 @@ public class DateSwapComboTest extends ComboTest {
this.swapClass = swapClass;
}
}
-
+
@BeforeClass
public static void beforeClass() {
TestUtils.setTimeZone("PST");
TestUtils.setLocale(Locale.US);
}
-
+
@AfterClass
public static void afterClass() {
TestUtils.unsetTimeZone();
TestUtils.unsetLocale();
}
-
+
@Override
protected Serializer applySettings(Serializer s) throws Exception {
return s.builder().pojoSwaps(swapClass).build();
}
-
+
@Override
protected Parser applySettings(Parser p) throws Exception {
return p.builder().pojoSwaps(swapClass).build();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java
index ddb79f3..088f91b 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/CommonParser_UonTest.java
@@ -157,7 +157,7 @@ public class CommonParser_UonTest {
assertEquals(1, MyParserListener.events.size());
assertEquals("unknownProperty,1,5", MyParserListener.events.get(0));
}
-
+
public static class MyParserListener extends ParserListener {
final static List<String> events = new LinkedList<String>();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UonParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UonParserTest.java
index 87b46e1..8d91ede 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UonParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UonParserTest.java
@@ -49,12 +49,12 @@ public class UonParserTest {
// 2nd level
t = "(a=a)";
- assertEquals("a", ((Map)p.parse(t, Map.class)).get("a"));
- assertEquals("a", ((Map)pe.parse(t, Map.class)).get("a"));
+ assertEquals("a", p.parse(t, Map.class).get("a"));
+ assertEquals("a", pe.parse(t, Map.class).get("a"));
t = "('a'='a')";
- assertEquals("a", ((Map)p.parse(t, Map.class)).get("a"));
- assertEquals("a", ((Map)pe.parse(t, Map.class)).get("a"));
+ assertEquals("a", p.parse(t, Map.class).get("a"));
+ assertEquals("a", pe.parse(t, Map.class).get("a"));
// Simple map
// Top level
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
index 1ad27b4..141ea07 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
@@ -59,7 +59,7 @@ public class UrlEncodingParserTest {
// 2nd level
t = "?a=a";
- assertEquals("a", ((Map)p.parse(t, Map.class)).get("a"));
+ assertEquals("a", p.parse(t, Map.class).get("a"));
// Simple map
// Top level
[4/4] incubator-juneau git commit: Code cleanup.
Posted by ja...@apache.org.
Code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/7231baab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/7231baab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/7231baab
Branch: refs/heads/master
Commit: 7231baab1b687b9ce5144d438c8783ff13ac3cf7
Parents: 7a39c7c
Author: JamesBognar <ja...@apache.org>
Authored: Wed Jun 21 13:57:33 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Wed Jun 21 13:57:33 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/juneau/jena/RdfParser.java | 18 +-
.../apache/juneau/jena/RdfParserBuilder.java | 2 +-
.../org/apache/juneau/jena/RdfSerializer.java | 4 +-
.../juneau/jena/RdfSerializerBuilder.java | 6 +-
.../juneau/jena/RdfSerializerSession.java | 2 +-
.../java/org/apache/juneau/BeanMapTest.java | 8 +-
.../test/java/org/apache/juneau/ComboInput.java | 12 +-
.../test/java/org/apache/juneau/ComboTest.java | 206 +++++++++----------
.../org/apache/juneau/DynaBeanComboTest.java | 25 ++-
.../java/org/apache/juneau/MaxIndentTest.java | 32 +--
.../org/apache/juneau/PropertyNamerTest.java | 2 +-
.../test/java/org/apache/juneau/TestUtils.java | 14 +-
.../juneau/XmlValidatorParserBuilder.java | 3 +-
.../a/rttests/RoundTripAddClassAttrsTest.java | 12 +-
.../juneau/a/rttests/RoundTripBeanMapsTest.java | 4 +-
.../apache/juneau/a/rttests/RoundTripTest.java | 2 +-
.../apache/juneau/dto/html5/Html5ComboTest.java | 80 ++++++-
.../dto/html5/Html5TemplateComboTest.java | 13 +-
.../juneau/dto/jsonschema/JsonSchemaTest.java | 2 +-
.../juneau/encoders/EncoderGroupTest.java | 20 +-
.../org/apache/juneau/html/BasicHtmlTest.java | 116 ++++++++---
.../apache/juneau/html/CommonParserTest.java | 2 +-
.../juneau/https/AcceptExtensionsTest.java | 8 +-
.../org/apache/juneau/https/AcceptTest.java | 20 +-
.../org/apache/juneau/https/MediaRangeTest.java | 6 +-
.../juneau/ini/ConfigFileBuilderTest.java | 8 +-
.../juneau/ini/ConfigFileInterfaceTest.java | 120 +++++------
.../org/apache/juneau/ini/ConfigFileTest.java | 2 +-
.../apache/juneau/jena/CommonParserTest.java | 2 +-
.../apache/juneau/json/CommonParserTest.java | 2 +-
.../apache/juneau/parser/ParserGroupTest.java | 22 +-
.../juneau/serializer/SerializerGroupTest.java | 32 +--
.../org/apache/juneau/serializer/TestURI.java | 10 +-
.../juneau/serializer/UriResolutionTest.java | 46 ++---
.../org/apache/juneau/svl/vars/IfVarTest.java | 4 +-
.../apache/juneau/svl/vars/SwitchVarTest.java | 4 +-
.../juneau/test/pojos/SwappedPojoSwap.java | 2 +-
.../org/apache/juneau/test/pojos/TestEnum.java | 2 +-
.../transforms/BeanDictionaryComboTest.java | 40 +++-
.../ByteArrayBase64SwapComboTest.java | 29 ++-
.../transforms/CalendarSwapComboTest.java | 38 +++-
.../juneau/transforms/DateSwapComboTest.java | 40 +++-
.../urlencoding/CommonParser_UonTest.java | 2 +-
.../juneau/urlencoding/UonParserTest.java | 8 +-
.../urlencoding/UrlEncodingParserTest.java | 2 +-
.../urlencoding/UrlEncodingSerializerTest.java | 22 +-
.../org/apache/juneau/utils/ClassUtilsTest.java | 48 +++--
.../org/apache/juneau/utils/PojoQueryTest.java | 2 +-
.../apache/juneau/utils/StringUtilsTest.java | 2 +-
.../juneau/utils/StringVarResolverTest.java | 4 +-
.../utils/UriContextResolutionComboTest.java | 66 +++---
.../juneau/utils/UriContextUriComboTest.java | 30 +--
.../org/apache/juneau/xml/BasicXmlTest.java | 12 +-
.../org/apache/juneau/xml/CommonParserTest.java | 2 +-
.../java/org/apache/juneau/xml/XmlTest.java | 2 +-
.../examples/addressbook/AddressBook.java | 2 +-
.../examples/addressbook/IAddressBook.java | 2 +-
.../juneau/examples/rest/DirectoryResource.java | 2 +-
.../juneau/examples/rest/FileSpaceResource.java | 16 +-
.../examples/rest/MethodExampleResource.java | 12 +-
.../juneau/examples/rest/PetStoreResource.java | 28 +--
.../juneau/examples/rest/PhotosResource.java | 2 +-
.../juneau/examples/rest/SqlQueryResource.java | 4 +-
.../examples/rest/SystemPropertiesResource.java | 22 +-
.../examples/rest/TumblrParserResource.java | 2 +-
.../rest/addressbook/AddressBookResource.java | 22 +-
.../examples/rest/AddressBookResourceTest.java | 6 +-
.../juneau/examples/rest/RootResourcesTest.java | 4 +-
.../SampleRemoteableServicesResourceTest.java | 2 +-
.../examples/rest/SamplesMicroservice.java | 6 +-
.../juneau/microservice/Microservice.java | 34 +--
.../juneau/microservice/RestMicroservice.java | 24 +--
.../microservice/resources/LogsResource.java | 24 +--
.../apache/juneau/rest/jaxrs/BaseProvider.java | 4 +-
.../juneau/rest/test/pojos/SwappedPojoSwap.java | 2 +-
.../apache/juneau/rest/test/pojos/TestEnum.java | 2 +-
.../org/apache/juneau/rest/RestRequest.java | 4 +-
77 files changed, 830 insertions(+), 620 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 25e5c0a..c5cd6f4 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -64,7 +64,7 @@ public class RdfParser extends ReaderParser {
/** Default N3 parser, all default settings.*/
public static final RdfParser DEFAULT_N3 = new N3(PropertyStore.create());
-
+
/** Consumes RDF/XML input */
@Consumes("text/xml+rdf")
@@ -77,7 +77,7 @@ public class RdfParser extends ReaderParser {
public Xml(PropertyStore propertyStore) {
super(propertyStore);
}
-
+
@Override
protected ObjectMap getOverrideProperties() {
return super.getOverrideProperties().append(RDF_language, LANG_RDF_XML);
@@ -87,7 +87,7 @@ public class RdfParser extends ReaderParser {
/** Consumes N-Triple input */
@Consumes(value="text/n-triple")
public static class NTriple extends RdfParser {
-
+
/**
* Constructor.
* @param propertyStore The property store containing all the settings for this object.
@@ -95,7 +95,7 @@ public class RdfParser extends ReaderParser {
public NTriple(PropertyStore propertyStore) {
super(propertyStore);
}
-
+
@Override
protected ObjectMap getOverrideProperties() {
return super.getOverrideProperties().append(RDF_language, LANG_NTRIPLE);
@@ -113,7 +113,7 @@ public class RdfParser extends ReaderParser {
public Turtle(PropertyStore propertyStore) {
super(propertyStore);
}
-
+
@Override
protected ObjectMap getOverrideProperties() {
return super.getOverrideProperties().append(RDF_language, LANG_TURTLE);
@@ -131,7 +131,7 @@ public class RdfParser extends ReaderParser {
public N3(PropertyStore propertyStore) {
super(propertyStore);
}
-
+
@Override
protected ObjectMap getOverrideProperties() {
return super.getOverrideProperties().append(RDF_language, LANG_N3);
@@ -174,7 +174,7 @@ public class RdfParser extends ReaderParser {
c = new ArrayList();
else
c = (type.canCreateNewInstance(session.getOuter()) ? (Collection<?>)type.newInstance(session.getOuter()) : new ObjectList(session));
-
+
int argIndex = 0;
for (Resource resource : roots)
c.add(parseAnything(s, type.isArgs() ? type.getArg(argIndex++) : type.getElementType(), resource, session.getOuter(), null));
@@ -273,7 +273,7 @@ public class RdfParser extends ReaderParser {
PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();
ClassMeta<?> sType = eType.getSerializedClassMeta();
session.setCurrentClass(sType);
-
+
if (! sType.canCreateNewInstance(outer)) {
if (n.isResource()) {
Statement st = n.asResource().getProperty(session.getTypeProperty());
@@ -469,7 +469,7 @@ public class RdfParser extends ReaderParser {
return l;
}
-
+
//--------------------------------------------------------------------------------
// Entry point methods
//--------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index 05687fa..aa798ad 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -336,7 +336,7 @@ public class RdfParserBuilder extends ParserBuilder {
super.strict();
return this;
}
-
+
@Override /* ParserBuilder */
public RdfParserBuilder inputStreamCharset(String value) {
super.inputStreamCharset(value);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index 733d343..ccbc6b3 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -163,7 +163,7 @@ public class RdfSerializer extends WriterSerializer {
private final RdfSerializerContext ctx;
-
+
/**
* Constructor.
* @param propertyStore The property store containing all the settings for this object.
@@ -435,7 +435,7 @@ public class RdfSerializer extends WriterSerializer {
}
-
+
//--------------------------------------------------------------------------------
// Entry point methods
//--------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 0f82cec..d022797 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -94,7 +94,7 @@ public class RdfSerializerBuilder extends SerializerBuilder {
public RdfSerializerBuilder language(String value) {
return property(RDF_language, value);
}
-
+
/**
* Shortcut for calling <code>language(<jsf>LANG_RDF_XML</jsf>)</code>
* @return This object (for method chaining).
@@ -463,7 +463,7 @@ public class RdfSerializerBuilder extends SerializerBuilder {
super.sq();
return this;
}
-
+
@Override /* SerializerBuilder */
public RdfSerializerBuilder trimNullProperties(boolean value) {
super.trimNullProperties(value);
@@ -523,7 +523,7 @@ public class RdfSerializerBuilder extends SerializerBuilder {
super.abridged(value);
return this;
}
-
+
@Override /* SerializerBuilder */
public RdfSerializerBuilder listener(Class<? extends SerializerListener> value) {
super.listener(value);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 79691fe..eac8700 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -65,7 +65,7 @@ public final class RdfSerializerSession extends SerializerSession {
* If <jk>null</jk>, then the timezone defined on the context is used.
* @param mediaType The session media type (e.g. <js>"application/json"</js>).
* @param uriContext The URI context.
- * Identifies the current request URI used for resolution of URIs to absolute or root-relative form.
+ * Identifies the current request URI used for resolution of URIs to absolute or root-relative form.
*/
protected RdfSerializerSession(RdfSerializerContext ctx, ObjectMap op, Object output, Method javaMethod, Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {
super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java b/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
index 44ecd4f..679dd70 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -55,7 +55,7 @@ public class BeanMapTest {
addCollectionClass("LinkedListOfCalendar", LinkedList.class, Calendar.class);
}
}
-
+
//====================================================================================================
// Primitive field properties
//====================================================================================================
@@ -1358,7 +1358,7 @@ public class BeanMapTest {
//====================================================================================================
@Test
public void testToLinkedListInteger() throws Exception {
-
+
// With _type
ObjectMap m = new ObjectMap(session);
m.put("_type", "LinkedListOfInts");
@@ -1563,7 +1563,7 @@ public class BeanMapTest {
//====================================================================================================
@Test
public void testCastToStringArray() throws Exception {
-
+
// With _type
ObjectMap m = new ObjectMap(session);
m.put("_type", "StringArray");
@@ -1603,7 +1603,7 @@ public class BeanMapTest {
l2 = m.cast(bc.getClassMeta(StringBuffer[].class));
assertEquals("1", l[0].toString());
}
-
+
//====================================================================================================
// testCastToIntArray - cast() to int[]
//====================================================================================================
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/ComboInput.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/ComboInput.java b/juneau-core-test/src/test/java/org/apache/juneau/ComboInput.java
index ae7f737..2bfc196 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/ComboInput.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/ComboInput.java
@@ -14,18 +14,18 @@ package org.apache.juneau;
import java.lang.reflect.*;
-/**
+/**
* Represents the input to a ComboTest.
* @param <T>
*/
public class ComboInput<T> {
-
+
final String label;
final Object in;
final Type type;
final String json, jsonT, jsonR, xml, xmlT, xmlR, xmlNs, html, htmlT, htmlR, uon, uonT, uonR, urlEncoding,
urlEncodingT, urlEncodingR, msgPack, msgPackT, rdfXml, rdfXmlT, rdfXmlR;
-
+
public ComboInput(
String label,
Type type,
@@ -77,12 +77,12 @@ public class ComboInput<T> {
this.rdfXmlT = rdfXmlT;
this.rdfXmlR = rdfXmlR;
}
-
- /**
+
+ /**
* Override this method if you want to do a post-parse verification on the object.
* <p>
* Note that a Function would be preferred here, but it's not available in Java 6.
- *
+ *
* @param o The object returned by the parser.
*/
public void verify(T o) {}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/ComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/ComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/ComboTest.java
index 8a13997..510fe01 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/ComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/ComboTest.java
@@ -62,9 +62,9 @@ public abstract class ComboTest {
// /* RdfXmlT */ "xxx",
// /* RdfXmlR */ "xxx",
// },
-
+
private final ComboInput comboInput;
-
+
// These are the names of all the tests.
// You can comment out the names here to skip them.
private static final String[] runTests = {
@@ -115,16 +115,16 @@ public abstract class ComboTest {
};
private static final Set<String> runTestsSet = new HashSet<String>(Arrays.asList(runTests));
-
+
private final boolean SKIP_RDF_TESTS = Boolean.getBoolean("skipRdfTests");
private Map<Serializer,Serializer> serializerMap = new IdentityHashMap<Serializer,Serializer>();
private Map<Parser,Parser> parserMap = new IdentityHashMap<Parser,Parser>();
-
+
public ComboTest(ComboInput<?> comboInput) {
this.comboInput = comboInput;
}
-
+
private Serializer getSerializer(Serializer s) throws Exception {
Serializer s2 = serializerMap.get(s);
if (s2 == null) {
@@ -133,7 +133,7 @@ public abstract class ComboTest {
}
return s2;
}
-
+
private Parser getParser(Parser p) throws Exception {
Parser p2 = parserMap.get(p);
if (p2 == null) {
@@ -146,34 +146,34 @@ public abstract class ComboTest {
private void testSerialize(String testName, Serializer s, String expected) throws Exception {
try {
s = getSerializer(s);
-
+
boolean isRdf = s instanceof RdfSerializer;
if ((isRdf && SKIP_RDF_TESTS) || expected.isEmpty() || ! runTestsSet.contains(testName) ) {
System.err.println(comboInput.label + "/" + testName + " for "+s.getClass().getSimpleName()+" skipped.");
return;
}
-
+
String r = s.isWriterSerializer() ? ((WriterSerializer)s).serialize(comboInput.in) : ((OutputStreamSerializer)s).serializeToHex(comboInput.in);
-
+
// Can't control RdfSerializer output well, so manually remove namespace declarations
// double-quotes with single-quotes, and spaces with tabs.
// Also because RDF sucks really bad and can't be expected to produce consistent testable results,
// we must also do an expensive sort-then-compare operation to verify the results.
if (isRdf)
r = r.replaceAll("<rdf:RDF[^>]*>", "<rdf:RDF>").replace('"', '\'');
-
+
// Specifying "xxx" in the expected results will spit out what we should populate the field with.
if (expected.equals("xxx")) {
System.out.println(comboInput.label + "/" + testName + "=\n" + r.replaceAll("\n", "\\\\n").replaceAll("\t", "\\\\t")); // NOT DEBUG
System.out.println(r);
}
-
+
if (isRdf)
TestUtils.assertEqualsAfterSort(expected, r, "{0}/{1} parse-normal failed", comboInput.label, testName);
else
TestUtils.assertEquals(expected, r, "{0}/{1} parse-normal failed", comboInput.label, testName);
-
+
} catch (AssertionError e) {
throw e;
} catch (Exception e) {
@@ -181,26 +181,26 @@ public abstract class ComboTest {
throw new AssertionError(comboInput.label + "/" + testName + " failed. exception=" + e.getLocalizedMessage());
}
}
-
+
private void testParse(String testName, Serializer s, Parser p, String expected) throws Exception {
try {
s = getSerializer(s);
p = getParser(p);
-
+
boolean isRdf = s instanceof RdfSerializer;
if ((isRdf && SKIP_RDF_TESTS) || expected.isEmpty() || ! runTestsSet.contains(testName) ) {
System.err.println(comboInput.label + "/" + testName + " for "+s.getClass().getSimpleName()+" skipped.");
return;
}
-
+
String r = s.isWriterSerializer() ? ((WriterSerializer)s).serialize(comboInput.in) : ((OutputStreamSerializer)s).serializeToHex(comboInput.in);
Object o = p.parse(r, comboInput.type);
r = s.isWriterSerializer() ? ((WriterSerializer)s).serialize(o) : ((OutputStreamSerializer)s).serializeToHex(o);
-
+
if (isRdf)
r = r.replaceAll("<rdf:RDF[^>]*>", "<rdf:RDF>").replace('"', '\'');
-
+
if (isRdf)
TestUtils.assertEqualsAfterSort(expected, r, "{0}/{1} parse-normal failed", comboInput.label, testName);
else
@@ -212,15 +212,15 @@ public abstract class ComboTest {
throw new Exception(comboInput.label + "/" + testName + " failed.", e);
}
}
-
+
private void testParseVerify(String testName, Serializer s, Parser p) throws Exception {
try {
s = getSerializer(s);
p = getParser(p);
-
+
String r = s.isWriterSerializer() ? ((WriterSerializer)s).serialize(comboInput.in) : ((OutputStreamSerializer)s).serializeToHex(comboInput.in);
Object o = p.parse(r, comboInput.type);
-
+
comboInput.verify(o);
} catch (AssertionError e) {
throw e;
@@ -228,8 +228,8 @@ public abstract class ComboTest {
throw new Exception(comboInput.label + "/" + testName + " failed.", e);
}
}
-
-
+
+
private void testParseJsonEquivalency(String testName, OutputStreamSerializer s, InputStreamParser p, String expected) throws Exception {
try {
s = (OutputStreamSerializer)getSerializer(s);
@@ -246,31 +246,31 @@ public abstract class ComboTest {
throw new Exception(comboInput.label + "/" + testName + " failed.", e);
}
}
-
+
protected Serializer applySettings(Serializer s) throws Exception {
return s;
}
-
+
protected Parser applySettings(Parser p) throws Exception {
return p;
}
-
+
//--------------------------------------------------------------------------------
// JSON
//--------------------------------------------------------------------------------
WriterSerializer sJson = JsonSerializer.DEFAULT_LAX;
ReaderParser pJson = JsonParser.DEFAULT;
-
+
@Test
public void a11_serializeJson() throws Exception {
testSerialize("serializeJson", sJson, comboInput.json);
}
-
+
@Test
public void a12_parseJson() throws Exception {
testParse("parseJson", sJson, pJson, comboInput.json);
}
-
+
@Test
public void a13_verifyJson() throws Exception {
testParseVerify("verifyJson", sJson, pJson);
@@ -281,17 +281,17 @@ public abstract class ComboTest {
//--------------------------------------------------------------------------------
WriterSerializer sJsonT = new JsonSerializerBuilder().simple().beanTypePropertyName("t").build();
ReaderParser pJsonT = new JsonParserBuilder().beanTypePropertyName("t").build();
-
+
@Test
public void a21_serializeJsonT() throws Exception {
testSerialize("serializeJsonT", sJsonT, comboInput.jsonT);
}
-
+
@Test
public void a22_parseJsonT() throws Exception {
testParse("parseJsonT", sJsonT, pJsonT, comboInput.jsonT);
}
-
+
@Test
public void a23_verifyJsonT() throws Exception {
testParseVerify("verifyJsonT", sJsonT, pJsonT);
@@ -302,17 +302,17 @@ public abstract class ComboTest {
//--------------------------------------------------------------------------------
WriterSerializer sJsonR = JsonSerializer.DEFAULT_LAX_READABLE;
ReaderParser pJsonR = JsonParser.DEFAULT;
-
+
@Test
public void a31_serializeJsonR() throws Exception {
testSerialize("serializeJsonR", sJsonR, comboInput.jsonR);
}
-
+
@Test
public void a32_parseJsonR() throws Exception {
testParse("parseJsonR", sJsonR, pJsonR, comboInput.jsonR);
}
-
+
@Test
public void a33_verifyJsonR() throws Exception {
testParseVerify("verifyJsonR", sJsonR, pJsonR);
@@ -323,17 +323,17 @@ public abstract class ComboTest {
//--------------------------------------------------------------------------------
WriterSerializer sXml = XmlSerializer.DEFAULT_SQ;
ReaderParser pXml = XmlParser.DEFAULT;
-
+
@Test
public void b11_serializeXml() throws Exception {
testSerialize("serializeXml", sXml, comboInput.xml);
}
-
+
@Test
public void b12_parseXml() throws Exception {
testParse("parseXml", sXml, pXml, comboInput.xml);
}
-
+
@Test
public void b13_verifyXml() throws Exception {
testParseVerify("verifyXml", sXml, pXml);
@@ -344,38 +344,38 @@ public abstract class ComboTest {
//--------------------------------------------------------------------------------
WriterSerializer sXmlT = new XmlSerializerBuilder().sq().beanTypePropertyName("t").build();
ReaderParser pXmlT = new XmlParserBuilder().beanTypePropertyName("t").build();
-
+
@Test
public void b21_serializeXmlT() throws Exception {
testSerialize("serializeXmlT", sXmlT, comboInput.xmlT);
}
-
+
@Test
public void b22_parseXmlT() throws Exception {
testParse("parseXmlT", sXmlT, pXmlT, comboInput.xmlT);
}
-
+
@Test
public void b23_verifyXmlT() throws Exception {
testParseVerify("parseXmlTVerify", sXmlT, pXmlT);
}
-
+
//--------------------------------------------------------------------------------
// XML - Readable
//--------------------------------------------------------------------------------
WriterSerializer sXmlR = XmlSerializer.DEFAULT_SQ_READABLE;
ReaderParser pXmlR = XmlParser.DEFAULT;
-
+
@Test
public void b31_serializeXmlR() throws Exception {
testSerialize("serializeXmlR", sXmlR, comboInput.xmlR);
}
-
+
@Test
public void b32_parseXmlR() throws Exception {
testParse("parseXmlR", sXmlR, pXmlR, comboInput.xmlR);
}
-
+
@Test
public void b33_verifyXmlR() throws Exception {
testParseVerify("parseXmlRVerify", sXmlR, pXmlR);
@@ -391,12 +391,12 @@ public abstract class ComboTest {
public void b41_serializeXmlNs() throws Exception {
testSerialize("serializeXmlNs", sXmlNs, comboInput.xmlNs);
}
-
+
@Test
public void b42_parseXmlNs() throws Exception {
testParse("parseXmlNs", sXmlNs, pXmlNs, comboInput.xmlNs);
}
-
+
@Test
public void b43_verifyXmlNs() throws Exception {
testParseVerify("verifyXmlNs", sXmlNs, pXmlNs);
@@ -407,300 +407,300 @@ public abstract class ComboTest {
//--------------------------------------------------------------------------------
WriterSerializer sHtml = HtmlSerializer.DEFAULT_SQ;
ReaderParser pHtml = HtmlParser.DEFAULT;
-
+
@Test
public void c11_serializeHtml() throws Exception {
testSerialize("serializeHtml", sHtml, comboInput.html);
}
-
+
@Test
public void c12_parseHtml() throws Exception {
testParse("parseHtml", sHtml, pHtml, comboInput.html);
}
-
+
@Test
public void c13_verifyHtml() throws Exception {
testParseVerify("verifyHtml", sHtml, pHtml);
}
-
+
//--------------------------------------------------------------------------------
// HTML - 't' property
//--------------------------------------------------------------------------------
WriterSerializer sHtmlT = new HtmlSerializerBuilder().sq().beanTypePropertyName("t").build();
ReaderParser pHtmlT = new HtmlParserBuilder().beanTypePropertyName("t").build();
-
+
@Test
public void c21_serializeHtmlT() throws Exception {
testSerialize("serializeHtmlT", sHtmlT, comboInput.htmlT);
}
-
+
@Test
public void c22_parseHtmlT() throws Exception {
testParse("parseHtmlT", sHtmlT, pHtmlT, comboInput.htmlT);
}
-
+
@Test
public void c23_verifyHtmlT() throws Exception {
testParseVerify("verifyHtmlT", sHtmlT, pHtmlT);
}
-
+
//--------------------------------------------------------------------------------
// HTML - Readable
//--------------------------------------------------------------------------------
WriterSerializer sHtmlR = HtmlSerializer.DEFAULT_SQ_READABLE;
ReaderParser pHtmlR = HtmlParser.DEFAULT;
-
+
@Test
public void c31_serializeHtmlR() throws Exception {
testSerialize("serializeHtmlR", sHtmlR, comboInput.htmlR);
}
-
+
@Test
public void c32_parseHtmlR() throws Exception {
testParse("parseHtmlR", sHtmlR, pHtmlR, comboInput.htmlR);
}
-
+
@Test
public void c33_verifyHtmlR() throws Exception {
testParseVerify("verifyHtmlR", sHtmlR, pHtmlR);
}
-
+
//--------------------------------------------------------------------------------
// UON
//--------------------------------------------------------------------------------
WriterSerializer sUon = UonSerializer.DEFAULT;
ReaderParser pUon = UonParser.DEFAULT;
-
+
@Test
public void d11_serializeUon() throws Exception {
testSerialize("serializeUon", sUon, comboInput.uon);
}
-
+
@Test
public void d12_parseUon() throws Exception {
testParse("parseUon", sUon, pUon, comboInput.uon);
}
-
+
@Test
public void d13_verifyUon() throws Exception {
testParseVerify("verifyUon", sUon, pUon);
}
-
+
//--------------------------------------------------------------------------------
// UON - 't' property
//--------------------------------------------------------------------------------
WriterSerializer sUonT = new UonSerializerBuilder().beanTypePropertyName("t").build();
ReaderParser pUonT = new UonParserBuilder().beanTypePropertyName("t").build();
-
+
@Test
public void d21_serializeUonT() throws Exception {
testSerialize("serializeUonT", sUonT, comboInput.uonT);
}
-
+
@Test
public void d22_parseUonT() throws Exception {
testParse("parseUonT", sUonT, pUonT, comboInput.uonT);
}
-
+
@Test
public void d23_verifyUonT() throws Exception {
testParseVerify("verifyUonT", sUonT, pUonT);
}
-
+
//--------------------------------------------------------------------------------
// UON - Readable
//--------------------------------------------------------------------------------
WriterSerializer sUonR = UonSerializer.DEFAULT_READABLE;
ReaderParser pUonR = UonParser.DEFAULT;
-
+
@Test
public void d31_serializeUonR() throws Exception {
testSerialize("serializeUonR", sUonR, comboInput.uonR);
}
-
+
@Test
public void d32_parseUonR() throws Exception {
testParse("parseUonR", sUonR, pUonR, comboInput.uonR);
}
-
+
@Test
public void d33_verifyUonR() throws Exception {
testParseVerify("verifyUonR", sUonR, pUonR);
}
-
+
//--------------------------------------------------------------------------------
// UrlEncoding
//--------------------------------------------------------------------------------
WriterSerializer sUrlEncoding = UrlEncodingSerializer.DEFAULT;
ReaderParser pUrlEncoding = UrlEncodingParser.DEFAULT;
-
+
@Test
public void e11_serializeUrlEncoding() throws Exception {
testSerialize("serializeUrlEncoding", sUrlEncoding, comboInput.urlEncoding);
}
-
+
@Test
public void e12_parseUrlEncoding() throws Exception {
testParse("parseUrlEncoding", sUrlEncoding, pUrlEncoding, comboInput.urlEncoding);
}
-
+
@Test
public void e13_verifyUrlEncoding() throws Exception {
testParseVerify("verifyUrlEncoding", sUrlEncoding, pUrlEncoding);
}
-
+
//--------------------------------------------------------------------------------
// UrlEncoding - 't' property
//--------------------------------------------------------------------------------
WriterSerializer sUrlEncodingT = new UrlEncodingSerializerBuilder().beanTypePropertyName("t").build();
ReaderParser pUrlEncodingT = new UrlEncodingParserBuilder().beanTypePropertyName("t").build();
-
+
@Test
public void e21_serializeUrlEncodingT() throws Exception {
testSerialize("serializeUrlEncodingT", sUrlEncodingT, comboInput.urlEncodingT);
}
-
+
@Test
public void e22_parseUrlEncodingT() throws Exception {
testParse("parseUrlEncodingT", sUrlEncodingT, pUrlEncodingT, comboInput.urlEncodingT);
}
-
+
@Test
public void e23_verifyUrlEncodingT() throws Exception {
testParseVerify("verifyUrlEncodingT", sUrlEncodingT, pUrlEncodingT);
}
-
+
//--------------------------------------------------------------------------------
// UrlEncoding - Readable
//--------------------------------------------------------------------------------
WriterSerializer sUrlEncodingR = UrlEncodingSerializer.DEFAULT_READABLE;
ReaderParser pUrlEncodingR = UrlEncodingParser.DEFAULT;
-
+
@Test
public void e31_serializeUrlEncodingR() throws Exception {
testSerialize("serializeUrlEncodingR", sUrlEncodingR, comboInput.urlEncodingR);
}
-
+
@Test
public void e32_parseUrlEncodingR() throws Exception {
testParse("parseUrlEncodingR", sUrlEncodingR, pUrlEncodingR, comboInput.urlEncodingR);
}
-
+
@Test
public void e33_verifyUrlEncodingR() throws Exception {
testParseVerify("verifyUrlEncodingR", sUrlEncodingR, pUrlEncodingR);
}
-
+
//--------------------------------------------------------------------------------
// MsgPack
//--------------------------------------------------------------------------------
OutputStreamSerializer sMsgPack = MsgPackSerializer.DEFAULT;
InputStreamParser pMsgPack = MsgPackParser.DEFAULT;
-
+
@Test
public void f11_serializeMsgPack() throws Exception {
testSerialize("serializeMsgPack", sMsgPack, comboInput.msgPack);
}
-
+
@Test
public void f12_parseMsgPack() throws Exception {
testParse("parseMsgPack", sMsgPack, pMsgPack, comboInput.msgPack);
}
-
+
@Test
public void f13_parseMsgPackJsonEquivalency() throws Exception {
testParseJsonEquivalency("parseMsgPackJsonEquivalency", sMsgPack, pMsgPack, comboInput.json);
}
-
+
@Test
public void f14_verifyMsgPack() throws Exception {
testParseVerify("verifyMsgPack", sMsgPack, pMsgPack);
}
-
+
//--------------------------------------------------------------------------------
// MsgPack - 't' property
//--------------------------------------------------------------------------------
OutputStreamSerializer sMsgPackT = new MsgPackSerializerBuilder().beanTypePropertyName("t").build();
InputStreamParser pMsgPackT = new MsgPackParserBuilder().beanTypePropertyName("t").build();
-
+
@Test
public void f21_serializeMsgPackT() throws Exception {
testSerialize("serializeMsgPackT", sMsgPackT, comboInput.msgPackT);
}
-
+
@Test
public void f22_parseMsgPackT() throws Exception {
testParse("parseMsgPackT", sMsgPackT, pMsgPackT, comboInput.msgPackT);
}
-
+
@Test
public void f23_parseMsgPackTJsonEquivalency() throws Exception {
testParseJsonEquivalency("parseMsgPackTJsonEquivalency", sMsgPackT, pMsgPackT, comboInput.json);
}
-
+
@Test
public void f24_verifyMsgPackT() throws Exception {
testParseVerify("verifyMsgPackT", sMsgPackT, pMsgPackT);
}
-
+
//--------------------------------------------------------------------------------
// RdfXml
//--------------------------------------------------------------------------------
WriterSerializer sRdfXml = RdfSerializer.DEFAULT_XMLABBREV;
ReaderParser pRdfXml = RdfParser.DEFAULT_XML;
-
+
@Test
public void g11_serializeRdfXml() throws Exception {
testSerialize("serializeRdfXml", sRdfXml, comboInput.rdfXml);
}
-
+
@Test
public void g12_parseRdfXml() throws Exception {
testParse("parseRdfXml", sRdfXml, pRdfXml, comboInput.rdfXml);
}
-
+
@Test
public void g13_verifyRdfXml() throws Exception {
testParseVerify("verifyRdfXml", sRdfXml, pRdfXml);
}
-
+
//--------------------------------------------------------------------------------
// RdfXml - 't' property
//--------------------------------------------------------------------------------
WriterSerializer sRdfXmlT = new RdfSerializerBuilder().language(LANG_RDF_XML_ABBREV).beanTypePropertyName("t").build();
ReaderParser pRdfXmlT = new RdfParserBuilder().beanTypePropertyName("t").build();
-
+
@Test
public void g21_serializeRdfXmlT() throws Exception {
testSerialize("serializeRdfXmlT", sRdfXmlT, comboInput.rdfXmlT);
}
-
+
@Test
public void g22_parseRdfXmlT() throws Exception {
testParse("parseRdfXmlT", sRdfXmlT, pRdfXmlT, comboInput.rdfXmlT);
}
-
+
@Test
public void g23_verifyRdfXmlT() throws Exception {
testParseVerify("parseRdfXmlTVerify", sRdfXmlT, pRdfXmlT);
}
-
+
//--------------------------------------------------------------------------------
// RdfXml - Readable
//--------------------------------------------------------------------------------
WriterSerializer sRdfXmlR = new RdfSerializerBuilder().language(LANG_RDF_XML_ABBREV).ws().build();
ReaderParser pRdfXmlR = RdfParser.DEFAULT_XML;
-
+
@Test
public void g31_serializeRdfXmlR() throws Exception {
testSerialize("serializeRdfXmlR", sRdfXmlR, comboInput.rdfXmlR);
}
-
+
@Test
public void g32_parseRdfXmlR() throws Exception {
testParse("parseRdfXmlR", sRdfXmlR, pRdfXmlR, comboInput.rdfXmlR);
}
-
+
@Test
public void g33_verifyRdfXmlR() throws Exception {
testParseVerify("Verify", sRdfXmlR, pRdfXmlR);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
index 3be3753..f15b238 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
@@ -62,6 +62,7 @@ public class DynaBeanComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(BeanWithDynaField o) {
assertType(BeanWithDynaField.class, o);
}
@@ -95,6 +96,7 @@ public class DynaBeanComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(BeanWithDynaMethods o) {
assertType(BeanWithDynaMethods.class, o);
Assert.assertTrue(o.setterCalled);
@@ -129,6 +131,7 @@ public class DynaBeanComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(BeanWithDynaGetterOnly o) {
assertType(BeanWithDynaGetterOnly.class, o);
}
@@ -162,6 +165,7 @@ public class DynaBeanComboTest extends ComboTest {
/* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:f1a>1901-03-03T18:11:12Z</jp:f1a>\n </rdf:Description>\n</rdf:RDF>\n"
)
{
+ @Override
public void verify(BeanWithDynaFieldSwapped o) {
assertType(BeanWithDynaFieldSwapped.class, o);
assertType(Calendar.class, o.f1.get("f1a"));
@@ -196,6 +200,7 @@ public class DynaBeanComboTest extends ComboTest {
/* 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"
)
{
+ @Override
public void verify(BeanWithDynaFieldStringList o) {
assertType(BeanWithDynaFieldStringList.class, o);
}
@@ -203,28 +208,28 @@ public class DynaBeanComboTest extends ComboTest {
},
});
}
-
+
public DynaBeanComboTest(ComboInput<?> comboInput) {
super(comboInput);
}
-
+
@Override
protected Serializer applySettings(Serializer s) throws Exception {
return s.builder().trimNullProperties(false).build();
}
-
+
@Override
protected Parser applySettings(Parser p) throws Exception {
return p.builder().build();
}
-
+
@Bean(sort=true)
public static class BeanWithDynaField {
public int f1;
@BeanProperty(name="*")
public Map<String,Object> f2 = new LinkedHashMap<String,Object>();
public int f3;
-
+
public BeanWithDynaField init() {
this.f1 = 1;
this.f2 = new ObjectMap().append("f2a", "a").append("f2b", "b");
@@ -239,7 +244,7 @@ public class DynaBeanComboTest extends ComboTest {
private int f1, f3;
private Map<String,Object> f2 = new LinkedHashMap<String,Object>();
private boolean setterCalled = false;
-
+
public int getF1() {
return f1;
}
@@ -277,7 +282,7 @@ public class DynaBeanComboTest extends ComboTest {
private int f1, f3;
private Map<String,Object> f2 = new LinkedHashMap<String,Object>();
-
+
public int getF1() {
return f1;
}
@@ -303,7 +308,7 @@ public class DynaBeanComboTest extends ComboTest {
return this;
}
}
-
+
private static Calendar singleDate = new GregorianCalendar(TimeZone.getTimeZone("PST"));
static {
singleDate.setTimeInMillis(0);
@@ -314,7 +319,7 @@ public class DynaBeanComboTest extends ComboTest {
public static class BeanWithDynaFieldSwapped {
@BeanProperty(name="*", swap=CalendarSwap.ISO8601DTZ.class)
public Map<String,Calendar> f1 = new LinkedHashMap<String,Calendar>();
-
+
public BeanWithDynaFieldSwapped init() {
this.f1.put("f1a", singleDate);
return this;
@@ -325,7 +330,7 @@ public class DynaBeanComboTest extends ComboTest {
public static class BeanWithDynaFieldStringList {
@BeanProperty(name="*")
public Map<String,List<String>> f1 = new LinkedHashMap<String,List<String>>();
-
+
public BeanWithDynaFieldStringList init() {
this.f1.put("f1a", Arrays.asList(new String[]{"foo","bar"}));
return this;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java b/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java
index f50bcdd..a88cba0 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/MaxIndentTest.java
@@ -206,19 +206,19 @@ public class MaxIndentTest {
},
});
}
-
+
Input input;
-
+
public MaxIndentTest(Input input) {
this.input = input;
}
-
+
static class Input {
String label;
Object in;
int maxDepth;
String json, xml, html, uon, urlEnc;
-
+
Input(String label, Object in, int maxDepth, String json, String xml, String html, String uon, String urlEnc) {
this.label = label;
this.in = in;
@@ -230,14 +230,14 @@ public class MaxIndentTest {
this.urlEnc = urlEnc;
}
}
-
+
public static class List1dOfBeans extends LinkedList<ABean> {
public List1dOfBeans init1() {
add(new ABean().init());
return this;
}
}
-
+
public static class List2dOfBeans extends LinkedList<List1dOfBeans> {
public List2dOfBeans init2() {
add(new List1dOfBeans().init1());
@@ -251,7 +251,7 @@ public class MaxIndentTest {
return this;
}
}
-
+
public static class Map2dOfBeans extends LinkedHashMap<String,Map1dOfBeans> {
public Map2dOfBeans init2() {
put("b", new Map1dOfBeans().init1());
@@ -264,44 +264,44 @@ public class MaxIndentTest {
WriterSerializer s = JsonSerializer.DEFAULT_LAX_READABLE.builder().maxIndent(input.maxDepth).build();
testSerialize("json", s, input.json);
}
-
+
@Test
public void b11_serializeXml() throws Exception {
WriterSerializer s = XmlSerializer.DEFAULT_SQ_READABLE.builder().maxIndent(input.maxDepth).build();
testSerialize("xml", s, input.xml);
}
-
+
@Test
public void c11_serializeHtml() throws Exception {
WriterSerializer s = HtmlSerializer.DEFAULT_SQ_READABLE.builder().maxIndent(input.maxDepth).build();
testSerialize("html", s, input.html);
}
-
+
@Test
public void d11_serializeUon() throws Exception {
WriterSerializer s = UonSerializer.DEFAULT_READABLE.builder().maxIndent(input.maxDepth).build();
testSerialize("uon", s, input.uon);
}
-
+
@Test
public void e11_serializeUrlEncoding() throws Exception {
WriterSerializer s = UrlEncodingSerializer.DEFAULT_READABLE.builder().maxIndent(input.maxDepth).build();
testSerialize("urlEncoding", s, input.urlEnc);
}
-
+
private void testSerialize(String testName, Serializer s, String expected) throws Exception {
try {
String r = s.isWriterSerializer() ? ((WriterSerializer)s).serialize(input.in) : ((OutputStreamSerializer)s).serializeToHex(input.in);
-
+
// Specifying "xxx" in the expected results will spit out what we should populate the field with.
if (expected.equals("xxx")) {
System.out.println(input.label + "/" + testName + "=\n" + r.replaceAll("\n", "\\\\n").replaceAll("\t", "\\\\t")); // NOT DEBUG
System.out.println(r);
return;
}
-
+
TestUtils.assertEquals(expected, r, "{0}/{1} parse-normal failed", input.label, testName);
-
+
} catch (AssertionError e) {
throw e;
} catch (Exception e) {
@@ -309,5 +309,5 @@ public class MaxIndentTest {
throw new AssertionError(input.label + "/" + testName + " failed. exception=" + e.getLocalizedMessage());
}
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/PropertyNamerTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/PropertyNamerTest.java b/juneau-core-test/src/test/java/org/apache/juneau/PropertyNamerTest.java
index 4a0331e..48a23d1 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/PropertyNamerTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/PropertyNamerTest.java
@@ -36,7 +36,7 @@ public class PropertyNamerTest {
assertEquals("a", n.getPropertyName("A"));
assertEquals("a", n.getPropertyName("A"));
}
-
+
//====================================================================================================
// test underscore-lower-case
//====================================================================================================
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java b/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
index ad9d826..9356686 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/TestUtils.java
@@ -482,13 +482,13 @@ public class TestUtils {
public static void assertEqualsAfterSort(String expected, String actual, String msg, Object...args) {
String[] e = expected.trim().split("\n"), a = actual.trim().split("\n");
-
+
if (e.length != a.length)
throw new ComparisonFailure(format(msg, args), expected, actual);
-
+
Arrays.sort(e);
Arrays.sort(a);
-
+
for (int i = 0; i < e.length; i++)
if (! e[i].equals(a[i]))
throw new ComparisonFailure(format(msg, args), expected, actual);
@@ -501,16 +501,16 @@ public class TestUtils {
if ("xxx".equals(expected))
System.err.println("actual=["+actual+"]");
if (! isEquals(expected, actual))
- throw new ComparisonFailure(format(msg, args), toString(expected), toString(actual));
+ throw new ComparisonFailure(format(msg, args), toString(expected), toString(actual));
}
-
+
/**
* Creates a ClassMeta for the given types.
*/
public static Type getType(Type type, Type...args) {
return beanSession.getClassMeta(type, args);
}
-
+
/**
* Throws an AssertionError if the object isn't of the specified type.
*/
@@ -519,7 +519,7 @@ public class TestUtils {
return;
throw new AssertionError(new StringMessage("Expected type {0} but was {1}", type, (o == null ? null : o.getClass())));
}
-
+
private static boolean isEquals(Object o1, Object o2) {
if (o1 == null)
return o2 == null;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java b/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java
index f7ba051..6d7f00b 100644
--- a/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/XmlValidatorParserBuilder.java
@@ -15,11 +15,12 @@ package org.apache.juneau;
import org.apache.juneau.xml.*;
public class XmlValidatorParserBuilder extends XmlParserBuilder {
-
+
public XmlValidatorParserBuilder() {
super(PropertyStore.create());
}
+ @Override
public XmlValidatorParser build() {
return new XmlValidatorParser();
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
index d8e2388..d607d04 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrsTest.java
@@ -130,7 +130,7 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest {
ti = roundTrip(t, IA.class);
assertEquals("foo", ti.getF1());
- t = (A)roundTrip(t, Object.class);
+ t = roundTrip(t, Object.class);
assertEquals("foo", t.getF1());
}
@@ -192,7 +192,7 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest {
assertEquals("foo", t.f2c.getF1());
assertEquals("foo", ((A)t.f2d).getF1());
- t = (B)roundTrip(t, Object.class);
+ t = roundTrip(t, Object.class);
assertEquals("foo", t.f2a.getF1());
assertEquals("foo", t.f2b.getF1());
assertEquals("foo", t.f2c.getF1());
@@ -223,7 +223,7 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest {
assertEquals("foo", t.f3c.get("foo").getF1());
assertEquals("foo", t.f3d.get("foo").getF1());
- t = (C)roundTrip(t, Object.class);
+ t = roundTrip(t, Object.class);
assertEquals("foo", t.f3a.get("foo").getF1());
assertEquals("foo", t.f3b.get("foo").getF1());
assertEquals("foo", t.f3c.get("foo").getF1());
@@ -259,7 +259,7 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest {
assertEquals("foo", t.f4c[0].getF1());
assertEquals("foo", ((A)t.f4d[0]).getF1());
- t = (D)roundTrip(t, Object.class);
+ t = roundTrip(t, Object.class);
assertEquals("foo", t.f4a[0].getF1());
assertEquals("foo", t.f4b[0].getF1());
assertEquals("foo", t.f4c[0].getF1());
@@ -295,7 +295,7 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest {
assertEquals("foo", t.f5c.get(0).getF1());
assertEquals("foo", ((A)t.f5d.get(0)).getF1());
- t = (E)roundTrip(t, Object.class);
+ t = roundTrip(t, Object.class);
assertEquals("foo", t.f5a.get(0).getF1());
assertEquals("foo", t.f5b.get(0).getF1());
assertEquals("foo", t.f5c.get(0).getF1());
@@ -331,7 +331,7 @@ public class RoundTripAddClassAttrsTest extends RoundTripTest {
assertEquals("foo", t.f6c.get(0)[0].getF1());
assertEquals("foo", ((A)t.f6d.get(0)[0]).getF1());
- t = (F)roundTrip(t, Object.class);
+ t = roundTrip(t, Object.class);
assertEquals("foo", t.f6a.get(0)[0].getF1());
assertEquals("foo", t.f6b.get(0)[0].getF1());
assertEquals("foo", t.f6c.get(0)[0].getF1());
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
index 82c046f..35ba64a 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
@@ -365,7 +365,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
addClass("C3", C3.class);
}
}
-
+
//====================================================================================================
// Test @Bean(subTypeProperty=xxx) with real bean property
//====================================================================================================
@@ -459,7 +459,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
addClass("CA2", CA2.class);
}
}
-
+
//====================================================================================================
// Test @Bean(properties=xxx)
//====================================================================================================
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
----------------------------------------------------------------------
diff --git a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
index f5ed6be..b09a8bd 100755
--- a/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
+++ b/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTest.java
@@ -222,7 +222,7 @@ public abstract class RoundTripTest {
public Class<?>[] getDictionary() {
return new Class<?>[0];
}
-
+
public ObjectMap getProperties() {
return ObjectMap.EMPTY_MAP;
}