From b2b10d1685be65a53b8feae4b8d76e3bd689b16f Mon Sep 17 00:00:00 2001
From: John Was <janek.jan@gmail.com>
Date: Sun, 26 Jan 2014 15:02:26 +0100
Subject: [PATCH] more unit tests for helpers/FileHelper::findFiles using new
 wildcard exceptions matching

---
 framework/helpers/BaseFileHelper.php          |  1 +
 .../unit/framework/helpers/FileHelperTest.php | 67 ++++++++++++++-----
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php
index 88e416968f..eada047e56 100644
--- a/framework/helpers/BaseFileHelper.php
+++ b/framework/helpers/BaseFileHelper.php
@@ -259,6 +259,7 @@ class BaseFileHelper
 		if (!is_dir($dir)) {
 			throw new InvalidParamException('The dir argument must be a directory.');
 		}
+		$dir = rtrim($dir, DIRECTORY_SEPARATOR);
 		if (!isset($options['basePath'])) {
 			$options['basePath'] = realpath($dir);
 			// this should also be done only once
diff --git a/tests/unit/framework/helpers/FileHelperTest.php b/tests/unit/framework/helpers/FileHelperTest.php
index 8ad977fb95..1b2a83336d 100644
--- a/tests/unit/framework/helpers/FileHelperTest.php
+++ b/tests/unit/framework/helpers/FileHelperTest.php
@@ -253,23 +253,58 @@ class FileHelperTest extends TestCase
 	 */
 	public function testFindFilesExclude()
 	{
-		$dirName = 'test_dir';
-		$fileName = 'test_file.txt';
-		$excludeFileName = 'exclude_file.txt';
-		$this->createFileStructure([
-			$dirName => [
-				$fileName => 'file content',
-				$excludeFileName => 'exclude file content',
-			],
-		]);
-		$basePath = $this->testFilePath;
-		$dirName = $basePath . DIRECTORY_SEPARATOR . $dirName;
+		$basePath = $this->testFilePath . DIRECTORY_SEPARATOR;
+		$dirs = array('', 'one', 'one'.DIRECTORY_SEPARATOR.'two', 'three');
+		$files = array_fill_keys(array_map(function($n){return "a.$n";}, range(1,8)), 'file contents');
 
-		$options = [
-			'except' => [$excludeFileName],
-		];
-		$foundFiles = FileHelper::findFiles($dirName, $options);
-		$this->assertEquals([$dirName . DIRECTORY_SEPARATOR . $fileName], $foundFiles);
+		$tree = $files;
+		$root = $files;
+		$flat = array();
+		foreach($dirs as $dir) {
+			foreach($files as $fileName=>$contents) {
+				$flat[] = rtrim($basePath.$dir,DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$fileName;
+			}
+			if ($dir === '') continue;
+			$parts = explode(DIRECTORY_SEPARATOR, $dir);
+			$last = array_pop($parts);
+			$parent = array_pop($parts);
+			$tree[$last] = $files;
+			if ($parent !== null) {
+				$tree[$parent][$last] = &$tree[$last];
+			} else {
+				$root[$last] = &$tree[$last];
+			}
+		}
+		$this->createFileStructure($root);
+
+		// range
+		$foundFiles = FileHelper::findFiles($basePath, ['except' => ['a.[2-8]']]);
+		sort($foundFiles);
+		$expect = array_values(array_filter($flat, function($p){return substr($p, -3)==='a.1';}));
+		$this->assertEquals($expect, $foundFiles);
+
+		// suffix
+		$foundFiles = FileHelper::findFiles($basePath, ['except' => ['*.1']]);
+		sort($foundFiles);
+		$expect = array_values(array_filter($flat, function($p){return substr($p, -3)!=='a.1';}));
+		$this->assertEquals($expect, $foundFiles);
+
+		// dir
+		$foundFiles = FileHelper::findFiles($basePath, ['except' => ['/one']]);
+		sort($foundFiles);
+		$expect = array_values(array_filter($flat, function($p){return strpos($p, DIRECTORY_SEPARATOR.'one')===false;}));
+		$this->assertEquals($expect, $foundFiles);
+
+		// dir contents
+		$foundFiles = FileHelper::findFiles($basePath, ['except' => ['?*/a.1']]);
+		sort($foundFiles);
+		$expect = array_values(array_filter($flat, function($p){
+			return substr($p, -11, 10)==='one'.DIRECTORY_SEPARATOR.'two'.DIRECTORY_SEPARATOR.'a.' || (
+				substr($p, -8)!==DIRECTORY_SEPARATOR.'one'.DIRECTORY_SEPARATOR.'a.1' &&
+				substr($p, -10)!==DIRECTORY_SEPARATOR.'three'.DIRECTORY_SEPARATOR.'a.1'
+			);
+		}));
+		$this->assertEquals($expect, $foundFiles);
 	}
 
 	public function testCreateDirectory()