4 files changed, 215 insertions, 184 deletions
diff --git a/MockFtpServer/src/main/groovy/org/mockftpserver/fake/filesystem/UnixFakeFileSystem.groovy b/MockFtpServer/src/main/java/org/mockftpserver/fake/filesystem/UnixFakeFileSystem.java
index e8ad9eb..f511601 100644
--- a/MockFtpServer/src/main/groovy/org/mockftpserver/fake/filesystem/UnixFakeFileSystem.groovy
+++ b/MockFtpServer/src/main/java/org/mockftpserver/fake/filesystem/UnixFakeFileSystem.java
@@ -1,84 +1,85 @@
-/*
- * Copyright 2008 the original author or authors.
- * 
- * 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.mockftpserver.fake.filesystem
-
-/**
- * Implementation of the         {@link FileSystem}         interface that simulates a Unix
- * file system. The rules for file and directory names include: 
- * <ul>
- *   <li>Filenames are case-sensitive</li>
- *   <li>Forward slashes (/) are the only valid path separators</li>  
- * </ul>
- *
- * The <code>directoryListingFormatter</code> property is automatically initialized to an instance
- * of      {@link UnixDirectoryListingFormatter}     .
- *
- * @version $Revision$ - $Date$
- *
- * @author Chris Mair
- */
-class UnixFakeFileSystem extends AbstractFakeFileSystem {
-
-    public static final char SEPARATOR = '/';
-
-    /**
-     * Construct a new instance and initialize the directoryListingFormatter to a UnixDirectoryListingFormatter.
-     */
-    UnixFakeFileSystem() {
-        this.directoryListingFormatter = new UnixDirectoryListingFormatter()
-    }
-
-    //-------------------------------------------------------------------------
-    // Abstract Method Implementations
-    //-------------------------------------------------------------------------
-
-    protected char getSeparatorChar() {
-        return SEPARATOR
-    }
-
-    /**
-     * Return true if the specified path designates a valid (absolute) file path. For Unix,
-     * a path is valid if it starts with the '/' character, followed by an optional sequence of
-     * any characters except '/'.
-     *
-     * @param path - the path
-     * @return true if path is valid, false otherwise
-     *
-     * @throws AssertionError - if path is null
-     */
-    protected boolean isValidName(String path) {
-        assert path != null
-        // Any character but '/'
-        return path ==~ /\/|(\/[^\/]+)+/
-    }
-
-    /**
-     * Return true if the specified char is a separator character ('\' or '/')
-     * @param c - the character to test
-     * @return true if the specified char is a separator character ('\' or '/')
-     */
-    protected boolean isSeparator(char c) {
-        return c == SEPARATOR
-    }
-
-    /**
-     * @return true if the specified path component is a root for this filesystem
-     */
-    protected boolean isRoot(String pathComponent) {
-        return pathComponent.contains(":")
-    }
-
+/*
+ * Copyright 2008 the original author or authors.
+ *
+ * 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.mockftpserver.fake.filesystem;
+
+import org.mockftpserver.core.util.Assert;
+
+/**
+ * Implementation of the {@link FileSystem} interface that simulates a Unix
+ * file system. The rules for file and directory names include:
+ * <ul>
+ * <li>Filenames are case-sensitive</li>
+ * <li>Forward slashes (/) are the only valid path separators</li>
+ * </ul>
+ * <p/>
+ * The <code>directoryListingFormatter</code> property is automatically initialized to an instance
+ * of {@link UnixDirectoryListingFormatter}.
+ *
+ * @author Chris Mair
+ * @version $Revision: 160 $ - $Date: 2008-11-15 08:46:23 -0500 (Sat, 15 Nov 2008) $
+ */
+public class UnixFakeFileSystem extends AbstractFakeFileSystem {
+
+    public static final char SEPARATOR = '/';
+
+    /**
+     * Construct a new instance and initialize the directoryListingFormatter to a UnixDirectoryListingFormatter.
+     */
+    public UnixFakeFileSystem() {
+        this.setDirectoryListingFormatter(new UnixDirectoryListingFormatter());
+    }
+
+    //-------------------------------------------------------------------------
+    // Abstract Method Implementations
+    //-------------------------------------------------------------------------
+
+    protected char getSeparatorChar() {
+        return SEPARATOR;
+    }
+
+    /**
+     * Return true if the specified path designates a valid (absolute) file path. For Unix,
+     * a path is valid if it starts with the '/' character, followed by an optional sequence of
+     * any characters except '/'.
+     *
+     * @param path - the path
+     * @return true if path is valid, false otherwise
+     * @throws AssertionError - if path is null
+     */
+    protected boolean isValidName(String path) {
+        Assert.notNull(path, "path");
+        // Any character but '/'
+        return path.matches("\\/|(\\/[^\\/]+)+");
+    }
+
+    /**
+     * Return true if the specified char is a separator character ('\' or '/')
+     *
+     * @param c - the character to test
+     * @return true if the specified char is a separator character ('\' or '/')
+     */
+    protected boolean isSeparator(char c) {
+        return c == SEPARATOR;
+    }
+
+    /**
+     * @return true if the specified path component is a root for this filesystem
+     */
+    protected boolean isRoot(String pathComponent) {
+        return pathComponent.contains(":");
+    }
+
 }
 \ No newline at end of file
diff --git a/MockFtpServer/src/main/groovy/org/mockftpserver/fake/filesystem/WindowsFakeFileSystem.groovy b/MockFtpServer/src/main/java/org/mockftpserver/fake/filesystem/WindowsFakeFileSystem.java
index 35f2efd..6a1722e 100644
--- a/MockFtpServer/src/main/groovy/org/mockftpserver/fake/filesystem/WindowsFakeFileSystem.groovy
+++ b/MockFtpServer/src/main/java/org/mockftpserver/fake/filesystem/WindowsFakeFileSystem.java
@@ -1,99 +1,102 @@
-/*
- * Copyright 2008 the original author or authors.
- * 
- * 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.mockftpserver.fake.filesystem
-
-/**
- * Implementation of the          {@link FileSystem}          interface that simulates a Microsoft
- * Windows file system. The rules for file and directory names include: 
- * <ul>
- *   <li>Filenames are case-insensitive (and normalized to lower-case)</li>
- *   <li>Either forward slashes (/) or backward slashes (\) are valid path separators (but are normalized to '\')</li>  
- *   <li>An absolute path starts with a drive specifier (e.g. 'a:' or 'c:') followed 
- *   		by '\' or '/', or else if it starts with "\\"</li>  
- * </ul>
- *
- * The <code>directoryListingFormatter</code> property is automatically initialized to an instance
- * of       {@link WindowsDirectoryListingFormatter}      .
- *
- * @version $Revision$ - $Date$
- *
- * @author Chris Mair
- */
-class WindowsFakeFileSystem extends AbstractFakeFileSystem {
-
-    public static final char SEPARATOR = '\\'
-    static final VALID_PATTERN = /\p{Alpha}\:(\\|(\\[^\\\:\*\?\<\>\|\"]+)+)/
-    static final LAN_PREFIX = "\\\\"
-
-    /**
-     * Construct a new instance and initialize the directoryListingFormatter to a WindowsDirectoryListingFormatter.
-     */
-    WindowsFakeFileSystem() {
-        this.directoryListingFormatter = new WindowsDirectoryListingFormatter()
-    }
-
-    //-------------------------------------------------------------------------
-    // Abstract Or Overridden Method Implementations
-    //-------------------------------------------------------------------------
-
-    /**
-     * Return the normalized and unique key used to access the file system entry. Windows is case-insensitive,
-     * so normalize all paths to lower-case.
-     * @param path - the path
-     * @return the corresponding normalized key
-     */
-    protected String getFileSystemEntryKey(String path) {
-        return normalize(path).toLowerCase()
-    }
-
-    protected char getSeparatorChar() {
-        return SEPARATOR
-    }
-
-    /**
-     * Return true if the specified path designates a valid (absolute) file path. For Windows
-     * paths, a path is valid if it starts with a drive specifier followed by
-     * '\' or '/', or if it starts with "\\".
-     *
-     * @param path - the path
-     * @return true if path is valid, false otherwise
-     *
-     * @throws AssertionError - if path is null
-     */
-    protected boolean isValidName(String path) {
-        // \/:*?"<>|
-        assert path != null
-        def standardized = path.replace("/", "\\")
-        return (standardized ==~ VALID_PATTERN) || standardized.startsWith(LAN_PREFIX)
-    }
-
-    /**
-     * Return true if the specified char is a separator character ('\' or '/')
-     * @param c - the character to test
-     * @return true if the specified char is a separator character ('\' or '/')
-     */
-    protected boolean isSeparator(char c) {
-        return c == '\\' || c == '/'
-    }
-
-    /**
-     * @return true if the specified path component is a root for this filesystem
-     */
-    protected boolean isRoot(String pathComponent) {
-        return pathComponent.contains(":")
-    }
-
+/*
+ * Copyright 2008 the original author or authors.
+ *
+ * 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.mockftpserver.fake.filesystem;
+
+import org.mockftpserver.core.util.Assert;
+
+/**
+ * Implementation of the {@link FileSystem} interface that simulates a Microsoft
+ * Windows file system. The rules for file and directory names include:
+ * <ul>
+ * <li>Filenames are case-insensitive (and normalized to lower-case)</li>
+ * <li>Either forward slashes (/) or backward slashes (\) are valid path separators (but are normalized to '\')</li>
+ * <li>An absolute path starts with a drive specifier (e.g. 'a:' or 'c:') followed
+ * by '\' or '/', or else if it starts with "\\"</li>
+ * </ul>
+ * <p/>
+ * The <code>directoryListingFormatter</code> property is automatically initialized to an instance
+ * of {@link WindowsDirectoryListingFormatter}.
+ *
+ * @author Chris Mair
+ * @version $Revision: 160 $ - $Date: 2008-11-15 08:46:23 -0500 (Sat, 15 Nov 2008) $
+ */
+public class WindowsFakeFileSystem extends AbstractFakeFileSystem {
+
+    public static final char SEPARATOR = '\\';
+    private static final String VALID_PATTERN = "\\p{Alpha}\\:" + "(\\\\|(\\\\[^\\\\\\:\\*\\?\\<\\>\\|\\\"]+)+)";
+    //static final VALID_PATTERN = /\p{Alpha}\:(\\|(\\[^\\\:\*\?\<\>\|\"]+)+)/
+    private static final String LAN_PREFIX = "\\\\";
+
+    /**
+     * Construct a new instance and initialize the directoryListingFormatter to a WindowsDirectoryListingFormatter.
+     */
+    public WindowsFakeFileSystem() {
+        this.setDirectoryListingFormatter(new WindowsDirectoryListingFormatter());
+    }
+
+    //-------------------------------------------------------------------------
+    // Abstract Or Overridden Method Implementations
+    //-------------------------------------------------------------------------
+
+    /**
+     * Return the normalized and unique key used to access the file system entry. Windows is case-insensitive,
+     * so normalize all paths to lower-case.
+     *
+     * @param path - the path
+     * @return the corresponding normalized key
+     */
+    protected String getFileSystemEntryKey(String path) {
+        return normalize(path).toLowerCase();
+    }
+
+    protected char getSeparatorChar() {
+        return SEPARATOR;
+    }
+
+    /**
+     * Return true if the specified path designates a valid (absolute) file path. For Windows
+     * paths, a path is valid if it starts with a drive specifier followed by
+     * '\' or '/', or if it starts with "\\".
+     *
+     * @param path - the path
+     * @return true if path is valid, false otherwise
+     * @throws AssertionError - if path is null
+     */
+    protected boolean isValidName(String path) {
+        // \/:*?"<>|
+        Assert.notNull(path, "path");
+        String standardized = path.replace('/', '\\');
+        return standardized.matches(VALID_PATTERN) || standardized.startsWith(LAN_PREFIX);
+    }
+
+    /**
+     * Return true if the specified char is a separator character ('\' or '/')
+     *
+     * @param c - the character to test
+     * @return true if the specified char is a separator character ('\' or '/')
+     */
+    protected boolean isSeparator(char c) {
+        return c == '\\' || c == '/';
+    }
+
+    /**
+     * @return true if the specified path component is a root for this filesystem
+     */
+    protected boolean isRoot(String pathComponent) {
+        return pathComponent.contains(":");
+    }
+
 }
 \ No newline at end of file
diff --git a/MockFtpServer/src/test/groovy/org/mockftpserver/fake/command/AbstractFakeCommandHandlerTest.groovy b/MockFtpServer/src/test/groovy/org/mockftpserver/fake/command/AbstractFakeCommandHandlerTest.groovy
index 4ad2263..46fb8ec 100644
--- a/MockFtpServer/src/test/groovy/org/mockftpserver/fake/command/AbstractFakeCommandHandlerTest.groovy
+++ b/MockFtpServer/src/test/groovy/org/mockftpserver/fake/command/AbstractFakeCommandHandlerTest.groovy
@@ -23,7 +23,7 @@ import org.mockftpserver.core.session.StubSession
 import org.mockftpserver.fake.filesystem.DirectoryEntry
 import org.mockftpserver.fake.filesystem.FileEntry
 import org.mockftpserver.fake.filesystem.FileSystemException
-import org.mockftpserver.fake.filesystem.UnixFakeFileSystem
+import org.mockftpserver.fake.filesystem.TestUnixFakeFileSystem
 import org.mockftpserver.fake.server.StubServerConfiguration
 import org.mockftpserver.fake.user.UserAccount
 import org.mockftpserver.test.AbstractGroovyTest
@@ -45,7 +45,7 @@ abstract class AbstractFakeCommandHandlerTest extends AbstractGroovyTest {
     protected fileSystem
     protected userAccount
 
-    /** Set this to false to skip the test that verifies that the CommandHandler requires a logged in user        */
+    /** Set this to false to skip the test that verifies that the CommandHandler requires a logged in user          */
     boolean testNotLoggedIn = true
 
     //-------------------------------------------------------------------------
@@ -99,7 +99,7 @@ abstract class AbstractFakeCommandHandlerTest extends AbstractGroovyTest {
         super.setUp()
         session = new StubSession()
         serverConfiguration = new StubServerConfiguration()
-        fileSystem = new UnixFakeFileSystem()
+        fileSystem = new TestUnixFakeFileSystem()
         fileSystem.createParentDirectoriesAutomatically = true
         serverConfiguration.setFileSystem(fileSystem)
 
diff --git a/MockFtpServer/src/test/groovy/org/mockftpserver/fake/filesystem/TestUnixFakeFileSystem.groovy b/MockFtpServer/src/test/groovy/org/mockftpserver/fake/filesystem/TestUnixFakeFileSystem.groovy
new file mode 100644
index 0000000..569b257
--- /dev/null
+++ b/MockFtpServer/src/test/groovy/org/mockftpserver/fake/filesystem/TestUnixFakeFileSystem.groovy
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008 the original author or authors.
+ * 
+ * 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.mockftpserver.fake.filesystem
+
+/**
+ * Test-only subclass of UnixFakeFileSystem. Groovy implementation enables access to metaclass.
+ *
+ * @version $Revision: 160 $ - $Date: 2008-11-15 08:46:23 -0500 (Sat, 15 Nov 2008) $
+ *
+ * @author Chris Mair
+ */
+class TestUnixFakeFileSystem extends UnixFakeFileSystem {
+
+}
+\ No newline at end of file