Author: miguel
Date: 2006-10-30 16:01:02 -0500 (Mon, 30 Oct 2006)
New Revision: 67150
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
trunk/mcs/class/System.Configuration/System.Configuration/NameValueConfigurationCollection.cs
trunk/mcs/class/corlib/System.IO/ChangeLog
trunk/mcs/class/corlib/System.IO/DirectoryInfo.cs
trunk/mcs/class/corlib/Test/System.IO/ChangeLog
trunk/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
Log:
2006-10-30 Joel Reed <[EMAIL PROTECTED]>
* NameValueConfigurationCollection.cs: Implement the Properties
property.
2006-10-30 Joel Reed <[EMAIL PROTECTED]>
* DirectoryInfo.cs: Implement SearchOption.AllDirectories option.
2006-10-30 <[EMAIL PROTECTED]>
* DirectoryInfoTest.cs: Updated tests to support the DirectoryInfo
SearchOption.AllDirectories
Modified: trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
2006-10-30 20:26:47 UTC (rev 67149)
+++ trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
2006-10-30 21:01:02 UTC (rev 67150)
@@ -1,3 +1,8 @@
+2006-10-30 Joel Reed <[EMAIL PROTECTED]>
+
+ * NameValueConfigurationCollection.cs: Implement the Properties
+ property.
+
2006-08-23 Konstantin Triger <[EMAIL PROTECTED]>
* ConfigurationLocation.cs: do not read root element, correctly close
stream.
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/NameValueConfigurationCollection.cs
===================================================================
---
trunk/mcs/class/System.Configuration/System.Configuration/NameValueConfigurationCollection.cs
2006-10-30 20:26:47 UTC (rev 67149)
+++
trunk/mcs/class/System.Configuration/System.Configuration/NameValueConfigurationCollection.cs
2006-10-30 21:01:02 UTC (rev 67150)
@@ -41,6 +41,13 @@
CollectionType =
ConfigurationElementCollectionType.AddRemoveClearMap)]
public sealed class NameValueConfigurationCollection :
ConfigurationElementCollection
{
+ static ConfigurationPropertyCollection properties;
+
+ static NameValueConfigurationCollection ()
+ {
+ properties = new ConfigurationPropertyCollection ();
+ }
+
public NameValueConfigurationCollection ()
{
}
@@ -62,7 +69,7 @@
protected internal override ConfigurationPropertyCollection
Properties {
get {
- throw new NotImplementedException ();
+ return properties;
}
}
Modified: trunk/mcs/class/corlib/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.IO/ChangeLog 2006-10-30 20:26:47 UTC (rev
67149)
+++ trunk/mcs/class/corlib/System.IO/ChangeLog 2006-10-30 21:01:02 UTC (rev
67150)
@@ -1,3 +1,7 @@
+2006-10-30 Joel Reed <[EMAIL PROTECTED]>
+
+ * DirectoryInfo.cs: Implement SearchOption.AllDirectories option.
+
2006-10-11 Dick Porter <[EMAIL PROTECTED]>
* FileStream.cs: Cope with 2.0 FileShare.Delete values. Patch by
Modified: trunk/mcs/class/corlib/System.IO/DirectoryInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.IO/DirectoryInfo.cs 2006-10-30 20:26:47 UTC
(rev 67149)
+++ trunk/mcs/class/corlib/System.IO/DirectoryInfo.cs 2006-10-30 21:01:02 UTC
(rev 67150)
@@ -203,14 +203,25 @@
#if NET_2_0
// additional search methods
- [MonoTODO ("AllDirectories isn't implemented")]
public DirectoryInfo[] GetDirectories (string pattern,
SearchOption searchOption)
{
switch (searchOption) {
case SearchOption.TopDirectoryOnly:
return GetDirectories (pattern);
case SearchOption.AllDirectories:
- throw new NotImplementedException ();
+ Queue workq = new
Queue(GetDirectories(pattern));
+ Queue doneq = new Queue();
+ while (workq.Count > 0)
+ {
+ DirectoryInfo cinfo =
(DirectoryInfo) workq.Dequeue();
+ DirectoryInfo[] cinfoDirs =
cinfo.GetDirectories(pattern);
+ foreach (DirectoryInfo i in
cinfoDirs) workq.Enqueue(i);
+ doneq.Enqueue(cinfo);
+ }
+
+ DirectoryInfo[] infos = new
DirectoryInfo[doneq.Count];
+ doneq.CopyTo(infos, 0);
+ return infos;
default:
string msg = Locale.GetText ("Invalid enum
value '{0}' for '{1}'.", searchOption, "SearchOption");
throw new ArgumentOutOfRangeException
("searchOption", msg);
Modified: trunk/mcs/class/corlib/Test/System.IO/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.IO/ChangeLog 2006-10-30 20:26:47 UTC
(rev 67149)
+++ trunk/mcs/class/corlib/Test/System.IO/ChangeLog 2006-10-30 21:01:02 UTC
(rev 67150)
@@ -1,3 +1,8 @@
+2006-10-30 Joel Reed <[EMAIL PROTECTED]>
+
+ * DirectoryInfoTest.cs: Updated tests to support the DirectoryInfo
+ SearchOption.AllDirectories
+
2006-09-24 Raja R Harinath <[EMAIL PROTECTED]>
* FileInfoTest.cs (IsReadOnly): Fix compilation. Mark as NotWorking.
Modified: trunk/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs 2006-10-30
20:26:47 UTC (rev 67149)
+++ trunk/mcs/class/corlib/Test/System.IO/DirectoryInfoTest.cs 2006-10-30
21:01:02 UTC (rev 67150)
@@ -1,263 +1,263 @@
-// DirectoryInfoTest.cs - NUnit Test Cases for System.IO.DirectoryInfo class
-//
-// Authors
-// Ville Palo ([EMAIL PROTECTED])
-// Sebastien Pouliot <[EMAIL PROTECTED]>
-//
-// (C) 2003 Ville Palo
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-
-using NUnit.Framework;
-using System;
-using System.Collections;
-using System.IO;
-
-namespace MonoTests.System.IO
-{
- [TestFixture]
- public class DirectoryInfoTest : Assertion
- {
- string TempFolder = Path.Combine (Path.GetTempPath (),
"MonoTests.System.IO.Tests");
-
- static readonly char DSC = Path.DirectorySeparatorChar;
- string current;
-
- [SetUp]
- protected void SetUp ()
- {
- current = Directory.GetCurrentDirectory ();
- if (Directory.Exists (TempFolder))
- Directory.Delete (TempFolder, true);
- Directory.CreateDirectory (TempFolder);
- }
-
- [TearDown]
- protected void TearDown ()
- {
- if (Directory.Exists (TempFolder))
- Directory.Delete (TempFolder, true);
- Directory.SetCurrentDirectory (current);
- }
-
- [Test]
- public void Ctr ()
- {
- string path = TempFolder + DSC + "DIT.Ctr.Test";
- DeleteDir (path);
-
- FileInfo info = new FileInfo (path);
- AssertEquals ("test#01", true,
info.DirectoryName.EndsWith (".Tests"));
- AssertEquals ("test#02", false, info.Exists);
- AssertEquals ("test#03", ".Test", info.Extension);
- AssertEquals ("test#05", "DIT.Ctr.Test", info.Name);
- }
-
- [Test]
- [ExpectedException(typeof(ArgumentNullException))]
- public void CtorArgumentNullException ()
- {
- DirectoryInfo info = new DirectoryInfo (null);
- }
-
- [Test]
- [ExpectedException(typeof(ArgumentException))]
- public void CtorArgumentException1 ()
- {
- DirectoryInfo info = new DirectoryInfo ("");
- }
-
- [Test]
- [ExpectedException(typeof(ArgumentException))]
- public void CtorArgumentException2 ()
- {
- DirectoryInfo info = new DirectoryInfo (" ");
- }
-
- [Test]
- [ExpectedException(typeof(ArgumentException))]
- public void CtorArgumentException3 ()
- {
- string path = "";
- foreach (char c in Path.InvalidPathChars) {
- path += c;
- }
- DirectoryInfo info = new DirectoryInfo (path);
- }
-
- [Test]
- public void Exists ()
- {
- string path = TempFolder + DSC + "DIT.Exists.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- AssertEquals ("test#01", false, info.Exists);
-
- Directory.CreateDirectory (path);
- AssertEquals ("test#02", false, info.Exists);
- info = new DirectoryInfo (path);
- AssertEquals ("test#03", true, info.Exists);
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void Name ()
- {
- string path = TempFolder + DSC + "DIT.Name.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- AssertEquals ("test#01", "DIT.Name.Test",
info.Name);
-
- info = Directory.CreateDirectory (path);
- AssertEquals ("test#02", "DIT.Name.Test",
info.Name);
-
-
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void Parent ()
- {
- string path = TempFolder + DSC + "DIT.Parent.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- AssertEquals ("test#01",
"MonoTests.System.IO.Tests", info.Parent.Name);
-
- info = Directory.CreateDirectory (path);
- AssertEquals ("test#02",
"MonoTests.System.IO.Tests", info.Parent.Name);
-
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void Create ()
- {
- string path = TempFolder + DSC + "DIT.Create.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- AssertEquals ("test#01", false, info.Exists);
- info.Create ();
- AssertEquals ("test#02", false, info.Exists);
- info = new DirectoryInfo (path);
- AssertEquals ("test#03", true, info.Exists);
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void CreateSubdirectory ()
- {
- string sub_path = Path.Combine ("test01", "test02");
- try {
- DirectoryInfo info = new DirectoryInfo
(TempFolder);
- info.CreateSubdirectory (sub_path);
- Assert ("test#01", Directory.Exists
(Path.Combine (TempFolder, sub_path)));
- } finally {
- DeleteDir (Path.Combine (TempFolder, sub_path));
- }
-
+// DirectoryInfoTest.cs - NUnit Test Cases for System.IO.DirectoryInfo class
+//
+// Authors
+// Ville Palo ([EMAIL PROTECTED])
+// Sebastien Pouliot <[EMAIL PROTECTED]>
+//
+// (C) 2003 Ville Palo
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+
+using NUnit.Framework;
+using System;
+using System.Collections;
+using System.IO;
+
+namespace MonoTests.System.IO
+{
+ [TestFixture]
+ public class DirectoryInfoTest : Assertion
+ {
+ string TempFolder = Path.Combine (Path.GetTempPath (),
"MonoTests.System.IO.Tests");
+
+ static readonly char DSC = Path.DirectorySeparatorChar;
+ string current;
+
+ [SetUp]
+ protected void SetUp ()
+ {
+ current = Directory.GetCurrentDirectory ();
+ if (Directory.Exists (TempFolder))
+ Directory.Delete (TempFolder, true);
+ Directory.CreateDirectory (TempFolder);
+ }
+
+ [TearDown]
+ protected void TearDown ()
+ {
+ if (Directory.Exists (TempFolder))
+ Directory.Delete (TempFolder, true);
+ Directory.SetCurrentDirectory (current);
}
+
+ [Test]
+ public void Ctr ()
+ {
+ string path = TempFolder + DSC + "DIT.Ctr.Test";
+ DeleteDir (path);
+
+ FileInfo info = new FileInfo (path);
+ AssertEquals ("test#01", true,
info.DirectoryName.EndsWith (".Tests"));
+ AssertEquals ("test#02", false, info.Exists);
+ AssertEquals ("test#03", ".Test", info.Extension);
+ AssertEquals ("test#05", "DIT.Ctr.Test", info.Name);
+ }
+
+ [Test]
+ [ExpectedException(typeof(ArgumentNullException))]
+ public void CtorArgumentNullException ()
+ {
+ DirectoryInfo info = new DirectoryInfo (null);
+ }
+
+ [Test]
+ [ExpectedException(typeof(ArgumentException))]
+ public void CtorArgumentException1 ()
+ {
+ DirectoryInfo info = new DirectoryInfo ("");
+ }
+
+ [Test]
+ [ExpectedException(typeof(ArgumentException))]
+ public void CtorArgumentException2 ()
+ {
+ DirectoryInfo info = new DirectoryInfo (" ");
+ }
+
+ [Test]
+ [ExpectedException(typeof(ArgumentException))]
+ public void CtorArgumentException3 ()
+ {
+ string path = "";
+ foreach (char c in Path.InvalidPathChars) {
+ path += c;
+ }
+ DirectoryInfo info = new DirectoryInfo (path);
+ }
+
+ [Test]
+ public void Exists ()
+ {
+ string path = TempFolder + DSC + "DIT.Exists.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ AssertEquals ("test#01", false, info.Exists);
+
+ Directory.CreateDirectory (path);
+ AssertEquals ("test#02", false, info.Exists);
+ info = new DirectoryInfo (path);
+ AssertEquals ("test#03", true, info.Exists);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void Name ()
+ {
+ string path = TempFolder + DSC + "DIT.Name.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ AssertEquals ("test#01", "DIT.Name.Test",
info.Name);
+
+ info = Directory.CreateDirectory (path);
+ AssertEquals ("test#02", "DIT.Name.Test",
info.Name);
+
+
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void Parent ()
+ {
+ string path = TempFolder + DSC + "DIT.Parent.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ AssertEquals ("test#01",
"MonoTests.System.IO.Tests", info.Parent.Name);
+
+ info = Directory.CreateDirectory (path);
+ AssertEquals ("test#02",
"MonoTests.System.IO.Tests", info.Parent.Name);
+
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void Create ()
+ {
+ string path = TempFolder + DSC + "DIT.Create.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ AssertEquals ("test#01", false, info.Exists);
+ info.Create ();
+ AssertEquals ("test#02", false, info.Exists);
+ info = new DirectoryInfo (path);
+ AssertEquals ("test#03", true, info.Exists);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void CreateSubdirectory ()
+ {
+ string sub_path = Path.Combine ("test01", "test02");
+ try {
+ DirectoryInfo info = new DirectoryInfo
(TempFolder);
+ info.CreateSubdirectory (sub_path);
+ Assert ("test#01", Directory.Exists
(Path.Combine (TempFolder, sub_path)));
+ } finally {
+ DeleteDir (Path.Combine (TempFolder, sub_path));
+ }
+
+ }
[Test]
[ExpectedException(typeof(ArgumentException))]
public void CreateSubdirectoryEmptyString ()
{
new DirectoryInfo (".").CreateSubdirectory ("");
- }
-
- [Test]
- public void Delete1 ()
- {
- string path = TempFolder + DSC + "DIT.Delete1.Test";
- DeleteDir (path);
-
- try {
- Directory.CreateDirectory (path);
- DirectoryInfo info = new DirectoryInfo (path);
- AssertEquals ("test#01", true, info.Exists);
-
- info.Delete ();
- AssertEquals ("test#02", true, info.Exists);
-
- info = new DirectoryInfo (path);
- AssertEquals ("test#03", false, info.Exists);
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void Delete2 ()
- {
- string path = TempFolder + DSC + "DIT.Delete2.Test";
- DeleteDir (path);
-
- try {
- Directory.CreateDirectory (path);
- File.Create (path + DSC + "test").Close ();
- DirectoryInfo info = new DirectoryInfo (path);
- AssertEquals ("test#01", true, info.Exists);
-
- info.Delete (true);
- AssertEquals ("test#02", true, info.Exists);
-
- info = new DirectoryInfo (path);
- AssertEquals ("test#03", false, info.Exists);
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (IOException))]
- public void DeleteIOException1 ()
- {
- string path = TempFolder + DSC + "DIT.DeleteIOException1.Test";
- DeleteDir (path);
-
- try {
- Directory.CreateDirectory (path);
- File.Create (path + DSC + "test").Close ();
- DirectoryInfo info = new DirectoryInfo (path);
- info.Delete ();
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (IOException))]
- public void DeleteIOException2 ()
- {
- string path = TempFolder + DSC + "DIT.DeleteIOException2.Test";
- DeleteDir (path);
-
- try {
- Directory.CreateDirectory (path);
- File.Create (path + DSC + "test").Close ();
- DirectoryInfo info = new DirectoryInfo (path);
- info.Delete (false);
- } finally {
- DeleteDir (path);
- }
}
[Test]
+ public void Delete1 ()
+ {
+ string path = TempFolder + DSC + "DIT.Delete1.Test";
+ DeleteDir (path);
+
+ try {
+ Directory.CreateDirectory (path);
+ DirectoryInfo info = new DirectoryInfo (path);
+ AssertEquals ("test#01", true, info.Exists);
+
+ info.Delete ();
+ AssertEquals ("test#02", true, info.Exists);
+
+ info = new DirectoryInfo (path);
+ AssertEquals ("test#03", false, info.Exists);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void Delete2 ()
+ {
+ string path = TempFolder + DSC + "DIT.Delete2.Test";
+ DeleteDir (path);
+
+ try {
+ Directory.CreateDirectory (path);
+ File.Create (path + DSC + "test").Close ();
+ DirectoryInfo info = new DirectoryInfo (path);
+ AssertEquals ("test#01", true, info.Exists);
+
+ info.Delete (true);
+ AssertEquals ("test#02", true, info.Exists);
+
+ info = new DirectoryInfo (path);
+ AssertEquals ("test#03", false, info.Exists);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (IOException))]
+ public void DeleteIOException1 ()
+ {
+ string path = TempFolder + DSC + "DIT.DeleteIOException1.Test";
+ DeleteDir (path);
+
+ try {
+ Directory.CreateDirectory (path);
+ File.Create (path + DSC + "test").Close ();
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.Delete ();
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (IOException))]
+ public void DeleteIOException2 ()
+ {
+ string path = TempFolder + DSC + "DIT.DeleteIOException2.Test";
+ DeleteDir (path);
+
+ try {
+ Directory.CreateDirectory (path);
+ File.Create (path + DSC + "test").Close ();
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.Delete (false);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
// from bug #75443
public void FullName ()
{
@@ -270,7 +270,7 @@
di = new DirectoryInfo ("something" +
Path.AltDirectorySeparatorChar);
AssertEquals ("AltDirectorySeparatorChar",
Path.DirectorySeparatorChar, di.FullName [di.FullName.Length - 1]);
- }
+ }
[Test]
public void FullName_RootDirectory ()
@@ -288,323 +288,328 @@
AssertEquals ("FullName-Alt", "/", di.FullName);
}
AssertNull ("Parent-Alt", di.Parent);
- }
-
- [Test]
- public void GetDirectories1 ()
- {
- string path = TempFolder + DSC +
"DIT.GetDirectories1.Test";
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- AssertEquals ("test#01", 0, info.GetDirectories
().Length);
-
- Directory.CreateDirectory (path + DSC + "1");
- Directory.CreateDirectory (path + DSC + "2");
- File.Create (path + DSC + "filetest").Close ();
- AssertEquals ("test#02", 2, info.GetDirectories
().Length);
-
- Directory.Delete (path + DSC + 2);
- AssertEquals ("test#02", 1, info.GetDirectories
().Length);
-
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void GetDirectories2 ()
- {
- string path = TempFolder + DSC +
"DIT.GetDirectories2.Test";
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- AssertEquals ("test#01", 0, info.GetDirectories
("*").Length);
-
- Directory.CreateDirectory (path + DSC +
"test120");
- Directory.CreateDirectory (path + DSC +
"test210");
- Directory.CreateDirectory (path + DSC +
"atest330");
- Directory.CreateDirectory (path + DSC +
"test220");
- File.Create (path + DSC + "filetest").Close ();
-
- AssertEquals ("test#02", 4, info.GetDirectories
("*").Length);
- AssertEquals ("test#03", 3, info.GetDirectories
("test*").Length);
- AssertEquals ("test#04", 2, info.GetDirectories
("test?20").Length);
- AssertEquals ("test#05", 0, info.GetDirectories
("test?").Length);
- AssertEquals ("test#06", 0, info.GetDirectories
("test[12]*").Length);
- AssertEquals ("test#07", 2, info.GetDirectories
("test2*0").Length);
- AssertEquals ("test#08", 4, info.GetDirectories
("*test*").Length);
-
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (DirectoryNotFoundException))]
- public void GetDirectoriesDirectoryNotFoundException1 ()
- {
- string path = TempFolder + DSC +
"DIT.GetDirectoriesDirectoryNotFoundException1.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- info.GetDirectories ();
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (DirectoryNotFoundException))]
- public void GetDirectoriesDirectoryNotFoundException2 ()
- {
- string path = TempFolder + DSC +
"DIT.GetDirectoriesDirectoryNotFoundException2.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- info.GetDirectories ("*");
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (ArgumentNullException))]
- public void GetDirectoriesArgumentNullException ()
- {
- string path = TempFolder + DSC +
"DIT.GetDirectoriesArgumentNullException.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- info.GetDirectories (null);
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void GetFiles1 ()
- {
- string path = TempFolder + DSC + "DIT.GetFiles1.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- AssertEquals ("test#01", 0, info.GetFiles
().Length);
- File.Create (path + DSC + "file1").Close ();
- File.Create (path + DSC + "file2").Close ();
- Directory.CreateDirectory (path + DSC +
"directory1");
- AssertEquals ("test#02", 2, info.GetFiles
().Length);
-
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void GetFiles2()
- {
- string path = TempFolder + DSC + "DIT.GetFiles2.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- AssertEquals ("test#01", 0, info.GetFiles
("*").Length);
- File.Create (path + DSC + "file120file").Close
();
- File.Create (path + DSC + "file220file").Close
();
- File.Create (path + DSC + "afile330file").Close
();
- File.Create (path + DSC + "test.abc").Close ();
- File.Create (path + DSC + "test.abcd").Close ();
- File.Create (path + DSC + "test.abcdef").Close
();
- Directory.CreateDirectory (path + DSC + "dir");
-
- AssertEquals ("test#02", 6, info.GetFiles
("*").Length);
- AssertEquals ("test#03", 2, info.GetFiles
("file*file").Length);
- AssertEquals ("test#04", 3, info.GetFiles
("*file*").Length);
- AssertEquals ("test#05", 2, info.GetFiles
("file?20file").Length);
- AssertEquals ("test#07", 1, info.GetFiles
("*.abcd").Length);
- AssertEquals ("test#08", 2, info.GetFiles
("*.abcd*").Length);
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (DirectoryNotFoundException))]
- public void GetFilesDirectoryNotFoundException1 ()
- {
- string path = TempFolder + DSC +
"DIT.GetFilesDirectoryNotFoundException1.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- info.GetFiles ();
-
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (DirectoryNotFoundException))]
- public void GetFilesDirectoryNotFoundException2 ()
- {
- string path = TempFolder + DSC +
"DIT.GetFilesDirectoryNotFoundException2.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- info.GetFiles ("*");
-
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (ArgumentNullException))]
- public void GetFilesArgumentNullException ()
- {
- string path = TempFolder + DSC +
"DIT.GetFilesArgumentNullException.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- info.GetFiles (null);
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- public void MoveTo ()
- {
- string path1 = TempFolder + DSC +
"DIT.MoveTo.Soucre.Test";
- string path2 = TempFolder + DSC +
"DIT.MoveTo.Dest.Test";
- DeleteDir (path1);
- DeleteDir (path2);
-
- try {
- DirectoryInfo info1 = Directory.CreateDirectory
(path1);
- DirectoryInfo info2 = new DirectoryInfo (path2);
-
- AssertEquals ("test#01", true, info1.Exists);
- AssertEquals ("test#02", false, info2.Exists);
-
- info1.MoveTo (path2);
- AssertEquals ("test#03", true, info1.Exists);
- AssertEquals ("test#04", false, info2.Exists);
-
- info1 = new DirectoryInfo (path1);
- info2 = new DirectoryInfo (path2);
- AssertEquals ("test#05", false, info1.Exists);
- AssertEquals ("test#06", true, info2.Exists);
-
- } finally {
- DeleteDir (path1);
- DeleteDir (path2);
- }
- }
-
- [Test]
- [ExpectedException (typeof (ArgumentNullException))]
- public void MoveToArgumentNullException ()
- {
- string path = TempFolder + DSC +
"DIT.MoveToArgumentNullException.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- info.MoveTo (null);
- } finally {
- DeleteDir (path);
- }
-
- }
-
- [Test]
- [ExpectedException (typeof (IOException))]
- public void MoveToIOException1 ()
- {
- string path = TempFolder + DSC +
"DIT.MoveToIOException1.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- info.MoveTo (path);
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (ArgumentException))]
- public void MoveToArgumentException1 ()
- {
- string path = TempFolder + DSC +
"DIT.MoveToArgumentException1.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- info.MoveTo ("");
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (ArgumentException))]
- public void MoveToArgumentException2 ()
- {
- string path = TempFolder + DSC +
"DIT.MoveToArgumentException2.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- info.MoveTo (" ");
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (ArgumentException))]
- public void MoveToArgumentException3 ()
- {
- string path = TempFolder + DSC +
"DIT.MoveToArgumentException3.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = Directory.CreateDirectory
(path);
- info.MoveTo (Path.InvalidPathChars [0].ToString
());
- } finally {
- DeleteDir (path);
- }
- }
-
- [Test]
- [ExpectedException (typeof (IOException))]
- public void MoveToIOException2 ()
- {
- string path = TempFolder + DSC +
"DIT.MoveToIOException2.Test";
- DeleteDir (path);
-
- try {
- DirectoryInfo info = new DirectoryInfo (path);
- info.MoveTo (path);
- } finally {
- DeleteDir (path);
- }
- }
-
- private void DeleteDir (string path)
- {
- if (Directory.Exists (path))
- Directory.Delete (path, true);
- }
+ }
+
+ [Test]
+ public void GetDirectories1 ()
+ {
+ string path = TempFolder + DSC +
"DIT.GetDirectories1.Test";
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ AssertEquals ("test#01", 0, info.GetDirectories
().Length);
+
+ Directory.CreateDirectory (path + DSC + "1");
+ Directory.CreateDirectory (path + DSC + "2");
+ File.Create (path + DSC + "filetest").Close ();
+ AssertEquals ("test#02", 2, info.GetDirectories
().Length);
+
+ Directory.Delete (path + DSC + 2);
+ AssertEquals ("test#02", 1, info.GetDirectories
().Length);
+
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void GetDirectories2 ()
+ {
+ string path = TempFolder + DSC +
"DIT.GetDirectories2.Test";
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ AssertEquals ("test#01", 0, info.GetDirectories
("*").Length);
+
+ Directory.CreateDirectory (path + DSC +
"test120");
+ Directory.CreateDirectory (path + DSC +
"test210");
+ Directory.CreateDirectory (path + DSC +
"atest330");
+ Directory.CreateDirectory (path + DSC +
"test220");
+ Directory.CreateDirectory (path + DSC + "rest");
+ Directory.CreateDirectory (path + DSC + "rest"
+ DSC + "subdir");
+ File.Create (path + DSC + "filetest").Close ();
+
+ AssertEquals ("test#02", 5, info.GetDirectories
("*").Length);
+ AssertEquals ("test#03", 3, info.GetDirectories
("test*").Length);
+ AssertEquals ("test#04", 2, info.GetDirectories
("test?20").Length);
+ AssertEquals ("test#05", 0, info.GetDirectories
("test?").Length);
+ AssertEquals ("test#06", 0, info.GetDirectories
("test[12]*").Length);
+ AssertEquals ("test#07", 2, info.GetDirectories
("test2*0").Length);
+ AssertEquals ("test#08", 4, info.GetDirectories
("*test*").Length);
+#if NET_2_0
+ AssertEquals ("test#09", 6, info.GetDirectories
("*", SearchOption.AllDirectories).Length);
+#endif
+
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (DirectoryNotFoundException))]
+ public void GetDirectoriesDirectoryNotFoundException1 ()
+ {
+ string path = TempFolder + DSC +
"DIT.GetDirectoriesDirectoryNotFoundException1.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.GetDirectories ();
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (DirectoryNotFoundException))]
+ public void GetDirectoriesDirectoryNotFoundException2 ()
+ {
+ string path = TempFolder + DSC +
"DIT.GetDirectoriesDirectoryNotFoundException2.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.GetDirectories ("*");
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (ArgumentNullException))]
+ public void GetDirectoriesArgumentNullException ()
+ {
+ string path = TempFolder + DSC +
"DIT.GetDirectoriesArgumentNullException.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.GetDirectories (null);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void GetFiles1 ()
+ {
+ string path = TempFolder + DSC + "DIT.GetFiles1.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ AssertEquals ("test#01", 0, info.GetFiles
().Length);
+ File.Create (path + DSC + "file1").Close ();
+ File.Create (path + DSC + "file2").Close ();
+ Directory.CreateDirectory (path + DSC +
"directory1");
+ AssertEquals ("test#02", 2, info.GetFiles
().Length);
+
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void GetFiles2()
+ {
+ string path = TempFolder + DSC + "DIT.GetFiles2.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ AssertEquals ("test#01", 0, info.GetFiles
("*").Length);
+ File.Create (path + DSC + "file120file").Close
();
+ File.Create (path + DSC + "file220file").Close
();
+ File.Create (path + DSC + "afile330file").Close
();
+ File.Create (path + DSC + "test.abc").Close ();
+ File.Create (path + DSC + "test.abcd").Close ();
+ File.Create (path + DSC + "test.abcdef").Close
();
+ Directory.CreateDirectory (path + DSC + "dir");
+
+ AssertEquals ("test#02", 6, info.GetFiles
("*").Length);
+ AssertEquals ("test#03", 2, info.GetFiles
("file*file").Length);
+ AssertEquals ("test#04", 3, info.GetFiles
("*file*").Length);
+ AssertEquals ("test#05", 2, info.GetFiles
("file?20file").Length);
+ AssertEquals ("test#07", 1, info.GetFiles
("*.abcd").Length);
+ AssertEquals ("test#08", 2, info.GetFiles
("*.abcd*").Length);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (DirectoryNotFoundException))]
+ public void GetFilesDirectoryNotFoundException1 ()
+ {
+ string path = TempFolder + DSC +
"DIT.GetFilesDirectoryNotFoundException1.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.GetFiles ();
+
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (DirectoryNotFoundException))]
+ public void GetFilesDirectoryNotFoundException2 ()
+ {
+ string path = TempFolder + DSC +
"DIT.GetFilesDirectoryNotFoundException2.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.GetFiles ("*");
+
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (ArgumentNullException))]
+ public void GetFilesArgumentNullException ()
+ {
+ string path = TempFolder + DSC +
"DIT.GetFilesArgumentNullException.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.GetFiles (null);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ public void MoveTo ()
+ {
+ string path1 = TempFolder + DSC +
"DIT.MoveTo.Soucre.Test";
+ string path2 = TempFolder + DSC +
"DIT.MoveTo.Dest.Test";
+ DeleteDir (path1);
+ DeleteDir (path2);
+
+ try {
+ DirectoryInfo info1 = Directory.CreateDirectory
(path1);
+ DirectoryInfo info2 = new DirectoryInfo (path2);
+
+ AssertEquals ("test#01", true, info1.Exists);
+ AssertEquals ("test#02", false, info2.Exists);
+
+ info1.MoveTo (path2);
+ AssertEquals ("test#03", true, info1.Exists);
+ AssertEquals ("test#04", false, info2.Exists);
+
+ info1 = new DirectoryInfo (path1);
+ info2 = new DirectoryInfo (path2);
+ AssertEquals ("test#05", false, info1.Exists);
+ AssertEquals ("test#06", true, info2.Exists);
+
+ } finally {
+ DeleteDir (path1);
+ DeleteDir (path2);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (ArgumentNullException))]
+ public void MoveToArgumentNullException ()
+ {
+ string path = TempFolder + DSC +
"DIT.MoveToArgumentNullException.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ info.MoveTo (null);
+ } finally {
+ DeleteDir (path);
+ }
+
+ }
+
+ [Test]
+ [ExpectedException (typeof (IOException))]
+ public void MoveToIOException1 ()
+ {
+ string path = TempFolder + DSC +
"DIT.MoveToIOException1.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ info.MoveTo (path);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (ArgumentException))]
+ public void MoveToArgumentException1 ()
+ {
+ string path = TempFolder + DSC +
"DIT.MoveToArgumentException1.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ info.MoveTo ("");
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (ArgumentException))]
+ public void MoveToArgumentException2 ()
+ {
+ string path = TempFolder + DSC +
"DIT.MoveToArgumentException2.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ info.MoveTo (" ");
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (ArgumentException))]
+ public void MoveToArgumentException3 ()
+ {
+ string path = TempFolder + DSC +
"DIT.MoveToArgumentException3.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = Directory.CreateDirectory
(path);
+ info.MoveTo (Path.InvalidPathChars [0].ToString
());
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ [Test]
+ [ExpectedException (typeof (IOException))]
+ public void MoveToIOException2 ()
+ {
+ string path = TempFolder + DSC +
"DIT.MoveToIOException2.Test";
+ DeleteDir (path);
+
+ try {
+ DirectoryInfo info = new DirectoryInfo (path);
+ info.MoveTo (path);
+ } finally {
+ DeleteDir (path);
+ }
+ }
+
+ private void DeleteDir (string path)
+ {
+ if (Directory.Exists (path))
+ Directory.Delete (path, true);
+ }
[Test]
public void DirectoryNameWithSpace ()
@@ -621,157 +626,157 @@
foreach (FileInfo f in i.GetFiles ()) // This
used to throw
dummy = f.Name;
}
- }
-
- [Test]
- public void LastWriteTime ()
- {
- DirectoryInfo info = new DirectoryInfo
(TempFolder);
- info.LastWriteTime = new DateTime (2003, 6, 4,
6, 4, 0);
-
- DateTime time = Directory.GetLastWriteTime
(TempFolder);
- AssertEquals ("test#01", 2003, time.Year);
- AssertEquals ("test#02", 6, time.Month);
- AssertEquals ("test#03", 4, time.Day);
- AssertEquals ("test#04", 6, time.Hour);
- AssertEquals ("test#05", 4, time.Minute);
- AssertEquals ("test#06", 0, time.Second);
-
- time = TimeZone.CurrentTimeZone.ToLocalTime (
- Directory.GetLastWriteTimeUtc
(TempFolder));
- AssertEquals ("test#07", 2003, time.Year);
- AssertEquals ("test#08", 6, time.Month);
- AssertEquals ("test#09", 4, time.Day);
- AssertEquals ("test#10", 6, time.Hour);
- AssertEquals ("test#11", 4, time.Minute);
- AssertEquals ("test#12", 0, time.Second);
- }
-
- [Test]
- public void LastWriteTimeUtc ()
- {
- DirectoryInfo info = new DirectoryInfo
(TempFolder);
- info.LastWriteTimeUtc = new DateTime (2003, 6,
4, 6, 4, 0);
-
- DateTime time =
TimeZone.CurrentTimeZone.ToUniversalTime (
- Directory.GetLastWriteTime
(TempFolder));
- AssertEquals ("test#1", 2003, time.Year);
- AssertEquals ("test#2", 6, time.Month);
- AssertEquals ("test#3", 4, time.Day);
- AssertEquals ("test#4", 6, time.Hour);
- AssertEquals ("test#5", 4, time.Minute);
- AssertEquals ("test#6", 0, time.Second);
-
- time = Directory.GetLastWriteTimeUtc
(TempFolder);
- AssertEquals ("test#7", 2003, time.Year);
- AssertEquals ("test#8", 6, time.Month);
- AssertEquals ("test#9", 4, time.Day);
- AssertEquals ("test#10", 6, time.Hour);
- AssertEquals ("test#11", 4, time.Minute);
- AssertEquals ("test#12", 0, time.Second);
- }
-
- [Test]
- public void LastAccessTime ()
- {
- DirectoryInfo info = new DirectoryInfo
(TempFolder);
- info.LastAccessTime = DateTime.Now;
- }
-
- [Test]
- public void LastAccessTimeUtc ()
- {
- DirectoryInfo info = new DirectoryInfo
(TempFolder);
- info.LastAccessTimeUtc = DateTime.Now;
- }
-
- [Test]
- public void CreationTime ()
- {
- DirectoryInfo info = new DirectoryInfo
(TempFolder);
- info.CreationTime = DateTime.Now;
- }
-
- [Test]
- public void CreationTimeUtc ()
- {
- DirectoryInfo info = new DirectoryInfo
(TempFolder);
- info.CreationTimeUtc = DateTime.Now;
- }
-
-
- private void CheckName (string name)
- {
- DirectoryInfo di = new DirectoryInfo (name);
- AssertEquals (name + ".Name", "share", di.Name);
- AssertEquals (name + ".Parent.Name", "usr",
di.Parent.Name);
- }
-
- [Test]
- public void Name_Bug76903 ()
- {
- CheckName ("/usr/share");
- CheckName ("/usr/share/");
- CheckName ("/usr/share/.");
- CheckName ("/usr/share/./");
- CheckName ("/usr/share/blabla/../");
- CheckName ("/usr/lib/../share/.");
- }
-
- [Test]
- public void Hang_76191 ()
- {
- // from bug #76191 (hangs on Windows)
- DirectoryInfo di = new DirectoryInfo
(Environment.CurrentDirectory);
- Stack s = new Stack ();
- s.Push (di);
- while (di.Parent != null) {
- di = di.Parent;
- s.Push (di);
- }
- while (s.Count > 0) {
- di = (DirectoryInfo) s.Pop ();
- Assert (di.Name, di.Exists);
- }
- }
-
- private void WindowsParentFullName (string name, string
expected)
- {
- DirectoryInfo di = new DirectoryInfo (name);
- if (di.Parent == null)
- AssertNull (name, expected);
- else
- AssertEquals (name, expected,
di.Parent.FullName);
- }
-
- [Test]
- public void WindowsSystem32_76191 ()
- {
- // check for Unix platforms - see FAQ for more details
- //
http://www.mono-project.com/FAQ:_Technical#How_to_detect_the_execution_platform_.3F
- int platform = (int) Environment.OSVersion.Platform;
- if ((platform == 4) || (platform == 128))
- return;
-
- Directory.SetCurrentDirectory (@"C:\WINDOWS\system32");
- WindowsParentFullName ("C:", "C:\\WINDOWS");
- WindowsParentFullName ("C:\\", null);
- WindowsParentFullName ("C:\\dir", "C:\\");
- WindowsParentFullName ("C:\\dir\\", "C:\\");
- WindowsParentFullName ("C:\\dir\\dir", "C:\\dir");
- WindowsParentFullName ("C:\\dir\\dir\\", "C:\\dir");
}
- [Test]
- public void Parent_Bug77090 ()
+ [Test]
+ public void LastWriteTime ()
+ {
+ DirectoryInfo info = new DirectoryInfo
(TempFolder);
+ info.LastWriteTime = new DateTime (2003, 6, 4,
6, 4, 0);
+
+ DateTime time = Directory.GetLastWriteTime
(TempFolder);
+ AssertEquals ("test#01", 2003, time.Year);
+ AssertEquals ("test#02", 6, time.Month);
+ AssertEquals ("test#03", 4, time.Day);
+ AssertEquals ("test#04", 6, time.Hour);
+ AssertEquals ("test#05", 4, time.Minute);
+ AssertEquals ("test#06", 0, time.Second);
+
+ time = TimeZone.CurrentTimeZone.ToLocalTime (
+ Directory.GetLastWriteTimeUtc
(TempFolder));
+ AssertEquals ("test#07", 2003, time.Year);
+ AssertEquals ("test#08", 6, time.Month);
+ AssertEquals ("test#09", 4, time.Day);
+ AssertEquals ("test#10", 6, time.Hour);
+ AssertEquals ("test#11", 4, time.Minute);
+ AssertEquals ("test#12", 0, time.Second);
+ }
+
+ [Test]
+ public void LastWriteTimeUtc ()
+ {
+ DirectoryInfo info = new DirectoryInfo
(TempFolder);
+ info.LastWriteTimeUtc = new DateTime (2003, 6,
4, 6, 4, 0);
+
+ DateTime time =
TimeZone.CurrentTimeZone.ToUniversalTime (
+ Directory.GetLastWriteTime
(TempFolder));
+ AssertEquals ("test#1", 2003, time.Year);
+ AssertEquals ("test#2", 6, time.Month);
+ AssertEquals ("test#3", 4, time.Day);
+ AssertEquals ("test#4", 6, time.Hour);
+ AssertEquals ("test#5", 4, time.Minute);
+ AssertEquals ("test#6", 0, time.Second);
+
+ time = Directory.GetLastWriteTimeUtc
(TempFolder);
+ AssertEquals ("test#7", 2003, time.Year);
+ AssertEquals ("test#8", 6, time.Month);
+ AssertEquals ("test#9", 4, time.Day);
+ AssertEquals ("test#10", 6, time.Hour);
+ AssertEquals ("test#11", 4, time.Minute);
+ AssertEquals ("test#12", 0, time.Second);
+ }
+
+ [Test]
+ public void LastAccessTime ()
+ {
+ DirectoryInfo info = new DirectoryInfo
(TempFolder);
+ info.LastAccessTime = DateTime.Now;
+ }
+
+ [Test]
+ public void LastAccessTimeUtc ()
+ {
+ DirectoryInfo info = new DirectoryInfo
(TempFolder);
+ info.LastAccessTimeUtc = DateTime.Now;
+ }
+
+ [Test]
+ public void CreationTime ()
+ {
+ DirectoryInfo info = new DirectoryInfo
(TempFolder);
+ info.CreationTime = DateTime.Now;
+ }
+
+ [Test]
+ public void CreationTimeUtc ()
+ {
+ DirectoryInfo info = new DirectoryInfo
(TempFolder);
+ info.CreationTimeUtc = DateTime.Now;
+ }
+
+
+ private void CheckName (string name)
{
- DirectoryInfo di = new DirectoryInfo ("/home");
- if (Path.DirectorySeparatorChar == '\\') {
- Assert ("/home parent (Windows path)",
di.Parent.Name.EndsWith (":\\"));
- }
- else
- AssertEquals ("/home parent", "/",
di.Parent.Name);
- AssertNull ("/home parent parent", di.Parent.Parent);
- }
- }
-}
+ DirectoryInfo di = new DirectoryInfo (name);
+ AssertEquals (name + ".Name", "share", di.Name);
+ AssertEquals (name + ".Parent.Name", "usr",
di.Parent.Name);
+ }
+
+ [Test]
+ public void Name_Bug76903 ()
+ {
+ CheckName ("/usr/share");
+ CheckName ("/usr/share/");
+ CheckName ("/usr/share/.");
+ CheckName ("/usr/share/./");
+ CheckName ("/usr/share/blabla/../");
+ CheckName ("/usr/lib/../share/.");
+ }
+
+ [Test]
+ public void Hang_76191 ()
+ {
+ // from bug #76191 (hangs on Windows)
+ DirectoryInfo di = new DirectoryInfo
(Environment.CurrentDirectory);
+ Stack s = new Stack ();
+ s.Push (di);
+ while (di.Parent != null) {
+ di = di.Parent;
+ s.Push (di);
+ }
+ while (s.Count > 0) {
+ di = (DirectoryInfo) s.Pop ();
+ Assert (di.Name, di.Exists);
+ }
+ }
+
+ private void WindowsParentFullName (string name, string
expected)
+ {
+ DirectoryInfo di = new DirectoryInfo (name);
+ if (di.Parent == null)
+ AssertNull (name, expected);
+ else
+ AssertEquals (name, expected,
di.Parent.FullName);
+ }
+
+ [Test]
+ public void WindowsSystem32_76191 ()
+ {
+ // check for Unix platforms - see FAQ for more details
+ //
http://www.mono-project.com/FAQ:_Technical#How_to_detect_the_execution_platform_.3F
+ int platform = (int) Environment.OSVersion.Platform;
+ if ((platform == 4) || (platform == 128))
+ return;
+
+ Directory.SetCurrentDirectory (@"C:\WINDOWS\system32");
+ WindowsParentFullName ("C:", "C:\\WINDOWS");
+ WindowsParentFullName ("C:\\", null);
+ WindowsParentFullName ("C:\\dir", "C:\\");
+ WindowsParentFullName ("C:\\dir\\", "C:\\");
+ WindowsParentFullName ("C:\\dir\\dir", "C:\\dir");
+ WindowsParentFullName ("C:\\dir\\dir\\", "C:\\dir");
+ }
+
+ [Test]
+ public void Parent_Bug77090 ()
+ {
+ DirectoryInfo di = new DirectoryInfo ("/home");
+ if (Path.DirectorySeparatorChar == '\\') {
+ Assert ("/home parent (Windows path)",
di.Parent.Name.EndsWith (":\\"));
+ }
+ else
+ AssertEquals ("/home parent", "/",
di.Parent.Name);
+ AssertNull ("/home parent parent", di.Parent.Parent);
+ }
+ }
+}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches