diff --git a/core/src/test/java/hudson/util/IsOverriddenTest.java b/core/src/test/java/hudson/util/IsOverriddenTest.java index 7cef973df7..aa84b46290 100644 --- a/core/src/test/java/hudson/util/IsOverriddenTest.java +++ b/core/src/test/java/hudson/util/IsOverriddenTest.java @@ -96,14 +96,38 @@ public class IsOverriddenTest { @Issue("JENKINS-62723") @Test public void finalOverrides() { - errors.checkSucceeds(() -> {assertThat("X1 overrides X.m1", Util.isOverridden(X.class, X1.class, "m1"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("X1 does not override X.m2", Util.isOverridden(X.class, X1.class, "m2"), is(false)); return null;}); - errors.checkSucceeds(() -> {assertThat("X2 overrides X.m1", Util.isOverridden(X.class, X2.class, "m1"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("X2 does not override X.m2", Util.isOverridden(X.class, X2.class, "m2"), is(false)); return null;}); - errors.checkSucceeds(() -> {assertThat("X3 overrides X.m1", Util.isOverridden(X.class, X3.class, "m1"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("X3 overrides X.m2", Util.isOverridden(X.class, X3.class, "m2"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("X4 overrides X.m1", Util.isOverridden(X.class, X4.class, "m1"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("X4 overrides X.m2", Util.isOverridden(X.class, X4.class, "m2"), is(true)); return null;}); + errors.checkSucceeds(() -> { + assertThat("X1 overrides X.m1", Util.isOverridden(X.class, X1.class, "m1"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("x1 does not override x.m2", Util.isOverridden(X.class, X1.class, "m2"), is(false)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("X2 overrides X.m1", Util.isOverridden(X.class, X2.class, "m1"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("X2 does not override X.m2", Util.isOverridden(X.class, X2.class, "m2"), is(false)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("X3 overrides X.m1", Util.isOverridden(X.class, X3.class, "m1"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("X3 overrides X.m2", Util.isOverridden(X.class, X3.class, "m2"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("X4 overrides X.m1", Util.isOverridden(X.class, X4.class, "m1"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("X4 overrides X.m2", Util.isOverridden(X.class, X4.class, "m2"), is(true)); + return null; + }); } public interface X { void m1(); @@ -130,19 +154,55 @@ public class IsOverriddenTest { @Test public void baseInterface() { // Normal case: classes implementing interface methods - errors.checkSucceeds(() -> {assertThat("I1 does not override I1.foo", Util.isOverridden(I1.class, I1.class, "foo"), is(false)); return null;}); - errors.checkSucceeds(() -> {assertThat("I2 does not override I1.foo", Util.isOverridden(I1.class, I2.class, "foo"), is(false)); return null;}); - errors.checkSucceeds(() -> {assertThat("C1 does not override I1.foo", Util.isOverridden(I1.class, C1.class, "foo"), is(false)); return null;}); - errors.checkSucceeds(() -> {assertThat("C2 does not override I1.foo", Util.isOverridden(I1.class, C2.class, "foo"), is(false)); return null;}); - errors.checkSucceeds(() -> {assertThat("C3 overrides I1.foo", Util.isOverridden(I1.class, C3.class, "foo"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("C4 overrides I1.foo", Util.isOverridden(I1.class, C4.class, "foo"), is(true)); return null;}); + errors.checkSucceeds(() -> { + assertThat("I1 does not override I1.foo", Util.isOverridden(I1.class, I1.class, "foo"), is(false)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("I2 does not override I1.foo", Util.isOverridden(I1.class, I2.class, "foo"), is(false)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("C1 does not override I1.foo", Util.isOverridden(I1.class, C1.class, "foo"), is(false)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("C2 does not override I1.foo", Util.isOverridden(I1.class, C2.class, "foo"), is(false)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("C3 overrides I1.foo", Util.isOverridden(I1.class, C3.class, "foo"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("C4 overrides I1.foo", Util.isOverridden(I1.class, C4.class, "foo"), is(true)); + return null; + }); // Special case: interfaces providing default implementation of base interface - errors.checkSucceeds(() -> {assertThat("I1 does not override I1.bar", Util.isOverridden(I1.class, I1.class, "bar"), is(false)); return null;}); - errors.checkSucceeds(() -> {assertThat("I2 overrides I1.bar", Util.isOverridden(I1.class, I2.class, "bar"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("C1 does not override I1.bar", Util.isOverridden(I1.class, C1.class, "bar"), is(false)); return null;}); - errors.checkSucceeds(() -> {assertThat("C2 overrides I1.bar (via I2)", Util.isOverridden(I1.class, C2.class, "bar"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("C3 overrides I1.bar (via I2)", Util.isOverridden(I1.class, C3.class, "bar"), is(true)); return null;}); - errors.checkSucceeds(() -> {assertThat("C4 overrides I1.bar", Util.isOverridden(I1.class, C4.class, "bar"), is(true)); return null;}); + errors.checkSucceeds(() -> { + assertThat("I1 does not override I1.bar", Util.isOverridden(I1.class, I1.class, "bar"), is(false)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("I2 overrides I1.bar", Util.isOverridden(I1.class, I2.class, "bar"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("C1 does not override I1.bar", Util.isOverridden(I1.class, C1.class, "bar"), is(false)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("C2 overrides I1.bar (via I2)", Util.isOverridden(I1.class, C2.class, "bar"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("C3 overrides I1.bar (via I2)", Util.isOverridden(I1.class, C3.class, "bar"), is(true)); + return null; + }); + errors.checkSucceeds(() -> { + assertThat("C4 overrides I1.bar", Util.isOverridden(I1.class, C4.class, "bar"), is(true)); + return null; + }); } private interface I1 { String foo(); diff --git a/core/src/test/java/hudson/util/SubClassGeneratorTest.java b/core/src/test/java/hudson/util/SubClassGeneratorTest.java index 7b7cf4a3d2..d9ca838c63 100644 --- a/core/src/test/java/hudson/util/SubClassGeneratorTest.java +++ b/core/src/test/java/hudson/util/SubClassGeneratorTest.java @@ -38,7 +38,10 @@ public class SubClassGeneratorTest { int y; public Foo() {} public Foo(String s) {this.s=s;} - public Foo(double x, int y) {this.x=x;this.y=y;} + public Foo(double x, int y) { + this.x = x; + this.y = y; + } } @Test diff --git a/test/src/test/java/lib/form/RepeatableTest.java b/test/src/test/java/lib/form/RepeatableTest.java index 3d75e5d4ff..1fe764dd98 100644 --- a/test/src/test/java/lib/form/RepeatableTest.java +++ b/test/src/test/java/lib/form/RepeatableTest.java @@ -23,6 +23,8 @@ */ package lib.form; +import static org.junit.Assert.assertThrows; + import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlButton; @@ -129,7 +131,10 @@ public class RepeatableTest extends HudsonTestCase { public String txt; public boolean bool; @DataBoundConstructor - public Foo(String txt, boolean bool) { this.txt = txt; this.bool = bool; } + public Foo(String txt, boolean bool) { + this.txt = txt; + this.bool = bool; + } @Override public String toString() { return "foo:" + txt + ':' + bool; } } @@ -157,7 +162,7 @@ public class RepeatableTest extends HudsonTestCase { f.getInputByValue("").setValueAttribute("value one"); f.getInputByValue("").setValueAttribute("value two"); f.getInputByValue("").setValueAttribute("value three"); - try { f.getInputByValue(""); fail("?"); } catch (ElementNotFoundException expected) { } + assertThrows(ElementNotFoundException.class, () -> f.getInputByValue("")); f.getInputsByName("bool").get(2).click(); submit(f); assertEqualsJsonArray("[{\"bool\":false,\"txt\":\"value one\"}," @@ -171,7 +176,7 @@ public class RepeatableTest extends HudsonTestCase { HtmlPage p = createWebClient().goTo("self/testSimple"); HtmlForm f = p.getFormByName("config"); f.getInputByValue("").setValueAttribute("new one"); - try { f.getInputByValue(""); fail("?"); } catch (ElementNotFoundException expected) { } + assertThrows(ElementNotFoundException.class, () -> f.getInputByValue("")); f.getInputsByName("bool").get(1).click(); submit(f); assertEqualsJsonArray("[{\"bool\":true,\"txt\":\"existing one\"}," @@ -256,7 +261,10 @@ public class RepeatableTest extends HudsonTestCase { public static class FooRadio { public String txt, radio; - public FooRadio(String txt, String radio) { this.txt = txt; this.radio = radio; } + public FooRadio(String txt, String radio) { + this.txt = txt; + this.radio = radio; + } } public void testRadio_ExistingData() throws Exception { @@ -313,13 +321,19 @@ public class RepeatableTest extends HudsonTestCase { public static class Apple extends Fruit { private int seeds; - @DataBoundConstructor public Apple(int seeds) { super("Apple"); this.seeds = seeds; } + @DataBoundConstructor public Apple(int seeds) { + super("Apple"); + this.seeds = seeds; + } @Extension public static final FruitDescriptor D = new FruitDescriptor(Apple.class); @Override public String toString() { return name + " with " + seeds + " seeds"; } } public static class Banana extends Fruit { private boolean yellow; - @DataBoundConstructor public Banana(boolean yellow) { super("Banana"); this.yellow = yellow; } + @DataBoundConstructor public Banana(boolean yellow) { + super("Banana"); + this.yellow = yellow; + } @Extension public static final FruitDescriptor D = new FruitDescriptor(Banana.class); @Override public String toString() { return (yellow ? "Yellow" : "Green") + " " + name; } }