[seam-commits] Seam SVN: r14873 - branches/enterprise/WFK-2_0/jboss-seam/src/main/java/org/jboss/seam/mock.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-06-07 06:59:45 -0400 (Thu, 07 Jun 2012)
New Revision: 14873

Modified:
   branches/enterprise/WFK-2_0/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
Log:
JBSEAM-4986 attempt to fix it by not using FactoryFinder to get the MockApplication instance

Modified: branches/enterprise/WFK-2_0/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java	2012-06-07 10:59:35 UTC (rev 14872)
+++ branches/enterprise/WFK-2_0/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java	2012-06-07 10:59:45 UTC (rev 14873)
@@ -987,7 +987,11 @@
    protected void setupClass() throws Exception
    {
       servletContext = ServletLifecycle.getServletContext();
-      applicationFactory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
+      
+      // FactoryFinder cannot be reliably used, as something could have called getFactory sooner
+      //applicationFactory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
+      applicationFactory = new MockApplicationFactory();
+      
       application = applicationFactory.getApplication();
       conversationViewRootAttributes = new HashMap<String, Map>();
       seamFilter = createSeamFilter();