Author: seade
Date: Sun May 6 20:31:18 2007
New Revision: 535722
URL: http://svn.apache.org/viewvc?view=rev&rev=535722
Log:
One more fix to the retrieval of skin names so it works in applications as well
as tests.
Skin name test case now caters for .svn directory.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/ui/TurbineUIService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/ui/TurbineUIService.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/ui/TurbineUIService.java?view=diff&rev=535722&r1=535721&r2=535722
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/ui/TurbineUIService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/ui/TurbineUIService.java
Sun May 6 20:31:18 2007
@@ -228,7 +228,7 @@
*/
public String[] getSkinNames()
{
- File skinsDir = new File(skinsDirectory);
+ File skinsDir = new File(TurbineServlet.getRealPath(skinsDirectory));
return skinsDir.list(DirectoryFileFilter.INSTANCE);
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java?view=diff&rev=535722&r1=535721&r2=535722
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
Sun May 6 20:31:18 2007
@@ -109,11 +109,13 @@
UITool ui = getTool();
String[] skinNames = ui.getSkinNames();
- assertEquals(2, skinNames.length);
+ // two real skins + ".svn"
+ assertEquals(3, skinNames.length);
// Not completely sure this will always be in the same order.
- assertEquals("myotherskin", skinNames[0]);
- assertEquals("myskin", skinNames[1]);
+ assertEquals(".svn", skinNames[0]); // Not actually a skin
+ assertEquals("myotherskin", skinNames[1]);
+ assertEquals("myskin", skinNames[2]);
}
public void testSkinValues()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
