Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java?rev=1847822&r1=1847821&r2=1847822&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java (original) +++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java Fri Nov 30 13:40:20 2018 @@ -1,5 +1,8 @@ package org.apache.fulcrum.json.jackson; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,9 +22,6 @@ package org.apache.fulcrum.json.jackson; * under the License. */ -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -import org.apache.avalon.framework.logger.ConsoleLogger; +import org.apache.avalon.framework.logger.Log4JLogger; import org.apache.avalon.framework.logger.Logger; import org.apache.fulcrum.json.JsonService; import org.apache.fulcrum.json.jackson.example.Bean; @@ -42,9 +42,12 @@ import org.apache.fulcrum.json.jackson.m import org.apache.fulcrum.json.jackson.mixins.RectangleMixin; import org.apache.fulcrum.json.jackson.mixins.RectangleMixin2; import org.apache.fulcrum.json.jackson.mixins.TypedRectangle; -import org.apache.fulcrum.testcontainer.BaseUnit4Test; -import org.junit.Before; -import org.junit.Test; +import org.apache.fulcrum.testcontainer.BaseUnit5Test; +import org.apache.log4j.LogManager; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping; @@ -54,18 +57,21 @@ import com.fasterxml.jackson.databind.Ob * * cft. http://wiki.fasterxml.com/JacksonPolymorphicDeserialization * + * adding {@literal @}{@link RunWith} annotation with {@link JUnitPlatform} allows intellij/eclipse IDE recognize it's a test + * * @author gk * @version $Id$ */ -public class JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test extends BaseUnit4Test { +@RunWith(JUnitPlatform.class) +public class JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test extends BaseUnit5Test { private JsonService sc = null; private final String preDefinedOutput = "{\"container\":{\"type\":\"java.util.HashMap\",\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}"; Logger logger; - @Before + @BeforeEach public void setUp() throws Exception { sc = (JsonService) this.lookup(JsonService.ROLE); - logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG); + logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) ); ((Jackson2MapperService) sc).getMapper().enableDefaultTypingAsProperty( DefaultTyping.OBJECT_AND_NON_CONCRETE, "type"); } @@ -74,14 +80,14 @@ public class JacksonMapperEnabledDefault @Test public void testSerialize() throws Exception { String serJson = sc.ser(new TestClass("mytest")); - assertEquals("Serialization failed ", preDefinedOutput, serJson); + assertEquals( preDefinedOutput, serJson, "Serialization failed "); } @Test public void testDeSerialize() throws Exception { String serJson = sc.ser(new TestClass("mytest")); Object deson = sc.deSer(serJson, TestClass.class); - assertEquals("DeSer failed ", TestClass.class, deson.getClass()); + assertEquals(TestClass.class, deson.getClass(), "DeSer failed "); } @Test public void testSerializeDateWithDefaultDateFormat() throws Exception { @@ -90,9 +96,10 @@ public class JacksonMapperEnabledDefault map.put("date", Calendar.getInstance().getTime()); String serJson = sc.ser(map); logger.debug("serJson:" +serJson); - assertTrue( - "Serialize with Adapater failed ", - serJson.matches(".*\"java.util.Date\",\"\\d\\d/\\d\\d/\\d{4}\".*")); + assertEquals( + true, + serJson.matches(".*\"java.util.Date\",\"\\d\\d/\\d\\d/\\d{4}\".*"), + "Serialize with Adapater failed "); } @Test public void testSerializeDeSerializeDate() throws Exception { @@ -123,8 +130,9 @@ public class JacksonMapperEnabledDefault sourceDate.set(Calendar.SECOND, 0); sourceDate.set(Calendar.MILLISECOND, 0); sourceDate.set(Calendar.HOUR_OF_DAY, 0); - assertEquals("millisec of result and source date should be equal, after zeroing not used formatter values:: ", - ((Date)serObject.mydate).getTime(),sourceDate.getTime().getTime() ); + assertEquals( + ((Date)serObject.mydate).getTime(),sourceDate.getTime().getTime(), + "millisec of result and source date should be equal, after zeroing not used formatter values:: "); } // all values represented in format of the object, which would be serialized are conserved, while the others are nulled @Test @@ -160,8 +168,9 @@ public class JacksonMapperEnabledDefault // cleanup all values the mapper dateformat does not contain. sourceDate.set(Calendar.SECOND, 0); sourceDate.set(Calendar.MILLISECOND, 0); - assertEquals("milliseconds of resultDate (serialized) should be equal, if properly set the: ", - ((Date)serObject.mydate).getTime(),sourceDate.getTime().getTime() ); + assertEquals( + ((Date)serObject.mydate).getTime(),sourceDate.getTime().getTime(), + "milliseconds of resultDate (serialized) should be equal, if properly set the. "); } // timezone handling example @@ -182,8 +191,9 @@ public class JacksonMapperEnabledDefault logger.debug("may not be equal: millisec(resultDate(string)):" + ((Date)serObject.mydate).getTime() + " millisec(sourceDate):"+ compareDate.getTime().getTime() ); - assertEquals("format should be equal", compareDateFormatted, - df.format(((Date)serObject.mydate).getTime()) + assertEquals( compareDateFormatted, + df.format(((Date)serObject.mydate).getTime()), + "format should be equal" ); logger.debug("format in locale timezone (resultDate(string)):" + df.format(((Date)serObject.mydate).getTime())); } @@ -193,14 +203,13 @@ public class JacksonMapperEnabledDefault filteredBean.setName("joe"); String bean = sc.serializeOnlyFilter(filteredBean, "name"); assertEquals( - "Ser filtered Bean failed ", "{\"name\":\"joe\"}", bean); Rectangle filteredRectangle = new Rectangle(5, 10); filteredRectangle.setName("jim"); String rectangle = sc.serializeOnlyFilter(filteredRectangle, "w", "name"); - assertEquals("Ser filtered Rectangle failed ", + assertEquals( "{\"w\":5,\"name\":\"jim\"}", rectangle); } @Test @@ -216,7 +225,6 @@ public class JacksonMapperEnabledDefault String result = sc.serializeOnlyFilter(beanList, Bean.class, "name", "age"); assertEquals( - "Serialization of beans failed ", "[{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe0','age':0},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe1','age':1},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe2','age':2},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe3','age':3},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe4','age':4},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe5','age':5},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe6','age':6},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe7','age':7},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe8','age':8},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe9','age':9}]", result.replace('"', '\'')); } @@ -239,9 +247,9 @@ public class JacksonMapperEnabledDefault // -> need to use constructCollectionType Class clazz = Class.forName("org.apache.fulcrum.json.jackson.example.Bean"); List<Bean> beanList2 = (List<Bean>)sc.deSerCollection(result, new ArrayList(),clazz); - assertTrue("DeSer failed ", beanList2.size() == 10); + assertTrue( beanList2.size() == 10); for (Bean bean : beanList2) { - assertEquals("DeSer failed ", Bean.class, bean.getClass()); + assertEquals( Bean.class, bean.getClass()); } } @Test @@ -262,12 +270,12 @@ public class JacksonMapperEnabledDefault Class clazz = Class.forName("org.apache.fulcrum.json.jackson.example.Bean"); List<Bean> beanList2 = (List<Bean>)sc.deSerCollection(result, new ArrayList(),clazz); //Object beanList2 = sc.deSer(result, List.class); - assertTrue("DeSer failed ", beanList2 instanceof List); - assertTrue("DeSer failed ", ((List) beanList2).size() == 10); + assertTrue( beanList2 instanceof List); + assertTrue( ((List) beanList2).size() == 10); for (int i = 0; i < ((List) beanList2).size(); i++) { - assertTrue("DeSer failed ", + assertTrue( ((List) beanList2).get(i) instanceof Bean); - assertTrue("DeSer failed ", ((Bean) ((List) beanList2).get(i)) + assertTrue(((Bean) ((List) beanList2).get(i)) .getName().equals("joe" + i)); } @@ -279,7 +287,7 @@ public class JacksonMapperEnabledDefault String serRect = sc .addAdapter("M4RMixin", Rectangle.class, RectangleMixin.class).ser( filteredRectangle); - assertEquals("Ser failed ", "{\"width\":5}", serRect); + assertEquals( "{\"width\":5}", serRect); } @Test public void testSerializeWith2Mixins() throws Exception { @@ -290,13 +298,12 @@ public class JacksonMapperEnabledDefault String serRect = sc.addAdapter("M4RMixin2", Rectangle.class, RectangleMixin2.class).ser(filteredRectangle); - assertEquals("Ser failed ", "{\"name\":\"jim\",\"width\":5}", serRect); + assertEquals( "{\"name\":\"jim\",\"width\":5}", serRect); // String bean = sc.addAdapter("M4RBeanMixin", Bean.class, BeanMixin.class).ser(filteredBean);; assertEquals( - "Ser filtered Bean failed ", "{\"name\":\"joe\"}", bean); } @@ -309,7 +316,6 @@ public class JacksonMapperEnabledDefault // profession was already set to ignore, does not change String bean = sc.serializeOnlyFilter(filteredBean, Bean.class, "profession"); assertEquals( - "Ser filtered Bean failed ", "{}", bean); } @@ -324,7 +330,6 @@ public class JacksonMapperEnabledDefault // now profession is used after cleaning adapter String bean = sc.serializeOnlyFilter(filteredBean, Bean.class, "profession"); assertEquals( - "Ser filtered Bean failed ", "{\"profession\":\"\"}", bean); } @@ -337,19 +342,16 @@ public class JacksonMapperEnabledDefault // if serialization is done Jackson clean cache String rectangle0 = sc.ser(filteredRectangle,Rectangle.class,true); assertEquals( - "Ser filtered Rectangle failed ", "{\"name\":\"jim\",\"width\":5}", rectangle0); // filtering out name, using width from mixin2 as a second filter String rectangle = sc.serializeOnlyFilter(filteredRectangle, Rectangle.class, true, "width"); assertEquals( - "Ser filtered Rectangle failed ", "{\"width\":5}", rectangle); // default for mixin String rectangle1 = sc.ser(filteredRectangle); assertEquals( - "Ser filtered Rectangle failed ", "{\"name\":\"jim\",\"width\":5}", rectangle1); } @@ -365,7 +367,6 @@ public class JacksonMapperEnabledDefault String result = sc.addAdapter("M4RMixin", Bean.class, BeanMixin.class) .ser(beanList); assertEquals( - "Serialization of beans failed ", "[{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe0'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe1'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe2'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe3'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe4'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe5'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe6'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe7'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe8'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe9'}]", result.replace('"', '\'')); } @@ -386,9 +387,9 @@ public class JacksonMapperEnabledDefault // -> need to use constructCollectionType List<Bean> beanList2 = (List<Bean>)sc.deSerCollection(result, new ArrayList(),Bean.class); - assertTrue("DeSer failed ", beanList2.size() == 10); + assertTrue( beanList2.size() == 10); for (Bean bean : beanList2) { - assertEquals("DeSer failed ", Bean.class, bean.getClass()); + assertEquals( Bean.class, bean.getClass()); } } @Test @@ -407,9 +408,9 @@ public class JacksonMapperEnabledDefault "M4BeanRMixin", Bean.class, BeanMixin.class); String serRect = sc.ser(components); assertEquals( - "Serialization failed ", "[{'type':'org.apache.fulcrum.json.jackson.example.Rectangle','width':25},{'type':'org.apache.fulcrum.json.jackson.example.Rectangle','width':250},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe0'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe1'},{'type':'org.apache.fulcrum.json.jackson.example.Bean','name':'joe2'}]", - serRect.replace('"', '\'')); + serRect.replace('"', '\''), + "Serialization failed "); } @Test public void testSerializeCollectionWithOnlyFilter() throws Exception {
Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java?rev=1847822&r1=1847821&r2=1847822&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java (original) +++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java Fri Nov 30 13:40:20 2018 @@ -19,8 +19,7 @@ package org.apache.fulcrum.json.jackson; * under the License. */ -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; import java.util.Calendar; @@ -31,7 +30,7 @@ import java.util.List; import java.util.Map; import org.apache.avalon.framework.activity.Initializable; -import org.apache.avalon.framework.logger.ConsoleLogger; +import org.apache.avalon.framework.logger.Log4JLogger; import org.apache.avalon.framework.logger.Logger; import org.apache.fulcrum.json.JsonService; import org.apache.fulcrum.json.jackson.example.Bean; @@ -40,12 +39,15 @@ import org.apache.fulcrum.json.jackson.e import org.apache.fulcrum.json.jackson.mixins.BeanMixin; import org.apache.fulcrum.json.jackson.mixins.RectangleMixin; import org.apache.fulcrum.json.jackson.mixins.RectangleMixin2; -import org.apache.fulcrum.testcontainer.BaseUnit4Test; +import org.apache.fulcrum.testcontainer.BaseUnit5Test; +import org.apache.log4j.LogManager; import org.json.JSONArray; import org.json.JSONObject; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; @@ -57,36 +59,36 @@ import com.fasterxml.jackson.datatype.js * @author gk * @version $Id$ */ -public class JacksonMapperTest extends BaseUnit4Test { +@RunWith(JUnitPlatform.class) +public class JacksonMapperTest extends BaseUnit5Test { private final String preDefinedOutput = "{\"container\":{\"cf\":\"Config.xml\"},\"configurationName\":\"Config.xml\",\"name\":\"mytest\"}"; private JsonService sc = null; Logger logger; - @Before + @BeforeEach public void setUp() throws Exception { sc = (JsonService) this.lookup(JsonService.ROLE); - logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG); + logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) ); } @Test public void testSerialize() throws Exception { String serJson = sc.ser(new TestClass("mytest")); - assertEquals("Serialization failed ", preDefinedOutput, serJson); + assertEquals(preDefinedOutput, serJson, "Serialization failed "); } - @Ignore + @Disabled public void testDeSerialize() throws Exception { String serJson = sc.ser(new TestClass("mytest")); Object deson = sc.deSer(serJson, TestClass.class); - assertEquals("DeSer failed ", TestClass.class, deson.getClass()); + assertEquals(TestClass.class, deson.getClass(), "DeSer failed "); } @Test public void testSerializeDateWithDefaultDateFormat() throws Exception { Map<String, Date> map = new HashMap<String, Date>(); map.put("date", Calendar.getInstance().getTime()); String serJson = sc.ser(map); - assertTrue("Serialize with Adapater failed ", - serJson.matches("\\{\"date\":\"\\d\\d/\\d\\d/\\d{4}\"\\}")); + assertTrue(serJson.matches("\\{\"date\":\"\\d\\d/\\d\\d/\\d{4}\"\\}"), "Serialize with Adapater failed "); } @Test public void testDeSerializeDate() throws Exception { @@ -94,22 +96,23 @@ public class JacksonMapperTest extends B map.put("date", Calendar.getInstance().getTime()); String serJson = ((Jackson2MapperService) sc).ser(map, Map.class); Map serDate = sc.deSer(serJson, Map.class); - assertEquals("Date DeSer failed ", String.class, serDate.get("date") - .getClass()); + assertEquals(String.class, serDate.get("date") + .getClass(), "Date DeSer failed "); } @Test public void testSerializeWithCustomFilter() throws Exception { Bean filteredBean = new Bean(); filteredBean.setName("joe"); String bean = sc.serializeOnlyFilter(filteredBean, Bean.class, "name"); - assertEquals("Ser filtered Bean failed ", "{\"name\":\"joe\"}", bean); + assertEquals("{\"name\":\"joe\"}", bean, "Serialization of bean failed "); Rectangle filteredRectangle = new Rectangle(5, 10); filteredRectangle.setName("jim"); String rectangle = sc.serializeOnlyFilter(filteredRectangle, Rectangle.class, "w", "name"); - assertEquals("Ser filtered Rectangle failed ", - "{\"w\":5,\"name\":\"jim\"}", rectangle); + assertEquals("{\"w\":5,\"name\":\"jim\"}", + rectangle, + "Ser filtered Rectangle failed "); } @Test @@ -125,9 +128,9 @@ public class JacksonMapperTest extends B String result = sc.serializeOnlyFilter(beanList, Bean.class, "name", "age"); assertEquals( - "Serialization of beans failed ", "[{'name':'joe0','age':0},{'name':'joe1','age':1},{'name':'joe2','age':2},{'name':'joe3','age':3},{'name':'joe4','age':4},{'name':'joe5','age':5},{'name':'joe6','age':6},{'name':'joe7','age':7},{'name':'joe8','age':8},{'name':'joe9','age':9}]", - result.replace('"', '\'')); + result.replace('"', '\''), + "Serialization of beans failed "); } @Test @@ -161,9 +164,9 @@ public class JacksonMapperTest extends B "age"); List<Bean> beanList2 = (List<Bean>) ((Jackson2MapperService) sc) .deSerCollectionWithType(result, List.class, Bean.class); - assertTrue("DeSer failed ", beanList2.size() == 10); + assertTrue(beanList2.size() == 10, "DeSer failed "); for (Bean bean : beanList2) { - assertEquals("DeSer failed ", Bean.class, bean.getClass()); + assertEquals(Bean.class, bean.getClass(), "DeSer failed "); } } @Test @@ -180,15 +183,15 @@ public class JacksonMapperTest extends B String result = sc.serializeOnlyFilter(beanList, Bean.class, "name", "age"); Object beanList2 = sc.deSer(result, List.class); - assertTrue("DeSer failed ", beanList2 instanceof List); - assertTrue("DeSer failed ", ((List) beanList2).size() == 10); + assertTrue(beanList2 instanceof List,"DeSer failed, no List "); + assertTrue(((List) beanList2).size() == 10, "DeSer failed size not 10"); for (int i = 0; i < ((List) beanList2).size(); i++) { - assertTrue("DeSer failed ", - ((List) beanList2).get(i) instanceof Map); assertTrue( - "DeSer failed ", + ((List) beanList2).get(i) instanceof Map, "DeSer failed: no map"); + assertTrue( + ((Map) ((List) beanList2).get(i)).get("name").equals( - "joe" + i)); + "joe" + i), "DeSer failed: name not joe"); } } @@ -214,8 +217,8 @@ public class JacksonMapperTest extends B JSONArray jsonOrgResult = sc.deSer(filteredSerList, JSONArray.class);//readValue(serList, JSONArray.class); logger.debug("jsonOrgResult: "+ jsonOrgResult.toString(2)); - assertEquals("DeSer failed ", "jim jar", ((JSONObject)(jsonOrgResult.get(0))).get("name") ); - assertEquals("DeSer failed ", 45, ((JSONObject)(jsonOrgResult.get(1))).get("age") ); + assertEquals("jim jar", ((JSONObject)(jsonOrgResult.get(0))).get("name"), "DeSer failed: name not jim jar" ); + assertEquals( 45, ((JSONObject)(jsonOrgResult.get(1))).get("age"), "DeSer failed: age != 45" ); } // support for org.json mapping @@ -248,7 +251,7 @@ public class JacksonMapperTest extends B String serRect = sc .addAdapter("M4RMixin", Rectangle.class, RectangleMixin.class).ser( filteredRectangle); - assertEquals("Ser failed ", "{\"width\":5}", serRect); + assertEquals("{\"width\":5}", serRect, "Ser failed "); } @Test public void testSerializeWith2Mixins() throws Exception { @@ -259,10 +262,10 @@ public class JacksonMapperTest extends B String serRect = sc.addAdapter("M4RMixin2", Rectangle.class, RectangleMixin2.class).ser(filteredRectangle); - assertEquals("Ser failed ", "{\"name\":\"jim\",\"width\":5}", serRect); + assertEquals("{\"name\":\"jim\",\"width\":5}", serRect,"Ser failed "); String bean = sc.serializeOnlyFilter(filteredBean, Bean.class, "name"); - assertEquals("Ser filtered Bean failed ", "{\"name\":\"joe\"}", bean); + assertEquals("{\"name\":\"joe\"}", bean, "Ser filtered Bean failed "); } @Test public void testSerializationCollectionWithMixin() throws Exception { @@ -277,15 +280,15 @@ public class JacksonMapperTest extends B String result = sc.addAdapter("M4RMixin", Bean.class, BeanMixin.class) .ser(beanList); assertEquals( - "Serialization of beans failed ", "[{'name':'joe0'},{'name':'joe1'},{'name':'joe2'},{'name':'joe3'},{'name':'joe4'},{'name':'joe5'},{'name':'joe6'},{'name':'joe7'},{'name':'joe8'},{'name':'joe9'}]", - result.replace('"', '\'')); + result.replace('"', '\''), + "Serialization of beans failed "); } @Test public void testDeSerUnQuotedObject() throws Exception { String jsonString = "{name:\"joe\"}"; Bean result = sc.deSer(jsonString, Bean.class); - assertTrue("expected bean object!", result instanceof Bean); + assertTrue(result instanceof Bean, "expected bean object!"); } public void testDeserializationCollection2() throws Exception { @@ -298,8 +301,8 @@ public class JacksonMapperTest extends B Collection<Rectangle> resultList0 = ((Jackson2MapperService) sc) .deSerCollectionWithType(serColl, ArrayList.class, Rectangle.class); for (int i = 0; i < 10; i++) { - assertEquals("deser reread size failed", (i * i), ((List<Rectangle>)resultList0) - .get(i).getSize()); + assertEquals((i * i), ((List<Rectangle>)resultList0) + .get(i).getSize(), "deser reread size failed"); } } @Test @@ -316,15 +319,14 @@ public class JacksonMapperTest extends B .ser(beanList); Object beanList2 = sc.deSer(result, List.class); - assertTrue("DeSer failed ", beanList2 instanceof List); - assertTrue("DeSer failed ", ((List) beanList2).size() == 10); + assertTrue( beanList2 instanceof List, "DeSer failed" ); + assertTrue( ((List) beanList2).size() == 10, "DeSer failed "); for (int i = 0; i < ((List) beanList2).size(); i++) { - assertTrue("DeSer failed ", - ((List) beanList2).get(i) instanceof Map); assertTrue( - "DeSer failed ", + ((List) beanList2).get(i) instanceof Map, "DeSer failed "); + assertTrue( ((Map) ((List) beanList2).get(i)).get("name").equals( - "joe" + i)); + "joe" + i), "DeSer failed "); } } @Test @@ -343,9 +345,8 @@ public class JacksonMapperTest extends B "M4BeanRMixin", Bean.class, BeanMixin.class); String serRect = sc.ser(components); assertEquals( - "DeSer failed ", "[{'width':25},{'width':250},{'name':'joe0'},{'name':'joe1'},{'name':'joe2'}]", - serRect.replace('"', '\'')); + serRect.replace('"', '\''), "DeSer failed "); // adding h and name for first two items, adding width for beans String deSerTest = "[{\"width\":25,\"age\":99, \"h\":50,\"name\":\"rect1\"},{\"width\":250,\"name\":\"rect2\"},{\"name\":\"joe0\"},{\"name\":\"joe1\"},{\"name\":\"joe2\"}]"; Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java?rev=1847822&r1=1847821&r2=1847822&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java (original) +++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java Fri Nov 30 13:40:20 2018 @@ -1,5 +1,6 @@ package org.apache.fulcrum.json.jackson; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,44 +20,48 @@ package org.apache.fulcrum.json.jackson; * under the License. */ -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.avalon.framework.logger.ConsoleLogger; +import org.apache.avalon.framework.logger.Log4JLogger; import org.apache.avalon.framework.logger.Logger; import org.apache.fulcrum.json.JsonService; import org.apache.fulcrum.json.jackson.example.Bean; -import org.apache.fulcrum.testcontainer.BaseUnit4Test; +import org.apache.fulcrum.testcontainer.BaseUnit5Test; +import org.apache.log4j.LogManager; import org.json.JSONArray; import org.json.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; /** * Jackson2 JSON Test * - * Test without type setting - * + * Test without type setting + * * @author gk * @version $Id: JacksonMapperTest.java 1800753 2017-07-04 11:00:03Z gk $ */ -public class JsonOrgJacksonMapperTest extends BaseUnit4Test { +@RunWith(JUnitPlatform.class) +public class JsonOrgJacksonMapperTest extends BaseUnit5Test { private JsonService sc = null; Logger logger; - @Before + @BeforeEach public void setUp() throws Exception { sc = (JsonService) this.lookup(JsonService.ROLE); sc.addAdapter(null, null,new JsonOrgModule()); //((Jackson2MapperService)sc).registerModule(new JsonOrgModule()); - logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG); + logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) ); } // support for org.json mapping @@ -76,8 +81,8 @@ public class JsonOrgJacksonMapperTest ex logger.debug("serList: "+ filteredSerList); JSONArray jsonOrgResult = sc.deSer(filteredSerList, JSONArray.class);//readValue(serList, JSONArray.class); logger.debug("jsonOrgResult: "+ jsonOrgResult.toString(2)); - assertEquals("DeSer failed ", "jim jar", ((JSONObject)(jsonOrgResult.get(0))).get("name") ); - assertEquals("DeSer failed ", 45, ((JSONObject)(jsonOrgResult.get(1))).get("age") ); + assertEquals("jim jar", ((JSONObject)(jsonOrgResult.get(0))).get("name"), "DeSer failed " ); + assertEquals( 45, ((JSONObject)(jsonOrgResult.get(1))).get("age"), "DeSer failed " ); } // support for org.json mapping @@ -95,7 +100,7 @@ public class JsonOrgJacksonMapperTest ex String[] filterAttr = {"name", "age" }; JSONArray jsonArray =((Jackson2MapperService)sc).getMapper().convertValue( beanList, JSONArray .class ); logger.debug("jsonArray: "+ jsonArray.toString(2)); - assertEquals("Get JSONObject from jsonArray failed ", "jim jar", ((JSONObject)jsonArray.get( 0 )).get( "name" )); + assertEquals("jim jar", ((JSONObject)jsonArray.get( 0 )).get( "name" ), "Get JSONObject from jsonArray failed "); } // support for org.json mapping @@ -106,7 +111,7 @@ public class JsonOrgJacksonMapperTest ex bean.setAge(12); JSONObject jsonObject =((Jackson2MapperService)sc).getMapper().convertValue( bean, JSONObject.class ); logger.debug("jsonObject: "+ jsonObject.toString(2)); - assertEquals("Get name from jsonObject failed ", "joe", jsonObject.get( "name" )); + assertEquals("joe", jsonObject.get( "name" ),"Get name from jsonObject failed "); } @Test @@ -121,8 +126,8 @@ public class JsonOrgJacksonMapperTest ex ((Jackson2MapperService)sc).initialize();// need to get fresh mapper String[] filterAttr = {"name" }; String filteredBean = sc.serializeOnlyFilter(bean, Bean.class, filterAttr); - assertEquals("Ser filtered Bean failed ", "{\"name\":\"joe2\"}", filteredBean); - logger.debug("filteredBean: "+ filteredBean.toString()); + logger.debug("filteredBean: "+ filteredBean); + assertEquals("{\"name\":\"joe2\"}", filteredBean, "Ser filtered Bean failed "); } @Test @@ -139,12 +144,12 @@ public class JsonOrgJacksonMapperTest ex Map mapOfJsonObject = sc.deSer( serJsonObject, HashMap.class ); String[] filterAttr = {"name" }; String filteredJsonObject = sc.serializeOnlyFilter(mapOfJsonObject, filterAttr); - assertEquals("Ser filtered JSONObject failed ", "{\"name\":\"joe3\"}", filteredJsonObject); - logger.debug("filteredJsonObject: "+ filteredJsonObject.toString()); + logger.debug("filteredJsonObject: "+ filteredJsonObject); + assertEquals("{\"name\":\"joe3\"}", filteredJsonObject, "Ser filtered JSONObject failed "); // works without init String filteredBean = sc.serializeOnlyFilter(bean, Bean.class, filterAttr); - assertEquals("Ser filtered Bean failed ", "{\"name\":\"joe3\"}", filteredBean); - logger.debug("filteredBean: "+ filteredBean.toString()); + logger.debug("filteredBean: "+ filteredBean); + assertEquals("{\"name\":\"joe3\"}", filteredBean, "Ser filtered Bean failed "); } } Modified: turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java?rev=1847822&r1=1847821&r2=1847822&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java (original) +++ turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java Fri Nov 30 13:40:20 2018 @@ -18,10 +18,9 @@ package org.apache.fulcrum.json.jackson; * specific language governing permissions and limitations * under the License. */ - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.Calendar; @@ -30,17 +29,20 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.avalon.framework.logger.ConsoleLogger; +import org.apache.avalon.framework.logger.Log4JLogger; import org.apache.avalon.framework.logger.Logger; import org.apache.fulcrum.json.JsonService; import org.apache.fulcrum.json.jackson.example.Bean; import org.apache.fulcrum.json.jackson.example.Rectangle; import org.apache.fulcrum.json.jackson.example.TestClass; -import org.apache.fulcrum.testcontainer.BaseUnit4Test; +import org.apache.fulcrum.testcontainer.BaseUnit5Test; +import org.apache.log4j.LogManager; import org.json.JSONArray; import org.json.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; import com.jayway.jsonpath.Configuration; @@ -56,22 +58,29 @@ import com.jayway.jsonpath.spi.json.Jack * @author gk * @version $Id$ */ -public class JsonPathJacksonTest extends BaseUnit4Test { +@RunWith(JUnitPlatform.class) +public class JsonPathJacksonTest extends BaseUnit5Test { private JsonService sc = null; Logger logger; - @Before + @BeforeEach public void setUp() throws Exception { sc = (JsonService) this.lookup(JsonService.ROLE); - logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG); + logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) ); try { Configuration conf = Configuration.defaultConfiguration(); logger.debug("jayway jsonpath conf:"+ conf.jsonProvider()); - assertEquals("Jackson JsonPath JsonProvider match failed ", JacksonJsonProvider.class.getName(), conf.jsonProvider().getClass().getName()); + assertEquals( JacksonJsonProvider.class.getName(), conf.jsonProvider().getClass().getName(), + "Jackson JsonPath JsonProvider match failed "); + logger.debug("Jackson2MapperService.mapper:"+ ((Jackson2MapperService)sc).getMapper() + " confjsonProvider:" + conf.jsonProvider()); - assertTrue("JsonProvider is not a JacksonJsonProvider ", conf.jsonProvider() instanceof JacksonJsonProvider); - assertEquals("JacksonJsonProvider mapper is not configured mapper", ((Jackson2MapperService)sc).getMapper(), ((JacksonJsonProvider)conf.jsonProvider()).getObjectMapper()); + + assertTrue(conf.jsonProvider() instanceof JacksonJsonProvider, + "JsonProvider is not a JacksonJsonProvider "); + + assertEquals(((Jackson2MapperService)sc).getMapper(), ((JacksonJsonProvider)conf.jsonProvider()).getObjectMapper(), + "JacksonJsonProvider mapper is not configured mapper"); } catch (Throwable e) { if (e.getCause() != null && e.getCause() instanceof ClassNotFoundException) { logger.error(e.getMessage(), e.getCause()); @@ -88,7 +97,7 @@ public class JsonPathJacksonTest extends String serJson = sc.ser(new TestClass("mytest")); logger.debug("serJson:"+ serJson); String cf = JsonPath.parse(serJson).read("$.container.cf");// .using(conf) - assertEquals("Serialization failed ", "Config.xml", cf); + assertEquals("Config.xml", cf, "Serialization failed "); } @Test @@ -101,7 +110,7 @@ public class JsonPathJacksonTest extends Date date = JsonPath.parse(serJson).read("$.date", Date.class);// .using(conf) Calendar parsedDate = Calendar.getInstance(); parsedDate.setTime(date); - assertEquals("Serialization failed ", refDate.get(Calendar.DATE), parsedDate.get(Calendar.DATE)); + assertEquals(refDate.get(Calendar.DATE), parsedDate.get(Calendar.DATE), "Serialization failed "); } @Test @@ -118,12 +127,15 @@ public class JsonPathJacksonTest extends //System.out.println("bean list: "+ result); Bean joe2 = JsonPath.parse(result).read("$[2]", Bean.class); - assertEquals("DeSer failed ", "joe2", joe2.getName()); + assertEquals("joe2", joe2.getName(), + "DeSer failed "); // could not map to typed list List<Map<String, Object>> beanList2 = JsonPath.parse(result).read("$[-2:]", List.class); - assertEquals("Expect 2 Elements failed ", 2, beanList2.size()); + assertEquals(2, beanList2.size(), + "Expect 2 Elements failed "); //System.out.println("bean list result: "+ beanList2); - assertEquals("DeSer failed ", "joe9", beanList2.get(1).get("name")); + assertEquals("joe9", beanList2.get(1).get("name"), + "DeSer failed "); } @Test @@ -153,7 +165,8 @@ public class JsonPathJacksonTest extends //System.out.println("result: "+ result); int idx = 0; for (Rectangle rect : result) { - assertEquals("deser reread size failed", (idx * idx), rect.getSize()); + assertEquals((idx * idx), rect.getSize(), + "deser reread size failed"); idx++; } } @@ -180,8 +193,10 @@ public class JsonPathJacksonTest extends JSONArray jsonOrgResult = JsonPath.parse(filteredSerList).read("$",typeRef); logger.debug("jsonOrgResult: "+ jsonOrgResult.toString(2)); - assertEquals("DeSer failed ", "jim jar", ((JSONObject)(jsonOrgResult.get(0))).get("name") ); - assertEquals("DeSer failed ", 45, ((JSONObject)(jsonOrgResult.get(1))).get("age") ); + assertEquals("jim jar", ((JSONObject)(jsonOrgResult.get(0))).get("name"), + "DeSer failed name" ); + assertEquals(45, ((JSONObject)(jsonOrgResult.get(1))).get("age"), + "DeSer failed age" ); } @Test @@ -189,7 +204,8 @@ public class JsonPathJacksonTest extends String jsonString = "{name:\"joe\"}"; TypeRef<Bean> typeRef = new TypeRef<Bean>() { }; Bean result = JsonPath.parse(jsonString).read("$",typeRef); - assertTrue("expected bean object!", result instanceof Bean); + assertTrue(result instanceof Bean, + "expected bean object!"); } } Modified: turbine/fulcrum/trunk/json/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/pom.xml?rev=1847822&r1=1847821&r2=1847822&view=diff ============================================================================== --- turbine/fulcrum/trunk/json/pom.xml (original) +++ turbine/fulcrum/trunk/json/pom.xml Fri Nov 30 13:40:20 2018 @@ -93,11 +93,28 @@ </plugins> </build> <dependencies> - <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-testcontainer</artifactId> - <version>1.0.7</version> - <scope>test</scope> + <dependency> + <groupId>org.apache.fulcrum</groupId> + <artifactId>fulcrum-testcontainer</artifactId> + <version>1.0.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <!-- Log4j2 should be used by default , remved optional --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2.version}</version> + </dependency> + <!-- log4j1.2 bridge instead of log4j --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${log4j2.version}</version> </dependency> </dependencies> @@ -143,13 +160,11 @@ </profiles> <properties> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> - <java.version>1.8</java.version> <turbine.site.path>fulcrum/fulcrum-json</turbine.site.path> <turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/json</turbine.scmPubCheckoutDirectory> <turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache> <siteContent.path>${project.build.directory}/staging</siteContent.path><!-- default stagingSiteURL --> + <log4j2.version>2.11.1</log4j2.version> </properties> </project>
