Skip to content

Commit 1c338c4

Browse files
baevbaev
authored
add possibility to use custom marker annotations (via allure-framework#315)
1 parent 26135e7 commit 1c338c4

43 files changed

Lines changed: 1492 additions & 624 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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.qameta.allure.AllureLifecycle;
44
import io.qameta.allure.model.StepResult;
55
import io.qameta.allure.model.TestResult;
6+
import io.qameta.allure.test.AllureFeatures;
67
import io.qameta.allure.test.AllureResultsWriterStub;
78
import org.junit.jupiter.api.BeforeEach;
89
import org.junit.jupiter.api.Test;
@@ -27,6 +28,7 @@ public void initLifecycle() {
2728
AllureAspectJ.setLifecycle(lifecycle);
2829
}
2930

31+
@AllureFeatures.Steps
3032
@Test
3133
void shouldCreateStepsForAsserts() {
3234
final String uuid = UUID.randomUUID().toString();
@@ -48,6 +50,7 @@ void shouldCreateStepsForAsserts() {
4850
.containsExactly("assertThat 'Data'", "hasSize '4'");
4951
}
5052

53+
@AllureFeatures.Steps
5154
@Test
5255
public void shouldHandleNullableObject() {
5356
assertThat((Object) null).as("Nullable object").isNull();

‎allure-attachments/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies {
1111
testCompile("org.junit.jupiter:junit-jupiter-api")
1212
testCompile("org.mockito:mockito-core")
1313
testCompile("org.slf4j:slf4j-simple")
14+
testCompile(project(":allure-java-commons-test"))
1415
testCompile(project(":allure-junit-platform"))
1516
testRuntime("org.junit.jupiter:junit-jupiter-engine")
1617
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.qameta.allure.AllureLifecycle;
44
import io.qameta.allure.attachment.http.HttpRequestAttachment;
5+
import io.qameta.allure.test.AllureFeatures;
56
import org.junit.jupiter.api.Test;
67

78
import java.nio.charset.StandardCharsets;
@@ -20,6 +21,7 @@
2021
class DefaultAttachmentProcessorTest {
2122

2223
@SuppressWarnings("unchecked")
24+
@AllureFeatures.Attachments
2325
@Test
2426
void shouldProcessAttachments() {
2527
final HttpRequestAttachment attachment = randomHttpRequestAttachment();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.qameta.allure.attachment;
22

33
import io.qameta.allure.attachment.http.HttpRequestAttachment;
4+
import io.qameta.allure.test.AllureFeatures;
45
import org.junit.jupiter.api.Test;
56

67
import static io.qameta.allure.attachment.testdata.TestData.randomHttpRequestAttachment;
@@ -11,6 +12,7 @@
1112
*/
1213
class FreemarkerAttachmentRendererTest {
1314

15+
@AllureFeatures.Attachments
1416
@Test
1517
void shouldRenderRequestAttachment() {
1618
final HttpRequestAttachment data = randomHttpRequestAttachment();
@@ -23,6 +25,7 @@ void shouldRenderRequestAttachment() {
2325
.hasFieldOrProperty("content");
2426
}
2527

28+
@AllureFeatures.Attachments
2629
@Test
2730
void shouldRenderResponseAttachment() {
2831
final HttpRequestAttachment data = randomHttpRequestAttachment();

‎allure-citrus/src/test/java/io/qameta/allure/citrus/AllureCitrusTest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import io.qameta.allure.model.StatusDetails;
1818
import io.qameta.allure.model.StepResult;
1919
import io.qameta.allure.model.TestResult;
20+
import io.qameta.allure.test.AllureFeatures;
2021
import io.qameta.allure.test.AllureResults;
2122
import io.qameta.allure.test.AllureResultsWriterStub;
2223
import org.junit.jupiter.api.Test;
@@ -35,6 +36,7 @@
3536
@SuppressWarnings("unchecked")
3637
class AllureCitrusTest {
3738

39+
@AllureFeatures.Base
3840
@Test
3941
void shouldSetName() {
4042
final DefaultTestDesigner designer = new DefaultTestDesigner();
@@ -46,6 +48,7 @@ void shouldSetName() {
4648
.containsExactly("Simple test");
4749
}
4850

51+
@AllureFeatures.PassedTests
4952
@Test
5053
void shouldSetStatus() {
5154
final DefaultTestDesigner designer = new DefaultTestDesigner();
@@ -57,6 +60,7 @@ void shouldSetStatus() {
5760
.containsExactly(Status.PASSED);
5861
}
5962

63+
@AllureFeatures.BrokenTests
6064
@Test
6165
void shouldSetBrokenStatus() {
6266
final DefaultTestDesigner designer = new DefaultTestDesigner();
@@ -69,6 +73,7 @@ void shouldSetBrokenStatus() {
6973
.containsExactly(Status.BROKEN);
7074
}
7175

76+
@AllureFeatures.FailedTests
7277
@Test
7378
void shouldSetFailedStatus() {
7479
final DefaultTestDesigner designer = new DefaultTestDesigner();
@@ -86,6 +91,7 @@ public void doExecute(final TestContext context) {
8691
.containsExactly(Status.FAILED);
8792
}
8893

94+
@AllureFeatures.FailedTests
8995
@Test
9096
void shouldSetStatusDetails() {
9197
final DefaultTestDesigner designer = new DefaultTestDesigner();
@@ -99,6 +105,7 @@ void shouldSetStatusDetails() {
99105
.containsExactly("failed by design");
100106
}
101107

108+
@AllureFeatures.Steps
102109
@Test
103110
void shouldAddSteps() {
104111
final DefaultTestDesigner designer = new DefaultTestDesigner();
@@ -114,6 +121,7 @@ void shouldAddSteps() {
114121
.containsExactly("echo", "echo", "echo");
115122
}
116123

124+
@AllureFeatures.Steps
117125
@Test
118126
void shouldAddAllureSteps() {
119127
final DefaultTestDesigner designer = new DefaultTestDesigner();
@@ -135,6 +143,7 @@ public void doExecute(final TestContext context) {
135143
.containsExactly("a", "b", "c");
136144
}
137145

146+
@AllureFeatures.Timings
138147
@Test
139148
void shouldSetStart() {
140149
final long before = Instant.now().toEpochMilli();
@@ -149,6 +158,7 @@ void shouldSetStart() {
149158
.allMatch(v -> v >= before && v <= after);
150159
}
151160

161+
@AllureFeatures.Timings
152162
@Test
153163
void shouldSetStop() {
154164
final long before = Instant.now().toEpochMilli();
@@ -163,6 +173,7 @@ void shouldSetStop() {
163173
.allMatch(v -> v >= before && v <= after);
164174
}
165175

176+
@AllureFeatures.Parameters
166177
@Test
167178
void shouldSetParameters() {
168179
final DefaultTestDesigner designer = new DefaultTestDesigner();

‎allure-cucumber-jvm/src/test/java/io/qameta/allure/cucumberjvm/AllureCucumberJvmTest.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.qameta.allure.model.StatusDetails;
2222
import io.qameta.allure.model.StepResult;
2323
import io.qameta.allure.model.TestResult;
24+
import io.qameta.allure.test.AllureFeatures;
2425
import io.qameta.allure.test.AllureResults;
2526
import io.qameta.allure.test.AllureResultsWriterStub;
2627
import org.junit.jupiter.api.Disabled;
@@ -47,6 +48,7 @@
4748
@SuppressWarnings("unchecked")
4849
class AllureCucumberJvmTest {
4950

51+
@AllureFeatures.Base
5052
@Test
5153
void shouldSetName() {
5254
final AllureResults results = runFeature("features/simple.feature");
@@ -58,6 +60,7 @@ void shouldSetName() {
5860

5961
}
6062

63+
@AllureFeatures.PassedTests
6164
@Test
6265
void shouldSetStatus() {
6366
final AllureResults results = runFeature("features/simple.feature");
@@ -68,6 +71,7 @@ void shouldSetStatus() {
6871
.containsExactlyInAnyOrder(Status.PASSED);
6972
}
7073

74+
@AllureFeatures.FailedTests
7175
@Test
7276
void shouldSetFailedStatus() {
7377
final AllureResults results = runFeature("features/failed.feature");
@@ -78,6 +82,7 @@ void shouldSetFailedStatus() {
7882
.containsExactlyInAnyOrder(Status.FAILED);
7983
}
8084

85+
@AllureFeatures.FailedTests
8186
@Test
8287
void shouldSetStatusDetails() {
8388
final AllureResults results = runFeature("features/failed.feature");
@@ -89,6 +94,7 @@ void shouldSetStatusDetails() {
8994
.containsExactlyInAnyOrder("expected: <15> but was: <123>");
9095
}
9196

97+
@AllureFeatures.BrokenTests
9298
@Test
9399
void shouldSetBrokenStatus() {
94100
final AllureResults results = runFeature("features/broken.feature");
@@ -99,6 +105,7 @@ void shouldSetBrokenStatus() {
99105
.containsExactlyInAnyOrder(Status.BROKEN);
100106
}
101107

108+
@AllureFeatures.Stages
102109
@Test
103110
void shouldSetStage() {
104111
final AllureResults results = runFeature("features/simple.feature");
@@ -109,6 +116,7 @@ void shouldSetStage() {
109116
.containsExactlyInAnyOrder(Stage.FINISHED);
110117
}
111118

119+
@AllureFeatures.Timings
112120
@Test
113121
void shouldSetStart() {
114122
final long before = Instant.now().toEpochMilli();
@@ -121,6 +129,7 @@ void shouldSetStart() {
121129
.allMatch(v -> v >= before && v <= after);
122130
}
123131

132+
@AllureFeatures.Timings
124133
@Test
125134
void shouldSetStop() {
126135
final long before = Instant.now().toEpochMilli();
@@ -133,6 +142,7 @@ void shouldSetStop() {
133142
.allMatch(v -> v >= before && v <= after);
134143
}
135144

145+
@AllureFeatures.FullName
136146
@Test
137147
void shouldSetFullName() {
138148
final AllureResults results = runFeature("features/simple.feature");
@@ -143,6 +153,7 @@ void shouldSetFullName() {
143153
.containsExactlyInAnyOrder("Simple feature: Add a to b");
144154
}
145155

156+
@AllureFeatures.Descriptions
146157
@Test
147158
void shouldSetDescription() {
148159
final AllureResults results = runFeature("features/description.feature");
@@ -159,6 +170,7 @@ void shouldSetDescription() {
159170
);
160171
}
161172

173+
@AllureFeatures.Attachments
162174
@Test
163175
void shouldAddDataTableAttachment() {
164176
final AllureResults results = runFeature("features/datatable.feature");
@@ -192,6 +204,7 @@ void shouldAddDataTableAttachment() {
192204

193205
}
194206

207+
@AllureFeatures.Steps
195208
@Disabled("unsupported")
196209
@Test
197210
void shouldAddBackgroundSteps() {
@@ -211,6 +224,7 @@ void shouldAddBackgroundSteps() {
211224
);
212225
}
213226

227+
@AllureFeatures.Parameters
214228
@Disabled("unsupported")
215229
@Test
216230
void shouldAddParametersFromExamples() {
@@ -231,6 +245,7 @@ void shouldAddParametersFromExamples() {
231245

232246
}
233247

248+
@AllureFeatures.MarkerAnnotations
234249
@Test
235250
void shouldAddTags() {
236251
final AllureResults results = runFeature("features/tags.feature");
@@ -246,6 +261,7 @@ void shouldAddTags() {
246261
);
247262
}
248263

264+
@AllureFeatures.Links
249265
@ExtendWith(SystemPropertyExtension.class)
250266
@SystemProperty(name = "allure.link.issue.pattern", value = "https://example.org/issue/{}")
251267
@SystemProperty(name = "allure.link.tms.pattern", value = "https://example.org/tms/{}")
@@ -264,6 +280,7 @@ void shouldAddLinks() {
264280
);
265281
}
266282

283+
@AllureFeatures.MarkerAnnotations
267284
@Test
268285
void shouldAddBddLabels() {
269286
final AllureResults results = runFeature("features/tags.feature");
@@ -279,6 +296,7 @@ void shouldAddBddLabels() {
279296
);
280297
}
281298

299+
@AllureFeatures.Timeline
282300
@Test
283301
void shouldThreadHostLabels() {
284302
final AllureResults results = runFeature("features/tags.feature");
@@ -291,6 +309,7 @@ void shouldThreadHostLabels() {
291309
.contains("host", "thread");
292310
}
293311

312+
@AllureFeatures.MarkerAnnotations
294313
@Test
295314
void shouldCommonLabels() {
296315
final AllureResults results = runFeature("features/tags.feature");
@@ -307,6 +326,7 @@ void shouldCommonLabels() {
307326
);
308327
}
309328

329+
@AllureFeatures.NotImplementedTests
310330
@Test
311331
void shouldProcessNotImplementedScenario() {
312332
final AllureResults results = runFeature("features/undefined.feature");
@@ -317,6 +337,7 @@ void shouldProcessNotImplementedScenario() {
317337
.containsExactlyInAnyOrder((Status) null);
318338
}
319339

340+
@AllureFeatures.Base
320341
@Disabled("unsupported")
321342
@Test
322343
void shouldSupportDryRun() {
@@ -330,6 +351,7 @@ void shouldSupportDryRun() {
330351
);
331352
}
332353

354+
@AllureFeatures.Base
333355
@Issue("173")
334356
@Issue("164")
335357
@Test

0 commit comments

Comments
 (0)