svn commit: r1408338 - in /turbine/core/trunk/src/test/org/apache/turbine: pipeline/DefaultSessionTimeoutValveTest.java services/pull/tools/UIToolTest.java

[gk]

Author: gk
Date: Mon Nov 12 16:03:09 2012
New Revision: 1408338

URL: http://svn.apache.org/viewvc?rev=1408338&view=rev
Log:
fixing tests running with java 1.7(09), which has no implicit test execution 
order - in compliance with junit assumptions of independent tests.

Modified:
    
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
    
turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java

Modified: 
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java?rev=1408338&r1=1408337&r2=1408338&view=diff
==============================================================================
--- 
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
 (original)
+++ 
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultSessionTimeoutValveTest.java
 Mon Nov 12 16:03:09 2012
@@ -106,6 +106,10 @@ public class DefaultSessionTimeoutValveT
      */
     public void testDefaults() throws Exception
     {
+        
+        // reset
+        
Turbine.getConfiguration().setProperty(TurbineConstants.SESSION_TIMEOUT_KEY,
+                TurbineConstants.SESSION_TIMEOUT_DEFAULT); 
         Vector v = new Vector();
         v.add(URIConstants.CGI_ACTION_PARAM);
         request.setupGetParameterNames(v.elements());

Modified: 
turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java?rev=1408338&r1=1408337&r2=1408338&view=diff
==============================================================================
--- 
turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
 (original)
+++ 
turbine/core/trunk/src/test/org/apache/turbine/services/pull/tools/UIToolTest.java
 Mon Nov 12 16:03:09 2012
@@ -63,6 +63,7 @@ public class UIToolTest
     public void testCssSlashes()
     {
         UITool ui = getTool();
+        ui.setSkin("myskin");
 
         String cssUrl = ui.getStylecss();
         assertEquals("CSS URL does not match", 
"http:///conf/test/turbine-resources/turbine-skins/myskin/skins.css";, cssUrl);
@@ -71,6 +72,7 @@ public class UIToolTest
     public void testImageSlashes()
     {
         UITool ui = getTool();
+        ui.setSkin("myskin");
 
         String img = "myimage.gif";
 
@@ -91,16 +93,17 @@ public class UIToolTest
     public void testPathologicalCases()
     {
        UITool ui = getTool();
+               ui.setSkin("myskin");
 
        String img = "";
         String imgUrl = ui.image(img);
         assertEquals("Could not strip empty String", 
"http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, 
imgUrl);
 
-       img = "/";
+        img = "/";
         imgUrl = ui.image(img);
         assertEquals("Could not strip single Slash", 
"http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, 
imgUrl);
 
-       img = "//";
+        img = "//";
         imgUrl = ui.image(img);
         assertEquals("Could not strip double Slash", 
"http:///conf/test/turbine-resources/turbine-skins/myskin/turbine-images/";, 
imgUrl);
     }