Skip to content

Commit

Permalink
Add log4j base config, FIX: TC for login user
Browse files Browse the repository at this point in the history
  • Loading branch information
freestaila committed Nov 7, 2023
1 parent 4532d12 commit c373cf0
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 7 deletions.
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,10 @@
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.21.1</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package applications.github.api.user_module.services;

import applications.github.api.user_module.models.User;
import utilities.jsonUtils.JsonUtils;
import utilities.requestsUtils.AutomationException;
import utilities.requestsUtils.HeaderConfigs;
import utilities.requestsUtils.HttpStatus;
import utilities.requestsUtils.RequestsUtil;
import io.restassured.http.ContentType;
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/config/github/api/Config.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
package config.github.api;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.json.JSONObject;
import org.testng.ITestContext;
import org.testng.annotations.*;
import utilities.jsonUtils.JsonUtils;

import static utilities.requestsUtils.PropertiesUtil.loadProperties;

public class Config {
private static final Logger _logger = LogManager.getLogger(Config.class);

@BeforeSuite
@Parameters("config-File-Path")
public void setup(String configFilePath) {
System.setProperty("base_url",loadProperties(configFilePath).getProperty("baseURL"));
public void setup(String configFilePath, ITestContext context) {
System.setProperty("base_url", loadProperties(configFilePath).getProperty("baseURL"));
_logger.info("Server baseURL: " + System.getProperty("base_url"));
}
}
1 change: 0 additions & 1 deletion src/test/java/applications/github/api/GitHubTestRunner.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
<classes>
<class name="applications.github.api.user.TC_PatchUserInfo"/>
</classes>

</test>
</suite>
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ public class TC_GetUserInfo extends Config {
// Positive scenario
@Test
@Parameters("expectedUserData")
public void assertExpectedUserDataWithResponseData(String expectedUserData) throws AutomationException {
public void assertExpectedUserLoginWithResponse(String expectedUserData) throws AutomationException {
User expectedUser = createUserBodyFromJson(expectedUserData);
User actualUser = (User) UserService.init().getUserInfo(expectedUser).getResponse();
assertThat(actualUser, samePropertyValuesAs(expectedUser));
assertThat(actualUser.getLogin(), samePropertyValuesAs(expectedUser.getLogin()));
}

@Test
Expand Down
17 changes: 17 additions & 0 deletions src/test/resources/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="INFO">
<Appenders>
<Console name="ConsoleAppender" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
</Console>
<File name="FileAppender" fileName="application-${date:yyyyMMdd}.log" immediateFlush="false" append="true">
<PatternLayout pattern="%d{yyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
</File>
</Appenders>
<Loggers>
<Root level="debug">
<AppenderRef ref="ConsoleAppender" />
<AppenderRef ref="FileAppender"/>
</Root>
</Loggers>
</Configuration>

0 comments on commit c373cf0

Please sign in to comment.