<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongodb-driver</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongodb-driver</artifactId>
+ <version>3.12.10</version>
+ </dependency>
+
<dependency>
<groupId>org.janusgraph</groupId>
<artifactId>janusgraph-core</artifactId>
import com.aventstack.extentreports.ExtentReports;
import com.aventstack.extentreports.reporter.ExtentHtmlReporter;
-import com.aventstack.extentreports.reporter.ExtentXReporter;
import com.aventstack.extentreports.reporter.configuration.Protocol;
import com.aventstack.extentreports.reporter.configuration.Theme;
import java.io.File;
private static final String VERSIONS_INFO_FILE_NAME = "versions.info";
private static ExtentReports extent;
private static ExtentHtmlReporter htmlReporter;
- private static ExtentXReporter extentxReporter;
-
- public enum suiteNameXml {
-
- TESTNG_FAILED_XML_NAME("testng-failed.xml");
-
- suiteNameXml(String value) {
- this.value = value;
- }
-
- private String value;
-
- public String getValue() {
- return value;
- }
-
- }
-
- public synchronized static ExtentReports setReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception {
- String dbIp = Utils.getConfig().getReportDBhost();
- int dbPort = Utils.getConfig().getReportDBport();
+ private static synchronized ExtentReports setReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception {
if (extent == null) {
- extentxReporter = new ExtentXReporter(dbIp, dbPort);
extent = new ExtentReports();
initAndSetExtentHtmlReporter(filePath, htmlFile, isAppend);
-
- if (extentxReporter.config().getReportObjectId() != null) {
- setExtentXReporter(isAppend);
- } else {
- extentxReporter.stop();
- }
}
return extent;
}
- public synchronized static void setExtentXReporter(Boolean isAppend) {
- extentxReporter.setAppendExisting(isAppend);
- extent.attachReporter(extentxReporter);
- }
-
- public synchronized static void initAndSetExtentHtmlReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception {
+ private static synchronized void initAndSetExtentHtmlReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception {
htmlReporter = new ExtentHtmlReporter(filePath + htmlFile);
setConfiguration(htmlReporter);
htmlReporter.setAppendExisting(isAppend);
extent.attachReporter(htmlReporter);
}
- public synchronized static ExtentReports getReporter() {
+ public static synchronized ExtentReports getReporter() {
return extent;
}
String suiteName = getSuiteName(context);
if (suiteName.equals(suiteNameXml.TESTNG_FAILED_XML_NAME.getValue())) {
- if (config.isUseBrowserMobProxy()) {
- setTrafficCaptue(config);
- }
+ if (config.isUseBrowserMobProxy()) {
+ setTrafficCaptue(config);
+ }
setReporter(filepath, htmlFile, true);
String suiteNameFromVersionInfoFile = FileHandling.getKeyByValueFromPropertyFormatFile(filepath + VERSIONS_INFO_FILE_NAME, "suiteName");
}
- public static void reporterDataDefinition(String onboardVersion, String osVersion, String envData, String suiteNameFromVersionInfoFile)
+ private static void reporterDataDefinition(String onboardVersion, String osVersion, String envData, String suiteNameFromVersionInfoFile)
throws Exception {
extent.setSystemInfo("Onboard Version", onboardVersion);
extent.setSystemInfo("OS Version", osVersion);
-// extent.setSystemInfo("Host Name Address", RestCDUtils.getExecutionHostAddress());
extent.setSystemInfo("ExecutedOn", envData);
extent.setSystemInfo("SuiteName", suiteNameFromVersionInfoFile);
}
- public static String getSuiteName(ITestContext context) {
+ private static String getSuiteName(ITestContext context) {
String suitePath = context.getSuite().getXmlSuite().getFileName();
if (suitePath != null) {
File file = new File(suitePath);
return null;
}
- public synchronized static ExtentHtmlReporter setConfiguration(ExtentHtmlReporter htmlReporter) throws Exception {
+ private static synchronized ExtentHtmlReporter setConfiguration(ExtentHtmlReporter htmlReporter) throws Exception {
htmlReporter.config().setTheme(Theme.STANDARD);
htmlReporter.config().setEncoding("UTF-8");
htmlReporter.config().setProtocol(Protocol.HTTPS);
htmlReporter.config().setDocumentTitle("SDC Automation Report");
htmlReporter.config().setChartVisibilityOnOpen(true);
-// htmlReporter.config().setReportName(AutomationUtils.getATTVersion());
htmlReporter.config().setReportName("SDC Automation Report");
htmlReporter.config().setChartVisibilityOnOpen(false);
-// htmlReporter.config().setJS(icon);
return htmlReporter;
}
- public static void closeReporter() {
- extent.flush();
- }
-
- public static void setTrafficCaptue(Config config) {
+ private static void setTrafficCaptue(Config config) {
boolean mobProxyStatus = config.isUseBrowserMobProxy();
if (mobProxyStatus) {
config.setCaptureTraffic(true);
}
}
-}
+ enum suiteNameXml {
+
+ TESTNG_FAILED_XML_NAME("testng-failed.xml");
+
+ private String value;
+
+ suiteNameXml(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ }
+}
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import com.aventstack.extentreports.ExtentReports;
import com.aventstack.extentreports.ExtentTest;
-
import java.util.HashMap;
-public class ExtentTestManager implements SomeInterface{
+import java.util.Map;
- private static HashMap<Long, ExtentTest> extentTestMap = new HashMap<Long, ExtentTest>();
- private static ExtentReports extent = ExtentManager.getReporter();
-
- public ExtentTestManager(){
- }
-
- @Override
- public synchronized ExtentTest getTest() {
- return extentTestMap.get(Thread.currentThread().getId());
- }
+public class ExtentTestManager implements SomeInterface {
- public static synchronized void endTest() {
-// extent.endTest(extentTestMap.get(Thread.currentThread().getId()));
- extent.flush();
- }
+ private static final Map<Long, ExtentTest> extentTestMap = new HashMap<>();
+ private static final ExtentReports extent = ExtentManager.getReporter();
- public static synchronized ExtentTest startTest(String testName) {
- return startTest(testName, "");
- }
+ public static synchronized void endTest() {
+ extent.flush();
+ }
- public static synchronized ExtentTest startTest(String testName, String desc) {
- ExtentTest test = extent.createTest(testName, desc);
- extentTestMap.put(Thread.currentThread().getId(), test);
+ public static synchronized void startTest(String testName) {
+ extentTestMap.put(Thread.currentThread().getId(), extent.createTest(testName));
+ }
- return test;
- }
-
- public static synchronized <T> void assignCategory(Class<T> clazz){
- String[] parts = clazz.getName().split("\\.");
- String lastOne1 = parts[parts.length-1];
- String lastOne2 = parts[parts.length-2];
- extentTestMap.get(Thread.currentThread().getId()).assignCategory(lastOne2 + "-" + lastOne1);
- }
-
-
-}
+ public static synchronized <T> void assignCategory(Class<T> clazz) {
+ String[] parts = clazz.getName().split("\\.");
+ String lastOne1 = parts[parts.length - 1];
+ String lastOne2 = parts[parts.length - 2];
+ extentTestMap.get(Thread.currentThread().getId()).assignCategory(lastOne2 + "-" + lastOne1);
+ }
+ @Override
+ public synchronized ExtentTest getTest() {
+ return extentTestMap.get(Thread.currentThread().getId());
+ }
+
+}
import com.aventstack.extentreports.ExtentReports;
import com.aventstack.extentreports.reporter.ExtentHtmlReporter;
-import com.aventstack.extentreports.reporter.ExtentXReporter;
import com.aventstack.extentreports.reporter.configuration.Protocol;
import com.aventstack.extentreports.reporter.configuration.Theme;
import java.io.File;
private static final String VERSIONS_INFO_FILE_NAME = "versions.info";
private static ExtentReports extent;
private static ExtentHtmlReporter htmlReporter;
- private static ExtentXReporter extentxReporter;
-
- public enum suiteNameXml {
-
- TESTNG_FAILED_XML_NAME("testng-failed.xml");
-
- suiteNameXml(String value) {
- this.value = value;
- }
-
- private String value;
-
- public String getValue() {
- return value;
- }
-
- }
private static synchronized ExtentReports setReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception {
- String dbIp = DriverFactory.getConfig().getReportDBhost();
- int dbPort = DriverFactory.getConfig().getReportDBport();
-
if (extent == null) {
- extentxReporter = new ExtentXReporter(dbIp, dbPort);
extent = new ExtentReports();
initAndSetExtentHtmlReporter(filePath, htmlFile, isAppend);
- if (extentxReporter.config().getReportObjectId() != null) {
- setExtentXReporter(isAppend);
- } else {
- extentxReporter.stop();
- }
}
return extent;
}
- private static synchronized void setExtentXReporter(Boolean isAppend) {
- extentxReporter.setAppendExisting(isAppend);
- extent.attachReporter(extentxReporter);
- }
-
private static synchronized void initAndSetExtentHtmlReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception {
htmlReporter = new ExtentHtmlReporter(filePath + htmlFile);
setConfiguration(htmlReporter);
return htmlReporter;
}
- public static void closeReporter() {
- extent.flush();
- }
-
private static void setTrafficCaptue(Config config) {
boolean mobProxyStatus = config.isUseBrowserMobProxy();
if (mobProxyStatus) {
config.setCaptureTraffic(true);
}
}
+
+ public enum suiteNameXml {
+
+ TESTNG_FAILED_XML_NAME("testng-failed.xml");
+
+ private String value;
+
+ suiteNameXml(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ }
}
import com.aventstack.extentreports.ExtentReports;
import com.aventstack.extentreports.ExtentTest;
-import org.onap.sdc.backend.ci.tests.api.SomeInterface;
-
import java.util.HashMap;
+import java.util.Map;
+import org.onap.sdc.backend.ci.tests.api.SomeInterface;
public class ExtentTestManager implements SomeInterface {
- private final HashMap<Long, ExtentTest> extentTestByThreadIdMap = new HashMap<>();
- private final ExtentReports extent = ExtentManager.getReporter();
private static final ExtentTestManager INSTANCE = new ExtentTestManager();
+ private final Map<Long, ExtentTest> extentTestByThreadIdMap = new HashMap<>();
+ private final ExtentReports extent = ExtentManager.getReporter();
private ExtentTestManager() {
-
}
public static ExtentTestManager getInstance() {
extent.flush();
}
- public synchronized ExtentTest startTest(final String testName) {
- return startTest(testName, "");
- }
-
- public synchronized ExtentTest startTest(final String testName, final String desc) {
- final ExtentTest test = extent.createTest(testName, desc);
- extentTestByThreadIdMap.put(Thread.currentThread().getId(), test);
-
- return test;
+ public synchronized void startTest(final String testName) {
+ extentTestByThreadIdMap.put(Thread.currentThread().getId(), extent.createTest(testName));
}
public synchronized <T> void assignCategory(Class<T> clazz) {
extentTestByThreadIdMap.get(Thread.currentThread().getId()).assignCategory(lastOne2 + "-" + lastOne1);
}
}
-
Code Review / sdc.git / commitdiff