From 8dce51e81ef4cc49cf2a3f245791e0893cf993cb Mon Sep 17 00:00:00 2001 From: Mavlushechka Date: Fri, 30 Sep 2022 15:22:00 +0500 Subject: Move enums to constants package --- .../java/com/mavlushechka/a1qa/constants/Browser.java | 8 ++++++++ .../java/com/mavlushechka/a1qa/constants/Domain.java | 19 +++++++++++++++++++ .../com/mavlushechka/a1qa/constants/Interest.java | 7 +++++++ .../a1qa/driverUtils/WebDriverFactory.java | 2 +- .../java/com/mavlushechka/a1qa/models/Browser.java | 8 -------- .../java/com/mavlushechka/a1qa/models/Domain.java | 19 ------------------- src/main/java/com/mavlushechka/a1qa/models/Email.java | 2 ++ .../java/com/mavlushechka/a1qa/models/Interest.java | 7 ------- .../java/com/mavlushechka/a1qa/pages/GamePage.java | 2 +- .../com/mavlushechka/a1qa/pages/InterestsForm.java | 2 +- src/test/java/com/mavlushechka/a1qa/TestCase1.java | 4 ++-- 11 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/mavlushechka/a1qa/constants/Browser.java create mode 100644 src/main/java/com/mavlushechka/a1qa/constants/Domain.java create mode 100644 src/main/java/com/mavlushechka/a1qa/constants/Interest.java delete mode 100644 src/main/java/com/mavlushechka/a1qa/models/Browser.java delete mode 100644 src/main/java/com/mavlushechka/a1qa/models/Domain.java delete mode 100644 src/main/java/com/mavlushechka/a1qa/models/Interest.java (limited to 'src') diff --git a/src/main/java/com/mavlushechka/a1qa/constants/Browser.java b/src/main/java/com/mavlushechka/a1qa/constants/Browser.java new file mode 100644 index 0000000..3f8df35 --- /dev/null +++ b/src/main/java/com/mavlushechka/a1qa/constants/Browser.java @@ -0,0 +1,8 @@ +package com.mavlushechka.a1qa.constants; + + +public enum Browser { + + CHROME, FIREFOX + +} diff --git a/src/main/java/com/mavlushechka/a1qa/constants/Domain.java b/src/main/java/com/mavlushechka/a1qa/constants/Domain.java new file mode 100644 index 0000000..6de26ef --- /dev/null +++ b/src/main/java/com/mavlushechka/a1qa/constants/Domain.java @@ -0,0 +1,19 @@ +package com.mavlushechka.a1qa.constants; + +public enum Domain { + + ORG("org"), COUK("co.uk"), NET("net"), GOV("gov"), DE("de"), FR("fr"), NL("nl"), COM("com"), BE("be"), JPG("jpg"); + + private final String DOMAIN; + + + Domain(String domain) { + this.DOMAIN = domain; + } + + @Override + public String toString() { + return DOMAIN; + } + +} diff --git a/src/main/java/com/mavlushechka/a1qa/constants/Interest.java b/src/main/java/com/mavlushechka/a1qa/constants/Interest.java new file mode 100644 index 0000000..e4d5eb1 --- /dev/null +++ b/src/main/java/com/mavlushechka/a1qa/constants/Interest.java @@ -0,0 +1,7 @@ +package com.mavlushechka.a1qa.constants; + +public enum Interest { + + BALLS(), CABLES(), CINNAMON(), CLOSETS(), COTTON(), DOUGH(), DRYWALL(), ENVELOPPES(), FAUCETS(), MULLETS(), POLO(), PONIES(), POSTITS(), PURPLE(), QUESTIONS(), SELECTALL(), SNAILS(), SQUARES(), TIRES(), UNSELECTALL(), WINDOWS() + +} diff --git a/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverFactory.java b/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverFactory.java index e52a9cf..0ff118d 100644 --- a/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverFactory.java +++ b/src/main/java/com/mavlushechka/a1qa/driverUtils/WebDriverFactory.java @@ -1,6 +1,6 @@ package com.mavlushechka.a1qa.driverUtils; -import com.mavlushechka.a1qa.models.Browser; +import com.mavlushechka.a1qa.constants.Browser; import com.mavlushechka.a1qa.utils.JSONParser; import com.mavlushechka.a1qa.utils.LoggerUtils; import com.mavlushechka.a1qa.utils.StringUtils; diff --git a/src/main/java/com/mavlushechka/a1qa/models/Browser.java b/src/main/java/com/mavlushechka/a1qa/models/Browser.java deleted file mode 100644 index 013236b..0000000 --- a/src/main/java/com/mavlushechka/a1qa/models/Browser.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.mavlushechka.a1qa.models; - - -public enum Browser { - - CHROME, FIREFOX - -} diff --git a/src/main/java/com/mavlushechka/a1qa/models/Domain.java b/src/main/java/com/mavlushechka/a1qa/models/Domain.java deleted file mode 100644 index d5310d4..0000000 --- a/src/main/java/com/mavlushechka/a1qa/models/Domain.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mavlushechka.a1qa.models; - -public enum Domain { - - ORG("org"), COUK("co.uk"), NET("net"), GOV("gov"), DE("de"), FR("fr"), NL("nl"), COM("com"), BE("be"), JPG("jpg"); - - private final String DOMAIN; - - - Domain(String domain) { - this.DOMAIN = domain; - } - - @Override - public String toString() { - return DOMAIN; - } - -} diff --git a/src/main/java/com/mavlushechka/a1qa/models/Email.java b/src/main/java/com/mavlushechka/a1qa/models/Email.java index 5e82ad0..2ce0ff7 100644 --- a/src/main/java/com/mavlushechka/a1qa/models/Email.java +++ b/src/main/java/com/mavlushechka/a1qa/models/Email.java @@ -1,4 +1,6 @@ package com.mavlushechka.a1qa.models; +import com.mavlushechka.a1qa.constants.Domain; + public record Email(String username, String server, Domain domain) { } diff --git a/src/main/java/com/mavlushechka/a1qa/models/Interest.java b/src/main/java/com/mavlushechka/a1qa/models/Interest.java deleted file mode 100644 index c8e7531..0000000 --- a/src/main/java/com/mavlushechka/a1qa/models/Interest.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.mavlushechka.a1qa.models; - -public enum Interest { - - BALLS(), CABLES(), CINNAMON(), CLOSETS(), COTTON(), DOUGH(), DRYWALL(), ENVELOPPES(), FAUCETS(), MULLETS(), POLO(), PONIES(), POSTITS(), PURPLE(), QUESTIONS(), SELECTALL(), SNAILS(), SQUARES(), TIRES(), UNSELECTALL(), WINDOWS() - -} diff --git a/src/main/java/com/mavlushechka/a1qa/pages/GamePage.java b/src/main/java/com/mavlushechka/a1qa/pages/GamePage.java index 5eda151..5536fd2 100644 --- a/src/main/java/com/mavlushechka/a1qa/pages/GamePage.java +++ b/src/main/java/com/mavlushechka/a1qa/pages/GamePage.java @@ -1,7 +1,7 @@ package com.mavlushechka.a1qa.pages; import com.mavlushechka.a1qa.elements.Label; -import com.mavlushechka.a1qa.models.Interest; +import com.mavlushechka.a1qa.constants.Interest; import com.mavlushechka.a1qa.models.User; import org.openqa.selenium.By; diff --git a/src/main/java/com/mavlushechka/a1qa/pages/InterestsForm.java b/src/main/java/com/mavlushechka/a1qa/pages/InterestsForm.java index f36f3f3..d75666f 100644 --- a/src/main/java/com/mavlushechka/a1qa/pages/InterestsForm.java +++ b/src/main/java/com/mavlushechka/a1qa/pages/InterestsForm.java @@ -2,7 +2,7 @@ package com.mavlushechka.a1qa.pages; import com.mavlushechka.a1qa.elements.Button; import com.mavlushechka.a1qa.elements.Label; -import com.mavlushechka.a1qa.models.Interest; +import com.mavlushechka.a1qa.constants.Interest; import org.openqa.selenium.By; public class InterestsForm extends BaseForm { diff --git a/src/test/java/com/mavlushechka/a1qa/TestCase1.java b/src/test/java/com/mavlushechka/a1qa/TestCase1.java index 5cc3bc7..1bb5ee0 100644 --- a/src/test/java/com/mavlushechka/a1qa/TestCase1.java +++ b/src/test/java/com/mavlushechka/a1qa/TestCase1.java @@ -1,8 +1,8 @@ package com.mavlushechka.a1qa; -import com.mavlushechka.a1qa.models.Domain; +import com.mavlushechka.a1qa.constants.Domain; import com.mavlushechka.a1qa.models.Email; -import com.mavlushechka.a1qa.models.Interest; +import com.mavlushechka.a1qa.constants.Interest; import com.mavlushechka.a1qa.models.User; import com.mavlushechka.a1qa.pages.GamePage; import com.mavlushechka.a1qa.pages.HomePage; -- cgit v1.2.3