You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/03/31 14:07:49 UTC
directory-fortress-commander git commit: FC-83 - Cleanup web test
processing
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master fdc77617d -> dcbd407ec
FC-83 - Cleanup web test processing
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/dcbd407e
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/dcbd407e
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/dcbd407e
Branch: refs/heads/master
Commit: dcbd407ecf4f8cf012bbdc11587ce66b2f056d6b
Parents: fdc7761
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Mar 31 07:07:38 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Mar 31 07:07:38 2015 -0500
----------------------------------------------------------------------
README.txt | 6 +++---
pom.xml | 43 ++++++++++++++++++++-----------------------
2 files changed, 23 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/dcbd407e/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 57aaeae..a6828ec 100755
--- a/README.txt
+++ b/README.txt
@@ -61,7 +61,7 @@ a. Open a command prompt on target machine in the root folder of the directory-f
b. Set java home and maven home.
c. Run maven install:
-# mvn clean install -DskipTests
+# mvn clean install
___________________________________________________________________________________
###################################################################################
# SECTION 3: Obtain the fortress.properties
@@ -76,7 +76,7 @@ ________________________________________________________________________________
# SECTION 4: Load Fortress Web Security Policy
###################################################################################
Run maven install with load file:
-# mvn install -Dload.file=./src/main/resources/FortressWebDemoUsers.xml -DskipTests=true
+# mvn install -Dload.file=./src/main/resources/FortressWebDemoUsers.xml
###################################################################################
# SECTION 5: Instructions to Deploy Fortress Web application to Tomcat
@@ -115,7 +115,7 @@ ________________________________________________________________________________
# SECTION 6: Instructions to test Fortress Web application using Solenium
###################################################################################
Run the Selenium Web driver integration tests:
-# mvn verify -DskipTests=false -Dnoload
+# mvn test -Dtest=FortressWebSeleniumITCase
Note: This test case depends on:
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/dcbd407e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f39e79..7bb073d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -72,11 +72,6 @@
</developer>
<developer>
- <id>kmckinney</id>
- <name>Kevin McKinney</name>
- </developer>
-
- <developer>
<id>elecharny</id>
<name>Emmanuel Lecharny</name>
<email>elecharny@apache.org</email>
@@ -97,7 +92,6 @@
<jetty.stopKey>stopJetty</jetty.stopKey>
<jetty.stopPort>9081</jetty.stopPort>
<jetty.port>9080</jetty.port>
- <skipTests>true</skipTests>
</properties>
<dependencies>
@@ -494,22 +488,25 @@
</execution>
</executions>
</plugin>
-
- <!-- Integration Test -->
+
+ <!-- Fires on 'mvn test -Dtest=ClassName' where ClassName is junit test class name, for this project: -->
+ <!-- mvn test -Dtest=FortressWebSeleniumITCase -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skipTests>${skipTests}</skipTests>
+ <systemPropertyVariables>
+ <version>${project.version}</version>
+ </systemPropertyVariables>
+ <excludes>
+ <exclude>${exclude.tests}</exclude>
+ </excludes>
+ <includes>
+ <include>${include.tests}</include>
+ </includes>
+ <groups>${testcase.groups}</groups>
+ <runOrder>random</runOrder>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<!-- this works for embedded testing with Jetty -->
@@ -536,10 +533,9 @@
<execution>
<phase>test</phase>
<configuration>
- <target name="fortress-load"
- unless="noload"
- description="Loads fortress web rbac policy into ldap">
- <echo message="############### Run Fortress Ant script to load demo policy ###############"/>
+ <target name="fortress-load" if="load.file"
+ description="Loads fortress rbac policy files into ldap">
+ <echo message="############### Run Fortress Policy Load ###############"/>
<java
classname="org.apache.tools.ant.launch.Launcher"
fork="true"
@@ -573,7 +569,8 @@
<sysproperty key="version" value="${project.version}"/>
<sysproperty key="tenant" value="HOME"/>
<arg value="-buildfile"/>
- <arg file="./src/main/resources/FortressWebDemoUsers.xml"/>
+ <arg file="./${load.file}" />
+ <!--<arg file="./src/main/resources/FortressWebDemoUsers.xml"/>-->
</java>
</target>
</configuration>