commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r345800 - /jakarta/commons/proper/jelly/trunk/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
Date Mon, 21 Nov 2005 01:07:32 GMT
Author: dion
Date: Sun Nov 20 17:07:28 2005
New Revision: 345800

URL: http://svn.apache.org/viewcvs?rev=345800&view=rev
Log:
Fix properties: eol = native and keywords = Date Author Id Revision HeadURL

Modified:
    jakarta/commons/proper/jelly/trunk/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
  (contents, props changed)

Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java?rev=345800&r1=345799&r2=345800&view=diff
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
Sun Nov 20 17:07:28 2005
@@ -1,124 +1,124 @@
-/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.jelly.tags.junit;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
-import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.XMLOutput;
-
-/**
- * Checks that a file exists, and if not, then the test will fail.
- *
- * @author <a href="mailto:dion@apache.org">Dion Gillard</a>
- * @version $Revision: 344024 $
- */
-public class AssertFileContainsTag extends AssertTagSupport
-{
-    /** the file to check */
-    private File file;
-    
-    /** content to match */
-    private String match;
-
-    /**
-     * Do the tag functionality: check the file exists.
-     * @param output a place to write text output
-     * @throws JellyTagException if the file doesn't exist.
-     */
-    public void doTag(XMLOutput output) throws JellyTagException
-    {
-        if (match == null)
-        {
-            throw new MissingAttributeException("match");
-        }
-        String message = getBodyText();
-        if (message == null || message.length() == 0)
-        {
-            message = "File does not contain '" + match + "'";
-        }
-
-        
-        if (file == null)
-        {
-            throw new MissingAttributeException("file");
-        }
-        else
-        {
-            if (file.exists() && file.canRead())
-            {
-                try
-                {
-                    BufferedReader br = new BufferedReader(new FileReader(file));
-                    String line;
-                    boolean found = false;
-                    while ((line = br.readLine()) != null)
-                    {
-                        if (line.indexOf(match) != -1)
-                        {
-                            found = true;
-                            break;
-                        }
-                    }
-                    br.close();
-                    if (!found)
-                    {
-                        fail(message);
-                    }
-                }
-                catch (IOException fnfe)
-                {
-                    throw new JellyTagException(fnfe);
-                }
-            }
-            else
-            {
-                try
-                {
-                    throw new JellyTagException("File '" + file.getCanonicalPath() 
-                        + "' can't be read.");
-                }
-                catch (IOException e)
-                {
-                    throw new JellyTagException(e);
-                }
-            }
-        }
-    }
-    
-    /**
-     * The file to be tested. If this file exists, the test will pass.
-     * @param aFile the file to test.
-     */
-    public void setFile(File aFile)
-    {
-        file = aFile;
-    }
-    
-    /**
-     * The content to be checked for. If this text matches some part
-     * of the given file, the test will pass.
-     */
-    public void setMatch(String aString)
-    {
-        match = aString;
-    }
-}
+/*
+ * Copyright 2002,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.jelly.tags.junit;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.apache.commons.jelly.MissingAttributeException;
+import org.apache.commons.jelly.JellyTagException;
+import org.apache.commons.jelly.XMLOutput;
+
+/**
+ * Checks that a file exists, and if not, then the test will fail.
+ *
+ * @author <a href="mailto:dion@apache.org">Dion Gillard</a>
+ * @version $Revision$
+ */
+public class AssertFileContainsTag extends AssertTagSupport
+{
+    /** the file to check */
+    private File file;
+    
+    /** content to match */
+    private String match;
+
+    /**
+     * Do the tag functionality: check the file exists.
+     * @param output a place to write text output
+     * @throws JellyTagException if the file doesn't exist.
+     */
+    public void doTag(XMLOutput output) throws JellyTagException
+    {
+        if (match == null)
+        {
+            throw new MissingAttributeException("match");
+        }
+        String message = getBodyText();
+        if (message == null || message.length() == 0)
+        {
+            message = "File does not contain '" + match + "'";
+        }
+
+        
+        if (file == null)
+        {
+            throw new MissingAttributeException("file");
+        }
+        else
+        {
+            if (file.exists() && file.canRead())
+            {
+                try
+                {
+                    BufferedReader br = new BufferedReader(new FileReader(file));
+                    String line;
+                    boolean found = false;
+                    while ((line = br.readLine()) != null)
+                    {
+                        if (line.indexOf(match) != -1)
+                        {
+                            found = true;
+                            break;
+                        }
+                    }
+                    br.close();
+                    if (!found)
+                    {
+                        fail(message);
+                    }
+                }
+                catch (IOException fnfe)
+                {
+                    throw new JellyTagException(fnfe);
+                }
+            }
+            else
+            {
+                try
+                {
+                    throw new JellyTagException("File '" + file.getCanonicalPath() 
+                        + "' can't be read.");
+                }
+                catch (IOException e)
+                {
+                    throw new JellyTagException(e);
+                }
+            }
+        }
+    }
+    
+    /**
+     * The file to be tested. If this file exists, the test will pass.
+     * @param aFile the file to test.
+     */
+    public void setFile(File aFile)
+    {
+        file = aFile;
+    }
+    
+    /**
+     * The content to be checked for. If this text matches some part
+     * of the given file, the test will pass.
+     */
+    public void setMatch(String aString)
+    {
+        match = aString;
+    }
+}

Propchange: jakarta/commons/proper/jelly/trunk/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/jelly/trunk/jelly-tags/junit/src/java/org/apache/commons/jelly/tags/junit/AssertFileContainsTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message