[jboss-cvs] JBossAS SVN: r57289 - in projects/microcontainer/trunk/container/src: main/org/jboss/virtual/plugins/vfs/helpers tests/org/jboss/test/virtual/support tests/org/jboss/test/virtual/test
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 29 09:41:11 EDT 2006
Author: adrian at jboss.org
Date: 2006-09-29 09:41:04 -0400 (Fri, 29 Sep 2006)
New Revision: 57289
Added:
projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/support/MockVirtualFileHandlerVisitor.java
Modified:
projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/AbstractVirtualFileHandlerVisitor.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/AbstractVFSContextTest.java
projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/AbstractVirtualFileHandlerTest.java
Log:
Basic visitor tests and ignore .svn files in the results.
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/AbstractVirtualFileHandlerVisitor.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/AbstractVirtualFileHandlerVisitor.java 2006-09-29 13:35:36 UTC (rev 57288)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/virtual/plugins/vfs/helpers/AbstractVirtualFileHandlerVisitor.java 2006-09-29 13:41:04 UTC (rev 57289)
@@ -39,19 +39,18 @@
*/
protected AbstractVirtualFileHandlerVisitor()
{
- this(VisitorAttributes.DEFAULT);
+ this(null);
}
/**
* Create a new AbstractVirtualFileVisitor using the default visitor attributes
*
- * @param attributes the attributes
- * @throws IllegalArgumentException if the attributes are null
+ * @param attributes the attributes or @{Link {@link VisitorAttributes#DEFAULT} when null
*/
protected AbstractVirtualFileHandlerVisitor(VisitorAttributes attributes)
{
if (attributes == null)
- throw new IllegalArgumentException("Null attributes");
+ attributes = VisitorAttributes.DEFAULT;
this.attributes = attributes;
}
Added: projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/support/MockVirtualFileHandlerVisitor.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/support/MockVirtualFileHandlerVisitor.java 2006-09-29 13:35:36 UTC (rev 57288)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/support/MockVirtualFileHandlerVisitor.java 2006-09-29 13:41:04 UTC (rev 57289)
@@ -0,0 +1,74 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.virtual.support;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.vfs.helpers.AbstractVirtualFileHandlerVisitor;
+import org.jboss.virtual.spi.VirtualFileHandler;
+
+/**
+ * MockVirtualFileHandlerVisitor.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class MockVirtualFileHandlerVisitor extends AbstractVirtualFileHandlerVisitor
+{
+ /** The visited handlers */
+ private List<VirtualFileHandler> visited = new ArrayList<VirtualFileHandler>();
+
+ /**
+ * Create a new MockVirtualFileHandlerVisitor.
+ */
+ public MockVirtualFileHandlerVisitor()
+ {
+ super();
+ }
+
+ /**
+ * Create a new MockVirtualFileHandlerVisitor.
+ *
+ * @param attributes the visitor attributes
+ */
+ public MockVirtualFileHandlerVisitor(VisitorAttributes attributes)
+ {
+ super(attributes);
+ }
+
+ /**
+ * Get the visited handlers
+ *
+ * @return the handlers
+ */
+ public List<VirtualFileHandler> getVisited()
+ {
+ return visited;
+ }
+
+ public void visit(VirtualFileHandler handler)
+ {
+ visited.add(handler);
+ }
+}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/AbstractVFSContextTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/AbstractVFSContextTest.java 2006-09-29 13:35:36 UTC (rev 57288)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/AbstractVFSContextTest.java 2006-09-29 13:41:04 UTC (rev 57289)
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Set;
+import org.jboss.test.virtual.support.MockVirtualFileHandlerVisitor;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.jboss.virtual.spi.VFSContext;
@@ -95,7 +96,7 @@
Set<String> actual = new HashSet<String>();
for (VirtualFileHandler child : children)
{
- if (child.getName().startsWith("META-INF") == false)
+ if (child.getName().startsWith("META-INF") == false && child.getName().equals(".svn") == false)
actual.add(child.getName());
}
@@ -192,9 +193,55 @@
}
}
- /* TODO visit
public void testVisit() throws Exception
{
+ VFSContext context = getVFSContext("children");
+ VirtualFileHandler root = context.getRoot();
+ MockVirtualFileHandlerVisitor visitor = new MockVirtualFileHandlerVisitor();
+ context.visit(root, visitor);
+
+ Set<String> expected = new HashSet<String>();
+ expected.add("child1");
+ expected.add("child2");
+ expected.add("child3");
+
+ Set<String> actual = new HashSet<String>();
+ for (VirtualFileHandler child : visitor.getVisited())
+ {
+ if (child.getName().startsWith("META-INF") == false)
+ actual.add(child.getName());
+ }
+
+ assertEquals(expected, actual);
}
- */
+
+ public void testVisitNullHandler() throws Exception
+ {
+ VFSContext context = getVFSContext("children");
+ MockVirtualFileHandlerVisitor visitor = new MockVirtualFileHandlerVisitor();
+ try
+ {
+ context.visit(null, visitor);
+ fail("Should not be here!");
+ }
+ catch (Throwable t)
+ {
+ checkThrowable(IllegalArgumentException.class, t);
+ }
+ }
+
+ public void testVisitNullVisitor() throws Exception
+ {
+ VFSContext context = getVFSContext("children");
+ VirtualFileHandler root = context.getRoot();
+ try
+ {
+ context.visit(root, null);
+ fail("Should not be here!");
+ }
+ catch (Throwable t)
+ {
+ checkThrowable(IllegalArgumentException.class, t);
+ }
+ }
}
Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/AbstractVirtualFileHandlerTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/AbstractVirtualFileHandlerTest.java 2006-09-29 13:35:36 UTC (rev 57288)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/virtual/test/AbstractVirtualFileHandlerTest.java 2006-09-29 13:41:04 UTC (rev 57289)
@@ -401,7 +401,7 @@
Set<String> actual = new HashSet<String>();
for (VirtualFileHandler child : children)
{
- if (child.getName().startsWith("META-INF") == false)
+ if (child.getName().startsWith("META-INF") == false && child.getName().equals(".svn") == false)
actual.add(child.getName());
}
More information about the jboss-cvs-commits
mailing list