From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17
---
tests/com/gitblit/tests/GroovyScriptTest.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/tests/com/gitblit/tests/GroovyScriptTest.java b/tests/com/gitblit/tests/GroovyScriptTest.java
index 8538d64..3d3621d 100644
--- a/tests/com/gitblit/tests/GroovyScriptTest.java
+++ b/tests/com/gitblit/tests/GroovyScriptTest.java
@@ -23,6 +23,8 @@
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -226,8 +228,7 @@
BufferedWriter writer = new BufferedWriter(new FileWriter(tempScript));
- writer.write("import com.gitblit.utils.ClientLogger\n");
- writer.write("clientLogger.sendMessage('this is a test message')\n");
+ writer.write("clientLogger.info('this is a test message')\n");
writer.flush();
writer.close();
@@ -308,9 +309,23 @@
class MockClientLogger {
List<String> messages = new ArrayList<String>();
- public void sendMessage(String message) {
+ public void info(String message) {
messages.add(message);
}
+
+ public void error(String message) {
+ messages.add(message);
+ }
+
+ public void error(String message, Throwable t) {
+ PrintWriter writer = new PrintWriter(new StringWriter());
+ if (!StringUtils.isEmpty(message)) {
+ writer.append(message);
+ writer.append('\n');
+ }
+ t.printStackTrace(writer);
+ messages.add(writer.toString());
+ }
}
class MockMail {
--
Gitblit v1.9.1