gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Feedback changes - restructed project structure

Browse Source
This commit is contained in:
Colin But
2016-06-28 21:53:55 +01:00
parent 35c0942803
commit 27e4e9afee
18 changed files with 28 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
page-object/etc/page-object.ucls
View File

@@ -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"

17
page-object/pom.xml
View File

@@ -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>

35
page-object/sample-application/pom.xml
View File

@@ -1,35 +0,0 @@
<?xml version="1.0"?>
<!--
The MIT License
Copyright (c) 2014 Ilkka Seppälä
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>page-object</artifactId>
<groupId>com.iluwatar</groupId>
<version>1.12.0-SNAPSHOT</version>
</parent>
<artifactId>sample-application</artifactId>
</project>

2
page-object/sample-application/src/main/java/com/iluwatar/pageobject/App.java → page-object/src/main/java/com/iluwatar/pageobject/App.java
View File

@@ -71,7 +71,7 @@ public final class App {
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()) {

0
page-object/sample-application/src/main/resources/credentials.txt → page-object/src/main/resources/credentials.txt
View File

0
page-object/sample-application/src/main/resources/sample-ui/album-list.html → page-object/src/main/resources/sample-ui/album-list.html
View File

0
page-object/sample-application/src/main/resources/sample-ui/album-page.html → page-object/src/main/resources/sample-ui/album-page.html
View File

0
page-object/sample-application/src/main/resources/sample-ui/css/album-list.css → page-object/src/main/resources/sample-ui/css/album-list.css
View File

0
page-object/sample-application/src/main/resources/sample-ui/css/style.css → page-object/src/main/resources/sample-ui/css/style.css
View File

0
page-object/sample-application/src/main/resources/sample-ui/login.html → page-object/src/main/resources/sample-ui/login.html
View File

4
page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java → page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
View File

@@ -24,8 +24,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;

4
page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java → page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
View File

@@ -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;

4
page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java → page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
View File

@@ -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;

3
page-object/test-automation/src/main/java/com/iluwatar/pages/AlbumListPage.java → page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.java
View File

@@ -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;

3
page-object/test-automation/src/main/java/com/iluwatar/pages/AlbumPage.java → page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.java
View File

@@ -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.HtmlPage;
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;

3
page-object/test-automation/src/main/java/com/iluwatar/pages/LoginPage.java → page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.java
View File

@@ -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;

4
page-object/test-automation/src/main/java/com/iluwatar/Page.java → page-object/src/test/java/com/iluwatar/pageobject/pages/Page.java
View File

@@ -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;

48
page-object/test-automation/pom.xml
View File

@@ -1,48 +0,0 @@
<?xml version="1.0"?>
<!--
The MIT License
Copyright (c) 2014 Ilkka Seppälä
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>page-object</artifactId>
<groupId>com.iluwatar</groupId>
<version>1.12.0-SNAPSHOT</version>
</parent>
<artifactId>test-automation</artifactId>
<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>