提交 11fd480f 编写于 作者: D Daniel Beck

[JENKINS-22839] Style changes after feedback

上级 92cd35f0
...@@ -31,6 +31,7 @@ import hudson.Util; ...@@ -31,6 +31,7 @@ import hudson.Util;
import hudson.XmlFile; import hudson.XmlFile;
import hudson.model.AbstractModelObject; import hudson.model.AbstractModelObject;
import hudson.model.Computer; import hudson.model.Computer;
import hudson.util.HttpResponses;
import jenkins.model.Jenkins; import jenkins.model.Jenkins;
import hudson.model.Saveable; import hudson.model.Saveable;
import hudson.model.TaskListener; import hudson.model.TaskListener;
...@@ -44,6 +45,7 @@ import hudson.util.RingBufferLogHandler; ...@@ -44,6 +45,7 @@ import hudson.util.RingBufferLogHandler;
import hudson.util.XStream2; import hudson.util.XStream2;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse; import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.interceptor.RequirePOST; import org.kohsuke.stapler.interceptor.RequirePOST;
...@@ -298,9 +300,9 @@ public class LogRecorder extends AbstractModelObject implements Saveable { ...@@ -298,9 +300,9 @@ public class LogRecorder extends AbstractModelObject implements Saveable {
} }
@RequirePOST @RequirePOST
public void doClear(StaplerRequest req, StaplerResponse rsp) throws IOException { public HttpResponse doClear() throws IOException {
handler.clear(); handler.clear();
rsp.sendRedirect2("."); return HttpResponses.redirectToDot();
} }
/** /**
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
package hudson.logging; package hudson.logging;
import java.io.IOException;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.LogRecord; import java.util.logging.LogRecord;
import org.junit.Test; import org.junit.Test;
...@@ -54,7 +55,7 @@ public class LogRecorderTest { ...@@ -54,7 +55,7 @@ public class LogRecorderTest {
assertFalse(matches("", "hudson.model.Hudson", Level.FINE)); assertFalse(matches("", "hudson.model.Hudson", Level.FINE));
} }
@Test public void testClearing() { @Test public void testClearing() throws IOException {
LogRecorder lr = new LogRecorder("foo"); LogRecorder lr = new LogRecorder("foo");
LogRecorder.Target t = new LogRecorder.Target("", Level.FINE); LogRecorder.Target t = new LogRecorder.Target("", Level.FINE);
lr.targets.add(t); lr.targets.add(t);
...@@ -62,11 +63,11 @@ public class LogRecorderTest { ...@@ -62,11 +63,11 @@ public class LogRecorderTest {
LogRecord record = createLogRecord("jenkins", Level.INFO, "message"); LogRecord record = createLogRecord("jenkins", Level.INFO, "message");
lr.handler.publish(record); lr.handler.publish(record);
assertEquals(lr.handler.getView().get(0), record); assertEquals(lr.handler.getView().get(0), record);
assertTrue(lr.handler.getView().size() == 1); assertEquals(1, lr.handler.getView().size());
lr.handler.clear(); lr.doClear();
assertTrue(lr.handler.getView().size() == 0); assertEquals(0, lr.handler.getView().size());
} }
@Test public void testSpecificExclusion() { @Test public void testSpecificExclusion() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册