Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -116,7 +116,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
new IsolatedStorageFileStream ("/rootpath", FileMode.Create);
}
#if NET_4_0
[Test]
public void Constructor_StorageInvalid ()
{
@@ -143,6 +142,5 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
} catch (InvalidOperationException) {
}
}
#endif
}
}

View File

@@ -224,7 +224,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
}
#endif
#if NET_4_0
// This is supposed to be working only in SL.
[Test]
[ExpectedException (typeof (NotSupportedException))]
@@ -232,7 +231,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
{
IsolatedStorageFile.GetUserStoreForSite ();
}
#endif
[Test]
public void GetStore_Domain_Zone ()
@@ -457,19 +455,10 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
try {
isf.CreateDirectory (path);
}
#if NET_4_0
catch (IsolatedStorageException ex) {
Assert.IsFalse (ex.Message.IndexOf (path) >= 0, "Message");
Assert.IsNull (ex.InnerException, "InnerException");
}
#else
catch (IOException ex) {
Assert.AreEqual (typeof (IOException), ex.GetType (), "Type");
// don't leak path information
Assert.IsFalse (ex.Message.IndexOf (path) >= 0, "Message");
Assert.IsNull (ex.InnerException, "InnerException");
}
#endif
}
}
@@ -498,11 +487,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
}
[Test]
#if NET_4_0
[ExpectedException (typeof (ArgumentException))]
#else
[ExpectedException (typeof (SecurityException))]
#endif
public void GetFilesInSubdirs ()
{
IsolatedStorageFile isf = IsolatedStorageFile.GetUserStoreForAssembly ();
@@ -511,7 +496,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
}
#if NET_4_0
[Test]
[ExpectedException (typeof (ArgumentException))]
public void GetDirsInSubDirs ()
@@ -520,7 +504,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
isf.CreateDirectory ("subdir");
string [] dir_names = isf.GetDirectoryNames ("subdir/../*");
}
#endif
[Test] // https://bugzilla.novell.com/show_bug.cgi?id=376188
public void CreateSubDirectory ()
@@ -555,7 +538,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
} catch (ArgumentNullException) {
}
#if NET_4_0
// We are getting an internal IndexOutOfRangeException in 2.0
// Not sure we want to mimic that one.
try {
@@ -563,7 +545,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
Assert.Fail ("#Exc1");
} catch (IsolatedStorageException) {
}
#endif
try {
isf.DeleteFile ("idontexist");
@@ -571,13 +552,11 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
} catch (IsolatedStorageException) {
}
#if NET_4_0
try {
isf.DeleteFile ("../../file");
Assert.Fail ("#Exc3");
} catch (IsolatedStorageException) {
}
#endif
try {
isf.DeleteFile ("subdir/file");
@@ -618,7 +597,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
}
}
#if NET_4_0
[Test]
public void Remove ()
{
@@ -1056,7 +1034,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
isf.MoveFile (" ", "file-new-new");
Assert.Fail ("#Exc2");
} catch (ArgumentException e) {
Console.WriteLine (e);
}
try {
@@ -1121,7 +1098,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
isf.DeleteDirectory ("dir1");
}
}
#endif
[Test]
public void RootedDirectory ()
{

View File

@@ -245,7 +245,6 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
}
}
#if NET_4_0
[Test]
[ExpectedException (typeof (InvalidOperationException))]
public void IsolatedStorage_UsedSize ()
@@ -278,6 +277,5 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
Assert.AreEqual (false, nais.IncreaseQuotaTo (0), "#A1");
Assert.AreEqual (false, nais.IncreaseQuotaTo (100), "#A2");
}
#endif
}
}