svn commit: r1633208 - /myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderTest.java

[an...@apache.org]

Author: andys
Date: Mon Oct 20 19:27:21 2014
New Revision: 1633208

URL: http://svn.apache.org/r1633208
Log:
TRINIDAD-2516 SkinProviderTest failing because of surefire test run order

Thanks for the patch Anand.


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

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderTest.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderTest.java?rev=1633208&r1=1633207&r2=1633208&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderTest.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/skin/provider/SkinProviderTest.java Mon Oct 20 19:27:21 2014
@@ -90,6 +90,7 @@ public class SkinProviderTest extends Te
     _externalContext = null;
     _provider = null;
     RenderKitBootstrap.clearFactories();
+    MRequestContext.releaseApplicationState();
   }
 
   public void testTrinidadBaseSkinsUsingId()
@@ -241,7 +242,6 @@ public class SkinProviderTest extends Te
 
   public void testSkinCache()
   {
-
     _cleanTempDir();
 
     // access skin from external provider
@@ -441,12 +441,16 @@ public class SkinProviderTest extends Te
   {
     try
     {
+      // since the order of test execution is not guaranteed, this test may find some left over application state 
+      // from other test executions. therefore, clear any application state from previous test cases.
+      MRequestContext.releaseApplicationState();
       RenderKitBootstrap bootstrap = new RenderKitBootstrap();
       bootstrap.init();
       _facesConfigInfo = bootstrap.getFacesConfigInfo();
     }
     catch (Exception e)
     {
+      System.out.println("***** RenderKitBootstrap FAILED *******");
     }
   }
 }