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

MOSIP-36031 #333

Merged
merged 1 commit into from
Sep 30, 2024
Merged

MOSIP-36031 #333

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion uitest-admin/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

java --version
java -jar adminui-*-jar-with-dependencies.jar
java -jar uitest-admin-*-jar-with-dependencies.jar
12 changes: 11 additions & 1 deletion uitest-admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<rest.assured.version>3.0.7</rest.assured.version>
<testng.version>6.11</testng.version>
<zt.zip.version>1.13</zt.zip.version>
<fileName>adminui-1.2.1-SNAPSHOT-jar-with-dependencies</fileName>
<fileName>uitest-admin-1.2.1-SNAPSHOT-jar-with-dependencies</fileName>

<!-- maven -->
<maven.compiler.target>21</maven.compiler.target>
Expand Down Expand Up @@ -199,6 +199,16 @@
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>com.github.jknack</groupId>
<artifactId>handlebars</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>com.github.mifmif</groupId>
<artifactId>generex</artifactId>
<version>1.0.2</version>
</dependency>
</dependencies>
<build>
<pluginManagement>
Expand Down
133 changes: 79 additions & 54 deletions uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/EmailableReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,19 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.lang.reflect.Field;
import java.text.NumberFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;

import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.testng.IReporter;
import org.testng.ISuite;
Expand All @@ -34,6 +39,7 @@




/**
* Reporter that generates a single-page HTML report of the test results.
*/
Expand All @@ -55,7 +61,7 @@ public class EmailableReport implements IReporter {
int totalSkippedTests = 0;
int totalFailedTests = 0;



public void setFileName(String fileName) {
this.fileName = fileName;
Expand Down Expand Up @@ -91,7 +97,7 @@ public void generateReport(List<XmlSuite> xmlSuites, List<ISuite> suites, String
File orignialReportFile = new File(System.getProperty("user.dir") + "/"
+ System.getProperty("testng.outpur.dir") + "/" + System.getProperty("emailable.report2.name"));
logger.info("reportFile is::" + System.getProperty("user.dir") + "/" + System.getProperty("testng.outpur.dir")
+ "/" + System.getProperty("emailable.report2.name"));
+ "/" + System.getProperty("emailable.report2.name"));

File newReportFile = new File(
System.getProperty("user.dir") + "/" + System.getProperty("testng.outpur.dir") + "/" + newString);
Expand All @@ -114,9 +120,9 @@ public void generateReport(List<XmlSuite> xmlSuites, List<ISuite> suites, String

/* Need to figure how to handle EXTENT report handling */







} catch (Exception e) {
logger.error("error occured while pushing the object" + e.getMessage());
Expand All @@ -139,16 +145,12 @@ private String getCommitId() {
Properties properties = new Properties();
try (InputStream is = EmailableReport.class.getClassLoader().getResourceAsStream("git.properties")) {
properties.load(is);
Process process = Runtime.getRuntime().exec("git rev-parse --abbrev-ref HEAD");

// Read the output of the command
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
String branch = reader.readLine();
return "Commit Id is: " + properties.getProperty("git.commit.id.abbrev") + " & Branch Name is:"
+ branch;
+ properties.getProperty("git.branch");

} catch (IOException io) {
logger.error(io.getMessage());
} catch (IOException e) {
logger.error(e.getMessage());
return "";
}

Expand Down Expand Up @@ -178,24 +180,31 @@ protected void writeHead() {

protected void writeStylesheet() {
writer.print("<style type=\"text/css\">");
writer.print("table {margin-bottom:10px;border-collapse:collapse;empty-cells:show}");
writer.print("th,td {border:1px solid #009;padding:.25em .5em}");
writer.print("th {vertical-align:bottom}");
writer.print("td {vertical-align:top}");
writer.print("table a {font-weight:bold}");
writer.print(".stripe td {background-color: #E6EBF9}");
writer.print(".num {text-align:center}");
writer.print(".passedodd td {background-color: #3F3}");
writer.print(".passedeven td {background-color: #0A0}");
writer.print(".skippedodd td {background-color: #FFA500}");
writer.print(".skippedeven td {background-color: #FFA500}");
writer.print(".failedodd td,.attn {background-color: #F33}");
writer.print(".failedeven td,.stripe .attn {background-color: #D00}");
writer.print(".stacktrace {white-space:pre;font-family:monospace}");
writer.print(".totop {font-size:85%;text-align:center;border-bottom:2px solid #000}");
writer.print(".orange-bg {background-color: #FFA500}");
writer.print(".green-bg {background-color: #0A0}");
writer.print("</style>");
writer.print("table {margin-bottom:10px;border-collapse:collapse;empty-cells:show;width: 100%;}");
writer.print("th,td {border:1px solid #009;padding:.25em .5em;width: 25%;}"); // Set a fixed width for uniform cell sizes
writer.print("th {vertical-align:bottom}");
writer.print("td {vertical-align:top}");
writer.print("table a {font-weight:bold}");
writer.print(".stripe td {background-color: #E6EBF9}");
writer.print(".num {text-align:center}");
writer.print(".orange-bg {background-color: #FFA500}");
writer.print(".grey-bg {background-color: #808080}");
writer.print(".thich-orange-bg {background-color: #CC5500}");
writer.print(".green-bg {background-color: #0A0}");
writer.print(".attn {background-color: #D00}");
writer.print(".passedodd td {background-color: #3F3}");
writer.print(".passedeven td {background-color: #0A0}");
writer.print(".skippedodd td {background-color: #FFA500}");
writer.print(".skippedeven td,.stripe {background-color: #FFA500}");
writer.print(".failedodd td {background-color: #F33}");
writer.print(".failedeven td,.stripe {background-color: #D00}");
writer.print(".ignoredodd td {background-color: #808080}");
writer.print(".ignoredeven td {background-color: #808080}");
writer.print(".known_issuesodd td {background-color: #CC5500}");
writer.print(".known_issueseven td {background-color: #CC5500}");
writer.print(".stacktrace {white-space:pre;font-family:monospace}");
writer.print(".totop {font-size:85%;text-align:center;border-bottom:2px solid #000}");
writer.print("</style>");
}

protected void writeBody() {
Expand All @@ -213,7 +222,21 @@ protected void writeDocumentEnd() {
protected void writeSuiteSummary() {
NumberFormat integerFormat = NumberFormat.getIntegerInstance();
NumberFormat decimalFormat = NumberFormat.getNumberInstance();

String formattedDate =null;
LocalDate currentDate = LocalDate.now();
String branch = null;

try {

DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
formattedDate = currentDate.format(formatter);
Process process = Runtime.getRuntime().exec("git rev-parse --abbrev-ref HEAD");
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
branch = reader.readLine();
}
catch (Exception e) {
// TODO: handle exception
}
totalPassedTests = 0;
totalSkippedTests = 0;
totalFailedTests = 0;
Expand All @@ -223,16 +246,18 @@ protected void writeSuiteSummary() {
for (SuiteResult suiteResult : suiteResults) {

writer.print("<tr><th colspan=\"7\">");
writer.print(Utils.escapeHtml(suiteResult.getSuiteName() + "-" + getCommitId()));
writer.print("</th></tr>");
writer.print(Utils.escapeHtml(suiteResult.getSuiteName() + " ---- " + "Report Date: " + formattedDate
+ " ---- " + "Tested Environment: "
+ ConfigManager.getiam_apienvuser().replaceAll(".*?\\.([^\\.]+)\\..*", "$1") + " ---- "
+ getCommitId())); writer.print("</th></tr>");

writer.print("<tr><th colspan=\"7\"><span class=\"not-bold\"><pre>");
writer.print(Utils.escapeHtml("Server Component Details " + AdminTestUtil.getServerComponentsDetails()));
writer.print("</pre></span>");
// writer.print(GlobalConstants.TRTR);
writer.print("</th></tr>");

writer.print("<tr>");
// writer.print("<th>Test Suite</th>");
// writer.print("<th>Test Suite</th>");
writer.print("<th># Passed</th>");
writer.print("<th># Skipped</th>");
writer.print("<th># Failed</th>");
Expand All @@ -254,8 +279,8 @@ protected void writeSuiteSummary() {
writer.print(">");

buffer.setLength(0);
// writeTableData(buffer.append("<a href=\"#t").append(testIndex).append("\">")
// .append(Utils.escapeHtml(testResult.getTestName())).append("</a>").toString());
// writeTableData(buffer.append("<a href=\"#t").append(testIndex).append("\">")
// .append(Utils.escapeHtml(testResult.getTestName())).append("</a>").toString());
writeTableData(integerFormat.format(passedTests), (passedTests > 0 ? "num green-bg" : "num"));
writeTableData(integerFormat.format(skippedTests), (skippedTests > 0 ? "num orange-bg" : "num"));
writeTableData(integerFormat.format(failedTests), (failedTests > 0 ? "num attn" : "num"));
Expand Down Expand Up @@ -360,7 +385,7 @@ private int writeScenarioSummary(String description, List<ClassResult> classResu
buffer.setLength(0);
int scenariosPerClass = 0;
int methodIndex = 0;

for (MethodResult methodResult : classResult.getMethodResults()) {
List<ITestResult> results = methodResult.getResults();
int resultsCount = results.size();
Expand All @@ -370,23 +395,23 @@ private int writeScenarioSummary(String description, List<ClassResult> classResu
// Write the remaining scenarios for the method

for (int i = 0; i < resultsCount; i++) {

ITestResult result = results.get(i);
// String [] scenarioDetails = getScenarioDetails(result);
// String scenarioName = Utils.escapeHtml("Scenario_" + scenarioDetails[0]);
// String scenarioDescription = Utils.escapeHtml(scenarioDetails[1]);
// String [] scenarioDetails = getScenarioDetails(result);

// String scenarioName = Utils.escapeHtml("Scenario_" + scenarioDetails[0]);
// String scenarioDescription = Utils.escapeHtml(scenarioDetails[1]);

long scenarioStart = result.getStartMillis();
long scenarioDuration = result.getEndMillis() - scenarioStart;

// buffer.append("<tr class=\"").append(cssClass).append("\">").append("<td><a href=\"#m")
// .append(scenarioIndex).append("\">").append(scenarioName).append("</a></td>")
// .append("<td>").append(scenarioDescription).append("</td>")
// .append("<td>").append(scenarioDuration).append("</td></tr>");
// buffer.append("<tr class=\"").append(cssClass).append("\">").append("<td><a href=\"#m")
// .append(scenarioIndex).append("\">").append(scenarioName).append("</a></td>")
// .append("<td>").append(scenarioDescription).append("</td>")
// .append("<td>").append(scenarioDuration).append("</td></tr>");
buffer.append("<tr class=\"").append(cssClass).append("\">") // Start of table row with a specified CSS class
.append("<td><a href=\"#m").append(scenarioIndex).append("\">").append(methodName).append("</a></td>") // Table cell with a hyperlink
.append("<td>").append(scenarioDuration).append("</td></tr>"); // Table cell with scenario duration
.append("<td><a href=\"#m").append(scenarioIndex).append("\">").append(methodName).append("</a></td>") // Table cell with a hyperlink
.append("<td>").append(scenarioDuration).append("</td></tr>"); // Table cell with scenario duration

scenarioIndex++;
}
Expand All @@ -403,7 +428,7 @@ private int writeScenarioSummary(String description, List<ClassResult> classResu
return scenarioCount;
}



/**
* Writes the details for all test scenarios.
Expand All @@ -422,7 +447,7 @@ protected void writeScenarioDetails() {
scenarioIndex += writeScenarioDetails(testResult.getFailedTestResults(), scenarioIndex);
scenarioIndex += writeScenarioDetails(testResult.getSkippedConfigurationResults(), scenarioIndex);
scenarioIndex += writeScenarioDetails(testResult.getSkippedTestResults(), scenarioIndex);
// scenarioIndex += writeScenarioDetails(testResult.getPassedTestResults(), scenarioIndex);
// scenarioIndex += writeScenarioDetails(testResult.getPassedTestResults(), scenarioIndex);
}
}
}
Expand All @@ -438,8 +463,8 @@ private int writeScenarioDetails(List<ClassResult> classResults, int startingSce
for (MethodResult methodResult : classResult.getMethodResults()) {
List<ITestResult> results = methodResult.getResults();
assert !results.isEmpty();
// ITestResult firstResult = results.iterator().next();
// String methodName=firstResult.getName();
// ITestResult firstResult = results.iterator().next();
// String methodName=firstResult.getName();
String label = Utils
.escapeHtml(className + "#" + results.iterator().next().getMethod().getMethodName());
for (ITestResult result : results) {
Expand All @@ -459,7 +484,7 @@ private void writeScenario(int scenarioIndex, String label, ITestResult result)
writer.print("<h3 id=\"m");
writer.print(scenarioIndex);
writer.print("\">");
writer.print(label);
writer.print(label);
writer.print("</h3>");

writer.print("<table class=\"result\">");
Expand Down
2 changes: 1 addition & 1 deletion uitest-admin/src/main/java/io/mosip/testrig/adminui/utility/TestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static void startTestRunner() throws Exception {
TestNG runner = new TestNG();
if(!ConfigManager.gettestcases().equals("")) {
XmlSuite suite = new XmlSuite();
suite.setName("MySuite");
suite.setName("ADMIN-UI-AUTOMATION");
suite.addListener("io.mosip.testrig.adminui.utility.EmailableReport");
XmlClass blocklistedwordsCRUD = new XmlClass("io.mosip.testrig.adminui.testcase.BlockListTest");
XmlClass bulkUploadCRUD = new XmlClass("io.mosip.testrig.adminui.testcase.BulkUploadTest");
Expand Down
Loading