Skip to content

Commit ea4ab0f

Browse files
baevbaev
authored
bump deps (via allure-framework#471)
1 parent 39b8ca0 commit ea4ab0f

92 files changed

Lines changed: 481 additions & 210 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void shouldHandleByteArrayObject() {
8282
.extracting(StepResult::getName)
8383
.containsExactly(
8484
"assertThat '<BINARY>'",
85-
"as 'Byte array object []'",
85+
"describedAs 'Byte array object'",
8686
"isEqualTo '<BINARY>'"
8787
);
8888
}

‎allure-cucumber-jvm/src/main/resources/META-INF/aop-ajc.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<aspectj>
2+
<weaver options="-warn:none -Xlint:ignore"/>
23
<aspects>
34
<aspect name="io.qameta.allure.aspects.StepsAspects"/>
45
<aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
56
</aspects>
6-
</aspectj>
7+
</aspectj>

‎allure-cucumber2-jvm/src/main/resources/META-INF/aop-ajc.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<aspectj>
2+
<weaver options="-warn:none -Xlint:ignore"/>
23
<aspects>
34
<aspect name="io.qameta.allure.aspects.StepsAspects"/>
45
<aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
56
</aspects>
6-
</aspectj>
7+
</aspectj>

‎allure-cucumber3-jvm/src/main/resources/META-INF/aop-ajc.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<aspectj>
2+
<weaver options="-warn:none -Xlint:ignore"/>
23
<aspects>
34
<aspect name="io.qameta.allure.aspects.StepsAspects"/>
45
<aspect name="io.qameta.allure.aspects.AttachmentsAspects"/>
56
</aspects>
6-
</aspectj>
7+
</aspectj>

‎allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/AllureCucumber5Jvm.java‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,67 @@
1515
*/
1616
package io.qameta.allure.cucumber5jvm;
1717

18-
19-
import gherkin.ast.*;
20-
import io.qameta.allure.cucumber5jvm.testsourcemodel.TestSourcesModelProxy;
18+
import gherkin.ast.Examples;
19+
import gherkin.ast.Feature;
20+
import gherkin.ast.ScenarioDefinition;
21+
import gherkin.ast.ScenarioOutline;
22+
import gherkin.ast.TableRow;
2123
import io.cucumber.plugin.ConcurrentEventListener;
22-
import io.cucumber.plugin.event.*;
24+
import io.cucumber.plugin.event.DataTableArgument;
25+
import io.cucumber.plugin.event.EmbedEvent;
26+
import io.cucumber.plugin.event.EventHandler;
27+
import io.cucumber.plugin.event.EventPublisher;
28+
import io.cucumber.plugin.event.HookTestStep;
29+
import io.cucumber.plugin.event.HookType;
30+
import io.cucumber.plugin.event.PickleStepTestStep;
31+
import io.cucumber.plugin.event.Result;
32+
import io.cucumber.plugin.event.StepArgument;
33+
import io.cucumber.plugin.event.TestCase;
34+
import io.cucumber.plugin.event.TestCaseFinished;
35+
import io.cucumber.plugin.event.TestCaseStarted;
36+
import io.cucumber.plugin.event.TestSourceRead;
37+
import io.cucumber.plugin.event.TestStepFinished;
38+
import io.cucumber.plugin.event.TestStepStarted;
39+
import io.cucumber.plugin.event.WriteEvent;
2340
import io.qameta.allure.Allure;
2441
import io.qameta.allure.AllureLifecycle;
25-
import io.qameta.allure.model.*;
42+
import io.qameta.allure.cucumber5jvm.testsourcemodel.TestSourcesModelProxy;
43+
import io.qameta.allure.model.FixtureResult;
44+
import io.qameta.allure.model.Parameter;
2645
import io.qameta.allure.model.Status;
46+
import io.qameta.allure.model.StatusDetails;
47+
import io.qameta.allure.model.StepResult;
48+
import io.qameta.allure.model.TestResult;
49+
import io.qameta.allure.model.TestResultContainer;
2750

2851
import java.io.ByteArrayInputStream;
2952
import java.net.URI;
3053
import java.nio.charset.StandardCharsets;
31-
import java.util.*;
54+
import java.util.Collections;
55+
import java.util.Deque;
56+
import java.util.LinkedList;
57+
import java.util.List;
58+
import java.util.Objects;
59+
import java.util.Optional;
60+
import java.util.UUID;
3261
import java.util.concurrent.ConcurrentHashMap;
3362
import java.util.stream.Collectors;
3463
import java.util.stream.IntStream;
3564
import java.util.stream.Stream;
3665

37-
import static io.qameta.allure.util.ResultsUtils.*;
66+
import static io.qameta.allure.util.ResultsUtils.createParameter;
67+
import static io.qameta.allure.util.ResultsUtils.getStatus;
68+
import static io.qameta.allure.util.ResultsUtils.getStatusDetails;
69+
import static io.qameta.allure.util.ResultsUtils.md5;
3870

3971
/**
4072
* Allure plugin for Cucumber JVM 5.0.
4173
*/
4274
@SuppressWarnings({
75+
"ClassDataAbstractionCoupling",
76+
"ClassFanOutComplexity",
4377
"PMD.ExcessiveImports",
44-
"ClassFanOutComplexity", "ClassDataAbstractionCoupling"
78+
"PMD.GodClass",
4579
})
4680
public class AllureCucumber5Jvm implements ConcurrentEventListener {
4781

@@ -291,7 +325,7 @@ private List<Parameter> getExamplesAsParameters(
291325
private void createDataTableAttachment(final DataTableArgument dataTableArgument) {
292326
final List<List<String>> rowsInTable = dataTableArgument.cells();
293327
final StringBuilder dataTableCsv = new StringBuilder();
294-
for (List<String> columns:rowsInTable) {
328+
for (List<String> columns : rowsInTable) {
295329
if (!columns.isEmpty()) {
296330
for (int i = 0; i < columns.size(); i++) {
297331
if (i == columns.size() - 1) {

‎allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModel.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* Copyright 2020 Qameta Software OÜ
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package io.qameta.allure.cucumber5jvm.testsourcemodel;
217

318
import gherkin.AstBuilder;

‎allure-cucumber5-jvm/src/main/java/io/qameta/allure/cucumber5jvm/testsourcemodel/TestSourcesModelProxy.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.HashMap;
2626
import java.util.Map;
2727

28-
2928
public class TestSourcesModelProxy {
3029

3130
private final Map<URI, TestSourceRead> pathToReadEventMap = new HashMap<>();

‎allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ void shouldCreateResponseAttachmentWithEmptyBody() throws Exception {
162162
.containsExactly("No body present");
163163
}
164164

165-
@SuppressWarnings("unchecked")
166165
@Test
167166
void shouldCreateRequestAttachmentWithEmptyBodyWhenNoContentIsReturned() throws Exception {
168167
final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);

‎allure-java-commons-test/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ description = "Allure Java Commons Test Utils"
22

33
dependencies {
44
api("commons-io:commons-io")
5+
api("io.github.benas:random-beans")
6+
api("org.apache.commons:commons-lang3")
57
api(project(":allure-java-commons"))
68
}
79

‎allure-java-commons-test/src/main/java/io/qameta/allure/test/TestData.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright 2020 Qameta Software OÜ
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package io.qameta.allure.test;
17+
18+
import org.apache.commons.lang3.RandomStringUtils;
19+
20+
/**
21+
* @author charlie (Dmitry Baev).
22+
*/
23+
public final class TestData {
24+
25+
private TestData() {
26+
throw new IllegalStateException("do not instance");
27+
}
28+
29+
public static String randomName() {
30+
return RandomStringUtils.randomAlphabetic(10);
31+
}
32+
33+
public static String randomId() {
34+
return randomString(10);
35+
}
36+
37+
public static String randomString(final int count) {
38+
return RandomStringUtils.randomAlphanumeric(count);
39+
}
40+
41+
}

0 commit comments

Comments
 (0)