restructure project

Naimadnap · Oct 20, 2014 · 12592b5 · 12592b5
1 parent 61ff996
commit 12592b5
Show file tree

Hide file tree

Showing 8 changed files with 375 additions and 358 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,12 +42,17 @@ Thumbs.db
 
 # Maven #
 #########
-*/target/*
+**/target/*
 
 # Other IDE's#
 ##############
 \.classpath
 \.project
 \.settings
 \.dorsync
-/nbactions.xml
+/nbactions.xml
+
+# Binary Downloads #
+####################
+**/selenium_standalone_binaries/
+**/selenium_standalone_zips/
diff --git a/pom.xml b/pom.xml
@@ -39,16 +39,21 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <standalone.binary.root.folder>${project.basedir}/selenium_standalone_binaries</standalone.binary.root.folder>
+        <env.config>local</env.config>
         <browser>firefox</browser>
         <threads>1</threads>
+        <standalone.binary.root.folder>${project.build.testResources}/selenium_standalone_binaries</standalone.binary.root.folder>
+        <remote>false</remote>
+        <seleniumGridURL/>
+        <platform/>
+        <browserVersion/>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-server</artifactId>
-            <version>2.41.0</version>
+            <version>2.43.1</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -89,41 +94,27 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    </configuration>
-                    <version>2.3.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <profiles>
         <profile>
             <id>selenium-tests</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
+                <resources>
+                    <resource>
+                        <directory>src/test/resources</directory>
+                    </resource>
+                </resources>
                 <plugins>
                     <plugin>
                         <groupId>com.lazerycode.selenium</groupId>
                         <artifactId>driver-binary-downloader-maven-plugin</artifactId>
                         <version>1.0.3</version>
                         <configuration>
                             <rootStandaloneServerDirectory>${standalone.binary.root.folder}</rootStandaloneServerDirectory>
-                            <downloadedZipFileDirectory>${project.basedir}/selenium_standalone_zips</downloadedZipFileDirectory>
-                            <customRepositoryMap>${project.basedir}/RepositoryMap.xml</customRepositoryMap>
+                            <downloadedZipFileDirectory>${project.build.testResources}/selenium_standalone_zips</downloadedZipFileDirectory>
+                            <customRepositoryMap>${project.build.testResources}/RepositoryMap.xml</customRepositoryMap>
                         </configuration>
                         <executions>
                             <execution>
@@ -133,16 +124,35 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <source>1.7</source>
+                            <target>1.7</target>
+                        </configuration>
+                        <version>2.3.2</version>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>2.7.2</version>
                         <configuration>
-                            <includes>
-                                <include>**/*ST.java</include>
-                            </includes>
                             <parallel>methods</parallel>
                             <threadCount>${threads}</threadCount>
+                            <systemProperties>
+                                <env.config>${env.config}</env.config>
+                                <browser>${browser}</browser>
+                                <binaryRootFolder>${standalone.binary.root.folder}</binaryRootFolder>
+                                <screenshotDirectory>${project.build.directory}/screenshots</screenshotDirectory>
+                                <remoteDriver>${remote}</remoteDriver>
+                                <gridURL>${seleniumGridURL}</gridURL>
+                                <desiredPlatform>${platform}</desiredPlatform>
+                                <desiredBrowserVersion>${browserVersion}</desiredBrowserVersion>
+                            </systemProperties>
+                            <includes>
+                                <include>**/*WebDriver.java</include>
+                            </includes>
                         </configuration>
                     </plugin>
                 </plugins>