svn commit: r447033 - /jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java

[henning]

Author: henning
Date: Sun Sep 17 03:29:04 2006
New Revision: 447033

URL: http://svn.apache.org/viewvc?view=rev&rev=447033
Log:
Add an explicit "does that file exist" test to getFileName()
and enforce it for isMatch. isMatch only makes sense if both
files to test exists. Let's see if we can provoke some hidden
errors in the unit tests...

Modified:
    
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java

Modified: 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java
URL: 
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java?view=diff&rev=447033&r1=447032&r2=447033
==============================================================================
--- 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java
 (original)
+++ 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java
 Sun Sep 17 03:29:04 2006
@@ -54,7 +54,12 @@
      *
      * @return The full path to the file.
      */
-    protected static String getFileName (String dir, String base, String ext)
+    protected static String getFileName (final String dir, final String base, 
final String ext)
+    {
+        return getFileName(dir, base, ext, false);
+    }
+
+    protected static String getFileName (final String dir, final String base, 
final String ext, final boolean mustExist)
     {
         StringBuffer buf = new StringBuffer();
 
@@ -77,11 +82,25 @@
             }
             
             buf.append('.').append(ext);
-            
+
+            if (mustExist)
+            {
+                File testFile = new File(buf.toString());
+                        
+                if (!testFile.exists())
+                {
+                    fail("getFileName() result " + testFile.getPath() + " does 
not exist!"); 
+                }
+
+                if (!testFile.isFile())
+                {
+                    fail("getFileName() result " + testFile.getPath() + " is 
not a file!"); 
+                }
+            }
         }
         catch (IOException e)
         {
-            fail("IO Exception while running getFileName(" + dir + ", " + base 
+ ", "+ ext + "): " + e.getMessage());
+            fail("IO Exception while running getFileName(" + dir + ", " + base 
+ ", "+ ext + ", " + mustExist + "): " + e.getMessage());
         }
 
         return buf.toString();
@@ -141,10 +160,10 @@
         throws Exception
     {
         String result = StringUtils.fileContentsToString
-            (getFileName(resultsDir, baseFileName, resultExt));
+                (getFileName(resultsDir, baseFileName, resultExt, true));
 
         String compare = StringUtils.fileContentsToString
-             (getFileName(compareDir, baseFileName, compareExt));
+                (getFileName(compareDir, baseFileName, compareExt, true));
 
         /*
          *  normalize each wrt newline



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]