diff options
| author | Mavlushechka <mavlushechka@gmail.com> | 2022-11-04 17:14:28 +0500 | 
|---|---|---|
| committer | Mavlushechka <mavlushechka@gmail.com> | 2022-11-04 17:14:28 +0500 | 
| commit | 6ccb36175e931fb58e6d7b8979230d40eab3b3b0 (patch) | |
| tree | 638175fabf6ac288a18b1b5e44a5cd7c54fab475 | |
| parent | c45ef3024c0cd23ab20d441abb5fb57f9f89f323 (diff) | |
| parent | b35d0d37087a240ff0a0a61dbeab66f7132e1ba4 (diff) | |
Merge branch 'main' into exam
# Conflicts:
#	.gitignore
#	src/main/java/com/mavlushechka/a1qa/framework/utils/IntegerUtils.java
#	src/main/java/com/mavlushechka/a1qa/framework/utils/StringUtils.java
#	src/main/java/com/mavlushechka/a1qa/framework/utils/UrlConnectionManager.java
#	src/main/resources/settings.json
#	src/main/resources/testData.json
#	src/test/java/com/mavlushechka/a1qa/project/TestCase1.java
11 files changed, 0 insertions, 325 deletions
diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 21edb71..0000000 --- a/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" -         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> -    <modelVersion>4.0.0</modelVersion> - -    <groupId>com.mavlushechka.a1qa</groupId> -    <artifactId>task3</artifactId> -    <version>1.0-SNAPSHOT</version> - -    <dependencies> -        <dependency> -            <groupId>com.github.aquality-automation</groupId> -            <artifactId>aquality-selenium</artifactId> -            <version>3.1.0</version> -        </dependency> -        <dependency> -            <groupId>org.testng</groupId> -            <artifactId>testng</artifactId> -            <version>7.6.1</version> -            <scope>test</scope> -        </dependency> -        <dependency> -            <groupId>org.json</groupId> -            <artifactId>json</artifactId> -            <version>20220924</version> -        </dependency> -        <dependency> -            <groupId>com.google.code.gson</groupId> -            <artifactId>gson</artifactId> -            <version>2.10</version> -        </dependency> -        <dependency> -            <groupId>org.apache.logging.log4j</groupId> -            <artifactId>log4j-core</artifactId> -            <version>2.19.0</version> -        </dependency> -    </dependencies> - -    <properties> -        <maven.compiler.source>18</maven.compiler.source> -        <maven.compiler.target>18</maven.compiler.target> -        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -    </properties> - -</project>
\ No newline at end of file diff --git a/src/main/java/com/mavlushechka/a1qa/framework/constants/RequestMethod.java b/src/main/java/com/mavlushechka/a1qa/framework/constants/RequestMethod.java deleted file mode 100644 index 85316c9..0000000 --- a/src/main/java/com/mavlushechka/a1qa/framework/constants/RequestMethod.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.mavlushechka.a1qa.framework.constants; - -public enum RequestMethod { - -    GET, POST - -} diff --git a/src/main/java/com/mavlushechka/a1qa/framework/constants/Status.java b/src/main/java/com/mavlushechka/a1qa/framework/constants/Status.java deleted file mode 100644 index 63fbc9a..0000000 --- a/src/main/java/com/mavlushechka/a1qa/framework/constants/Status.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mavlushechka.a1qa.framework.constants; - -public enum Status { - -    OK(200), CREATED(201), NOT_FOUND(404); - -    public final int code; - -    Status(int code) { -        this.code = code; -    } - -} diff --git a/src/main/java/com/mavlushechka/a1qa/framework/utils/DoubleUtils.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/DoubleUtils.java deleted file mode 100644 index 1865715..0000000 --- a/src/main/java/com/mavlushechka/a1qa/framework/utils/DoubleUtils.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mavlushechka.a1qa.framework.utils; - -public class DoubleUtils { - -    public static double getPercentageOf(double number, double percentage) { -        return number / 100 * percentage; -    } - -} diff --git a/src/main/java/com/mavlushechka/a1qa/framework/utils/FileParser.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/FileParser.java deleted file mode 100644 index 40ea62d..0000000 --- a/src/main/java/com/mavlushechka/a1qa/framework/utils/FileParser.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mavlushechka.a1qa.framework.utils; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; - -public class FileParser { - -    public static String parse(String filename) { -        StringBuilder stringBuilder = new StringBuilder(); - -        try (BufferedReader bufferedReader = new BufferedReader(new FileReader(filename))) { -            while (bufferedReader.ready()) { -                stringBuilder.append(bufferedReader.readLine()); -            } -        } catch (IOException ioException) { -            throw new IllegalArgumentException("Cannot find required file."); -        } -        return stringBuilder.toString(); -    } - -} diff --git a/src/main/java/com/mavlushechka/a1qa/framework/utils/HttpUrlConnectionFactory.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/HttpUrlConnectionFactory.java deleted file mode 100644 index cfa0628..0000000 --- a/src/main/java/com/mavlushechka/a1qa/framework/utils/HttpUrlConnectionFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.mavlushechka.a1qa.framework.utils; - -import com.mavlushechka.a1qa.framework.constants.RequestMethod; - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - -public class HttpUrlConnectionFactory { - -    private HttpUrlConnectionFactory() { -    } - -    public static HttpURLConnection createHttpUrlConnection(String spec, RequestMethod requestMethod, boolean doOutput) throws IOException { -        HttpURLConnection httpUrlConnection = (HttpURLConnection) new URL(spec).openConnection(); - -        httpUrlConnection.setRequestMethod(requestMethod.name()); -        httpUrlConnection.setConnectTimeout(Integer.parseInt(JsonParser.parseData("config", "httpUrlConnection.connectTimeout"))); -        httpUrlConnection.setReadTimeout(Integer.parseInt(JsonParser.parseData("config", "httpUrlConnection.readTimeout"))); -        httpUrlConnection.setDoOutput(doOutput); -        httpUrlConnection.setRequestProperty("Content-Type", "application/json; charset=UTF-8"); -        return httpUrlConnection; -    } - -} diff --git a/src/main/java/com/mavlushechka/a1qa/framework/utils/JsonParser.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/JsonParser.java deleted file mode 100644 index 4f89e12..0000000 --- a/src/main/java/com/mavlushechka/a1qa/framework/utils/JsonParser.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.mavlushechka.a1qa.framework.utils; - -import com.google.gson.Gson; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.Map; -import java.util.TreeMap; - -public class JsonParser { - -    private final static TreeMap<String, JSONObject> parsedJSON = new TreeMap<>(); - - -    public static String parseData(String filename, String key) { -        return parse(filename, key, false); -    } - -    public static String parseObject(String filename, String key) { -        return parse(filename, key, true); -    } - -    public static boolean isJson(String json) { -        try { -            new JSONObject(json); -        } catch (JSONException jsonObjectException) { -            try { -                new JSONArray(json); -            } catch (JSONException jsonArrayException) { -                return false; -            } -        } -        return true; -    } - -    public static boolean isBodyEmpty(String json) { -        return json.equals("{}"); -    } - -    public static <T> T convertToObject(String json, Class<T> classToConvert) { -        return new Gson().fromJson(json, classToConvert); -    } - -    public static <T> String convertToJson(T object) { -        return new Gson().toJson(object); -    } - -    public static <T> T[] convertArray(String json, Class<T> classToConvert) { -        Gson gson = new Gson(); -        JSONArray jsonArray = new JSONArray(json); -        ArrayList<T> objects = new ArrayList<>(); - -        for (int i = 0; i < jsonArray.length(); i++) { -            objects.add(gson.fromJson(jsonArray.getJSONObject(i).toString(), classToConvert)); -        } -        return (T[]) objects.toArray(); -    } - -    private static String parse(String filename, String key, boolean isObject) { -        Map.Entry<String, JSONObject> ceilingEntry = parsedJSON.ceilingEntry(filename); - -        if (ceilingEntry == null || !ceilingEntry.getKey().startsWith(filename)) { -            parseFile(filename); -        } -        return parseData(filename, key, isObject); -    } - -    private static void parseFile(String filename) { -        parsedJSON.put(filename, new JSONObject(FileParser.parse("src/main/resources/" + filename + ".json"))); -    } - -    private static String parseData(String jsonName, String key, boolean isObject) { -        JSONObject jsonObject = new JSONObject(parsedJSON.get(jsonName).toString()); -        String[] keys = key.split("\\."); - -        for (int i = 0; i < keys.length - 1; i++) { -            if (keys[i].contains("[") && keys[i].contains("]")) { -                String splitKey = keys[i].split("\\[")[0]; -                int index = Integer.parseInt(keys[i].split("\\[")[1].replaceAll("[\\[\\]]", "")); - -                jsonObject = jsonObject.getJSONArray(splitKey).getJSONObject(index); -            } else { -                jsonObject = jsonObject.getJSONObject(keys[i]); -            } -        } -        if (isObject) { -            return jsonObject.getJSONObject(keys[keys.length - 1]).toString(); -        } -        return jsonObject.getString(keys[keys.length - 1]); -    } - -} diff --git a/src/main/java/com/mavlushechka/a1qa/framework/utils/LoggerUtils.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/LoggerUtils.java deleted file mode 100644 index 8675d92..0000000 --- a/src/main/java/com/mavlushechka/a1qa/framework/utils/LoggerUtils.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.mavlushechka.a1qa.framework.utils; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.config.ConfigurationSource; -import org.apache.logging.log4j.core.config.Configurator; -import org.apache.logging.log4j.core.config.xml.XmlConfiguration; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; - -public class LoggerUtils { - -    private final static File CONFIGURATION_FILE = new File("src/main/resources/log4j2.xml"); -    private static Logger logger; -    private static int step = 0; - - -    private LoggerUtils() { -    } - -    public static void initialize() { -        try { -            Configurator.initialize(new XmlConfiguration(null, new ConfigurationSource(new FileInputStream(CONFIGURATION_FILE)))); -        } catch (IOException ioException) { -            throw new RuntimeException(ioException); -        } -        logger = LogManager.getLogger(); -    } - -    public static void step(String text) { -        step++; -        info("Step %d: %s".formatted(step, text)); -    } - -    public static void info(String text) { -        logger.log(Level.INFO, text); -    } - -    public static void error(String text) { -        logger.log(Level.ERROR, text); -    } - -} diff --git a/src/main/resources/config.json b/src/main/resources/config.json deleted file mode 100644 index efac2e4..0000000 --- a/src/main/resources/config.json +++ /dev/null @@ -1,18 +0,0 @@ -{ -  "browser": { -    "url": "http://localhost:8080" -  }, -  "randomTextGenerator": { -    "lettersLowerBound": "97", -    "lettersUpperBound": "122", -    "length": "10" -  }, -  "integerUtils": { -    "randomNumberMin": "0", -    "randomNumberMax": "101" -  }, -  "httpUrlConnection": { -    "connectTimeout": "5000", -    "readTimeout": "5000" -  } -}
\ No newline at end of file diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml deleted file mode 100644 index 756a521..0000000 --- a/src/main/resources/log4j2.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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="target/logFile.log"> -            <PatternLayout> -                <Pattern>%d %p %c{1.} [%t] %m%n</Pattern> -            </PatternLayout> -        </File> -    </Appenders> -    <Loggers> -        <Logger name="FILE_APPENDER" -                level="INFO" additivity="false"> -            <AppenderRef ref="fileAppender" /> -        </Logger> -        <Root level="TRACE"> -            <AppenderRef ref="consoleAppender"/> -            <AppenderRef ref="fileAppender"/> -        </Root> -    </Loggers> -</Configuration>
\ No newline at end of file diff --git a/src/test/java/com/mavlushechka/a1qa/framework/BaseTest.java b/src/test/java/com/mavlushechka/a1qa/framework/BaseTest.java deleted file mode 100644 index c4240d5..0000000 --- a/src/test/java/com/mavlushechka/a1qa/framework/BaseTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mavlushechka.a1qa.framework; - -import aquality.selenium.browser.AqualityServices; -import com.mavlushechka.a1qa.framework.utils.JsonParser; -import com.mavlushechka.a1qa.framework.utils.LoggerUtils; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeSuite; - -public class BaseTest { - -    @BeforeSuite -    public void setUp() { -        LoggerUtils.initialize(); -        AqualityServices.getBrowser().goTo(JsonParser.parseData("config", "browser.url")); -    } - -    @AfterTest -    public void tearDown() { -        AqualityServices.getBrowser().quit(); -    } - -}  |