Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-979]Changed exception message accessing from getMessage() to getLocalizedMessage() and added a test 

Signed-off-by: Christian Amend <christian.amend@sap.com>
This commit is contained in:
Morten Riedel 2016-07-14 09:52:34 +02:00 committed by Christian Amend
parent 77423380bb
commit 7d698645e0
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java
View File

@ -143,7 +143,7 @@ public class ODataExceptionHelper {
}
private static ODataServerError basicServerError(final Exception e) {
ODataServerError serverError = new ODataServerError().setException(e).setMessage(e.getMessage());
ODataServerError serverError = new ODataServerError().setException(e).setMessage(e.getLocalizedMessage());
if (serverError.getMessage() == null) {
serverError.setMessage("OData Library: An exception without message text was thrown.");
}

32
lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerImplTest.java
View File

@ -18,6 +18,8 @@
*/
package org.apache.olingo.server.core;
import java.io.InputStream;
import java.nio.charset.Charset;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@ -266,7 +268,35 @@ public class ODataHandlerImplTest {
assertEquals("application/json;odata.metadata=minimal",
response.getHeader(HttpHeader.CONTENT_TYPE));
}
@Test
public void applicationExceptionInProcessorMessage() throws Exception {
final String ODATA_ERRORCODE = "425";
final String ORIGINAL_MESSAGE = "original message";
final String LOCALIZED_MESSAGE = "localized message";
MetadataProcessor processor = mock(MetadataProcessor.class);
ODataApplicationException oDataApplicationException = new ODataApplicationException(ORIGINAL_MESSAGE, 425, Locale.ENGLISH, ODATA_ERRORCODE) {
@Override
public String getLocalizedMessage() {
return LOCALIZED_MESSAGE;
}
};
doThrow(oDataApplicationException).when(processor).readMetadata(
any(ODataRequest.class), any(ODataResponse.class), any(UriInfo.class), any(ContentType.class));
final ODataResponse response = dispatch(HttpMethod.GET, "$metadata", processor);
InputStream contentStream = response.getContent();
String responseContent = IOUtils.toString(contentStream, Charset.forName("UTF-8"));
// does the response contain the localized message and the status code?
boolean isMessage = responseContent.contains(LOCALIZED_MESSAGE) && responseContent.contains(ODATA_ERRORCODE);
// test if message is localized
assertEquals(true, isMessage);
// test if the original is hold
assertEquals(ORIGINAL_MESSAGE, oDataApplicationException.getMessage());
}
@Test
public void applicationExceptionInProcessor() throws Exception {
MetadataProcessor processor = mock(MetadataProcessor.class);