Skip to content

Commit 7c42cad

Browse files
mpkorstanjempkorstanje
committed
Rename stepdefbody to stepdefinitionbody
1 parent 366c20b commit 7c42cad

File tree

6 files changed

+51
-51
lines changed

6 files changed

+51
-51
lines changed

‎java8/src/main/groovy/lambda.java.gsp

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package io.cucumber.java8;
22

3-
import io.cucumber.java8.StepdefBody.A0;
4-
import io.cucumber.java8.StepdefBody.A1;
5-
import io.cucumber.java8.StepdefBody.A2;
6-
import io.cucumber.java8.StepdefBody.A3;
7-
import io.cucumber.java8.StepdefBody.A4;
8-
import io.cucumber.java8.StepdefBody.A5;
9-
import io.cucumber.java8.StepdefBody.A6;
10-
import io.cucumber.java8.StepdefBody.A7;
11-
import io.cucumber.java8.StepdefBody.A8;
12-
import io.cucumber.java8.StepdefBody.A9;
3+
import io.cucumber.java8.StepDefinitionBody.A0;
4+
import io.cucumber.java8.StepDefinitionBody.A1;
5+
import io.cucumber.java8.StepDefinitionBody.A2;
6+
import io.cucumber.java8.StepDefinitionBody.A3;
7+
import io.cucumber.java8.StepDefinitionBody.A4;
8+
import io.cucumber.java8.StepDefinitionBody.A5;
9+
import io.cucumber.java8.StepDefinitionBody.A6;
10+
import io.cucumber.java8.StepDefinitionBody.A7;
11+
import io.cucumber.java8.StepDefinitionBody.A8;
12+
import io.cucumber.java8.StepDefinitionBody.A9;
1313

1414
import io.cucumber.java8.LambdaGlueRegistry;
1515
import io.cucumber.java8.Java8StepDefinition;

‎java8/src/main/java/io/cucumber/java8/Java8StepDefinition.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ final class Java8StepDefinition extends AbstractGlueDefinition implements StepDe
1616
private final long timeoutMillis;
1717
private final List<ParameterInfo> parameterInfos;
1818
private final String expression;
19-
private <T extends StepdefBody> Java8StepDefinition(String expression,
20-
long timeoutMillis,
21-
Class<T> bodyClass,
22-
T body) {
19+
private <T extends StepDefinitionBody> Java8StepDefinition(String expression,
20+
long timeoutMillis,
21+
Class<T> bodyClass,
22+
T body) {
2323
super(body, new Exception().getStackTrace()[3]);
2424
this.timeoutMillis = timeoutMillis;
2525
this.expression = requireNonNull(expression, "cucumber-expression may not be null");
2626
this.parameterInfos = fromTypes(expression, location, resolveRawArguments(bodyClass, body.getClass()));
2727
}
2828

29-
public static <T extends StepdefBody> Java8StepDefinition create(
29+
public static <T extends StepDefinitionBody> Java8StepDefinition create(
3030
String expression, Class<T> bodyClass, T body) {
3131
return new Java8StepDefinition(expression, 0, bodyClass, body);
3232
}
3333

34-
public static <T extends StepdefBody> StepDefinition create(
34+
public static <T extends StepDefinitionBody> StepDefinition create(
3535
String expression, long timeoutMillis, Class<T> bodyClass, T body) {
3636
return new Java8StepDefinition(expression, timeoutMillis, bodyClass, body);
3737
}

‎java8/src/main/java/io/cucumber/java8/StepdefBody.java renamed to ‎java8/src/main/java/io/cucumber/java8/StepDefinitionBody.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@
33
import org.apiguardian.api.API;
44

55
@API(status = API.Status.STABLE)
6-
public interface StepdefBody {
6+
public interface StepDefinitionBody {
77
@FunctionalInterface
8-
interface A0 extends StepdefBody {
8+
interface A0 extends StepDefinitionBody {
99
void accept() throws Throwable;
1010
}
1111
@FunctionalInterface
12-
interface A1<T1> extends StepdefBody {
12+
interface A1<T1> extends StepDefinitionBody {
1313
void accept(T1 p1) throws Throwable;
1414
}
1515
@FunctionalInterface
16-
interface A2<T1, T2> extends StepdefBody {
16+
interface A2<T1, T2> extends StepDefinitionBody {
1717
void accept(T1 p1, T2 p2) throws Throwable;
1818
}
1919
@FunctionalInterface
20-
interface A3<T1, T2, T3> extends StepdefBody {
20+
interface A3<T1, T2, T3> extends StepDefinitionBody {
2121
void accept(T1 p1, T2 p2, T3 p3) throws Throwable;
2222
}
2323
@FunctionalInterface
24-
interface A4<T1, T2, T3, T4> extends StepdefBody {
24+
interface A4<T1, T2, T3, T4> extends StepDefinitionBody {
2525
void accept(T1 p1, T2 p2, T3 p3, T4 p4) throws Throwable;
2626
}
2727
@FunctionalInterface
28-
interface A5<T1, T2, T3, T4, T5> extends StepdefBody {
28+
interface A5<T1, T2, T3, T4, T5> extends StepDefinitionBody {
2929
void accept(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5) throws Throwable;
3030
}
3131
@FunctionalInterface
32-
interface A6<T1, T2, T3, T4, T5, T6> extends StepdefBody {
32+
interface A6<T1, T2, T3, T4, T5, T6> extends StepDefinitionBody {
3333
void accept(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6) throws Throwable;
3434
}
3535
@FunctionalInterface
36-
interface A7<T1, T2, T3, T4, T5, T6, T7> extends StepdefBody {
36+
interface A7<T1, T2, T3, T4, T5, T6, T7> extends StepDefinitionBody {
3737
void accept(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7) throws Throwable;
3838
}
3939
@FunctionalInterface
40-
interface A8<T1, T2, T3, T4, T5, T6, T7, T8> extends StepdefBody {
40+
interface A8<T1, T2, T3, T4, T5, T6, T7, T8> extends StepDefinitionBody {
4141
void accept(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8) throws Throwable;
4242
}
4343
@FunctionalInterface
44-
interface A9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends StepdefBody {
44+
interface A9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends StepDefinitionBody {
4545
void accept(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8, T9 p9) throws Throwable;
4646
}
4747
}

‎java8/src/test/java/io/cucumber/java8/AnonInnerClassStepdefs.java renamed to ‎java8/src/test/java/io/cucumber/java8/AnonInnerClassStepDefinitions.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

5-
public class AnonInnerClassStepdefs implements LambdaGlue {
5+
public class AnonInnerClassStepDefinitions implements LambdaGlue {
66

77
@SuppressWarnings("Convert2Lambda")
8-
public AnonInnerClassStepdefs() {
8+
public AnonInnerClassStepDefinitions() {
99
LambdaGlueRegistry.INSTANCE.get().addStepDefinition(
1010
Java8StepDefinition.create(
11-
"I have {int} java7 beans in my {word}", StepdefBody.A2.class,
12-
new StepdefBody.A2<Integer, String>() {
11+
"I have {int} java7 beans in my {word}", StepDefinitionBody.A2.class,
12+
new StepDefinitionBody.A2<Integer, String>() {
1313
@Override
1414
public void accept(Integer cukes, String what) {
1515
assertEquals(42, cukes.intValue());

‎java8/src/test/java/io/cucumber/java8/Java8AnonInnerClassStepDefinitionTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,43 @@ class Java8AnonInnerClassStepDefinitionTest {
1313

1414
@Test
1515
void should_calculate_parameters_count_from_body_with_one_param() {
16-
Java8StepDefinition java8StepDefinition = Java8StepDefinition.create("I have some step", StepdefBody.A1.class, oneParamStep());
16+
Java8StepDefinition java8StepDefinition = Java8StepDefinition.create("I have some step", StepDefinitionBody.A1.class, oneParamStep());
1717
assertThat(java8StepDefinition.parameterInfos().size(), is(equalTo(1)));
1818
}
1919

2020
@Test
2121
void should_calculate_parameters_count_from_body_with_two_params() {
22-
Java8StepDefinition java8StepDefinition = Java8StepDefinition.create("I have some step", StepdefBody.A2.class, twoParamStep());
22+
Java8StepDefinition java8StepDefinition = Java8StepDefinition.create("I have some step", StepDefinitionBody.A2.class, twoParamStep());
2323
assertThat(java8StepDefinition.parameterInfos().size(), is(equalTo(2)));
2424
}
2525

26-
private StepdefBody.A1 oneParamStep() {
27-
return new StepdefBody.A1<String>() {
26+
private StepDefinitionBody.A1 oneParamStep() {
27+
return new StepDefinitionBody.A1<String>() {
2828
@Override
2929
public void accept(String p1) {
3030
}
3131
};
3232
}
3333

34-
private StepdefBody.A2 twoParamStep() {
35-
return new StepdefBody.A2<String, String>() {
34+
private StepDefinitionBody.A2 twoParamStep() {
35+
return new StepDefinitionBody.A2<String, String>() {
3636
@Override
3737
public void accept(String p1, String p2) {
3838
}
3939
};
4040
}
4141

42-
private StepdefBody.A1 genericListStep() {
43-
return new StepdefBody.A1<List<String>>() {
42+
private StepDefinitionBody.A1 genericListStep() {
43+
return new StepDefinitionBody.A1<List<String>>() {
4444
@Override
4545
public void accept(List<String> p1) {
4646
throw new UnsupportedOperationException();
4747
}
4848
};
4949
}
5050

51-
private StepdefBody.A1 nonGenericListStep() {
52-
return new StepdefBody.A1<List>() {
51+
private StepDefinitionBody.A1 nonGenericListStep() {
52+
return new StepDefinitionBody.A1<List>() {
5353
@Override
5454
public void accept(List p1) {
5555
throw new UnsupportedOperationException();

‎java8/src/test/java/io/cucumber/java8/Java8LambdaStepDefinitionTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,34 @@ class Java8LambdaStepDefinitionTest {
1616

1717
@Test
1818
void should_calculate_parameters_count_from_body_with_one_param() {
19-
StepdefBody.A1<String> body = p1 -> {
19+
StepDefinitionBody.A1<String> body = p1 -> {
2020
};
21-
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepdefBody.A1.class, body);
21+
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepDefinitionBody.A1.class, body);
2222
assertThat(stepDefinition.parameterInfos().size(), is(equalTo(1)));
2323
}
2424

2525
@Test
2626
void should_calculate_parameters_count_from_body_with_two_params() {
27-
StepdefBody.A2<String, String> body = (p1, p2) -> {
27+
StepDefinitionBody.A2<String, String> body = (p1, p2) -> {
2828
};
29-
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepdefBody.A2.class, body);
29+
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepDefinitionBody.A2.class, body);
3030
assertThat(stepDefinition.parameterInfos().size(), is(equalTo(2)));
3131
}
3232

3333
@Test
3434
void should_resolve_type_to_object() {
35-
StepdefBody.A1 body = (p1) -> {
35+
StepDefinitionBody.A1 body = (p1) -> {
3636
};
37-
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepdefBody.A1.class, body);
37+
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepDefinitionBody.A1.class, body);
3838

3939
assertThat(stepDefinition.parameterInfos().get(0).getType(), isA((Object.class)));
4040
}
4141

4242
@Test
4343
void should_fail_for_param_with_non_generic_list() {
44-
StepdefBody.A1<List> body = p1 -> {
44+
StepDefinitionBody.A1<List> body = p1 -> {
4545
};
46-
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepdefBody.A1.class, body);
46+
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepDefinitionBody.A1.class, body);
4747

4848
Executable testMethod = () -> stepDefinition.parameterInfos().get(0).getTypeResolver().resolve();
4949
CucumberBackendException actualThrown = assertThrows(CucumberBackendException.class, testMethod);
@@ -54,9 +54,9 @@ void should_fail_for_param_with_non_generic_list() {
5454

5555
@Test
5656
void should_fail_for_param_with_generic_list() {
57-
StepdefBody.A1<List<String>> body = p1 -> {
57+
StepDefinitionBody.A1<List<String>> body = p1 -> {
5858
};
59-
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepdefBody.A1.class, body);
59+
Java8StepDefinition stepDefinition = Java8StepDefinition.create("some step", StepDefinitionBody.A1.class, body);
6060

6161
Executable testMethod = () -> stepDefinition.parameterInfos().get(0).getTypeResolver().resolve();
6262
CucumberBackendException actualThrown = assertThrows(CucumberBackendException.class, testMethod);

0 commit comments

Comments
 (0)