Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 04b39ef

Browse filesBrowse files
baevbaev
authored
improve test coverage (fixes allure-framework#238, fixes allure-framework#145, via allure-framework#267)
1 parent 18de3c7 commit 04b39ef
Copy full SHA for 04b39ef

84 files changed

+1,880-1,246Lines changed: 1880 additions & 1246 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

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

Copy file name to clipboardExpand all lines: allure-assertj/src/test/java/io/qameta/allure/assertj/AllureAspectJTest.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void initLifecycle() {
2828
}
2929

3030
@Test
31-
public void shouldCreateStepsForAsserts() throws Exception {
31+
void shouldCreateStepsForAsserts() {
3232
final String uuid = UUID.randomUUID().toString();
3333
final TestResult result = new TestResult().setUuid(uuid);
3434

@@ -47,7 +47,7 @@ public void shouldCreateStepsForAsserts() throws Exception {
4747
.extracting(StepResult::getName)
4848
.containsExactly("assertThat 'Data'", "hasSize '4'");
4949
}
50-
50+
5151
@Test
5252
public void shouldHandleNullableObject() {
5353
assertThat((Object) null).as("Nullable object").isNull();
Collapse file

‎allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java‎

Copy file name to clipboardExpand all lines: allure-attachments/src/test/java/io/qameta/allure/attachment/FreemarkerAttachmentRendererTest.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class FreemarkerAttachmentRendererTest {
1313

1414
@Test
15-
public void shouldRenderRequestAttachment() {
15+
void shouldRenderRequestAttachment() {
1616
final HttpRequestAttachment data = randomHttpRequestAttachment();
1717
final DefaultAttachmentContent content = new FreemarkerAttachmentRenderer("http-request.ftl")
1818
.render(data);
@@ -24,7 +24,7 @@ public void shouldRenderRequestAttachment() {
2424
}
2525

2626
@Test
27-
public void shouldRenderResponseAttachment() {
27+
void shouldRenderResponseAttachment() {
2828
final HttpRequestAttachment data = randomHttpRequestAttachment();
2929
final DefaultAttachmentContent content = new FreemarkerAttachmentRenderer("http-response.ftl")
3030
.render(data);
Collapse file

‎allure-cucumber-jvm/build.gradle.kts‎

Copy file name to clipboardExpand all lines: allure-cucumber-jvm/build.gradle.kts
+10-2Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@ dependencies {
88
agent("org.aspectj:aspectjweaver")
99
compile("info.cukes:cucumber-core:$cucumberVersion")
1010
compile("info.cukes:cucumber-java:$cucumberVersion")
11-
compile("info.cukes:cucumber-junit:$cucumberVersion")
1211
compile("info.cukes:gherkin:2.12.2")
1312
compile(project(":allure-java-commons"))
14-
testCompile("junit:junit:4.12")
13+
14+
testCompile("info.cukes:cucumber-testng:$cucumberVersion")
15+
testCompile("commons-io:commons-io")
16+
testCompile("io.github.glytching:junit-extensions")
17+
testCompile("org.assertj:assertj-core")
18+
testCompile("org.junit.jupiter:junit-jupiter-api")
19+
testCompile("org.slf4j:slf4j-simple")
20+
testCompile(project(":allure-java-commons-test"))
21+
testRuntime("org.junit.jupiter:junit-jupiter-engine")
1522
}
1623

1724
tasks.named<Jar>("jar") {
@@ -23,6 +30,7 @@ tasks.named<Jar>("jar") {
2330
}
2431

2532
tasks.named<Test>("test") {
33+
useJUnitPlatform()
2634
doFirst {
2735
jvmArgs("-javaagent:${agent.singleFile}")
2836
}
Collapse file

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

Copy file name to clipboardExpand all lines: allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/AllureCucumberJvm.java
+13-8Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
import io.qameta.allure.model.StepResult;
2222
import io.qameta.allure.model.TestResult;
2323
import io.qameta.allure.util.ResultsUtils;
24+
2425
import java.io.ByteArrayInputStream;
2526
import java.nio.charset.Charset;
2627
import java.util.ArrayList;
2728
import java.util.Collections;
2829
import java.util.Deque;
2930
import java.util.LinkedList;
3031
import java.util.List;
31-
import java.util.stream.Collectors;
3232

3333

3434
/**
@@ -49,11 +49,14 @@ public class AllureCucumberJvm implements Reporter, Formatter {
4949
private boolean isNullMatch = true;
5050
private Scenario currentScenario;
5151

52-
52+
@SuppressWarnings("unused")
5353
public AllureCucumberJvm() {
54-
this.lifecycle = Allure.getLifecycle();
55-
final List<I18n> i18nList = I18n.getAll();
54+
this(Allure.getLifecycle());
55+
}
5656

57+
public AllureCucumberJvm(final AllureLifecycle lifecycle) {
58+
this.lifecycle = lifecycle;
59+
final List<I18n> i18nList = I18n.getAll();
5760
i18nList.forEach(i18n -> SCENARIO_OUTLINE_KEYWORDS.addAll(i18n.keywords("scenario_outline")));
5861
}
5962

@@ -76,8 +79,7 @@ public void after(final Match match, final Result result) {
7679
public void startOfScenarioLifeCycle(final Scenario scenario) {
7780
this.currentScenario = scenario;
7881

79-
final Deque<Tag> tags = new LinkedList<>();
80-
tags.addAll(scenario.getTags());
82+
final Deque<Tag> tags = new LinkedList<>(scenario.getTags());
8183

8284
if (SCENARIO_OUTLINE_KEYWORDS.contains(scenario.getKeyword())) {
8385
synchronized (gherkinSteps) {
@@ -93,6 +95,7 @@ public void startOfScenarioLifeCycle(final Scenario scenario) {
9395
final TestResult result = new TestResult()
9496
.setUuid(scenario.getId())
9597
.setHistoryId(StepUtils.getHistoryId(scenario.getId()))
98+
.setFullName(String.format("%s: %s", currentFeature.getName(), scenario.getName()))
9699
.setName(scenario.getName())
97100
.setLabels(labelBuilder.getScenarioLabels())
98101
.setLinks(labelBuilder.getScenarioLinks());
@@ -151,9 +154,11 @@ public void result(final Result result) {
151154

152155
switch (result.getStatus()) {
153156
case FAILED:
157+
final Status status = ResultsUtils.getStatus(result.getError())
158+
.orElse(Status.FAILED);
154159
lifecycle.updateStep(stepResult -> stepResult.setStatus(Status.FAILED));
155160
lifecycle.updateTestCase(currentScenario.getId(), scenarioResult ->
156-
scenarioResult.setStatus(Status.FAILED)
161+
scenarioResult.setStatus(status)
157162
.setStatusDetails(statusDetails));
158163
lifecycle.stopStep();
159164
break;
@@ -203,7 +208,7 @@ private void createDataTableAttachment(final List<DataTableRow> dataTableRows) {
203208

204209
if (dataTableRows != null && !dataTableRows.isEmpty()) {
205210
dataTableRows.forEach(dataTableRow -> {
206-
dataTableCsv.append(dataTableRow.getCells().stream().collect(Collectors.joining("\t")));
211+
dataTableCsv.append(String.join("\t", dataTableRow.getCells()));
207212
dataTableCsv.append('\n');
208213
});
209214

Collapse file

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

Copy file name to clipboardExpand all lines: allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/StepUtils.java
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@
99
import gherkin.formatter.model.Step;
1010
import io.qameta.allure.Allure;
1111
import io.qameta.allure.AllureLifecycle;
12-
import io.qameta.allure.util.ResultsUtils;
1312
import io.qameta.allure.model.Status;
1413
import io.qameta.allure.model.StatusDetails;
1514
import io.qameta.allure.model.StepResult;
15+
import io.qameta.allure.util.ResultsUtils;
1616
import org.slf4j.Logger;
1717
import org.slf4j.LoggerFactory;
1818

1919
import java.lang.reflect.Field;
2020
import java.util.Objects;
2121

22+
import static io.qameta.allure.util.ResultsUtils.md5;
23+
2224
/**
2325
* Step utils.
2426
*/
@@ -79,11 +81,11 @@ protected String getStepUuid(final Step step) {
7981
}
8082

8183
protected static String getHistoryId(final String id) {
82-
return Utils.md5(id);
84+
return md5(id);
8385
}
8486

8587
protected void fireFixtureStep(final Match match, final Result result, final boolean isBefore) {
86-
final String uuid = Utils.md5(match.getLocation());
88+
final String uuid = md5(match.getLocation());
8789
final StepResult stepResult = new StepResult()
8890
.setName(match.getLocation())
8991
.setStatus(Status.fromValue(result.getStatus()))
Collapse file

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

Copy file name to clipboardExpand all lines: allure-cucumber-jvm/src/main/java/io/qameta/allure/cucumberjvm/Utils.java
-31Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.