Reformat the code with standard Eclipse IDE

Author: agilecreativity

src/main/java/env/BaseTest.java

@@ -9,16 +9,12 @@
 import methods.NavigateMethods;
 import methods.ProgressMethods;
 import methods.ScreenShotMethods;
-
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-
-public interface BaseTest 
-{
+public interface BaseTest {
 	public static RemoteWebDriver driver = Env.CreateWebDriver(Env.getBrowserName());
-	//public static WebDriverWait wait = new WebDriverWait(driver, 30);
-	
-	
+	//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();

src/main/java/env/Env.java

@@ -13,27 +13,26 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.SessionNotFoundException;
 
-
-public class Env 
+public class Env
 {
 	public static RemoteWebDriver driver = null;
 	static String browserName = null;
 	static Boolean isMobile;
-	
+
 	public static String getBrowserName()
 	{
-		browserName = System.getProperty("browser"); 
-		
+		browserName = System.getProperty("browser");
+
 		if(browserName == null)
 			browserName = "ff";
 		return browserName;
 	}
-	
+
 	public static RemoteWebDriver CreateWebDriver(String browser)
 	{
 			DesiredCapabilities capabilities = new DesiredCapabilities();
 			System.out.println("Browser: " + browser);
-			
+
 			switch (browser.toLowerCase()) {
 			case "mobileandroid":
 				capabilities.setCapability("platformName","Android");
@@ -52,7 +51,7 @@ public static RemoteWebDriver CreateWebDriver(String browser)
 				capabilities.setCapability("browserName", "Firefox");
 				capabilities.setCapability("browserVersion", "45");
 				capabilities.setCapability("resolution", "1440x900");
-				capabilities.setCapability("location", "US East");				
+				capabilities.setCapability("location", "US East");
 				isMobile = false;
 				break;
 
@@ -79,45 +78,98 @@ public static RemoteWebDriver CreateWebDriver(String browser)
 				break;
 
 			case "safari":
-				System.out.println("Safari not supported yet");				
+				System.out.println("Safari not supported yet");
 				break;
-				
+
 			 default:
 				 System.out.println("Invalid browser name "+browser);
 				 System.exit(0);
-					break;	
+					break;
 			}//switch
-			
-			
+
+
 			if(isMobile)
 			{
 				capabilities.setCapability("browserName", "mobileOS");
 				capabilities.setCapability("automationName", "PerfectoMobile");
 			}
-			
+
 			capabilities.setCapability("user", System.getProperty("PerfectoUser"));
-			capabilities.setCapability("password", System.getProperty("PerfectoPassword"));			
-			capabilities.setCapability("newCommandTimeout", "120");			
+			capabilities.setCapability("password", System.getProperty("PerfectoPassword"));
+			capabilities.setCapability("newCommandTimeout", "120");
 			capabilities.setCapability("scriptName", "Selenium Responsive");
-			
+
 			try {
 				driver = new RemoteWebDriver (new URL(System.getProperty("PerfectoCloud") + "/nexperience/perfectomobile/wd/hub"), capabilities);
 			} catch (MalformedURLException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			
+
 			if(isMobile)
 			{
 				RemoteExecuteMethod executeMethod = new RemoteExecuteMethod(driver);
 				Map<String,String> params = new HashMap<String,String>();
 				params.put("name", "WEBVIEW");
 				executeMethod.execute(DriverCommand.SWITCH_TO_CONTEXT, params);
 			}
-			
+
 			driver.manage().timeouts().implicitlyWait(60, TimeUnit.SECONDS);
-			
-			
+
+
 			return driver;
         }
-	}
+
+// public class Env {
+// 	static WebDriver driver = null;
+// 	static String browserName = null;
+//
+// 	public static String getBrowserName() {
+// 		browserName = System.getProperty("browser");
+//
+// 		if (browserName == null)
+// 			browserName = "ff";
+// 		return browserName;
+// 	}
+//
+// 	public static WebDriver CreateWebDriver(String browser) {
+// 		System.out.println("Browser: " + browser);
+//
+// 		switch (browser.toLowerCase()) {
+// 		case "ff":
+// 		case "firefox":
+// 			// ProfilesIni allProfiles = new ProfilesIni();
+// 			// FirefoxProfile profile = allProfiles.getProfile("selenium");
+// 			// driver = new FirefoxDriver(profile);
+// 			driver = new FirefoxDriver();
+// 			break;
+//
+// 		case "ch":
+// 		case "chrome":
+// 			driver = new ChromeDriver();
+// 			break;
+//
+// 		case "ie":
+// 		case "internetexplorer":
+// 			driver = new InternetExplorerDriver();
+// 			break;
+//
+// 		case "safari":
+// 			driver = new SafariDriver();
+// 			break;
+//
+// 		default:
+// 			System.out.println("Invalid browser name " + browser);
+// 			System.exit(0);
+// 			break;
+// 		}// switch
+//
+// 		driver.manage().deleteAllCookies();
+// 		driver.manage().window().maximize();
+// 		driver.manage().timeouts().pageLoadTimeout(60, TimeUnit.SECONDS);
+// 		driver.manage().timeouts().setScriptTimeout(60, TimeUnit.SECONDS);
+// 		driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS);
+//
+// 		return driver;
+//	}
+}