1 files changed, 108 insertions, 107 deletions
diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentManager.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentManager.java
index 02fe121d5c..e1961a2dd4 100644
--- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentManager.java
+++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ExtentManager.java
@@ -7,9 +7,9 @@
  * 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.
@@ -25,137 +25,138 @@ 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;
 import org.onap.sdc.backend.ci.tests.config.Config;
 import org.onap.sdc.backend.ci.tests.utils.Utils;
 import org.onap.sdc.backend.ci.tests.utils.general.FileHandling;
 import org.onap.sdc.backend.ci.tests.utils.rest.AutomationUtils;
 import org.testng.ITestContext;
 
-import java.io.File;
-
 public class ExtentManager {
-	
-	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 {
+    private static final String VERSIONS_INFO_FILE_NAME = "versions.info";
+    private static ExtentReports extent;
+    private static ExtentHtmlReporter htmlReporter;
+    private static ExtentXReporter extentxReporter;
 
-		TESTNG_FAILED_XML_NAME("testng-failed.xml");
+    public enum suiteNameXml {
 
-		suiteNameXml(String value) {
-		        this.value = value;
-		    }
+        TESTNG_FAILED_XML_NAME("testng-failed.xml");
+
+        suiteNameXml(String value) {
+            this.value = value;
+        }
 
-		private String value;
+        private String value;
+
+        public String getValue() {
+            return 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();
-
-    	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();
-			}
+        String dbIp = Utils.getConfig().getReportDBhost();
+        int dbPort = Utils.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;
     }
-    
-    public synchronized static void setExtentXReporter(Boolean isAppend){
-    	extentxReporter.setAppendExisting(isAppend);
-		extent.attachReporter(extentxReporter);
+
+    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{
-    	htmlReporter = new ExtentHtmlReporter(filePath + htmlFile);
-    	setConfiguration(htmlReporter);
-		htmlReporter.setAppendExisting(isAppend);
-		extent.attachReporter(htmlReporter);
+
+    public synchronized static 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() {
         return extent;
     }
 
-	public static void initReporter(String filepath, String htmlFile, ITestContext context) throws Exception {
-		
-		String onboardVersion = AutomationUtils.getOnboardVersion();
-		String osVersion = AutomationUtils.getOSVersion();
-		Config config = Utils.getConfig();
-		String envData = config.getUrl();
-		String suiteName = getSuiteName(context);
-		
-		if(suiteName.equals(suiteNameXml.TESTNG_FAILED_XML_NAME.getValue())){
-			if (config.getUseBrowserMobProxy())
-			    setTrafficCaptue(config);
-			
-			setReporter(filepath, htmlFile, true);
-			String suiteNameFromVersionInfoFile = FileHandling.getKeyByValueFromPropertyFormatFile(filepath + VERSIONS_INFO_FILE_NAME, "suiteName");
-			reporterDataDefinition(onboardVersion, osVersion, envData, suiteNameFromVersionInfoFile);
-		}else{
-			FileHandling.deleteDirectory(ComponentBaseTest.getReportFolder());
-			FileHandling.createDirectory(filepath);
-			setReporter(filepath, htmlFile, false);
-			reporterDataDefinition(onboardVersion, osVersion, envData, suiteName);
-			AutomationUtils.createVersionsInfoFile(filepath + VERSIONS_INFO_FILE_NAME, onboardVersion, osVersion, envData, suiteName);
-		}
-		
-	}
-
-	public static void reporterDataDefinition(String onboardVersion, String osVersion, String envData, String suiteNameFromVersionInfoFile) throws Exception {
-		extent.setSystemInfo("Onboard Version", onboardVersion);
-		extent.setSystemInfo("OS Version", osVersion);
+    public static void initReporter(String filepath, String htmlFile, ITestContext context) throws Exception {
+
+        String onboardVersion = AutomationUtils.getOnboardVersion();
+        String osVersion = AutomationUtils.getOSVersion();
+        Config config = Utils.getConfig();
+        String envData = config.getUrl();
+        String suiteName = getSuiteName(context);
+
+        if (suiteName.equals(suiteNameXml.TESTNG_FAILED_XML_NAME.getValue())) {
+			if (config.isUseBrowserMobProxy()) {
+				setTrafficCaptue(config);
+			}
+
+            setReporter(filepath, htmlFile, true);
+            String suiteNameFromVersionInfoFile = FileHandling.getKeyByValueFromPropertyFormatFile(filepath + VERSIONS_INFO_FILE_NAME, "suiteName");
+            reporterDataDefinition(onboardVersion, osVersion, envData, suiteNameFromVersionInfoFile);
+        } else {
+            FileHandling.deleteDirectory(ComponentBaseTest.getReportFolder());
+            FileHandling.createDirectory(filepath);
+            setReporter(filepath, htmlFile, false);
+            reporterDataDefinition(onboardVersion, osVersion, envData, suiteName);
+            AutomationUtils.createVersionsInfoFile(filepath + VERSIONS_INFO_FILE_NAME, onboardVersion, osVersion, envData, suiteName);
+        }
+
+    }
+
+    public 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) {
-		String suitePath = context.getSuite().getXmlSuite().getFileName();
-		if(suitePath != null){
-			File file = new File(suitePath);
-			String suiteName = file.getName();
-			return suiteName;
-		}
-		return null;
-	}
-	
-	public synchronized static 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);
+        extent.setSystemInfo("ExecutedOn", envData);
+        extent.setSystemInfo("SuiteName", suiteNameFromVersionInfoFile);
+    }
+
+    public static String getSuiteName(ITestContext context) {
+        String suitePath = context.getSuite().getXmlSuite().getFileName();
+        if (suitePath != null) {
+            File file = new File(suitePath);
+            String suiteName = file.getName();
+            return suiteName;
+        }
+        return null;
+    }
+
+    public synchronized static 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().setReportName("SDC Automation Report");
+        htmlReporter.config().setChartVisibilityOnOpen(false);
 //    	htmlReporter.config().setJS(icon);
-    	return htmlReporter;
+        return htmlReporter;
+    }
+
+    public static void closeReporter() {
+        extent.flush();
+    }
+
+    public static void setTrafficCaptue(Config config) {
+        boolean mobProxyStatus = config.isUseBrowserMobProxy();
+        if (mobProxyStatus) {
+            config.setCaptureTraffic(true);
+        }
     }
-	
-	public static void closeReporter(){
-		extent.flush();
-	}
-	
-	public static void setTrafficCaptue(Config config) {
-		boolean mobProxyStatus = config.getUseBrowserMobProxy();
-		if (mobProxyStatus){
-			config.setCaptureTraffic(true);;
-		}
-	}	
 }