Fix AssertThrowsOnLastStatement to preserve parameterized types when extracting arguments. by motlin · Pull Request #908 · openrewrite/rewrite-testing-frameworks

motlin · 2026-02-05T15:10:03Z

What's changed?

Fix AssertThrowsOnLastStatement to preserve parameterized types when extracting method arguments to local variables.

Input code:

assertThrows(Exception.class, () -> {
    doA();
    testThing(Map.of(), List.of(), Set.of("value"));
});

Replacement before fix:

doA();
Map of = Map.of();
List of1 = List.of();
Set of2 = Set.of("value");
assertThrows(Exception.class, () ->
    testThing(of, of1, of2));

Replacement after fix:

doA();
Map<String, String> map = Map.of();
List<String> list = List.of();
Set<String> set = Set.of("value");
assertThrows(Exception.class, () ->
    testThing(map, list, set));

Improvements:

Preserve types (Map to Map<String, String>)
Improve variable names (of, of1, of2 to map, list, and set) derived from method name.

What's your motivation?

When migrating JUnit 4 tests with @Test(expected = ...) that use Map.of(), List.of(), or Set.of() as arguments, the recipe produces code with raw types that causes compilation errors and poor variable names.

Anything in particular you'd like reviewers to focus on?

The buildParameterizedTypeName() method constructs type strings including generic parameters
The isShortFactoryMethodName() check for of, from, copyOf to derive variable names from return types instead

Anyone you would like to review specifically?

Have you considered any alternatives or workarounds?

The variable naming improvement could be split out or dropped.

Any additional context

Checklist

I've added unit tests to cover both positive and negative cases
I've read and applied the recipe conventions and best practices
I've used the IntelliJ IDEA auto-formatter on affected files

…extracting arguments.

src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java

greg-at-moderne · 2026-02-06T07:57:53Z

Thanks for another valuable contribution. That's well appreciated!

I think this change is definitely better than before the change. Left a small TODO for subsequent potential improvements.

Fix AssertThrowsOnLastStatement to preserve parameterized types when …

5909577

…extracting arguments.

moderne-meeseeks bot added this to OpenRewrite Feb 5, 2026

github-project-automation bot moved this to In Progress in OpenRewrite Feb 5, 2026

moderne-meeseeks bot assigned motlin Feb 5, 2026

github-actions bot reviewed Feb 5, 2026

View reviewed changes

src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java Show resolved Hide resolved

greg-at-moderne reviewed Feb 5, 2026

View reviewed changes

src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java Show resolved Hide resolved

greg-at-moderne reviewed Feb 6, 2026

View reviewed changes

src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java Show resolved Hide resolved

Apply suggestion from @greg-at-moderne

eabe9b0

github-actions bot reviewed Feb 6, 2026

View reviewed changes

src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java Show resolved Hide resolved

greg-at-moderne merged commit 75c12cd into openrewrite:main Feb 6, 2026
2 checks passed

github-project-automation bot moved this from In Progress to Done in OpenRewrite Feb 6, 2026

motlin deleted the AssertThrowsOnLastStatement branch February 6, 2026 14:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix AssertThrowsOnLastStatement to preserve parameterized types when extracting arguments.#908

Fix AssertThrowsOnLastStatement to preserve parameterized types when extracting arguments.#908
greg-at-moderne merged 2 commits intoopenrewrite:mainfrom
motlin:AssertThrowsOnLastStatement

motlin commented Feb 5, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

greg-at-moderne commented Feb 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

motlin commented Feb 5, 2026

What's changed?

What's your motivation?

Anything in particular you'd like reviewers to focus on?

Anyone you would like to review specifically?

Have you considered any alternatives or workarounds?

Any additional context

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

greg-at-moderne commented Feb 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants