Skip to content

Commit 92935f8

Browse files
agilecreativityagilecreativity
committed
Make sure that it works with any OSs (Windows/Mac)
1 parent f563a07 commit 92935f8

28 files changed

+395
-868
lines changed

‎.project

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>selenium-cucumber-java</name>
4-
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
5-
<projects/>
6-
<buildSpec>
7-
<buildCommand>
8-
<name>org.eclipse.jdt.core.javabuilder</name>
9-
</buildCommand>
10-
<buildCommand>
11-
<name>org.eclipse.m2e.core.maven2Builder</name>
12-
</buildCommand>
13-
</buildSpec>
14-
<natures>
15-
<nature>org.eclipse.jdt.core.javanature</nature>
16-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
17-
</natures>
18-
</projectDescription>
3+
<name>testscj</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

‎.settings/org.eclipse.jdt.core.prefs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
#Sun Jul 24 17:20:45 EDT 2016
2-
encoding/src/test/java=UTF-8
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
33
org.eclipse.jdt.core.compiler.compliance=1.7
4-
encoding/src/main/resources=UTF-8
54
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
6-
encoding/src/main/java=UTF-8
7-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
8-
eclipse.preferences.version=1
9-
encoding/src/test/resources=UTF-8
105
org.eclipse.jdt.core.compiler.source=1.7

‎Screenshots/screenshot20150401193118.png

1.05 MB
Loading

‎Screenshots/screenshot20150401194652.png

1.05 MB
Loading

‎Screenshots/screenshot20150428193817.png

1.07 MB
Loading

‎Screenshots/screenshot20150428194030.png

1.07 MB
Loading

‎pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<version>4.11</version>
3333
<scope>test</scope>
3434
</dependency>
35-
3635
<!-- These are the selenium-webdriver dependencies -->
3736
<dependency>
3837
<groupId>org.seleniumhq.selenium</groupId>
@@ -57,7 +56,6 @@
5756
</dependency>
5857
</dependencies>
5958

60-
6159
<build>
6260
<plugins>
6361
<plugin>
@@ -69,7 +67,6 @@
6967
<source>1.7</source>
7068
<target>1.7</target>
7169
<compilerArgument>-Werror</compilerArgument>
72-
7370
<systemPropertyVariables>
7471
<property>
7572
<name>browser</name>

‎src/main/java/env/BaseTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import methods.NavigateMethods;
1010
import methods.ProgressMethods;
1111
import methods.ScreenShotMethods;
12+
1213
import org.openqa.selenium.WebDriver;
1314
import org.openqa.selenium.support.ui.WebDriverWait;
1415

15-
public interface BaseTest
16-
{
16+
public interface BaseTest {
1717
public static WebDriver driver = Env.CreateWebDriver(Env.getBrowserName());
1818
public static WebDriverWait wait = new WebDriverWait(driver, 30);
1919

‎src/main/java/env/Env.java

Lines changed: 44 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,63 @@
11
package env;
22

33
import java.util.concurrent.TimeUnit;
4-
54
import org.openqa.selenium.WebDriver;
65
import org.openqa.selenium.chrome.ChromeDriver;
76
import org.openqa.selenium.firefox.FirefoxDriver;
87
import org.openqa.selenium.ie.InternetExplorerDriver;
98
import org.openqa.selenium.safari.SafariDriver;
109

11-
public class Env
12-
{
10+
public class Env {
11+
1312
static WebDriver driver = null;
1413
static String browserName = null;
1514

16-
public static String getBrowserName()
17-
{
15+
public static String getBrowserName() {
1816
browserName = System.getProperty("browser");
1917

20-
if(browserName == null)
18+
if (browserName == null)
2119
browserName = "ff";
2220
return browserName;
2321
}
2422

25-
public static WebDriver CreateWebDriver(String browser)
26-
{
27-
System.out.println("Browser: " + browser);
28-
29-
switch (browser.toLowerCase()) {
30-
case "ff":
31-
case "firefox":
32-
//ProfilesIni allProfiles = new ProfilesIni();
33-
//FirefoxProfile profile = allProfiles.getProfile("selenium");
34-
//driver = new FirefoxDriver(profile);
35-
driver = new FirefoxDriver();
36-
break;
37-
38-
case "ch":
39-
case "chrome":
40-
driver = new ChromeDriver();
41-
break;
42-
43-
case "ie" :
44-
case "internetexplorer":
45-
driver = new InternetExplorerDriver();
46-
break;
47-
48-
case "safari":
49-
driver = new SafariDriver();
50-
break;
51-
52-
default:
53-
System.out.println("Invalid browser name "+browser);
54-
System.exit(0);
55-
break;
56-
}//switch
57-
58-
driver.manage().deleteAllCookies();
59-
driver.manage().window().maximize();
60-
driver.manage().timeouts().pageLoadTimeout(60, TimeUnit.SECONDS);
61-
driver.manage().timeouts().setScriptTimeout(60, TimeUnit.SECONDS);
62-
driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS);
63-
64-
return driver;
65-
}
66-
23+
public static WebDriver CreateWebDriver(String browser) {
24+
System.out.println("Browser: " + browser);
25+
26+
switch (browser.toLowerCase()) {
27+
case "ff":
28+
case "firefox":
29+
// ProfilesIni allProfiles = new ProfilesIni();
30+
// FirefoxProfile profile = allProfiles.getProfile("selenium");
31+
// driver = new FirefoxDriver(profile);
32+
driver = new FirefoxDriver();
33+
break;
34+
35+
case "ch":
36+
case "chrome":
37+
driver = new ChromeDriver();
38+
break;
39+
40+
case "ie":
41+
case "internetexplorer":
42+
driver = new InternetExplorerDriver();
43+
break;
44+
45+
case "safari":
46+
driver = new SafariDriver();
47+
break;
48+
49+
default:
50+
System.out.println("Invalid browser name " + browser);
51+
System.exit(0);
52+
break;
53+
}// switch
54+
55+
driver.manage().deleteAllCookies();
56+
driver.manage().window().maximize();
57+
driver.manage().timeouts().pageLoadTimeout(60, TimeUnit.SECONDS);
58+
driver.manage().timeouts().setScriptTimeout(60, TimeUnit.SECONDS);
59+
driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS);
60+
61+
return driver;
62+
}
6763
}

‎src/main/java/methods/ScreenShotMethods.java

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,28 @@
1313
import env.BaseTest;
1414

1515
public class ScreenShotMethods implements BaseTest {
16-
/** Method to take screen shot and save in ./Screenshots folder */
16+
17+
public ScreenShotMethods() {
18+
}
19+
1720
public void takeScreenShot() throws IOException {
18-
File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
21+
File scrFile = (File) ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
22+
23+
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
1924

20-
DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
2125
Calendar cal = Calendar.getInstance();
2226
System.out.println(dateFormat.format(cal.getTime()));
2327

2428
String scrFilepath = scrFile.getAbsolutePath();
25-
System.out.println("scrFilepath: " + scrFilepath);
2629

27-
File currentDirFile = new File("Screenshots");
28-
String path = currentDirFile.getAbsolutePath();
29-
System.out.println("path: " + path + "+++");
30+
System.out.println((new StringBuilder("scrFilepath: ")).append(scrFilepath).toString());
3031

31-
System.out.println("****\n" + path + "\\screenshot" + dateFormat.format(cal.getTime()) + ".png");
32+
File currentDirFile = new File("Screenshots");
3233

33-
FileUtils.copyFile(scrFile, new File(path + "\\screenshot" + dateFormat.format(cal.getTime()) + ".png"));
34+
String path = currentDirFile.getAbsolutePath();
3435

35-
/*
36-
* DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
37-
* Calendar cal = Calendar.getInstance();
38-
* System.out.println(dateFormat.format(cal.getTime()));
39-
*/
36+
FileUtils.copyFile(scrFile,
37+
new File((new StringBuilder(String.valueOf(path))).append(File.separator + "screenshot-")
38+
.append(dateFormat.format(cal.getTime())).append(".png").toString()));
4039
}
41-
/*
42-
* cur_time = Time.now.strftime('%Y%m%d%H%M%S%L')
43-
* $driver.save_screenshot('./features/screenshots/screenshot' + cur_time +
44-
* '.png')
45-
*/
4640
}

0 commit comments

Comments
 (0)