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
