svn commit: r1199973 - /turbine/core/trunk/src/test/org/apache/turbine/TurbineConfigTest.java

[tv]

Author: tv
Date: Wed Nov  9 21:27:21 2011
New Revision: 1199973

URL: http://svn.apache.org/viewvc?rev=1199973&view=rev
Log:
Fix test relying on static methods

Modified:
    turbine/core/trunk/src/test/org/apache/turbine/TurbineConfigTest.java

Modified: turbine/core/trunk/src/test/org/apache/turbine/TurbineConfigTest.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/TurbineConfigTest.java?rev=1199973&r1=1199972&r2=1199973&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/TurbineConfigTest.java 
(original)
+++ turbine/core/trunk/src/test/org/apache/turbine/TurbineConfigTest.java Wed 
Nov  9 21:27:21 2011
@@ -53,11 +53,12 @@ public class TurbineConfigTest
     {
         String value = new 
File("/conf/test/TemplateService.properties").getPath();
         tc = new TurbineConfig(".", value);
+        Turbine turbine = new Turbine();
 
-        ServletConfig config = (ServletConfig) tc;
+        ServletConfig config = tc;
         ServletContext context = config.getServletContext();
 
-        String confFile= Turbine.findInitParameter(context, config,
+        String confFile= turbine.findInitParameter(context, config,
                 TurbineConfig.PROPERTIES_PATH_KEY,
                 null);
         assertEquals(value, confFile);
@@ -67,11 +68,12 @@ public class TurbineConfigTest
     {
         String value = new 
File("/conf/test/TurbineConfiguration.xml").getPath();
             txc = new TurbineXmlConfig(".", value);
+        Turbine turbine = new Turbine();
 
-        ServletConfig config = (ServletConfig) txc;
+        ServletConfig config = txc;
         ServletContext context = config.getServletContext();
 
-            String confFile= Turbine.findInitParameter(context, config,
+            String confFile= turbine.findInitParameter(context, config,
                     TurbineConfig.CONFIGURATION_PATH_KEY,
                     null);
         assertEquals(value, confFile);