Skip to content

Commit b144625

Browse files
baevbaev
authored
add lifecycle listeners (fixes #40, via #41)
1 parent 9af83db commit b144625

File tree

23 files changed

+731
-218
lines changed

23 files changed

+731
-218
lines changed

‎allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import gherkin.formatter.model.Tag;
1616
import io.qameta.allure.Allure;
1717
import io.qameta.allure.AllureLifecycle;
18-
import io.qameta.allure.ResultsUtils;
18+
import io.qameta.allure.util.ResultsUtils;
1919
import io.qameta.allure.model.Status;
2020
import io.qameta.allure.model.StatusDetails;
2121
import io.qameta.allure.model.StepResult;

‎allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/LabelBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import gherkin.formatter.model.Feature;
44
import gherkin.formatter.model.Scenario;
55
import gherkin.formatter.model.Tag;
6-
import io.qameta.allure.ResultsUtils;
6+
import io.qameta.allure.util.ResultsUtils;
77
import io.qameta.allure.Severity;
88
import io.qameta.allure.SeverityLevel;
99
import io.qameta.allure.Story;
@@ -17,8 +17,8 @@
1717
import java.util.Deque;
1818
import java.util.List;
1919

20-
import static io.qameta.allure.ResultsUtils.getHostName;
21-
import static io.qameta.allure.ResultsUtils.getThreadName;
20+
import static io.qameta.allure.util.ResultsUtils.getHostName;
21+
import static io.qameta.allure.util.ResultsUtils.getThreadName;
2222

2323
/**
2424
* Scenario labels and links builder.

‎allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import gherkin.formatter.model.Step;
1010
import io.qameta.allure.Allure;
1111
import io.qameta.allure.AllureLifecycle;
12-
import io.qameta.allure.ResultsUtils;
12+
import io.qameta.allure.util.ResultsUtils;
1313
import io.qameta.allure.model.Status;
1414
import io.qameta.allure.model.StatusDetails;
1515
import io.qameta.allure.model.StepResult;

‎allure-descriptions-javadoc/src/main/java/io/qameta/allure/descriptions/DescriptionsProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.Set;
2424
import java.util.stream.Collectors;
2525

26-
import static io.qameta.allure.ResultsUtils.generateMethodSignatureHash;
26+
import static io.qameta.allure.util.ResultsUtils.generateMethodSignatureHash;
2727

2828
/**
2929
* @author Egor Borisov ehborisov@gmail.com

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

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package io.qameta.allure;
22

33
import io.qameta.allure.model.Label;
4-
import io.qameta.allure.model.Stage;
5-
import io.qameta.allure.model.Status;
6-
import io.qameta.allure.model.StatusDetails;
7-
import io.qameta.allure.model.StepResult;
84

95
import java.io.ByteArrayInputStream;
106
import java.io.InputStream;
@@ -45,32 +41,11 @@ public static void addLinks(final io.qameta.allure.model.Link... links) {
4541
}
4642

4743
public static void addDescription(final String description) {
48-
getLifecycle().updateExecutable(executable -> executable.withDescription(description));
44+
getLifecycle().updateTestCase(executable -> executable.withDescription(description));
4945
}
5046

5147
public static void addDescriptionHtml(final String descriptionHtml) {
52-
getLifecycle().updateExecutable(executable -> executable.withDescriptionHtml(descriptionHtml));
53-
}
54-
55-
public static void addStep(final String name) {
56-
getLifecycle().addStep(new StepResult()
57-
.withName(name)
58-
.withStart(System.currentTimeMillis())
59-
.withStop(System.currentTimeMillis())
60-
.withStatus(Status.PASSED)
61-
.withStage(Stage.FINISHED)
62-
);
63-
}
64-
65-
public static void addStep(final String name, final Status status, final StatusDetails statusDetails) {
66-
getLifecycle().addStep(new StepResult()
67-
.withName(name)
68-
.withStart(System.currentTimeMillis())
69-
.withStop(System.currentTimeMillis())
70-
.withStatus(status)
71-
.withStatusDetails(statusDetails)
72-
.withStage(Stage.FINISHED)
73-
);
48+
getLifecycle().updateTestCase(executable -> executable.withDescriptionHtml(descriptionHtml));
7449
}
7550

7651
public static void addAttachment(final String name, final String content) {

0 commit comments

Comments
 (0)