From c3a340e0ec51776759874cb032ff1c468c92354f Mon Sep 17 00:00:00 2001
From: Sandeep Kumar <sandeep4odesk@gmail.com>
Date: Sun, 2 Oct 2016 18:01:49 +0530
Subject: [PATCH 1/3] Modifying methods in test files

---
 .../baeldung/selenium/SeleniumExample.java    | 11 ++----
 .../selenium/junit/TestSeleniumWithJUnit.java |  5 +--
 .../testng/TestSeleniumWithTestNG.java        |  5 +--
 .../testng/TestSeleniumWithTestNG.java        | 34 -------------------
 .../selenium/junit/TestSeleniumWithJUnit.java | 34 -------------------
 5 files changed, 9 insertions(+), 80 deletions(-)
 delete mode 100644 selenium-junit-testng/test/com/baeldun/selenium/testng/TestSeleniumWithTestNG.java
 delete mode 100644 selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java

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
index 6020b6bd2c..d8b248df81 100644
--- 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 @@ import org.openqa.selenium.firefox.FirefoxDriver;
 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 class SeleniumExample {
         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
index 371f730eb9..dabb1e1988 100644
--- 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
@@ -10,6 +10,7 @@ import org.junit.Test;
 public class TestSeleniumWithJUnit {
 
     private SeleniumExample seleniumExample;
+	private String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
 
     @Before
     public void setUp() {
@@ -23,8 +24,8 @@ public class TestSeleniumWithJUnit {
 
     @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
index ec10f9ca82..78ef8b8dfb 100644
--- 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
@@ -10,6 +10,7 @@ import org.testng.annotations.Test;
 public class TestSeleniumWithTestNG {
 
     private SeleniumExample seleniumExample;
+	private String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
 
     @BeforeSuite
     public void setUp() {
@@ -23,8 +24,8 @@ public class TestSeleniumWithTestNG {
 
     @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
deleted file mode 100644
index dcdfafc4f1..0000000000
--- a/selenium-junit-testng/test/com/baeldun/selenium/testng/TestSeleniumWithTestNG.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.baeldun.selenium.testng;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Test;
-
-public class TestSeleniumWithTestNG {
-
-    private WebDriver webDriver;
-    private final String url = "http://www.baeldung.com/";
-    private final String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
-
-    @BeforeSuite
-    public void setUp() {
-        webDriver = new FirefoxDriver();
-        webDriver.get(url);
-    }
-
-    @AfterSuite
-    public void tearDown() {
-        webDriver.close();
-    }
-
-    @Test
-    public void whenPageIsLoaded_thenTitleIsAsPerExpectation() {
-        String actualTitleReturned = webDriver.getTitle();
-        assertNotNull(actualTitleReturned);
-        assertEquals(expectedTitle, actualTitleReturned);
-    }
-}
diff --git a/selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java b/selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java
deleted file mode 100644
index a7b36c4e4e..0000000000
--- a/selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.baeldung.selenium.junit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-
-public class TestSeleniumWithJUnit {
-
-    private WebDriver webDriver;
-    private final String url = "http://www.baeldung.com/";
-    private final String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
-
-    @Before
-    public void setUp() {
-        webDriver = new FirefoxDriver();
-        webDriver.get(url);
-    }
-
-    @After
-    public void tearDown() {
-        webDriver.close();
-    }
-
-    @Test
-    public void whenPageIsLoaded_thenTitleIsAsPerExpectation() {
-        String actualTitleReturned = webDriver.getTitle();
-        assertNotNull(actualTitleReturned);
-        assertEquals(expectedTitle, actualTitleReturned);
-    }
-}

From d4e7c9d4af2a3b6f7e169d7d8c518748f53f3e42 Mon Sep 17 00:00:00 2001
From: Sandeep Kumar <sandeep4odesk@gmail.com>
Date: Sun, 2 Oct 2016 18:01:49 +0530
Subject: [PATCH 2/3] Modifying methods in test files

---
 selenium-junit-testng/pom.xml                 | 82 +++++++++++--------
 .../baeldung/selenium/SeleniumExample.java    | 11 +--
 .../selenium/junit/TestSeleniumWithJUnit.java |  5 +-
 .../testng/TestSeleniumWithTestNG.java        |  5 +-
 .../testng/TestSeleniumWithTestNG.java        | 34 --------
 .../selenium/junit/TestSeleniumWithJUnit.java | 34 --------
 6 files changed, 56 insertions(+), 115 deletions(-)
 delete mode 100644 selenium-junit-testng/test/com/baeldun/selenium/testng/TestSeleniumWithTestNG.java
 delete mode 100644 selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java

diff --git a/selenium-junit-testng/pom.xml b/selenium-junit-testng/pom.xml
index c6bd2b042c..bf5a082fba 100644
--- 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>
\ No newline at end of file
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
index 6020b6bd2c..d8b248df81 100644
--- 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 @@ import org.openqa.selenium.firefox.FirefoxDriver;
 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 class SeleniumExample {
         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
index 371f730eb9..dabb1e1988 100644
--- 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
@@ -10,6 +10,7 @@ import org.junit.Test;
 public class TestSeleniumWithJUnit {
 
     private SeleniumExample seleniumExample;
+	private String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
 
     @Before
     public void setUp() {
@@ -23,8 +24,8 @@ public class TestSeleniumWithJUnit {
 
     @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
index ec10f9ca82..78ef8b8dfb 100644
--- 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
@@ -10,6 +10,7 @@ import org.testng.annotations.Test;
 public class TestSeleniumWithTestNG {
 
     private SeleniumExample seleniumExample;
+	private String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
 
     @BeforeSuite
     public void setUp() {
@@ -23,8 +24,8 @@ public class TestSeleniumWithTestNG {
 
     @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
deleted file mode 100644
index dcdfafc4f1..0000000000
--- a/selenium-junit-testng/test/com/baeldun/selenium/testng/TestSeleniumWithTestNG.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.baeldun.selenium.testng;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Test;
-
-public class TestSeleniumWithTestNG {
-
-    private WebDriver webDriver;
-    private final String url = "http://www.baeldung.com/";
-    private final String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
-
-    @BeforeSuite
-    public void setUp() {
-        webDriver = new FirefoxDriver();
-        webDriver.get(url);
-    }
-
-    @AfterSuite
-    public void tearDown() {
-        webDriver.close();
-    }
-
-    @Test
-    public void whenPageIsLoaded_thenTitleIsAsPerExpectation() {
-        String actualTitleReturned = webDriver.getTitle();
-        assertNotNull(actualTitleReturned);
-        assertEquals(expectedTitle, actualTitleReturned);
-    }
-}
diff --git a/selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java b/selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java
deleted file mode 100644
index a7b36c4e4e..0000000000
--- a/selenium-junit-testng/test/com/baeldung/selenium/junit/TestSeleniumWithJUnit.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.baeldung.selenium.junit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-
-public class TestSeleniumWithJUnit {
-
-    private WebDriver webDriver;
-    private final String url = "http://www.baeldung.com/";
-    private final String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
-
-    @Before
-    public void setUp() {
-        webDriver = new FirefoxDriver();
-        webDriver.get(url);
-    }
-
-    @After
-    public void tearDown() {
-        webDriver.close();
-    }
-
-    @Test
-    public void whenPageIsLoaded_thenTitleIsAsPerExpectation() {
-        String actualTitleReturned = webDriver.getTitle();
-        assertNotNull(actualTitleReturned);
-        assertEquals(expectedTitle, actualTitleReturned);
-    }
-}

From ea6353917dac20a8b99c0cb37e0545932923f6dc Mon Sep 17 00:00:00 2001
From: Zeger Hendrikse <zeger.hendrikse@gmail.com>
Date: Wed, 5 Oct 2016 22:15:30 +0200
Subject: [PATCH 3/3] Fixed compilation errors

---
 .../com/baeldung/selenium/junit/TestSeleniumWithJUnit.java   | 3 ++-
 .../com/baeldung/selenium/testng/TestSeleniumWithTestNG.java | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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
index dabb1e1988..f183a613e7 100644
--- 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;
@@ -25,7 +26,7 @@ public class TestSeleniumWithJUnit {
     @Test
     public void whenPageIsLoaded_thenTitleIsAsPerExpectation() {
         String actualTitle = seleniumExample.getTitle();
-		assertNotNull(actualTitle);
+        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
index 78ef8b8dfb..3c94f3d440 100644
--- 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,7 +11,7 @@ import org.testng.annotations.Test;
 public class TestSeleniumWithTestNG {
 
     private SeleniumExample seleniumExample;
-	private String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
+    private String expectedTitle = "Baeldung | Java, Spring and Web Development tutorials";
 
     @BeforeSuite
     public void setUp() {
@@ -25,7 +26,7 @@ public class TestSeleniumWithTestNG {
     @Test
     public void whenPageIsLoaded_thenTitleIsAsPerExpectation() {
         String actualTitle = seleniumExample.getTitle();
-		assertNotNull(actualTitle);
+        assertNotNull(actualTitle);
         assertEquals(actualTitle, expectedTitle);
     }
 }