Imported Upstream version 5.20.0.191

Former-commit-id: f618c50e703b4397dafa8bd1c4db75cbe083570c
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-08 08:36:39 +00:00
parent d682dc917c
commit fad63d06c9
55 changed files with 48 additions and 85 deletions

View File

@@ -27,7 +27,7 @@ using System;
namespace Mono
{
// Keep in sync with mono/native/mono-native-platform-type.h
// Keep in sync with mono/native/mono-native-platform.h
[Flags]
enum MonoNativePlatformType
{

View File

@@ -30,40 +30,5 @@ namespace MonoTests.Mono
var initialized = MonoNativePlatform.IsInitialized ();
Assert.IsTrue (initialized, "MonoNativePlatform.IsInitialized()");
}
[Test]
public void TestReflectionInitialize ()
{
var asm = typeof (string).Assembly;
var type = asm.GetType ("Mono.MonoNativePlatform");
Assert.IsNotNull (type, "MonoNativePlatform");
var method = type.GetMethod ("Initialize", BindingFlags.Static | BindingFlags.Public);
Assert.IsNotNull (method, "MonoNativePlatform.Initialize");
var method2 = type.GetMethod ("IsInitialized", BindingFlags.Static | BindingFlags.Public);
Assert.IsNotNull (method2, "MonoNativePlatform.IsInitialized");
method.Invoke (null, null);
var result = (bool)method2.Invoke (null, null);
Assert.IsTrue (result, "MonoNativePlatform.IsInitialized()");
}
[Test]
public void TestInternalCounter ()
{
MonoNativePlatform.Initialize ();
var asm = typeof (string).Assembly;
var type = asm.GetType ("Mono.MonoNativePlatform");
Assert.IsNotNull (type, "MonoNativePlatform");
var method = type.GetMethod ("TestInternalCounter", BindingFlags.Static | BindingFlags.NonPublic);
Assert.IsNotNull (method, "MonoNativePlatform.TestInternalCounter");
var result = method.Invoke (null, null);
Assert.That (result, Is.GreaterThan (0), "MonoNativePlatform.TestInternalCounter()");
}
}
}

View File

@@ -1 +1 @@
ac73c8792dbdb43746aeeab1d2fc010ecce1f93e
a639af7dbcc005f41b8e91a5fc71eede726506f6

View File

@@ -2,8 +2,8 @@ Microsoft.Win32/RegistryKeyTest.cs
Mono/DataConvertTest.cs
../Mono/DataConverter.cs
Mono/NativePlatformTest.cs
../Mono/MonoNativePlatform.cs
../Mono/MonoNativePlatformType.cs
Mono/MonoNativePlatform.cs
Mono/MonoNativePlatformType.cs
System/ActivatorTest.cs
System/AppDomainManagerTest.cs
System/AppDomainSetupTest.cs

View File

@@ -1,6 +1,6 @@
Mono/NativePlatformTest.cs
../Mono/MonoNativePlatform.cs
../Mono/MonoNativePlatformType.cs
Mono/MonoNativePlatform.cs
Mono/MonoNativePlatformType.cs
Microsoft.Win32/RegistryKeyTest.cs
System.Diagnostics.Contracts/ContractAssertTest.cs
System.Diagnostics.Contracts/ContractAssumeTest.cs

View File

@@ -1,6 +1,6 @@
Mono/NativePlatformTest.cs
../Mono/MonoNativePlatform.cs
../Mono/MonoNativePlatformType.cs
Mono/MonoNativePlatform.cs
Mono/MonoNativePlatformType.cs
Microsoft.Win32/RegistryKeyTest.cs
System.Diagnostics.Contracts/ContractAssertTest.cs
System.Diagnostics.Contracts/ContractAssumeTest.cs

View File

@@ -6,8 +6,6 @@ corert/ThreadPoolBoundHandle.platformnotsupported.cs
corefx/Interop.GetRandomBytes.Mono.cs
corefx/Mono.SafePasswordHandle.Unix.cs
../../../external/corefx/src/System.Security.Cryptography.X509Certificates/src/Microsoft/Win32/SafeHandles/SafePasswordHandle.Unix.cs
Mono/MonoNativePlatform.cs
Mono/MonoNativePlatformType.cs
Microsoft.Win32/IRegistryApi.cs
Microsoft.Win32/Registry.cs
Microsoft.Win32/RegistryKey.cs