From fbbd847cd3aa6d6a18209f061628427f74e31c3c Mon Sep 17 00:00:00 2001 From: Olha Omelianchuk Date: Tue, 26 Nov 2024 15:28:32 +0100 Subject: [PATCH] [#303] remove if statement to check if neo version log needed --- .../neodymium/util/AllureAddons.java | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/xceptance/neodymium/util/AllureAddons.java b/src/main/java/com/xceptance/neodymium/util/AllureAddons.java index eeec30b6..7e49f0a8 100644 --- a/src/main/java/com/xceptance/neodymium/util/AllureAddons.java +++ b/src/main/java/com/xceptance/neodymium/util/AllureAddons.java @@ -31,10 +31,10 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import com.codeborne.selenide.Selenide; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.codeborne.selenide.Selenide; import com.google.common.collect.ImmutableMap; import io.qameta.allure.Allure; @@ -333,7 +333,6 @@ public static File getAllureResultsFolder() public static void addLinkToReport(String message, String url) { } - public static void initializeEnvironmentInformation() { @@ -341,13 +340,10 @@ public static void initializeEnvironmentInformation() if (!neoVersionLogged && Neodymium.configuration().logNeoVersion()) { - if (!AllureAddons.envFileExists()) - { - LOGGER.info("This test uses Neodymium Library (version: " + Neodymium.getNeodymiumVersion() - + "), MIT License, more details on https://github.com/Xceptance/neodymium-library"); - neoVersionLogged = true; - environmentDataMap.putIfAbsent("Testing Framework", "Neodymium " + Neodymium.getNeodymiumVersion()); - } + LOGGER.info("This test uses Neodymium Library (version: " + Neodymium.getNeodymiumVersion() + + "), MIT License, more details on https://github.com/Xceptance/neodymium-library"); + neoVersionLogged = true; + environmentDataMap.putIfAbsent("Testing Framework", "Neodymium " + Neodymium.getNeodymiumVersion()); } if (!customDataAdded && Neodymium.configuration().enableCustomEnvironmentData()) { @@ -384,27 +380,28 @@ public static void initializeEnvironmentInformation() } } - /** - * * @param name * of the attachment * @param data * that needs to be added as an attachment */ - public static void addDataAsJsonToReport(String name, Object data) + public static void addDataAsJsonToReport(String name, Object data) { ObjectMapper mapper = new ObjectMapper(); String dataObjectJson; - - try { + + try + { // covert Java object to JSON strings dataObjectJson = mapper.setSerializationInclusion(Include.NON_NULL).writeValueAsString(data); - - } catch (JsonProcessingException e) { + + } + catch (JsonProcessingException e) + { throw new RuntimeException(e); } - + Allure.addAttachment(name, "text/html", DataUtils.convertJsonToHtml(dataObjectJson), "html"); } }