From 7fead6ff7f00a65174cf474ff50a877df54990fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20P=2E=20Tjern=C3=B8?= Date: Wed, 8 Aug 2012 19:28:08 -0700 Subject: [PATCH] DRY Failure/UnstableBuilder. --- .../java/org/jvnet/hudson/test/FailureBuilder.java | 14 +++----------- .../org/jvnet/hudson/test/UnstableBuilder.java | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/FailureBuilder.java b/test/src/main/java/org/jvnet/hudson/test/FailureBuilder.java index 65856acf14..7caa45305c 100644 --- a/test/src/main/java/org/jvnet/hudson/test/FailureBuilder.java +++ b/test/src/main/java/org/jvnet/hudson/test/FailureBuilder.java @@ -23,29 +23,21 @@ */ package org.jvnet.hudson.test; -import hudson.Launcher; import hudson.Extension; -import hudson.model.AbstractBuild; -import hudson.model.BuildListener; import hudson.model.Descriptor; import hudson.model.Result; import hudson.tasks.Builder; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; - /** * Mock {@link Builder} that always cause a build to fail. * * @author Kohsuke Kawaguchi */ -public class FailureBuilder extends Builder { - - public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - listener.getLogger().println("Simulating a failure"); - build.setResult(Result.FAILURE); - return false; +public class FailureBuilder extends MockBuilder { + public FailureBuilder() { + super(Result.FAILURE); } @Extension diff --git a/test/src/main/java/org/jvnet/hudson/test/UnstableBuilder.java b/test/src/main/java/org/jvnet/hudson/test/UnstableBuilder.java index c638f676ec..0bf6d0a1c9 100644 --- a/test/src/main/java/org/jvnet/hudson/test/UnstableBuilder.java +++ b/test/src/main/java/org/jvnet/hudson/test/UnstableBuilder.java @@ -23,29 +23,21 @@ */ package org.jvnet.hudson.test; -import hudson.Launcher; import hudson.Extension; -import hudson.model.AbstractBuild; -import hudson.model.BuildListener; import hudson.model.Descriptor; import hudson.model.Result; import hudson.tasks.Builder; import net.sf.json.JSONObject; import org.kohsuke.stapler.StaplerRequest; -import java.io.IOException; - /** * Mock {@link Builder} that always cause a build to fail. * * @author Kohsuke Kawaguchi */ -public class UnstableBuilder extends Builder { - - public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException { - listener.getLogger().println("Simulating an unstable build"); - build.setResult(Result.UNSTABLE); - return true; +public class UnstableBuilder extends MockBuilder { + public UnstableBuilder() { + super(Result.UNSTABLE); } @Extension