svn commit: r1630639 - /myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/SkinTestCase.java

[an...@apache.org]

Author: andys
Date: Fri Oct 10 02:11:29 2014
New Revision: 1630639

URL: http://svn.apache.org/r1630639
Log:
TRINIDAD-2510 make SkinTestCase more extendable

Thanks for the patch Anand.




Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/SkinTestCase.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/SkinTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/SkinTestCase.java?rev=1630639&r1=1630638&r2=1630639&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/SkinTestCase.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/SkinTestCase.java Fri Oct 10 02:11:29 2014
@@ -64,24 +64,33 @@ public class SkinTestCase extends TestCa
   /**
    * Returns the StyleSheetDocument for the specified test skin.
    */
-  protected StyleSheetDocument getSkinDocument(TestSkin testSkin)
+  protected StyleSheetDocument getSkinDocument(String testSkinPath)
   {
-    return SkinTestUtils.parseSkin(testSkin.getResourceName());
+    return SkinTestUtils.parseSkin(testSkinPath);
   }
 
   /**
    * Performs a visit of all style sheet nodes in the specified test
    * skin
    */
-  protected void visitStyleSheets(TestSkin testSkin, StyleSheetVisitor visitor)
+  protected final void visitStyleSheets(TestSkin testSkin, StyleSheetVisitor visitor)
   {
-    StyleSheetDocument document = getSkinDocument(testSkin);
-    
+    visitStyleSheets(testSkin.getResourceName(), visitor);
+  }
+
+  /**
+   * Performs a visit of all style sheet nodes in the specified test
+   * skin. This overloaded method is useful in extending SkinTestCase to
+   * create more test cases since TestSkin does not provide all the skins
+   * that test needs.
+   */
+  protected void visitStyleSheets(String skinResourcePath, StyleSheetVisitor visitor)
+  {
+    StyleSheetDocument document = getSkinDocument(skinResourcePath);
     StyleSheetVisitUtils.visitStyleSheets(document.getStyleSheetsAsCollection(), visitor);
   }
 
-  private static final String _RESOURCE_PATH =
-    "org/apache/myfaces/trinidadinternal/skin/testSkins/";
-  
+  private static final String _RESOURCE_PATH = "org/apache/myfaces/trinidadinternal/skin/testSkins/";
   private static final String _SUFFIX = ".css";
 }
+