From db6270fb53973740b78ef4edbe5415370d24cca5 Mon Sep 17 00:00:00 2001 From: sameer49 Date: Tue, 29 Aug 2017 20:57:40 +0530 Subject: [PATCH 1/5] changed package name --- src/main/java/{env => environment}/BaseTest.java | 0 src/main/java/{env => environment}/Env.java | 2 +- src/main/java/methods/AssertionMethods.java | 2 +- src/main/java/methods/ClickElementsMethods.java | 2 +- src/main/java/methods/ConfigurationMethods.java | 2 +- src/main/java/methods/InputMethods.java | 2 +- src/main/java/methods/JavascriptHandlingMethods.java | 2 +- src/main/java/methods/NavigateMethods.java | 2 +- src/main/java/methods/ProgressMethods.java | 2 +- src/main/java/methods/ScreenShotMethods.java | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename src/main/java/{env => environment}/BaseTest.java (100%) rename src/main/java/{env => environment}/Env.java (99%) diff --git a/src/main/java/env/BaseTest.java b/src/main/java/environment/BaseTest.java similarity index 100% rename from src/main/java/env/BaseTest.java rename to src/main/java/environment/BaseTest.java diff --git a/src/main/java/env/Env.java b/src/main/java/environment/Env.java similarity index 99% rename from src/main/java/env/Env.java rename to src/main/java/environment/Env.java index 0b8393f..0be8cd0 100644 --- a/src/main/java/env/Env.java +++ b/src/main/java/environment/Env.java @@ -1,4 +1,4 @@ -package env; +package environment; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/main/java/methods/AssertionMethods.java b/src/main/java/methods/AssertionMethods.java index 0d00600..0804a72 100644 --- a/src/main/java/methods/AssertionMethods.java +++ b/src/main/java/methods/AssertionMethods.java @@ -6,7 +6,7 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Select; -import env.BaseTest; +import environment.BaseTest; public class AssertionMethods extends SelectElementByType implements BaseTest { diff --git a/src/main/java/methods/ClickElementsMethods.java b/src/main/java/methods/ClickElementsMethods.java index 77d1a5f..d23382d 100644 --- a/src/main/java/methods/ClickElementsMethods.java +++ b/src/main/java/methods/ClickElementsMethods.java @@ -5,7 +5,7 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedConditions; -import env.BaseTest; +import environment.BaseTest; public class ClickElementsMethods extends SelectElementByType implements BaseTest { diff --git a/src/main/java/methods/ConfigurationMethods.java b/src/main/java/methods/ConfigurationMethods.java index ce6faf0..59d1bac 100644 --- a/src/main/java/methods/ConfigurationMethods.java +++ b/src/main/java/methods/ConfigurationMethods.java @@ -7,7 +7,7 @@ import org.openqa.selenium.Capabilities; import org.openqa.selenium.remote.RemoteWebDriver; -import env.BaseTest; +import environment.BaseTest; public class ConfigurationMethods implements BaseTest { diff --git a/src/main/java/methods/InputMethods.java b/src/main/java/methods/InputMethods.java index bc2054f..ae179ec 100644 --- a/src/main/java/methods/InputMethods.java +++ b/src/main/java/methods/InputMethods.java @@ -6,7 +6,7 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Select; -import env.BaseTest; +import environment.BaseTest; public class InputMethods extends SelectElementByType implements BaseTest { diff --git a/src/main/java/methods/JavascriptHandlingMethods.java b/src/main/java/methods/JavascriptHandlingMethods.java index cc636ac..a5c7e02 100644 --- a/src/main/java/methods/JavascriptHandlingMethods.java +++ b/src/main/java/methods/JavascriptHandlingMethods.java @@ -1,6 +1,6 @@ package methods; -import env.BaseTest; +import environment.BaseTest; public class JavascriptHandlingMethods implements BaseTest { diff --git a/src/main/java/methods/NavigateMethods.java b/src/main/java/methods/NavigateMethods.java index feff052..ecc9065 100644 --- a/src/main/java/methods/NavigateMethods.java +++ b/src/main/java/methods/NavigateMethods.java @@ -7,7 +7,7 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedConditions; -import env.BaseTest; +import environment.BaseTest; public class NavigateMethods extends SelectElementByType implements BaseTest { diff --git a/src/main/java/methods/ProgressMethods.java b/src/main/java/methods/ProgressMethods.java index 3d770d2..9861c07 100644 --- a/src/main/java/methods/ProgressMethods.java +++ b/src/main/java/methods/ProgressMethods.java @@ -4,7 +4,7 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import env.BaseTest; +import environment.BaseTest; public class ProgressMethods extends SelectElementByType implements BaseTest { diff --git a/src/main/java/methods/ScreenShotMethods.java b/src/main/java/methods/ScreenShotMethods.java index 6e97414..8d7c095 100644 --- a/src/main/java/methods/ScreenShotMethods.java +++ b/src/main/java/methods/ScreenShotMethods.java @@ -10,7 +10,7 @@ import org.openqa.selenium.OutputType; import org.openqa.selenium.TakesScreenshot; -import env.BaseTest; +import environment.BaseTest; public class ScreenShotMethods implements BaseTest { From 18ac51b45f75469c5dc2417aaf249354cafb9b23 Mon Sep 17 00:00:00 2001 From: sameer49 Date: Tue, 29 Aug 2017 20:59:21 +0530 Subject: [PATCH 2/5] changed package name --- src/main/java/environment/BaseTest.java | 3 +-- src/test/java/stepDefintions/PredefinedStepDefinitions.java | 2 +- src/test/java/stepDefintions/UserStepDefinitions.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/environment/BaseTest.java b/src/main/java/environment/BaseTest.java index 4d82dc1..55305e7 100644 --- a/src/main/java/environment/BaseTest.java +++ b/src/main/java/environment/BaseTest.java @@ -1,4 +1,4 @@ -package env; +package environment; import methods.AssertionMethods; import methods.ClickElementsMethods; @@ -18,7 +18,6 @@ public interface BaseTest public static WebDriver driver = Env.CreateWebDriver(Env.getBrowserName()); public static WebDriverWait wait = new WebDriverWait(driver, 30); - MiscMethods miscmethodObj = new MiscMethods(); NavigateMethods navigationObj = new NavigateMethods(); AssertionMethods assertionObj = new AssertionMethods(); diff --git a/src/test/java/stepDefintions/PredefinedStepDefinitions.java b/src/test/java/stepDefintions/PredefinedStepDefinitions.java index dd18cbf..503dda4 100644 --- a/src/test/java/stepDefintions/PredefinedStepDefinitions.java +++ b/src/test/java/stepDefintions/PredefinedStepDefinitions.java @@ -4,7 +4,7 @@ import methods.TestCaseFailed; import cucumber.api.java.en.Then; -import env.BaseTest; +import environment.BaseTest; public class PredefinedStepDefinitions implements BaseTest { diff --git a/src/test/java/stepDefintions/UserStepDefinitions.java b/src/test/java/stepDefintions/UserStepDefinitions.java index 8868e31..9adcdd3 100644 --- a/src/test/java/stepDefintions/UserStepDefinitions.java +++ b/src/test/java/stepDefintions/UserStepDefinitions.java @@ -1,5 +1,5 @@ package stepDefintions; -import env.BaseTest; +import environment.BaseTest; public class UserStepDefinitions implements BaseTest{ From 20ffc8b3bbb9e4c05f353ef2c5c545f3216f379b Mon Sep 17 00:00:00 2001 From: sameer49 Date: Tue, 29 Aug 2017 21:09:20 +0530 Subject: [PATCH 3/5] modified gitignore --- .gitignore | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.gitignore b/.gitignore index ea8c4bf..b2ce77c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,24 @@ /target + +/target + +# Created by https://www.gitignore.io/api/java + +### Java ### +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# Generated files +/Screenshots + + From 337e143b26a28e566ed904f1e90c1f01bf591858 Mon Sep 17 00:00:00 2001 From: sameer49 Date: Tue, 29 Aug 2017 21:57:15 +0530 Subject: [PATCH 4/5] updated selenium-version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2c6fdef..3efc0ec 100644 --- a/pom.xml +++ b/pom.xml @@ -37,13 +37,13 @@ org.seleniumhq.selenium selenium-java - 3.0.0 + 3.5.2 org.seleniumhq.selenium selenium-server - 3.0.0 + 3.5.2 From 8aafa6cda2e3b5c01176e16fa97ac21ab119034d Mon Sep 17 00:00:00 2001 From: sameer49 Date: Tue, 29 Aug 2017 22:03:24 +0530 Subject: [PATCH 5/5] changed selenium version 3.0.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3efc0ec..2c6fdef 100644 --- a/pom.xml +++ b/pom.xml @@ -37,13 +37,13 @@ org.seleniumhq.selenium selenium-java - 3.5.2 + 3.0.0 org.seleniumhq.selenium selenium-server - 3.5.2 + 3.0.0