[richfaces-svn-commits] JBoss Rich Faces SVN: r13344 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces.

[richfaces-svn-commits at lists.jboss.org]

Author: abelevich
Date: 2009-04-01 11:49:22 -0400 (Wed, 01 Apr 2009)
New Revision: 13344

Modified:
   trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
Log:


Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java	2009-04-01 15:26:59 UTC (rev 13343)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java	2009-04-01 15:49:22 UTC (rev 13344)
@@ -135,8 +135,8 @@
     @DataProvider(name = "templates")
     protected Object[][] templates() {
         //return new Object[][] { { Template.SIMPLE }, { Template.DATA_TABLE }, { Template.DATA_TABLE2 }, { Template.MODAL_PANEL } };
-    	return Configurator.getTemplates();
-        //return this.data;
+   	
+    	return !useDefaultTemplates() ? getTestDependedTemplates() : Configurator.getTemplates(); 
     }
 
     /**
@@ -152,12 +152,7 @@
 			}
 		}
 		
-		if(!useDefaultTemplates()) {
-			String processTemplates = getTestDependedTemplates();
-	        Configurator.setTemplates(processTemplates);
-		}
-	        
-        synchronized (MUTEX) {
+	    synchronized (MUTEX) {
             this.filterPrefix = filterPrefix;
             selenium = createSeleniumClient(protocol + "://" + host + ":" + port + "/", browser);
             setFileExtensionContent();
@@ -236,7 +231,7 @@
      *  override this methods if you want use set custom templates per test class 
      * 
      */
-    protected String getTestDependedTemplates() {
+    protected Object [][] getTestDependedTemplates() {
     	return null;
     }