Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympus

* nickvergessen/ticket/11545:
  [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute

1 files changed, 25 insertions, 4 deletions

diff --git a/tests/functions/is_absolute_test.php b/tests/functions/is_absolute_test.php
index 5d70b6c2a3..7630b7c58c 100644
--- a/tests/functions/is_absolute_test.php
+++ b/tests/functions/is_absolute_test.php
@@ -14,14 +14,35 @@ class phpbb_functions_is_absolute_test extends phpbb_test_case
 	static public function is_absolute_data()
 	{
 		return array(
+			// Empty
 			array('', false),
+
+			// Absolute unix style
 			array('/etc/phpbb', true),
+			// Unix does not support \ so that is not an absolute path
+			array('\etc\phpbb', false),
+
+			// Absolute windows style
+			array('c:\windows', true),
+			array('C:\Windows', true),
+			array('c:/windows', true),
+			array('C:/Windows', true),
+
+			// Executable
 			array('etc/phpbb', false),
+			array('explorer.exe', false),
+
+			// Relative subdir
+			array('Windows\System32', false),
+			array('Windows\System32\explorer.exe', false),
+			array('Windows/System32', false),
+			array('Windows/System32/explorer.exe', false),
 
-			// Until we got DIRECTORY_SEPARATOR replaced in that function,
-			// test results vary on OS.
-			array('c:\windows', DIRECTORY_SEPARATOR == '\\'),
-			array('C:\Windows', DIRECTORY_SEPARATOR == '\\'),
+			// Relative updir
+			array('..\Windows\System32', false),
+			array('..\Windows\System32\explorer.exe', false),
+			array('../Windows/System32', false),
+			array('../Windows/System32/explorer.exe', false),
 		);
 	}