Skip to content

Commit e799e5a

Browse files
committed
Removing the factory design pattern used for reading CSV, Proprety and
json files.
1 parent 25d887b commit e799e5a

21 files changed

+237
-251
lines changed

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,12 @@
7070
<artifactId>jackson-core</artifactId>
7171
<version>2.14.1</version>
7272
</dependency>
73-
73+
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-csv -->
74+
<dependency>
75+
<groupId>com.fasterxml.jackson.dataformat</groupId>
76+
<artifactId>jackson-dataformat-csv</artifactId>
77+
<version>2.14.1</version>
78+
</dependency>
7479

7580
</dependencies>
7681

sample.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/java/decorators/ElementDecorator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import org.openqa.selenium.By;
44

55
public class ElementDecorator implements Element {
6-
protected final Element element;//composition - by containing
7-
//instances of other classes that implement the desired functionality.
8-
//Element class in this case
6+
protected final Element element;
97

108
protected ElementDecorator(Element element) {
119
this.element = element;

src/main/java/enums/FileType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
public enum FileType {
44
PROPERTY,
5-
JSON
5+
JSON,
6+
CSV
67
}

src/main/java/filereaderfactory/FileReaders.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/filereaderfactory/JsonFileReader.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/main/java/filereaderfactory/PropertyFileReader.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/main/java/filereaderfactory/ReaderManager.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/main/java/listeners/ExtentReportGenerator.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import com.aventstack.extentreports.reporter.ExtentSparkReporter;
77
import com.aventstack.extentreports.reporter.configuration.Theme;
88

9-
import enums.FileType;
10-
import filereaderfactory.FileReaders;
9+
import utilities.filereaders.PropertyFileReader;
1110

1211
public class ExtentReportGenerator {
1312

@@ -16,6 +15,8 @@ public class ExtentReportGenerator {
1615
*/
1716
public static ExtentReports generateReport() {
1817

18+
String propertyFilePath = System.getProperty("user.dir")+"/src/test/resources/Config.properties";
19+
1920
ExtentReports extentReport = new ExtentReports();
2021
File extentReportFile=new File(System.getProperty("user.dir")+"/ExtentReports/ExtentReports.html");
2122
ExtentSparkReporter extentSparkReporter=new ExtentSparkReporter(extentReportFile);
@@ -31,9 +32,7 @@ public static ExtentReports generateReport() {
3132

3233
// setting test and system info from test/resources/Config.properties file
3334
extentReport.setSystemInfo("Application URL",
34-
FileReaders.getFileReader(FileType.PROPERTY)
35-
.readFile(System.getProperty("user.dir")+"/src/test/resources/Config.properties")
36-
.get("url"));
35+
PropertyFileReader.readFile(propertyFilePath).get("url").toString());
3736
extentReport.setSystemInfo("Operating System",System.getProperty("os.name"));
3837
extentReport.setSystemInfo("User name ",System.getProperty("user.name"));
3938
extentReport.setSystemInfo("Java version",System.getProperty("java.version"));

src/main/java/logsetup/Log.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package logsetup;
2+
3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
5+
6+
public class Log{
7+
8+
public static Logger log = LogManager.getLogger(Log.class.getName());
9+
10+
public static void info(String logMessage) {
11+
log.info(logMessage);
12+
}
13+
14+
public static void error(String msg, Throwable throwable) {
15+
log.error(msg, throwable);
16+
}
17+
18+
public static void error(String msg) {
19+
log.error(msg);
20+
}
21+
}

0 commit comments

Comments
 (0)