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

allure-testng: add property to disable configuration failures logging #920

Merged
merged 12 commits into from
Jun 28, 2023
Merged

allure-testng: add property to disable configuration failures logging #920

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
05d9875
Allows for non-primary test failure to be configured to not show, ret…
iFatRain May 25, 2023
09a2aa1
Didn't mean to remove this @Test annotation, whoops
iFatRain May 25, 2023
06d1001
Changing verbiage from should -> is, adding additional unit test for …
iFatRain Jun 2, 2023
23fdbb1
Merge branch 'master' into master
iFatRain Jun 2, 2023
0b0ec75
Merge branch 'master' into master
iFatRain Jun 12, 2023
b7b4f3f
Merge branch 'master' into master
iFatRain Jun 14, 2023
d56aace
Merge branch 'master' into master
iFatRain Jun 15, 2023
b8c0d9d
Merge branch 'master' into master
iFatRain Jun 16, 2023
f93a589
Removing Sys.setProp for config related features, adding constructors…
iFatRain Jun 21, 2023
3093d76
Merge remote-tracking branch 'origin/master'
iFatRain Jun 21, 2023
da00711
Changing to default False and log->hide for configuration failure pro…
iFatRain Jun 28, 2023
a5f6ca9
Quick fix of test name to reflect updated naming
iFatRain Jun 28, 2023
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
34 changes: 18 additions & 16 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 @@ -537,23 +537,25 @@ public void onConfigurationSuccess(final ITestResult itr) {

@Override
public void onConfigurationFailure(final ITestResult itr) {
final String uuid = UUID.randomUUID().toString();
final String parentUuid = UUID.randomUUID().toString();

startTestCase(itr, parentUuid, uuid);

addChildToContainer(getUniqueUuid(itr.getTestContext()), uuid);
addChildToContainer(getUniqueUuid(itr.getTestContext().getSuite()), uuid);
addClassContainerChild(itr.getMethod().getTestClass(), uuid);
// results created for configuration failure should not be considered as test cases.
getLifecycle().updateTestCase(
uuid,
tr -> tr.getLabels().add(
new Label().setName(ALLURE_ID_LABEL_NAME).setValue("-1")
)
);
if (config.shouldLogConfigurationFailures()) {
final String uuid = UUID.randomUUID().toString();
final String parentUuid = UUID.randomUUID().toString();

startTestCase(itr, parentUuid, uuid);

addChildToContainer(getUniqueUuid(itr.getTestContext()), uuid);
addChildToContainer(getUniqueUuid(itr.getTestContext().getSuite()), uuid);
addClassContainerChild(itr.getMethod().getTestClass(), uuid);
// results created for configuration failure should not be considered as test cases.
getLifecycle().updateTestCase(
uuid,
tr -> tr.getLabels().add(
new Label().setName(ALLURE_ID_LABEL_NAME).setValue("-1")
)
);

stopTestCase(uuid, itr.getThrowable(), getStatus(itr.getThrowable()));
stopTestCase(uuid, itr.getThrowable(), getStatus(itr.getThrowable()));
}
//do nothing
}

Expand Down
13 changes: 13 additions & 0 deletions allure-testng/src/main/java/io/qameta/allure/testng/config/AllureTestNgConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@
public class AllureTestNgConfig {

public static final String ALLURE_TESTNG_HIDE_DISABLED_TESTS = "allure.testng.hide.disabled.tests";
public static final String ALLURE_TESTNG_LOG_CONFIGURATION_FAILURES = "allure.testng.log.configuration.failures";
private boolean hideDisabledTests;
private boolean logConfigurationFailures;

public AllureTestNgConfig(final Properties properties) {
this.hideDisabledTests = parseBoolean(properties.getProperty(ALLURE_TESTNG_HIDE_DISABLED_TESTS));
this.logConfigurationFailures = parseBoolean(properties.getProperty(ALLURE_TESTNG_LOG_CONFIGURATION_FAILURES,
iFatRain marked this conversation as resolved.
Show resolved Hide resolved
"true"));
}

public boolean isHideDisabledTests() {
Expand All @@ -39,6 +43,15 @@ public AllureTestNgConfig setHideDisabledTests(final boolean hide) {
return this;
}

public boolean shouldLogConfigurationFailures() {
iFatRain marked this conversation as resolved.
Show resolved Hide resolved
return logConfigurationFailures;
}

public AllureTestNgConfig setLogConfigurationFailures(final boolean logConfigurationFailure) {
this.logConfigurationFailures = logConfigurationFailure;
return this;
}

public static AllureTestNgConfig loadConfigProperties() {
final Properties properties = PropertiesUtils.loadAllureProperties();
return new AllureTestNgConfig(properties);
Expand Down
10 changes: 10 additions & 0 deletions allure-testng/src/test/java/io/qameta/allure/testng/AllureTestNgTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ public static Object[][] parallelConfiguration() {
};
}

@AllureFeatures.Fixtures
@Issue("356")
@Test
public void shouldUnsetLogConfigFailProperty() {
AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
assertThat(allureTestNgConfig.shouldLogConfigurationFailures()).isTrue();
allureTestNgConfig.setLogConfigurationFailures(false);
assertThat(allureTestNgConfig.shouldLogConfigurationFailures()).isFalse();
}

@Test
public void shouldSetConfigurationProperty() {
AllureTestNgConfig allureTestNgConfig = AllureTestNgConfig.loadConfigProperties();
Expand Down