svn commit: r427954 - /struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java

[ap...@apache.org]

Author: apetrelli
Date: Wed Aug  2 04:10:56 2006
New Revision: 427954

URL: http://svn.apache.org/viewvc?rev=427954&view=rev
Log:
SB-24
Corrected the check for instance count of MockComponentDefinitions.

Modified:
    struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java

Modified: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java?rev=427954&r1=427953&r2=427954&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java Wed Aug  2 04:10:56 2006
@@ -100,9 +100,15 @@
             assertEquals("MockDefinitionsReader not used.",  
                     readerInstanceCount + 1,
                     MockDefinitionsReader.getInstanceCount());
+            
+            // The reason of the "+ 2" is that MockComponentDefinitions is
+            // created twice, one in UrlDefinitionsFactory.init (that checks if
+            // the specific ComponentDefinitions implementation can be
+            // instantiated), the other in UrlDefinitionsFactory.readDefinitions
+            // (where the instance is really used).
             assertEquals("MockComponentDefinitions not used.",  
-                    defsInstanceCount + 1,
-                    MockDefinitionsReader.getInstanceCount());
+                    defsInstanceCount + 2,
+                    MockComponentDefinitions.getInstanceCount());
         } catch (Exception e) {
             fail("Exception initializing servlet: " + e);
         }