Feedback changes - restructed project structure

Author: colinbut

page-object/etc/page-object.ucls

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <class-diagram version="1.1.9" icons="true" always-add-relationships="false" generalizations="true" realizations="true" 
   associations="true" dependencies="false" nesting-relationships="true" router="FAN">  
-  <class id="1" language="java" name="com.iluwatar.pages.LoginPage" project="test-automation" 
+  <class id="1" language="java" name="java.com.iluwatar.pageobject.pages.LoginPage" project="test-automation"
     file="/test-automation/src/main/java/com/iluwatar/pages/LoginPage.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="163" y="396"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
@@ -10,7 +10,7 @@
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="2" language="java" name="com.iluwatar.pages.AlbumPage" project="test-automation" 
+  <class id="2" language="java" name="java.com.iluwatar.pageobject.pages.AlbumPage" project="test-automation"
     file="/test-automation/src/main/java/com/iluwatar/pages/AlbumPage.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="487" y="416"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
@@ -19,7 +19,7 @@
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="3" language="java" name="com.iluwatar.pages.AlbumListPage" project="test-automation" 
+  <class id="3" language="java" name="java.com.iluwatar.pageobject.pages.AlbumListPage" project="test-automation"
     file="/test-automation/src/main/java/com/iluwatar/pages/AlbumListPage.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="269" width="260" x="698" y="260"/>    
     <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" 
@@ -28,7 +28,7 @@
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="4" language="java" name="com.iluwatar.Page" project="test-automation" 
+  <class id="4" language="java" name="java.com.iluwatar.pageobject.pages.Page" project="test-automation"
     file="/test-automation/src/main/java/com/iluwatar/Page.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="481" y="57"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 

page-object/pom.xml

@@ -32,9 +32,16 @@
         <version>1.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>page-object</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>sample-application</module>
-        <module>test-automation</module>
-    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.22</version>
+        </dependency>
+    </dependencies>
 </project>

page-object/sample-application/pom.xml

@@ -71,7 +71,7 @@ public static void main(String[] args) {
 
     String currentWorkingDir = System.getProperty("user.dir");
     File applicationFile = new File(currentWorkingDir
-        + "/page-object/sample-application/src/main/resources/sample-ui/login.html");
+        + "/page-object/src/main/resources/sample-ui/login.html");
 
     // should work for unix like OS (mac, unix etc...)
     if (Desktop.isDesktopSupported()) {

page-object/sample-application/src/main/java/com/iluwatar/pageobject/App.java renamed to page-object/src/main/java/com/iluwatar/pageobject/App.java

@@ -24,8 +24,8 @@
 
 
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.iluwatar.pages.AlbumListPage;
-import com.iluwatar.pages.AlbumPage;
+import com.iluwatar.pageobject.pages.AlbumListPage;
+import com.iluwatar.pageobject.pages.AlbumPage;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;

page-object/sample-application/src/main/resources/credentials.txt renamed to page-object/src/main/resources/credentials.txt

@@ -23,8 +23,8 @@
 package com.iluwatar.pageobject;
 
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.iluwatar.pages.AlbumListPage;
-import com.iluwatar.pages.AlbumPage;
+import com.iluwatar.pageobject.pages.AlbumListPage;
+import com.iluwatar.pageobject.pages.AlbumPage;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;

page-object/sample-application/src/main/resources/sample-ui/album-list.html renamed to page-object/src/main/resources/sample-ui/album-list.html

@@ -23,8 +23,8 @@
 package com.iluwatar.pageobject;
 
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.iluwatar.pages.AlbumListPage;
-import com.iluwatar.pages.LoginPage;
+import com.iluwatar.pageobject.pages.AlbumListPage;
+import com.iluwatar.pageobject.pages.LoginPage;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;

page-object/sample-application/src/main/resources/sample-ui/album-page.html renamed to page-object/src/main/resources/sample-ui/album-page.html

@@ -20,12 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.pages;
+package com.iluwatar.pageobject.pages;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.iluwatar.Page;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

page-object/sample-application/src/main/resources/sample-ui/css/album-list.css renamed to page-object/src/main/resources/sample-ui/css/album-list.css

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.pages;
+package com.iluwatar.pageobject.pages;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlNumberInput;
@@ -29,7 +29,6 @@
 import com.gargoylesoftware.htmlunit.html.HtmlSelect;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-import com.iluwatar.Page;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

page-object/sample-application/src/main/resources/sample-ui/css/style.css renamed to page-object/src/main/resources/sample-ui/css/style.css

@@ -20,14 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.pages;
+package com.iluwatar.pageobject.pages;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-import com.iluwatar.Page;
 import java.io.IOException;
 import java.net.MalformedURLException;
 

page-object/sample-application/src/main/resources/sample-ui/login.html renamed to page-object/src/main/resources/sample-ui/login.html

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar;
+package com.iluwatar.pageobject.pages;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 
@@ -33,7 +33,7 @@ public abstract class Page {
    * Application Under Test path
    * This directory location is where html web pages are located
    */
-  public static final String AUT_PATH = "../sample-application/src/main/resources/sample-ui/";
+  public static final String AUT_PATH = "src/main/resources/sample-ui/";
 
   protected WebClient webClient;