Merge branch 'Sandeep4odesk-master'

bipul-agarwal · Oct 5, 2016 · c93bc1b · c93bc1b
2 parents 1296f2e + ea63539
commit c93bc1b
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 115 deletions.
diff --git a/selenium-junit-testng/pom.xml b/selenium-junit-testng/pom.xml
@@ -1,36 +1,48 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.baeldung</groupId>
-  <artifactId>selenium-junit-testng</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-  <dependency>
-   <groupId>org.seleniumhq.selenium</groupId>
-   <artifactId>selenium-java</artifactId>
-   <version>2.53.1</version>
-  </dependency>
-  <dependency>
-   <groupId>junit</groupId>
-   <artifactId>junit</artifactId>
-   <version>4.8.1</version>
-  </dependency>
-  <dependency>
-   <groupId>org.testng</groupId>
-   <artifactId>testng</artifactId>
-   <version>6.9.10</version>
-  </dependency>
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>selenium-junit-testng</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <testSourceDirectory></testSourceDirectory>
+                    <includes>
+                        <include>Test*.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>2.53.1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.9.10</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java b/selenium-junit-testng/src/main/java/com/baeldung/selenium/SeleniumExample.java
@@ -6,9 +6,8 @@
 public class SeleniumExample {
 
     private WebDriver webDriver;
-    private final String url = "http://www.baeldung.com/";
-    private final String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
-
+    private String url = "http://www.baeldung.com/";
+
     public SeleniumExample() {
         webDriver = new FirefoxDriver();
         webDriver.get(url);
@@ -18,12 +17,8 @@ public void closeWindow() {
         webDriver.close();
     }
 
-    public String getActualTitle() {
+    public String getTitle() {
         return webDriver.getTitle();
     }
 
-    public String getExpectedTitle() {
-        return expectedTitle;
-    }
-
 }
diff --git a/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java b/selenium-junit-testng/src/test/java/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java
@@ -1,6 +1,7 @@
 package test.java.com.baeldung.selenium.junit;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import main.java.com.baeldung.selenium.SeleniumExample;
 
 import org.junit.After;
@@ -10,6 +11,7 @@
 public class TestSeleniumWithJUnit {
 
     private SeleniumExample seleniumExample;
+	private String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
 
     @Before
     public void setUp() {
@@ -23,8 +25,8 @@ public void tearDown() {
 
     @Test
     public void whenPageIsLoaded_thenTitleIsAsPerExpectation() {
-        String expectedTitle = seleniumExample.getExpectedTitle();
-        String actualTitle = seleniumExample.getActualTitle();
+        String actualTitle = seleniumExample.getTitle();
+        assertNotNull(actualTitle);
         assertEquals(actualTitle, expectedTitle);
     }
 }
diff --git a/selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/TestSeleniumWithTestNG.java b/selenium-junit-testng/src/test/java/com/baeldung/selenium/testng/TestSeleniumWithTestNG.java
@@ -1,6 +1,7 @@
 package test.java.com.baeldung.selenium.testng;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import main.java.com.baeldung.selenium.SeleniumExample;
 
 import org.testng.annotations.AfterSuite;
@@ -10,6 +11,7 @@
 public class TestSeleniumWithTestNG {
 
     private SeleniumExample seleniumExample;
+    private String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
 
     @BeforeSuite
     public void setUp() {
@@ -23,8 +25,8 @@ public void tearDown() {
 
     @Test
     public void whenPageIsLoaded_thenTitleIsAsPerExpectation() {
-        String expectedTitle = seleniumExample.getExpectedTitle();
-        String actualTitle = seleniumExample.getActualTitle();
+        String actualTitle = seleniumExample.getTitle();
+        assertNotNull(actualTitle);
         assertEquals(actualTitle, expectedTitle);
     }
 }
diff --git a/selenium-junit-testng/test/com/baeldun/selenium/testng/TestSeleniumWithTestNG.java b/selenium-junit-testng/test/com/baeldun/selenium/testng/TestSeleniumWithTestNG.java
diff --git a/selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java b/selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java