mvn test runs headless tests by default

git-svn-id: http://svn.openqa.org/svn/selenium-rc/trunk/clients/perl@2115 0891141a-5dea-0310-ad27-ebc607f31677
lukec · Jan 13, 2008 · 34162d5 · 34162d5
1 parent 8dfe59c
commit 34162d5
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/build.xml b/build.xml
@@ -60,7 +60,23 @@
     	</perl>
     	<make />
     </target>
-    <target name="test" depends="init, make" unless="skiptests">
+
+    <target name="pre-test">
+        <condition property="skiptests-headless">
+            <or>
+                <isset property="skiptests" />
+                <not><istrue value="${headless}" /></not>
+            </or>
+        </condition>
+        <condition property="skiptests-nonheadless">
+            <or>
+                <istrue value="${headless}" />
+                <isset property="skiptests" />
+            </or>
+        </condition>
+    </target>
+
+    <target name="test-nonheadless" depends="init, make, pre-test" unless="skiptests-nonheadless">
     	<echo>${selenium-server}</echo>
         <java jar="${selenium-server}" fork="true" spawn="true"/>
         <sleep seconds="20"/>
@@ -75,6 +91,27 @@
         <fail if="build.failed" message="perl tests failed!" />
     </target>
 
+    <target name="test-headless" depends="init, make, pre-test" unless="skiptests-headless">
+    	<echo>${selenium-server}</echo>
+        <java jar="${selenium-server}" fork="true" spawn="true"/>
+        <sleep seconds="20"/>
+        <property name="lib.dir" location="lib" />
+        <perl failonerror="false" resultproperty="result">
+            <arg value="-MExtUtils::Command::MM" />
+            <arg value="-e" />
+            <arg value="test_harness(0, 'inc', 'blib/lib', 'blib/arch')" />
+            <arg file="t/test_i18n.t" />
+        </perl>
+        <get taskname="selenium-shutdown" src="http://localhost:4444/selenium-server/driver/?cmd=shutDown" dest="target/shutdown-result.txt" ignoreerrors="true" />
+        <sleep seconds="20"/>
+        <condition property="build.failed">
+        	<not><equals arg1="0" arg2="${result}" /></not>
+        </condition>
+        <fail if="build.failed" message="perl tests failed!" />
+    </target>
+
+    <target name="test" depends="test-headless, test-nonheadless" />
+
     <target name="dist" depends="generate-sources, doc">
         <mkdir dir="target" />
         <property name="project.version" value="UNKNOWNVERSION" />

diff --git a/pom.xml b/pom.xml
@@ -45,6 +45,9 @@
             </snapshots>
         </repository>
     </repositories>
+    <properties>
+        <headless>true</headless>
+    </properties>
     <profiles>
         <profile>
             <id>test</id>
@@ -68,6 +71,7 @@
                                             <property name="selenium-server"
                                                       value="${maven.dependency.org.openqa.selenium.server.selenium-server.standalone.jar.path}"/>
                                             <property name="project.version" value="${project.version}" />
+                                            <property name="headless" value="${headless}" />
                                         </ant>
                                     </tasks>
                                 </configuration>

diff --git a/t/test_i18n.t b/t/test_i18n.t
@@ -15,7 +15,7 @@ else {
 $sel = Test::WWW::Selenium->new(
     host        => $host,
     port        => $port,
-    browser     => "*firefox",
+    browser     => "*mock",
     browser_url => "http://$host:$port",
 );
 $sel->open("/selenium-server/tests/html/test_i18n.html");