You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2013/06/07 00:20:03 UTC
svn commit: r1490463 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test: pom.xml
src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java
Author: skygo
Date: Thu Jun 6 22:20:03 2013
New Revision: 1490463
URL: http://svn.apache.org/r1490463
Log:
add capturetohtml in parallel to be able to parse a bit selenium failed test result.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1490463&r1=1490462&r2=1490463&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Thu Jun 6 22:20:03 2013
@@ -318,6 +318,18 @@
<copy todir="${project.build.directory}/local-repo">
<fileset dir="src/test/resources/local-repo"/>
</copy>
+ <copy todir="${project.build.directory}/errorshtmlsnap/css">
+ <fileset dir="${webappDirectory}/css"/>
+ </copy>
+ <copy todir="${project.build.directory}/errorshtmlsnap/js">
+ <fileset dir="${webappDirectory}/js"/>
+ </copy>
+ <copy todir="${project.build.directory}/errorshtmlsnap/img">
+ <fileset dir="${webappDirectory}/img"/>
+ </copy>
+ <copy todir="${project.build.directory}/errorshtmlsnap/imgages">
+ <fileset dir="${webappDirectory}/images"/>
+ </copy>
</tasks>
</configuration>
</execution>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java?rev=1490463&r1=1490462&r2=1490463&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java Thu Jun 6 22:20:03 2013
@@ -27,6 +27,7 @@ import org.junit.Rule;
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
@@ -35,6 +36,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
+import org.apache.commons.io.FileUtils;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -683,11 +685,23 @@ public abstract class AbstractSeleniumTe
String fileBaseName = methodName + "_" + className + ".java_" + lineNumber + "-" + time;
selenium.windowMaximize();
-
+
+ try
+ {
+ // save html to have a minimum feedback if jenkins firefox not up
+ File fileNameHTML = new File( new File( "target", "errorshtmlsnap" ) , fileBaseName + ".html" );
+ FileUtils.writeStringToFile( fileNameHTML, selenium.getHtmlSource() );
+ }
+ catch ( IOException e )
+ {
+ System.out.print( e.getMessage() );
+ e.printStackTrace();
+ }
+
File fileName = new File( targetPath, fileBaseName + ".png" );
selenium.captureEntirePageScreenshot( fileName.getAbsolutePath(), "background=#FFFFFF" );
-
+
return fileName.getAbsolutePath();
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java?rev=1490463&r1=1490462&r2=1490463&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java Thu Jun 6 22:20:03 2013
@@ -46,7 +46,7 @@ public class ArchivaSeleniumExecutionRul
String fileName =
( (AbstractSeleniumTest) target ).captureScreenShotOnFailure( e, method.getMethod().getName(),
target.getClass().getName() );
-
+
throw new RuntimeException( e.getMessage() + " see screenShot file:" + fileName, e );
}
finally