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

Fix failing unit test of Contexted(Runtime)Exception, adjust formatted message. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@802569 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joerg Schaible 2009-08-09 18:06:58 +00:00
parent ad922624da
commit 7bd9b8ada1
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/org/apache/commons/lang/exception/DefaultExceptionContext.java
View File

@ -93,7 +93,9 @@ public class DefaultExceptionContext implements ExceptionContext {
} }
if (contextKeyList.size() > 0) { if (contextKeyList.size() > 0) {
buffer.append(SystemUtils.LINE_SEPARATOR); if (buffer.length() > 0l) {
buffer.append(SystemUtils.LINE_SEPARATOR);
}
buffer.append("Exception Context:"); buffer.append("Exception Context:");
buffer.append(SystemUtils.LINE_SEPARATOR); buffer.append(SystemUtils.LINE_SEPARATOR);
buffer.append("\t"); buffer.append("\t");
@ -120,8 +122,7 @@ public class DefaultExceptionContext implements ExceptionContext {
buffer.append(SystemUtils.LINE_SEPARATOR); buffer.append(SystemUtils.LINE_SEPARATOR);
buffer.append("\t"); buffer.append("\t");
} }
buffer.append(SystemUtils.LINE_SEPARATOR); buffer.append("---------------------------------");
buffer.append("\t---------------------------------");
} }
return buffer.toString(); return buffer.toString();
} }

10
src/test/org/apache/commons/lang/exception/ContextedExceptionTest.java
View File

@ -102,10 +102,6 @@ public class ContextedExceptionTest extends TestCase {
assertTrue(message.indexOf("5")>=0); assertTrue(message.indexOf("5")>=0);
assertTrue(message.indexOf("Crap")>=0); assertTrue(message.indexOf("Crap")>=0);
String contextMessage = contextedException.getFormattedExceptionMessage("");
assertTrue(contextMessage.indexOf(TEST_MESSAGE) == -1);
assertTrue(message.contains(contextMessage));
assertTrue(contextedException.getLabeledValue("test1") == null); assertTrue(contextedException.getLabeledValue("test1") == null);
assertTrue(contextedException.getLabeledValue("test2").equals("some value")); assertTrue(contextedException.getLabeledValue("test2").equals("some value"));
assertTrue(contextedException.getLabeledValue("crap") == null); assertTrue(contextedException.getLabeledValue("crap") == null);
@ -119,6 +115,12 @@ public class ContextedExceptionTest extends TestCase {
assertTrue(contextedException.getLabelSet().contains("test Poorly written obj")); assertTrue(contextedException.getLabelSet().contains("test Poorly written obj"));
assertTrue(!contextedException.getLabelSet().contains("crap")); assertTrue(!contextedException.getLabelSet().contains("crap"));
contextedException.addLabeledValue("test Poorly written obj", "replacement");
String contextMessage = contextedException.getFormattedExceptionMessage(null);
assertTrue(contextMessage.indexOf(TEST_MESSAGE) == -1);
assertTrue(contextedException.getMessage().endsWith(contextMessage));
} }
public void testNullExceptionPassing() { public void testNullExceptionPassing() {

10
src/test/org/apache/commons/lang/exception/ContextedRuntimeExceptionTest.java
View File

@ -102,10 +102,6 @@ public class ContextedRuntimeExceptionTest extends TestCase {
assertTrue(message.indexOf("5")>=0); assertTrue(message.indexOf("5")>=0);
assertTrue(message.indexOf("Crap")>=0); assertTrue(message.indexOf("Crap")>=0);
String contextMessage = contextedRuntimeException.getFormattedExceptionMessage("");
assertTrue(contextMessage.indexOf(TEST_MESSAGE) == -1);
assertTrue(message.contains(contextMessage));
assertTrue(contextedRuntimeException.getLabeledValue("test1") == null); assertTrue(contextedRuntimeException.getLabeledValue("test1") == null);
assertTrue(contextedRuntimeException.getLabeledValue("test2").equals("some value")); assertTrue(contextedRuntimeException.getLabeledValue("test2").equals("some value"));
assertTrue(contextedRuntimeException.getLabeledValue("crap") == null); assertTrue(contextedRuntimeException.getLabeledValue("crap") == null);
@ -119,6 +115,12 @@ public class ContextedRuntimeExceptionTest extends TestCase {
assertTrue(contextedRuntimeException.getLabelSet().contains("test Poorly written obj")); assertTrue(contextedRuntimeException.getLabelSet().contains("test Poorly written obj"));
assertTrue(!contextedRuntimeException.getLabelSet().contains("crap")); assertTrue(!contextedRuntimeException.getLabelSet().contains("crap"));
contextedRuntimeException.addLabeledValue("test Poorly written obj", "replacement");
String contextMessage = contextedRuntimeException.getFormattedExceptionMessage(null);
assertTrue(contextMessage.indexOf(TEST_MESSAGE) == -1);
assertTrue(contextedRuntimeException.getMessage().endsWith(contextMessage));
} }
public void testNullExceptionPassing() { public void testNullExceptionPassing() {