Skip to content
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

Jump to bottom

add Before/AfterGroups methods to report #386

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add Before/AfterGroups methods to report #386

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions allure-testng/src/main/java/io/qameta/allure/testng/AllureTestNg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,15 +426,15 @@ private void ifMethodFixtureStarted(final ITestNGMethod testMethod) {
Current current = currentTestResult.get();
final FixtureResult fixture = getFixtureResult(testMethod);
final String uuid = currentExecutable.get();
if (testMethod.isBeforeMethodConfiguration()) {
if (isBeforeMethod(testMethod)) {
if (current.isStarted()) {
currentTestResult.remove();
current = currentTestResult.get();
}
getLifecycle().startPrepareFixture(createFakeContainer(testMethod, current), uuid, fixture);
}

if (testMethod.isAfterMethodConfiguration()) {
if (isAfterMethod(testMethod)) {
getLifecycle().startTearDownFixture(createFakeContainer(testMethod, current), uuid, fixture);
}
}
Expand Down Expand Up @@ -487,7 +487,7 @@ public void afterInvocation(final IInvokedMethod method, final ITestResult testR
}
getLifecycle().stopFixture(executableUuid);

if (testMethod.isBeforeMethodConfiguration() || testMethod.isAfterMethodConfiguration()) {
if (isBeforeMethod(testMethod) || isAfterMethod(testMethod)) {
final String containerUuid = currentTestContainer.get();
validateContainerExists(getQualifiedName(testMethod), containerUuid);
currentTestContainer.remove();
Expand Down Expand Up @@ -542,7 +542,8 @@ private boolean isSupportedConfigurationFixture(final ITestNGMethod testMethod)
return testMethod.isBeforeMethodConfiguration() || testMethod.isAfterMethodConfiguration()
|| testMethod.isBeforeTestConfiguration() || testMethod.isAfterTestConfiguration()
|| testMethod.isBeforeClassConfiguration() || testMethod.isAfterClassConfiguration()
|| testMethod.isBeforeSuiteConfiguration() || testMethod.isAfterSuiteConfiguration();
|| testMethod.isBeforeSuiteConfiguration() || testMethod.isAfterSuiteConfiguration()
|| testMethod.isBeforeGroupsConfiguration() || testMethod.isAfterGroupsConfiguration();
}

private void validateContainerExists(final String fixtureName, final String containerUuid) {
Expand Down Expand Up @@ -810,4 +811,12 @@ private enum CurrentStage {
TEST,
AFTER
}

private boolean isAfterMethod(ITestNGMethod testMethod) {
return testMethod.isAfterMethodConfiguration() || testMethod.isAfterGroupsConfiguration();
}

private boolean isBeforeMethod(ITestNGMethod testMethod) {
return testMethod.isBeforeMethodConfiguration() || testMethod.isBeforeGroupsConfiguration();
}
}