Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@@ -31,12 +31,6 @@
<Compile Include="TraceSwitchClassTests.cs" />
<Compile Include="TraceTestHelper.cs" />
<Compile Include="CorrelationManagerTests.cs" />
<Compile Include="$(CommonTestPath)\System\AssertExtensions.cs">
<Link>Common\System\AssertExtensions.cs</Link>
</Compile>
<Compile Include="$(CommonTestPath)\System\IO\FileCleanupTestBase.cs">
<Link>Common\System\IO\FileCleanupTestBase.cs</Link>
</Compile>
<Compile Include="$(CommonTestPath)\System\PlatformDetection.cs">
<Link>Common\tests\System\PlatformDetection.cs</Link>
</Compile>

View File

@@ -243,7 +243,7 @@ namespace System.Diagnostics.TraceSourceTests
}
else
{
Assert.Throws<ArgumentException>(() => list.Add(item));
AssertExtensions.Throws<ArgumentException>("value", () => list.Add(item));
}
}
@@ -275,7 +275,7 @@ namespace System.Diagnostics.TraceSourceTests
Assert.Equal(item, list[1]);
var nonItem = CreateNonItem();
Assert.Throws<ArgumentException>(() => list[1] = nonItem);
AssertExtensions.Throws<ArgumentException>("value", () => list[1] = nonItem);
}
}
@@ -307,7 +307,7 @@ namespace System.Diagnostics.TraceSourceTests
public virtual void InsertExceptionTest()
{
var list = Create(2);
Assert.Throws<ArgumentException>(() => list.Insert(1, null));
AssertExtensions.Throws<ArgumentException>("value", () => list.Insert(1, null));
}
[Fact]
@@ -401,7 +401,7 @@ namespace System.Diagnostics.TraceSourceTests
{
var list = Create(4);
var arr = new Object[2];
Assert.Throws<ArgumentException>(() => list.CopyTo(arr, 0));
AssertExtensions.Throws<ArgumentException>("destinationArray", "", () => list.CopyTo(arr, 0));
}
}

View File

@@ -15,7 +15,7 @@ namespace System.Diagnostics.TraceSourceTests
public void ConstrutorExceptionTest()
{
Assert.Throws<ArgumentNullException>(() => new TraceSource(null));
Assert.Throws<ArgumentException>(() => new TraceSource(""));
AssertExtensions.Throws<ArgumentException>("name", null, () => new TraceSource(""));
}
[Fact]
@@ -132,20 +132,8 @@ namespace System.Diagnostics.TraceSourceTests
[Fact]
public void EmptySourceName()
{
ArgumentException exception1 = Assert.Throws<ArgumentException>(() => new TraceSource(string.Empty));
ArgumentException exception2 = Assert.Throws<ArgumentException>(() => new TraceSource(string.Empty, SourceLevels.All));
// In Desktop in TraceSource.ctor we create the ArgumentException without param name, just with Message = "name", so ParamName is null
if (PlatformDetection.IsFullFramework)
{
Assert.Null(exception1.ParamName);
Assert.Null(exception2.ParamName);
}
else
{
Assert.Equal("name", exception1.ParamName);
Assert.Equal("name", exception2.ParamName);
}
AssertExtensions.Throws<ArgumentException>("name", null, () => new TraceSource(string.Empty));
AssertExtensions.Throws<ArgumentException>("name", null, () => new TraceSource(string.Empty, SourceLevels.All));
}
}

View File

@@ -26,7 +26,7 @@ namespace System.Diagnostics.TraceSourceTests
item = new TraceSwitch("SwitchName", null, "warning");
Assert.Equal(TraceLevel.Warning, item.Level);
item = new TraceSwitch("Name", null, "NO_EXIST");
Assert.Throws<ArgumentException>(() => item.Level);
AssertExtensions.Throws<ArgumentException>(null, () => item.Level);
item = new TraceSwitch("Name", null, null);
Assert.Throws<ArgumentNullException>(() => item.Level);
@@ -40,8 +40,8 @@ namespace System.Diagnostics.TraceSourceTests
Assert.Equal(TraceLevel.Error, item.Level);
item.Level = TraceLevel.Info;
Assert.Equal(TraceLevel.Info, item.Level);
Assert.Throws<ArgumentException>(() => item.Level = (TraceLevel)(TraceLevel.Off - 1));
Assert.Throws<ArgumentException>(() => item.Level = (TraceLevel)(TraceLevel.Verbose + 1));
AssertExtensions.Throws<ArgumentException>(null, () => item.Level = (TraceLevel)(TraceLevel.Off - 1));
AssertExtensions.Throws<ArgumentException>(null, () => item.Level = (TraceLevel)(TraceLevel.Verbose + 1));
}
[Theory]