Divide classes into 2 packages: framework and project

31 files changed, 75 insertions, 64 deletions

diff --git a/src/main/java/com/mavlushechka/a1qa/constants/Attachment.java b/src/main/java/com/mavlushechka/a1qa/constants/Attachment.java
deleted file mode 100644
index a011430..0000000
--- a/src/main/java/com/mavlushechka/a1qa/constants/Attachment.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mavlushechka.a1qa.constants;
-
-public enum Attachment {
-
-    PHOTO
-
-}
diff --git a/src/main/java/com/mavlushechka/a1qa/constants/RequestMethod.java b/src/main/java/com/mavlushechka/a1qa/constants/RequestMethod.java
deleted file mode 100644
index 0f7e15c..0000000
--- a/src/main/java/com/mavlushechka/a1qa/constants/RequestMethod.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mavlushechka.a1qa.constants;
-
-public enum RequestMethod {
-
-    GET, POST
-
-}
diff --git a/src/main/java/com/mavlushechka/a1qa/framework/constants/RequestMethod.java b/src/main/java/com/mavlushechka/a1qa/framework/constants/RequestMethod.java
new file mode 100644
index 0000000..85316c9
--- /dev/null
+++ b/src/main/java/com/mavlushechka/a1qa/framework/constants/RequestMethod.java
@@ -0,0 +1,7 @@
+package com.mavlushechka.a1qa.framework.constants;
+
+public enum RequestMethod {
+
+    GET, POST
+
+}
diff --git a/src/main/java/com/mavlushechka/a1qa/constants/Status.java b/src/main/java/com/mavlushechka/a1qa/framework/constants/Status.java
index a319f39..63fbc9a 100644
--- a/src/main/java/com/mavlushechka/a1qa/constants/Status.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/constants/Status.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.constants;
+package com.mavlushechka.a1qa.framework.constants;
 
 public enum Status {
 
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/BaseForm.java b/src/main/java/com/mavlushechka/a1qa/framework/pages/BaseForm.java
index 8ed6026..6584879 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/BaseForm.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/pages/BaseForm.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.framework.pages;
 
 import aquality.selenium.elements.interfaces.IElement;
 import aquality.selenium.elements.interfaces.ILabel;
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/DoubleUtils.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/DoubleUtils.java
index d68b18c..1865715 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/DoubleUtils.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/utils/DoubleUtils.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.framework.utils;
 
 public class DoubleUtils {
 
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/FileParser.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/FileParser.java
index 7fd626f..40ea62d 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/FileParser.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/utils/FileParser.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.framework.utils;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/HttpUrlConnectionFactory.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/HttpUrlConnectionFactory.java
index 25d3a90..cfa0628 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/HttpUrlConnectionFactory.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/utils/HttpUrlConnectionFactory.java
@@ -1,6 +1,6 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.framework.utils;
 
-import com.mavlushechka.a1qa.constants.RequestMethod;
+import com.mavlushechka.a1qa.framework.constants.RequestMethod;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/IntegerUtils.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/IntegerUtils.java
index 37f3eb8..76280cc 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/IntegerUtils.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/utils/IntegerUtils.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.framework.utils;
 
 import java.util.OptionalInt;
 import java.util.Random;
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/JsonParser.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/JsonParser.java
index bbcc732..4f89e12 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/JsonParser.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/utils/JsonParser.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.framework.utils;
 
 import com.google.gson.Gson;
 import org.json.JSONArray;
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/LoggerUtils.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/LoggerUtils.java
index 2498f87..8675d92 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/LoggerUtils.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/utils/LoggerUtils.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.framework.utils;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/StringUtils.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/StringUtils.java
index 854d7cc..ae699d1 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/StringUtils.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/utils/StringUtils.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.framework.utils;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/UrlConnectionManager.java b/src/main/java/com/mavlushechka/a1qa/framework/utils/UrlConnectionManager.java
index 7ea092c..b8dad83 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/UrlConnectionManager.java
+++ b/src/main/java/com/mavlushechka/a1qa/framework/utils/UrlConnectionManager.java
@@ -1,6 +1,6 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.framework.utils;
 
-import com.mavlushechka.a1qa.constants.RequestMethod;
+import com.mavlushechka.a1qa.framework.constants.RequestMethod;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/src/main/java/com/mavlushechka/a1qa/models/Attachment.java b/src/main/java/com/mavlushechka/a1qa/models/Attachment.java
deleted file mode 100644
index a05ee71..0000000
--- a/src/main/java/com/mavlushechka/a1qa/models/Attachment.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.mavlushechka.a1qa.models;
-
-public record Attachment(com.mavlushechka.a1qa.constants.Attachment attachment, int ownerId, int mediaId) {
-
-    @Override
-    public String toString() {
-        return attachment.name().toLowerCase() + ownerId + "_" + mediaId;
-    }
-
-}
diff --git a/src/main/java/com/mavlushechka/a1qa/project/constants/Attachment.java b/src/main/java/com/mavlushechka/a1qa/project/constants/Attachment.java
new file mode 100644
index 0000000..ada25e8
--- /dev/null
+++ b/src/main/java/com/mavlushechka/a1qa/project/constants/Attachment.java
@@ -0,0 +1,7 @@
+package com.mavlushechka.a1qa.project.constants;
+
+public enum Attachment {
+
+    PHOTO
+
+}
diff --git a/src/main/java/com/mavlushechka/a1qa/constants/VkApiMethod.java b/src/main/java/com/mavlushechka/a1qa/project/constants/VkApiMethod.java
index 7126abb..c751bca 100644
--- a/src/main/java/com/mavlushechka/a1qa/constants/VkApiMethod.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/constants/VkApiMethod.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.constants;
+package com.mavlushechka.a1qa.project.constants;
 
 public enum VkApiMethod {
 
diff --git a/src/main/java/com/mavlushechka/a1qa/project/models/Attachment.java b/src/main/java/com/mavlushechka/a1qa/project/models/Attachment.java
new file mode 100644
index 0000000..0350d11
--- /dev/null
+++ b/src/main/java/com/mavlushechka/a1qa/project/models/Attachment.java
@@ -0,0 +1,10 @@
+package com.mavlushechka.a1qa.project.models;
+
+public record Attachment(com.mavlushechka.a1qa.project.constants.Attachment attachment, int ownerId, int mediaId) {
+
+    @Override
+    public String toString() {
+        return attachment.name().toLowerCase() + ownerId + "_" + mediaId;
+    }
+
+}
diff --git a/src/main/java/com/mavlushechka/a1qa/models/Comment.java b/src/main/java/com/mavlushechka/a1qa/project/models/Comment.java
index b8de1e0..bbbdc0f 100644
--- a/src/main/java/com/mavlushechka/a1qa/models/Comment.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/models/Comment.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.models;
+package com.mavlushechka.a1qa.project.models;
 
 public record Comment(int id, User user, Post post, String message) {
 }
diff --git a/src/main/java/com/mavlushechka/a1qa/models/Liker.java b/src/main/java/com/mavlushechka/a1qa/project/models/Liker.java
index 045852f..7f84eba 100644
--- a/src/main/java/com/mavlushechka/a1qa/models/Liker.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/models/Liker.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.models;
+package com.mavlushechka.a1qa.project.models;
 
 public class Liker {
 
diff --git a/src/main/java/com/mavlushechka/a1qa/models/Post.java b/src/main/java/com/mavlushechka/a1qa/project/models/Post.java
index 9cf8474..e7c97b4 100644
--- a/src/main/java/com/mavlushechka/a1qa/models/Post.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/models/Post.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.models;
+package com.mavlushechka.a1qa.project.models;
 
 public record Post(int id, User owner, String message, Attachment attachment) {
 }
diff --git a/src/main/java/com/mavlushechka/a1qa/models/User.java b/src/main/java/com/mavlushechka/a1qa/project/models/User.java
index c9bb3ff..b0089e8 100644
--- a/src/main/java/com/mavlushechka/a1qa/models/User.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/models/User.java
@@ -1,4 +1,4 @@
-package com.mavlushechka.a1qa.models;
+package com.mavlushechka.a1qa.project.models;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/CommentForm.java b/src/main/java/com/mavlushechka/a1qa/project/pages/CommentForm.java
index a4f79fe..228e34d 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/CommentForm.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/CommentForm.java
@@ -1,8 +1,9 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
 import aquality.selenium.elements.interfaces.ILabel;
-import com.mavlushechka.a1qa.models.Comment;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
+import com.mavlushechka.a1qa.project.models.Comment;
 import org.openqa.selenium.By;
 
 import java.util.Objects;
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/CommentsForm.java b/src/main/java/com/mavlushechka/a1qa/project/pages/CommentsForm.java
index 0cb1c08..4c022a6 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/CommentsForm.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/CommentsForm.java
@@ -1,9 +1,10 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
 import aquality.selenium.elements.interfaces.IButton;
-import com.mavlushechka.a1qa.models.Comment;
-import com.mavlushechka.a1qa.models.Post;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
+import com.mavlushechka.a1qa.project.models.Comment;
+import com.mavlushechka.a1qa.project.models.Post;
 import org.openqa.selenium.By;
 
 public class CommentsForm extends BaseForm {
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/FeedPage.java b/src/main/java/com/mavlushechka/a1qa/project/pages/FeedPage.java
index bebecc1..abc0f91 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/FeedPage.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/FeedPage.java
@@ -1,6 +1,7 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
 import org.openqa.selenium.By;
 
 public class FeedPage extends BaseForm {
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/HomePage.java b/src/main/java/com/mavlushechka/a1qa/project/pages/HomePage.java
index 20339f8..a4ab95c 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/HomePage.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/HomePage.java
@@ -1,8 +1,9 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
 import aquality.selenium.elements.interfaces.IButton;
 import aquality.selenium.elements.interfaces.ITextBox;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
 import org.openqa.selenium.By;
 
 public class HomePage extends BaseForm {
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/PostForm.java b/src/main/java/com/mavlushechka/a1qa/project/pages/PostForm.java
index 11b9513..a3f8972 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/PostForm.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/PostForm.java
@@ -1,10 +1,11 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
 import aquality.selenium.elements.interfaces.IButton;
 import aquality.selenium.elements.interfaces.ILabel;
-import com.mavlushechka.a1qa.models.Comment;
-import com.mavlushechka.a1qa.models.Post;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
+import com.mavlushechka.a1qa.project.models.Comment;
+import com.mavlushechka.a1qa.project.models.Post;
 import org.openqa.selenium.By;
 
 import java.util.Objects;
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/ProfilePage.java b/src/main/java/com/mavlushechka/a1qa/project/pages/ProfilePage.java
index 7b6aa9d..ae99f22 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/ProfilePage.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/ProfilePage.java
@@ -1,8 +1,9 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
-import com.mavlushechka.a1qa.models.Comment;
-import com.mavlushechka.a1qa.models.Post;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
+import com.mavlushechka.a1qa.project.models.Comment;
+import com.mavlushechka.a1qa.project.models.Post;
 import org.openqa.selenium.By;
 
 public class ProfilePage extends BaseForm {
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/ProfileWallForm.java b/src/main/java/com/mavlushechka/a1qa/project/pages/ProfileWallForm.java
index f030924..120e30f 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/ProfileWallForm.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/ProfileWallForm.java
@@ -1,8 +1,9 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
-import com.mavlushechka.a1qa.models.Comment;
-import com.mavlushechka.a1qa.models.Post;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
+import com.mavlushechka.a1qa.project.models.Comment;
+import com.mavlushechka.a1qa.project.models.Post;
 import org.openqa.selenium.By;
 
 public class ProfileWallForm extends BaseForm {
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/SideBarForm.java b/src/main/java/com/mavlushechka/a1qa/project/pages/SideBarForm.java
index 8df8c3d..01973ec 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/SideBarForm.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/SideBarForm.java
@@ -1,7 +1,8 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
 import aquality.selenium.elements.interfaces.IButton;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
 import org.openqa.selenium.By;
 
 public class SideBarForm extends BaseForm {
diff --git a/src/main/java/com/mavlushechka/a1qa/pages/SignInPage.java b/src/main/java/com/mavlushechka/a1qa/project/pages/SignInPage.java
index 56c16e7..872f87f 100644
--- a/src/main/java/com/mavlushechka/a1qa/pages/SignInPage.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/pages/SignInPage.java
@@ -1,8 +1,9 @@
-package com.mavlushechka.a1qa.pages;
+package com.mavlushechka.a1qa.project.pages;
 
 import aquality.selenium.browser.AqualityServices;
 import aquality.selenium.elements.interfaces.IButton;
 import aquality.selenium.elements.interfaces.ITextBox;
+import com.mavlushechka.a1qa.framework.pages.BaseForm;
 import org.openqa.selenium.By;
 
 public class SignInPage extends BaseForm {
diff --git a/src/main/java/com/mavlushechka/a1qa/utils/VkApiUtils.java b/src/main/java/com/mavlushechka/a1qa/project/utils/VkApiUtils.java
index 8d90898..a5cd439 100644
--- a/src/main/java/com/mavlushechka/a1qa/utils/VkApiUtils.java
+++ b/src/main/java/com/mavlushechka/a1qa/project/utils/VkApiUtils.java
@@ -1,9 +1,11 @@
-package com.mavlushechka.a1qa.utils;
+package com.mavlushechka.a1qa.project.utils;
 
-import com.mavlushechka.a1qa.constants.VkApiMethod;
-import com.mavlushechka.a1qa.models.Liker;
-import com.mavlushechka.a1qa.models.Post;
-import com.mavlushechka.a1qa.models.User;
+import com.mavlushechka.a1qa.project.constants.VkApiMethod;
+import com.mavlushechka.a1qa.framework.utils.JsonParser;
+import com.mavlushechka.a1qa.framework.utils.UrlConnectionManager;
+import com.mavlushechka.a1qa.project.models.Liker;
+import com.mavlushechka.a1qa.project.models.Post;
+import com.mavlushechka.a1qa.project.models.User;
 import org.json.JSONObject;
 
 import java.io.IOException;