Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

handle the {index} parameter like a native MessageFormat argument. #969

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

handle the {index} parameter like a native MessageFormat argument. #969

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c350cb
handle the {index} parameter like a native MessageFormat argument.
Jul 30, 2014
111e879
add test for ParameterizedTest with special test names
Jul 31, 2014
fbddf8b
fix Test for ParameterizedTest
Aug 1, 2014
367a362
Add feadback of #969
Aug 1, 2014
e1708f2
extract Pattern to a constant field
Aug 10, 2014
de1e40a
add short description on javaDoc
Aug 16, 2014
e6d2a26
revert code formatting and add only additional javaDoc.
Sep 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/main/java/org/junit/runners/Parameterized.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.junit.runner.Runner;
import org.junit.runners.model.FrameworkMethod;
Expand Down Expand Up @@ -342,8 +344,13 @@ private Exception parametersMethodReturnedWrongType() throws Exception {

private static TestWithParameters createTestWithParameters(
TestClass testClass, String pattern, int index, Object[] parameters) {
String finalPattern = pattern.replaceAll("\\{index\\}",
Integer.toString(index));
String finalPattern = pattern;
Pattern indexMatcherPattern = Pattern.compile("(\\{)index([^\\}]*\\})");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you extract a constant for this Pattern?

Matcher matcher = indexMatcherPattern.matcher(pattern);
if (matcher.find()) {
String idxPattern = matcher.group(1) + 0 + matcher.group(2);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use "0" instead of 0, because it is clearer.

finalPattern = pattern.replace(matcher.group(), MessageFormat.format(idxPattern, index));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this using replace and not replaceall?

}
String name = MessageFormat.format(finalPattern, parameters);
return new TestWithParameters("[" + name + "]", testClass,
Arrays.asList(parameters));
Expand Down