提交 34850200 编写于 作者: O Oliver Gondža

Introduce FormValidation#aggregate

上级 12ff0b24
......@@ -34,9 +34,9 @@ import hudson.model.AbstractBuild;
import hudson.model.BuildListener;
import hudson.model.Descriptor;
import hudson.tasks.Builder;
import hudson.util.ReflectionUtils.Parameter;
import jenkins.model.Jenkins;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
......@@ -44,7 +44,9 @@ import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.Stapler;
import org.springframework.util.StringUtils;
import javax.annotation.Nonnull;
import javax.servlet.ServletException;
import java.io.File;
import java.io.IOException;
import java.io.BufferedReader;
......@@ -53,6 +55,7 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
......@@ -209,7 +212,30 @@ public abstract class FormValidation extends IOException implements HttpResponse
return warning(e,String.format(format,args));
}
/**
* Aggregate multiple validations into one.
*
* @return Validation of the least successful kind aggregating all child messages.
* @since TODO
*/
public static @Nonnull FormValidation aggregate(@Nonnull Collection<FormValidation> validations) {
if (validations == null || validations.isEmpty()) return FormValidation.ok();
if (validations.size() == 1) return validations.iterator().next();
final StringBuilder sb = new StringBuilder("<ul style='list-style-type: none; padding-left: 0; margin: 0'>");
FormValidation.Kind worst = Kind.OK;
for (FormValidation validation: validations) {
sb.append("<li>").append(validation.renderHtml()).append("</li>");
if (validation.kind.ordinal() > worst.ordinal()) {
worst = validation.kind;
}
}
sb.append("</ul>");
return respond(worst, sb.toString());
}
/**
* Sends out an HTML fragment that indicates an error.
......
......@@ -25,6 +25,8 @@ package hudson.util;
import static org.junit.Assert.*;
import java.util.Arrays;
import org.junit.Test;
/**
......@@ -57,4 +59,50 @@ public class FormValidationTest {
public void testMessage() {
assertEquals("test msg", FormValidation.errorWithMarkup("test msg").getMessage());
}
@Test
public void aggregateZeroValidations() {
assertEquals(FormValidation.ok(), aggregate());
}
@Test
public void aggregateSingleValidations() {
FormValidation ok = FormValidation.ok();
FormValidation warning = FormValidation.warning("");
FormValidation error = FormValidation.error("");
assertEquals(ok, aggregate(ok));
assertEquals(warning, aggregate(warning));
assertEquals(error, aggregate(error));
}
@Test
public void aggregateSeveralValidations() {
FormValidation ok = FormValidation.ok("ok_message");
FormValidation warning = FormValidation.warning("warning_message");
FormValidation error = FormValidation.error("error_message");
final FormValidation ok_ok = aggregate(ok, ok);
assertEquals(FormValidation.Kind.OK, ok_ok.kind);
assertTrue(ok_ok.renderHtml().contains(ok.getMessage()));
final FormValidation ok_warning = aggregate(ok, warning);
assertEquals(FormValidation.Kind.WARNING, ok_warning.kind);
assertTrue(ok_warning.renderHtml().contains(ok.getMessage()));
assertTrue(ok_warning.renderHtml().contains(warning.getMessage()));
final FormValidation ok_error = aggregate(ok, error);
assertEquals(FormValidation.Kind.ERROR, ok_error.kind);
assertTrue(ok_error.renderHtml().contains(ok.getMessage()));
assertTrue(ok_error.renderHtml().contains(error.getMessage()));
final FormValidation warninig_error = aggregate(warning, error);
assertEquals(FormValidation.Kind.ERROR, warninig_error.kind);
assertTrue(warninig_error.renderHtml().contains(error.getMessage()));
assertTrue(warninig_error.renderHtml().contains(warning.getMessage()));
}
private FormValidation aggregate(FormValidation... fvs) {
return FormValidation.aggregate(Arrays.asList(fvs));
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册