Skip to content

Commit 27e4e9a

Browse files
colinbutcolinbut
committed
Feedback changes - restructed project structure
1 parent 35c0942 commit 27e4e9a

File tree

18 files changed

+28
-107
lines changed

18 files changed

+28
-107
lines changed

‎page-object/etc/page-object.ucls

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<class-diagram version="1.1.9" icons="true" always-add-relationships="false" generalizations="true" realizations="true"
33
associations="true" dependencies="false" nesting-relationships="true" router="FAN">
4-
<class id="1" language="java" name="com.iluwatar.pages.LoginPage" project="test-automation"
4+
<class id="1" language="java" name="java.com.iluwatar.pageobject.pages.LoginPage" project="test-automation"
55
file="/test-automation/src/main/java/com/iluwatar/pages/LoginPage.java" binary="false" corner="BOTTOM_RIGHT">
66
<position height="-1" width="-1" x="163" y="396"/>
77
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -10,7 +10,7 @@
1010
<operations public="true" package="true" protected="true" private="true" static="true"/>
1111
</display>
1212
</class>
13-
<class id="2" language="java" name="com.iluwatar.pages.AlbumPage" project="test-automation"
13+
<class id="2" language="java" name="java.com.iluwatar.pageobject.pages.AlbumPage" project="test-automation"
1414
file="/test-automation/src/main/java/com/iluwatar/pages/AlbumPage.java" binary="false" corner="BOTTOM_RIGHT">
1515
<position height="-1" width="-1" x="487" y="416"/>
1616
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -19,7 +19,7 @@
1919
<operations public="true" package="true" protected="true" private="true" static="true"/>
2020
</display>
2121
</class>
22-
<class id="3" language="java" name="com.iluwatar.pages.AlbumListPage" project="test-automation"
22+
<class id="3" language="java" name="java.com.iluwatar.pageobject.pages.AlbumListPage" project="test-automation"
2323
file="/test-automation/src/main/java/com/iluwatar/pages/AlbumListPage.java" binary="false" corner="BOTTOM_RIGHT">
2424
<position height="269" width="260" x="698" y="260"/>
2525
<display autosize="false" stereotype="true" package="true" initial-value="false" signature="true"
@@ -28,7 +28,7 @@
2828
<operations public="true" package="true" protected="true" private="true" static="true"/>
2929
</display>
3030
</class>
31-
<class id="4" language="java" name="com.iluwatar.Page" project="test-automation"
31+
<class id="4" language="java" name="java.com.iluwatar.pageobject.pages.Page" project="test-automation"
3232
file="/test-automation/src/main/java/com/iluwatar/Page.java" binary="false" corner="BOTTOM_RIGHT">
3333
<position height="-1" width="-1" x="481" y="57"/>
3434
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"

‎page-object/pom.xml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,16 @@
3232
<version>1.12.0-SNAPSHOT</version>
3333
</parent>
3434
<artifactId>page-object</artifactId>
35-
<packaging>pom</packaging>
36-
<modules>
37-
<module>sample-application</module>
38-
<module>test-automation</module>
39-
</modules>
35+
<dependencies>
36+
<dependency>
37+
<groupId>junit</groupId>
38+
<artifactId>junit</artifactId>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>net.sourceforge.htmlunit</groupId>
43+
<artifactId>htmlunit</artifactId>
44+
<version>2.22</version>
45+
</dependency>
46+
</dependencies>
4047
</project>

‎page-object/sample-application/pom.xml

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static void main(String[] args) {
7171

7272
String currentWorkingDir = System.getProperty("user.dir");
7373
File applicationFile = new File(currentWorkingDir
74-
+ "/page-object/sample-application/src/main/resources/sample-ui/login.html");
74+
+ "/page-object/src/main/resources/sample-ui/login.html");
7575

7676
// should work for unix like OS (mac, unix etc...)
7777
if (Desktop.isDesktopSupported()) {

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

0 commit comments

Comments
 (0)