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:41 UTC
[4/4] incubator-juneau git commit: Code cleanup.
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;
}