svn commit: r1296377 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test: parent/AbstractSeleniumTest.java tools/ArchivaSeleniumExecutionRule.java

[olamy]

Author: olamy
Date: Fri Mar  2 18:39:27 2012
New Revision: 1296377

URL: http://svn.apache.org/viewvc?rev=1296377&view=rev
Log:
print screenshot path in the stack trace failure

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/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-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java?rev=1296377&r1=1296376&r2=1296377&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
 Fri Mar  2 18:39:27 2012
@@ -62,6 +62,7 @@ public abstract class AbstractSeleniumTe
 
     /**
      * this method is called by the Rule before executing a test
+     *
      * @throws Exception
      */
     public void open()
@@ -649,7 +650,7 @@ public abstract class AbstractSeleniumTe
         Assert.assertEquals( getSelenium().getValue( locator ), expectedValue 
);
     }
 
-    public void captureScreenShotOnFailure( Throwable failure, String 
methodName, String className )
+    public String captureScreenShotOnFailure( Throwable failure, String 
methodName, String className )
     {
         SimpleDateFormat sdf = new SimpleDateFormat( "yyyy.MM.dd-HH_mm_ss" );
         String time = sdf.format( new Date() );
@@ -673,8 +674,10 @@ public abstract class AbstractSeleniumTe
         selenium.windowMaximize();
 
         File fileName = new File( targetPath, fileBaseName + ".png" );
+
         selenium.captureEntirePageScreenshot( fileName.getAbsolutePath(), 
"background=#FFFFFF" );
 
+        return fileName.getAbsolutePath();
     }
 
 }
\ No newline at end of file

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/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-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java?rev=1296377&r1=1296376&r2=1296377&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/tools/ArchivaSeleniumExecutionRule.java
 Fri Mar  2 18:39:27 2012
@@ -31,7 +31,7 @@ import org.junit.runners.model.Statement
 public class ArchivaSeleniumExecutionRule
     implements MethodRule //TestRule
 {
-
+    // FIXME cerate a separate TestRule for open and close calls ?
     public Selenium selenium;
 
     public Statement apply( Statement base, FrameworkMethod method, Object 
target )
@@ -43,8 +43,11 @@ public class ArchivaSeleniumExecutionRul
         }
         catch ( Throwable e )
         {
-            ( (AbstractSeleniumTest) target ).captureScreenShotOnFailure( e, 
method.getMethod().getName(),
-                                                                          
target.getClass().getName() );
+            String fileName =
+                ( (AbstractSeleniumTest) target ).captureScreenShotOnFailure( 
e, method.getMethod().getName(),
+                                                                              
target.getClass().getName() );
+
+            throw new RuntimeException( e.getMessage() + " see screenShot 
file:" + fileName, e );
         }
         finally
         {
@@ -63,6 +66,6 @@ public class ArchivaSeleniumExecutionRul
 
     public Statement apply( Statement base, Description description )
     {
-        return base;  //To change body of implemented methods use File | 
Settings | File Templates.
+        return base;
     }
 }