Skip to content

Fix falky test results categories matching #2796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baev merged 3 commits into from
Mar 4, 2025
Merged

Fix falky test results categories matching #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cddbb8
fix falky test results categories matching
baev Nov 6, 2024
a717a7d
fix build
baev Mar 4, 2025
6e2d88f
fix build
baev Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion allure-commandline/src/test/java/io/qameta/allure/testdata/TestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private TestData() {
}

public static String randomString() {
return RandomStringUtils.randomAlphabetic(10);
return RandomStringUtils.insecure().nextAlphabetic(10);
}

public static int randomPort() {
Expand Down
4 changes: 3 additions & 1 deletion allure-generator/src/main/java/io/qameta/allure/category/CategoriesPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ protected static List<TreeLayer> groupByCategories(final TestResult testResult)
return Arrays.asList(categoriesLayer, messageLayer);
}

@SuppressWarnings("CyclomaticComplexity")
public static boolean matches(final TestResult result, final Category category) {
final boolean matchesStatus = category.getMatchedStatuses().isEmpty()
|| nonNull(result.getStatus())
Expand All @@ -161,7 +162,8 @@ public static boolean matches(final TestResult result, final Category category)
final boolean matchesTrace = isNull(category.getTraceRegex())
|| nonNull(result.getStatusTrace())
&& matches(result.getStatusTrace(), category.getTraceRegex());
final boolean matchesFlaky = result.isFlaky() == category.isFlaky();
final boolean matchesFlaky = isNull(category.getFlaky())
|| result.isFlaky() == category.getFlaky();
return matchesStatus && matchesMessage && matchesTrace && matchesFlaky;
}

Expand Down
2 changes: 1 addition & 1 deletion allure-generator/src/main/java/io/qameta/allure/category/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ public class Category implements Serializable {
protected String messageRegex;
protected String traceRegex;
protected List<Status> matchedStatuses = new ArrayList<>();
protected boolean flaky;
protected Boolean flaky;

}
32 changes: 32 additions & 0 deletions allure-generator/src/test/java/io/qameta/allure/category/CategoriesPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,38 @@ meta, createTestResult("asd\n", Status.FAILED, true)
.containsKey("data/" + JSON_FILE_NAME);
}

@Test
void flakyTestsShouldBeMatchedByDefault() {
final Configuration configuration = ConfigurationBuilder.bundled().build();

final Category category = new Category()
.setName(CATEGORY_NAME)
.setMatchedStatuses(singletonList(Status.FAILED));

final Map<String, Object> meta = new HashMap<>();
meta.put("categories", singletonList(category));

final List<LaunchResults> launchResultsList = createSingleLaunchResults(
meta, createTestResult("asd\n", Status.FAILED, true)
);

final CategoriesPlugin plugin = new CategoriesPlugin();

final InMemoryReportStorage storage = new InMemoryReportStorage();
plugin.aggregate(configuration, launchResultsList, storage);

final Set<TestResult> results = launchResultsList.get(0).getAllResults();
List<Category> categories = results.toArray(new TestResult[]{})[0]
.getExtraBlock("categories");

assertThat(categories).as("test categories")
.extracting(Category::getName)
.containsExactly(category.getName());

assertThat(storage.getReportDataFiles())
.containsKey("data/" + JSON_FILE_NAME);
}

@Issue("587")
@Issue("572")
@Test
Expand Down
6 changes: 3 additions & 3 deletions plugins/jira-plugin/src/test/java/io/qameta/allure/jira/TestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ public static JiraService mockJiraService() {

public static TestResult createTestResult(final Status status) {
return new TestResult()
.setUid(RandomStringUtils.random(10))
.setName(RandomStringUtils.random(10))
.setHistoryId(RandomStringUtils.random(9))
.setUid(RandomStringUtils.insecure().nextAlphanumeric(10))
.setName(RandomStringUtils.insecure().nextAlphanumeric(10))
.setHistoryId(RandomStringUtils.insecure().nextAlphanumeric(9))
.setStatus(status);
}

Expand Down
16 changes: 8 additions & 8 deletions plugins/xray-plugin/src/test/java/io/qameta/allure/xray/XrayTestRunExportPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ void shouldExportTestRunToXray() {
when(launchResults.getAllResults()).thenReturn(results);

final ExecutorInfo executorInfo = new ExecutorInfo()
.setBuildName(RandomStringUtils.random(10))
.setReportUrl(RandomStringUtils.random(10));
.setBuildName(RandomStringUtils.insecure().next(10))
.setReportUrl(RandomStringUtils.insecure().next(10));
when(launchResults.getExtra("executor")).thenReturn(Optional.of(executorInfo));

final JiraService service = mock(JiraService.class);
Expand Down Expand Up @@ -124,8 +124,8 @@ void shouldExportTestRunToXrayWithAllTypesOfStatues() {
when(launchResults.getAllResults()).thenReturn(results);

final ExecutorInfo executorInfo = new ExecutorInfo()
.setBuildName(RandomStringUtils.random(10))
.setReportUrl(RandomStringUtils.random(10));
.setBuildName(RandomStringUtils.insecure().next(10))
.setReportUrl(RandomStringUtils.insecure().next(10));
when(launchResults.getExtra("executor")).thenReturn(Optional.of(executorInfo));

final JiraService service = mock(JiraService.class);
Expand Down Expand Up @@ -173,8 +173,8 @@ void shouldUpdateSimilarTestRunsInDifferentExecutions() {
when(launchResults.getAllResults()).thenReturn(results);

final ExecutorInfo executorInfo = new ExecutorInfo()
.setBuildName(RandomStringUtils.random(10))
.setReportUrl(RandomStringUtils.random(10));
.setBuildName(RandomStringUtils.insecure().next(10))
.setReportUrl(RandomStringUtils.insecure().next(10));
when(launchResults.getExtra("executor")).thenReturn(Optional.of(executorInfo));

final JiraService service = mock(JiraService.class);
Expand Down Expand Up @@ -212,8 +212,8 @@ void shouldUpdateSimilarTestRunsInDifferentExecutions() {

static TestResult createTestResult(final Status status) {
return new TestResult()
.setUid(RandomStringUtils.random(10))
.setName(RandomStringUtils.random(10))
.setUid(RandomStringUtils.insecure().next(10))
.setName(RandomStringUtils.insecure().next(10))
.setStatus(status);
}

Expand Down