Skip to content

Commit 09257f6

Browse files
baevbaev
authored
add parameter builder util method (fixes allure-framework#306, via allure-framework#323)
1 parent 51f256c commit 09257f6

File tree

13 files changed

+41
-45
lines changed

13 files changed

+41
-45
lines changed

‎allure-citrus/src/main/java/io/qameta/allure/citrus/AllureCitrus.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import io.qameta.allure.model.StatusDetails;
3535
import io.qameta.allure.model.StepResult;
3636
import io.qameta.allure.model.TestResult;
37-
import io.qameta.allure.util.ObjectUtils;
3837
import io.qameta.allure.util.ResultsUtils;
3938

4039
import java.lang.annotation.Annotation;
@@ -57,6 +56,7 @@
5756
import static io.qameta.allure.util.ResultsUtils.createFrameworkLabel;
5857
import static io.qameta.allure.util.ResultsUtils.createHostLabel;
5958
import static io.qameta.allure.util.ResultsUtils.createLanguageLabel;
59+
import static io.qameta.allure.util.ResultsUtils.createParameter;
6060
import static io.qameta.allure.util.ResultsUtils.createSuiteLabel;
6161
import static io.qameta.allure.util.ResultsUtils.createThreadLabel;
6262
import static io.qameta.allure.util.ResultsUtils.getProvidedLabels;
@@ -204,10 +204,7 @@ private void stopTestCase(final TestCase testCase,
204204
final String uuid = removeUuid(testCase);
205205
final Map<String, Object> definitions = testCase.getVariableDefinitions();
206206
final List<Parameter> parameters = definitions.entrySet().stream()
207-
.map(entry -> new Parameter()
208-
.setName(entry.getKey())
209-
.setValue(ObjectUtils.toString(entry.getValue()))
210-
)
207+
.map(entry -> createParameter(entry.getKey(), entry.getValue()))
211208
.collect(Collectors.toList());
212209

213210
getLifecycle().updateTestCase(uuid, result -> {

‎allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@
3838
import gherkin.pickles.PickleRow;
3939
import gherkin.pickles.PickleTable;
4040
import gherkin.pickles.PickleTag;
41-
4241
import io.qameta.allure.Allure;
4342
import io.qameta.allure.AllureLifecycle;
43+
import io.qameta.allure.model.FixtureResult;
4444
import io.qameta.allure.model.Parameter;
4545
import io.qameta.allure.model.Status;
4646
import io.qameta.allure.model.StatusDetails;
4747
import io.qameta.allure.model.StepResult;
4848
import io.qameta.allure.model.TestResult;
4949
import io.qameta.allure.model.TestResultContainer;
50-
import io.qameta.allure.model.FixtureResult;
5150

5251
import java.io.ByteArrayInputStream;
5352
import java.nio.charset.Charset;
@@ -61,6 +60,7 @@
6160
import java.util.stream.Collectors;
6261
import java.util.stream.IntStream;
6362

63+
import static io.qameta.allure.util.ResultsUtils.createParameter;
6464
import static io.qameta.allure.util.ResultsUtils.getStatus;
6565
import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
6666
import static io.qameta.allure.util.ResultsUtils.md5;
@@ -273,7 +273,7 @@ private List<Parameter> getExamplesAsParameters(final ScenarioOutline scenarioOu
273273
return IntStream.range(0, examples.getTableHeader().getCells().size()).mapToObj(index -> {
274274
final String name = examples.getTableHeader().getCells().get(index).getValue();
275275
final String value = row.getCells().get(index).getValue();
276-
return new Parameter().setName(name).setValue(value);
276+
return createParameter(name, value);
277277
}).collect(Collectors.toList());
278278
}
279279

‎allure-cucumber3-jvm/src/main/java/io/qameta/allure/cucumber3jvm/AllureCucumber3Jvm.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import cucumber.api.event.TestStepFinished;
3030
import cucumber.api.event.TestStepStarted;
3131
import cucumber.api.formatter.Formatter;
32-
3332
import gherkin.ast.Examples;
3433
import gherkin.ast.Feature;
3534
import gherkin.ast.ScenarioDefinition;
@@ -41,12 +40,12 @@
4140
import gherkin.pickles.PickleTag;
4241
import io.qameta.allure.Allure;
4342
import io.qameta.allure.AllureLifecycle;
43+
import io.qameta.allure.model.FixtureResult;
4444
import io.qameta.allure.model.Parameter;
4545
import io.qameta.allure.model.Status;
4646
import io.qameta.allure.model.StatusDetails;
4747
import io.qameta.allure.model.StepResult;
4848
import io.qameta.allure.model.TestResult;
49-
import io.qameta.allure.model.FixtureResult;
5049
import io.qameta.allure.model.TestResultContainer;
5150

5251
import java.io.ByteArrayInputStream;
@@ -62,6 +61,7 @@
6261
import java.util.stream.Collectors;
6362
import java.util.stream.IntStream;
6463

64+
import static io.qameta.allure.util.ResultsUtils.createParameter;
6565
import static io.qameta.allure.util.ResultsUtils.getStatus;
6666
import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
6767
import static io.qameta.allure.util.ResultsUtils.md5;
@@ -281,7 +281,7 @@ private List<Parameter> getExamplesAsParameters(final ScenarioOutline scenarioOu
281281
return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
282282
final String name = examplesBlock.get().getTableHeader().getCells().get(index).getValue();
283283
final String value = row.getCells().get(index).getValue();
284-
return new Parameter().setName(name).setValue(value);
284+
return createParameter(name, value);
285285
}).collect(Collectors.toList());
286286
} else {
287287
return Collections.emptyList();

‎allure-cucumber4-jvm/src/main/java/io/qameta/allure/cucumber4jvm/AllureCucumber4Jvm.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import cucumber.api.PickleStepTestStep;
2222
import cucumber.api.Result;
2323
import cucumber.api.TestCase;
24-
2524
import cucumber.api.event.ConcurrentEventListener;
2625
import cucumber.api.event.EventHandler;
2726
import cucumber.api.event.EventPublisher;
@@ -30,7 +29,6 @@
3029
import cucumber.api.event.TestSourceRead;
3130
import cucumber.api.event.TestStepFinished;
3231
import cucumber.api.event.TestStepStarted;
33-
3432
import cucumber.runtime.formatter.TestSourcesModelProxy;
3533
import gherkin.ast.Examples;
3634
import gherkin.ast.Feature;
@@ -43,13 +41,13 @@
4341
import gherkin.pickles.PickleTag;
4442
import io.qameta.allure.Allure;
4543
import io.qameta.allure.AllureLifecycle;
44+
import io.qameta.allure.model.FixtureResult;
4645
import io.qameta.allure.model.Parameter;
4746
import io.qameta.allure.model.Status;
4847
import io.qameta.allure.model.StatusDetails;
4948
import io.qameta.allure.model.StepResult;
5049
import io.qameta.allure.model.TestResult;
5150
import io.qameta.allure.model.TestResultContainer;
52-
import io.qameta.allure.model.FixtureResult;
5351

5452
import java.io.ByteArrayInputStream;
5553
import java.nio.charset.Charset;
@@ -63,6 +61,7 @@
6361
import java.util.stream.Collectors;
6462
import java.util.stream.IntStream;
6563

64+
import static io.qameta.allure.util.ResultsUtils.createParameter;
6665
import static io.qameta.allure.util.ResultsUtils.getStatus;
6766
import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
6867
import static io.qameta.allure.util.ResultsUtils.md5;
@@ -283,7 +282,7 @@ private List<Parameter> getExamplesAsParameters(
283282
return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
284283
final String name = examplesBlock.get().getTableHeader().getCells().get(index).getValue();
285284
final String value = row.getCells().get(index).getValue();
286-
return new Parameter().setName(name).setValue(value);
285+
return createParameter(name, value);
287286
}).collect(Collectors.toList());
288287
} else {
289288
return Collections.emptyList();

‎allure-java-commons/src/main/java/io/qameta/allure/Allure.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.qameta.allure.model.Status;
2222
import io.qameta.allure.model.StepResult;
2323
import io.qameta.allure.util.ExceptionUtils;
24-
import io.qameta.allure.util.ObjectUtils;
2524

2625
import java.io.ByteArrayInputStream;
2726
import java.io.InputStream;
@@ -37,6 +36,7 @@
3736
import static io.qameta.allure.util.ResultsUtils.STORY_LABEL_NAME;
3837
import static io.qameta.allure.util.ResultsUtils.SUITE_LABEL_NAME;
3938
import static io.qameta.allure.util.ResultsUtils.TMS_LINK_TYPE;
39+
import static io.qameta.allure.util.ResultsUtils.createParameter;
4040
import static io.qameta.allure.util.ResultsUtils.getStatus;
4141
import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
4242
import static java.util.Arrays.asList;
@@ -252,7 +252,7 @@ public static void label(final String name, final String value) {
252252
* @param value the value of parameter.
253253
*/
254254
public static <T> T parameter(final String name, final T value) {
255-
final Parameter parameter = new Parameter().setName(name).setValue(ObjectUtils.toString(value));
255+
final Parameter parameter = createParameter(name, value);
256256
getLifecycle().updateTestCase(testResult -> testResult.getParameters().add(parameter));
257257
return value;
258258
}
@@ -511,7 +511,7 @@ public void name(final String name) {
511511

512512
@Override
513513
public <T> T parameter(final String name, final T value) {
514-
final Parameter param = new Parameter().setName(name).setValue(ObjectUtils.toString(value));
514+
final Parameter param = createParameter(name, value);
515515
getLifecycle().updateStep(uuid, stepResult -> stepResult.getParameters().add(param));
516516
return value;
517517
}

‎allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.stream.IntStream;
2727

2828
import static io.qameta.allure.util.NamingUtils.processNameTemplate;
29+
import static io.qameta.allure.util.ResultsUtils.createParameter;
2930

3031
/**
3132
* @author charlie (Dmitry Baev).
@@ -57,11 +58,10 @@ public static Map<String, Object> getParametersMap(final MethodSignature signatu
5758
}
5859

5960
public static List<Parameter> getParameters(final MethodSignature signature, final Object... args) {
60-
return IntStream.range(0, args.length).mapToObj(index -> {
61-
final String name = signature.getParameterNames()[index];
62-
final String value = ObjectUtils.toString(args[index]);
63-
return new Parameter().setName(name).setValue(value);
64-
}).collect(Collectors.toList());
61+
return IntStream
62+
.range(0, args.length)
63+
.mapToObj(index -> createParameter(signature.getParameterNames()[index], args[index]))
64+
.collect(Collectors.toList());
6565
}
6666

6767
/**

‎allure-java-commons/src/main/java/io/qameta/allure/util/ResultsUtils.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import io.qameta.allure.Story;
2525
import io.qameta.allure.model.Label;
2626
import io.qameta.allure.model.Link;
27+
import io.qameta.allure.model.Parameter;
2728
import io.qameta.allure.model.Status;
2829
import io.qameta.allure.model.StatusDetails;
2930
import org.apache.tika.io.IOUtils;
@@ -104,6 +105,10 @@ private ResultsUtils() {
104105
throw new IllegalStateException("Do not instance");
105106
}
106107

108+
public static Parameter createParameter(final String name, final Object value) {
109+
return new Parameter().setName(name).setValue(ObjectUtils.toString(value));
110+
}
111+
107112
public static Label createSuiteLabel(final String suite) {
108113
return new Label().setName(SUITE_LABEL_NAME).setValue(suite);
109114
}

‎allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@
3434
import java.util.ArrayList;
3535
import java.util.Arrays;
3636
import java.util.List;
37-
import java.util.Objects;
3837
import java.util.stream.Collectors;
3938
import java.util.stream.IntStream;
4039

40+
import static io.qameta.allure.util.ResultsUtils.createParameter;
41+
4142
/**
4243
* Allure labels utils.
4344
*/
@@ -98,13 +99,7 @@ public void updateParameters(final TestResult result) {
9899
private List<Parameter> getMethodParameters() {
99100
final String[] parameterNames = signature.getParameterNames();
100101
return IntStream.range(0, parameterNames.length)
101-
.mapToObj(index -> {
102-
final String name = parameterNames[index];
103-
final String value = Objects.toString(args[index]);
104-
return new Parameter()
105-
.setName(name)
106-
.setValue(value);
107-
})
102+
.mapToObj(index -> createParameter(parameterNames[index], args[index]))
108103
.collect(Collectors.toList());
109104
}
110105

‎allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1ParametersAspects.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
import java.util.Objects;
2828

29+
import static io.qameta.allure.util.ResultsUtils.createParameter;
30+
2931
/**
3032
* Aspects for Allure1 Parameters.
3133
*/
@@ -54,9 +56,7 @@ public void parameterValueChanged(JoinPoint joinPoint) {
5456
String value = Objects.toString(joinPoint.getArgs()[0]);
5557

5658
getLifecycle().updateTestCase(testResult ->
57-
testResult.getParameters().add(new io.qameta.allure.model.Parameter()
58-
.setName(name).setValue(value)
59-
)
59+
testResult.getParameters().add(createParameter(name, value))
6060
);
6161
} catch (Exception ignored) {
6262
}

‎allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1StepsAspects.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
import static io.qameta.allure.aspects.Allure1Utils.getName;
3939
import static io.qameta.allure.aspects.Allure1Utils.getTitle;
40+
import static io.qameta.allure.util.ResultsUtils.createParameter;
4041
import static io.qameta.allure.util.ResultsUtils.getStatus;
4142
import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
4243

@@ -93,11 +94,9 @@ public String createTitle(final JoinPoint joinPoint) {
9394
}
9495

9596
private static List<Parameter> getParameters(final MethodSignature signature, final Object... args) {
96-
return IntStream.range(0, args.length).mapToObj(index -> {
97-
final String name = signature.getParameterNames()[index];
98-
final String value = Objects.toString(args[index]);
99-
return new Parameter().setName(name).setValue(value);
100-
}).collect(Collectors.toList());
97+
return IntStream.range(0, args.length)
98+
.mapToObj(index -> createParameter(signature.getParameterNames()[index], args[index]))
99+
.collect(Collectors.toList());
101100
}
102101

103102

0 commit comments

Comments
 (0)