=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/FredSpringWebTest.java' --- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/FredSpringWebTest.java 2013-11-12 09:51:23 +0000 +++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/FredSpringWebTest.java 2013-11-12 10:02:52 +0000 @@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.hisp.dhis.organisationunit.OrganisationUnit; -import org.hisp.dhis.web.webapi.v1.utils.CustomObjectMapper; +import org.hisp.dhis.web.webapi.v1.utils.ObjectMapperFactoryBean; import org.junit.Before; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -114,7 +114,7 @@ @Before public void setup() throws Exception { - objectMapper = new CustomObjectMapper(); + objectMapper = new ObjectMapperFactoryBean().getObject(); CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter(); characterEncodingFilter.setEncoding( "UTF-8" );