[patterntesting-devel] CVS: PatternTesting05/src/test/java/patterntesting/log LogRuntimeExceptionAspectTest.java, 1.1, 1.2 LogRecorder.java, 1.1, 1.2

[Oliver B. <ob...@us...>]

Update of /cvsroot/patterntesting/PatternTesting05/src/test/java/patterntesting/log
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23046/src/test/java/patterntesting/log

Modified Files:
	LogRuntimeExceptionAspectTest.java LogRecorder.java 
Log Message:
improved logging output

Index: LogRuntimeExceptionAspectTest.java
===================================================================
RCS file: /cvsroot/patterntesting/PatternTesting05/src/test/java/patterntesting/log/LogRuntimeExceptionAspectTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogRuntimeExceptionAspectTest.java	9 Oct 2008 19:20:43 -0000	1.1
+++ LogRuntimeExceptionAspectTest.java	23 Oct 2008 20:24:09 -0000	1.2
@@ -55,10 +55,10 @@
 	@Test
 	public void testLog() {
 		try {
-			throwRuntimeException();
+			throwRuntimeException("do you see me?");
 			fail("RuntimeException expected");
 		} catch (RuntimeException expected) {
-			checkLog();
+			checkLog("RuntimeException in throwRuntimeException(\"do you see me?\")");
 		}
 	}
 	
@@ -68,13 +68,13 @@
 			throwNullPointerException();
 			fail("NullPointerException expected");
 		} catch (RuntimeException expected) {
-			checkLog();
+			checkLog("NullPointerException in throwNullPointerException()");
 		}
 	}
 	
 	@LogRuntimeException(SimpleLog.LOG_LEVEL_INFO)
-	private void throwRuntimeException() {
-		throw new RuntimeException("do you see me?");
+	private void throwRuntimeException(String msg) {
+		throw new RuntimeException(msg);
 	}
 	
 	private void throwNullPointerException() {
@@ -82,16 +82,20 @@
 		s.length();
 	}
 	
-	private void checkLog() {
+	private void checkLog(String expected) {
 		log.debug(testLog.getRecord());
 		assertTrue(StringUtils.isNotBlank(testLog.getRecord()));
 		assertEquals(1, testLog.getNumberOfRecords());
+		assertEquals(expected, testLog.getText());
 	}
 
 }
 
 /**
  * $Log$
+ * Revision 1.2  2008/10/23 20:24:09  oboehm
+ * improved logging output
+ *
  * Revision 1.1  2008/10/09 19:20:43  oboehm
  * ThreadSafeAspect splitted into abstract and concrete part
  * LogRuntimeExceptionAspect added

Index: LogRecorder.java
===================================================================
RCS file: /cvsroot/patterntesting/PatternTesting05/src/test/java/patterntesting/log/LogRecorder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogRecorder.java	9 Oct 2008 19:20:43 -0000	1.1
+++ LogRecorder.java	23 Oct 2008 20:24:09 -0000	1.2
@@ -19,8 +19,12 @@
  */
 package patterntesting.log;
 
+import java.util.*;
+
 import org.apache.commons.logging.Log;
 
+import patterntesting.java.runtime.annotation.NullArgsAllowed;
+
 /**
  * @author <a href="bo...@ja...">oliver</a>
  * @since 09.10.2008
@@ -28,7 +32,8 @@
  */
 public class LogRecorder implements Log {
 	
-	private String tape = "";
+	private List<Object> objects = new ArrayList<Object>();
+	private List<Throwable> exceptions = new ArrayList<Throwable>();
 	private int n = 0;
 
 	/* (non-Javadoc)
@@ -158,16 +163,26 @@
 	}
 	
 	private void record(Object obj) {
-		this.tape += obj + "\n";
-		this.n++;
+		this.record(obj, null);
 	}
 	
+	@NullArgsAllowed
 	private void record(Object obj, Throwable t) {
-		this.record(obj + "\t" + t);
+		this.objects.add(obj);
+		this.exceptions.add(t);
+		this.n++;
 	}
 	
+	public String getText() {
+		String text = "";
+		for (Object obj : this.objects) {
+			text += obj;
+		}
+		return text.trim();
+	}
+
 	public String getRecord() {
-		return tape.toString().trim();
+		return getText();
 	}
 	
 	public int getNumberOfRecords() {
@@ -178,6 +193,9 @@
 
 /**
  * $Log$
+ * Revision 1.2  2008/10/23 20:24:09  oboehm
+ * improved logging output
+ *
  * Revision 1.1  2008/10/09 19:20:43  oboehm
  * ThreadSafeAspect splitted into abstract and concrete part
  * LogRuntimeExceptionAspect added