Split netcoreapp code to its own files

tarekgh · Feb 8, 2017 · 75c8d08 · 75c8d08
1 parent 701815a
commit 75c8d08
Show file tree

Hide file tree

Showing 10 changed files with 258 additions and 219 deletions.
diff --git a/src/System.Runtime/tests/ArrayTests.netcoreapp.cs b/src/System.Runtime/tests/ArrayTests.netcoreapp.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace System.Tests
+{
+    public static class Array17NetcoreappTests
+    {
+        [Fact]
+        public static void CreateInstance_Type_Int_Invalid()
+        {
+            // Type is not a valid RuntimeType
+            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), 0));
+        }
+
+        [Fact]
+        public static void CreateInstance_Type_Int_Int_Invalid()
+        {
+            // Type is not a valid RuntimeType
+            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), 0, 1));
+        }
+
+        [Fact]
+        public static void CreateInstance_Type_Int_Int_Int_Invalid()
+        {
+            // Type is not a valid RuntimeType
+            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), 0, 1, 2));
+        }
+    }
+}
diff --git a/src/System.Runtime/tests/ArrayTests.netstandard.cs b/src/System.Runtime/tests/ArrayTests.netstandard.cs
@@ -141,11 +141,6 @@ public static void CreateInstance_Type_Int_Invalid()
             Assert.Throws<NotSupportedException>(() => Array.CreateInstance(typeof(int).MakeByRefType(), 0)); // Element type is not supported (ref)
 
             Assert.Throws<ArgumentOutOfRangeException>("length", () => Array.CreateInstance(typeof(int), -1)); // Length < 0
-
-#if netcoreapp
-            // Type is not a valid RuntimeType
-            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), 0));
-#endif // netcoreapp
         }
 
         [Fact]
@@ -158,11 +153,6 @@ public static void CreateInstance_Type_Int_Int_Invalid()
             Assert.Throws<NotSupportedException>(() => Array.CreateInstance(typeof(int).MakeByRefType(), 0, 1)); // Element type is not supported (ref)
 
             Assert.Throws<ArgumentOutOfRangeException>("length2", () => Array.CreateInstance(typeof(int), 0, -1)); // Length < 0
-
-#if netcoreapp
-            // Type is not a valid RuntimeType
-            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), 0, 1));
-#endif // netcoreapp
         }
 
         [Fact]
@@ -184,11 +174,6 @@ public static void CreateInstance_Type_Int_Int_Int_Invalid()
             Assert.Throws<NotSupportedException>(() => Array.CreateInstance(typeof(int).MakeByRefType(), 0, 1, 2)); // Element type is not supported (ref)
 
             Assert.Throws<ArgumentOutOfRangeException>("length3", () => Array.CreateInstance(typeof(int), 0, 1, -1)); // Length < 0
-
-#if netcoreapp
-            // Type is not a valid RuntimeType
-            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), 0, 1, 2));
-#endif // netcoreapp
         }
 
         [Fact]

diff --git a/src/System.Runtime/tests/Helpers.cs b/src/System.Runtime/tests/Helpers.cs
@@ -8,30 +8,8 @@
 
 namespace System.Tests
 {
-    public static class Helpers
+    public static partial class Helpers
     {
-#if netcoreapp // AssemblyBuilder is not in netstandard yet 
-
-        private static Type s_nonRuntimeType;
-
-        public static Type NonRuntimeType()
-        {
-            if (s_nonRuntimeType == null)
-            {
-                AssemblyName assemblyName = new AssemblyName("AssemblyName");
-                AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
-                ModuleBuilder mboduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name);
-
-                TypeBuilder typeBuilder = mboduleBuilder.DefineType("TestType", TypeAttributes.Public);
-
-                GenericTypeParameterBuilder[] typeParams = typeBuilder.DefineGenericParameters("T");
-                s_nonRuntimeType = typeParams[0].UnderlyingSystemType;
-            }
-
-            return s_nonRuntimeType;
-        }
-#endif // netcoreapp
-
         public static void PerformActionWithCulture(CultureInfo culture, Action test)
         {
             CultureInfo originalCulture = CultureInfo.CurrentCulture;

diff --git a/src/System.Runtime/tests/Helpers.netcoreapp.cs b/src/System.Runtime/tests/Helpers.netcoreapp.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Globalization;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace System.Tests
+{
+    public static partial class Helpers
+    {
+        private static Type s_nonRuntimeType;
+
+        public static Type NonRuntimeType()
+        {
+            if (s_nonRuntimeType == null)
+            {
+                AssemblyName assemblyName = new AssemblyName("AssemblyName");
+                AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
+                ModuleBuilder mboduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name);
+
+                TypeBuilder typeBuilder = mboduleBuilder.DefineType("TestType", TypeAttributes.Public);
+
+                GenericTypeParameterBuilder[] typeParams = typeBuilder.DefineGenericParameters("T");
+                s_nonRuntimeType = typeParams[0].UnderlyingSystemType;
+            }
+
+            return s_nonRuntimeType;
+        }
+    }
+}
diff --git a/src/System.Runtime/tests/System.Runtime.Tests.csproj b/src/System.Runtime/tests/System.Runtime.Tests.csproj
@@ -120,6 +120,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+    <Compile Include="ArrayTests.netcoreapp.cs" />
+    <Compile Include="Helpers.netcoreapp.cs" />
+    <Compile Include="System\ActivatorTests.netcoreapp.cs" />
     <Compile Include="System\ArrayTests.netcoreapp.cs" />
     <Compile Include="System\EnumTests.netcoreapp.cs" />
     <Compile Include="System\GCTests.netcoreapp.cs" />

diff --git a/src/System.Runtime/tests/System/ActivatorTests.netcoreapp.cs b/src/System.Runtime/tests/System/ActivatorTests.netcoreapp.cs
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Reflection;
+using Xunit;
+
+namespace System.Tests
+{
+    public static class ActivatorNetcoreTests
+    {
+        [Fact]
+        public static void CreateInstance_Invalid()
+        {
+            // Type is not a valid RuntimeType
+            Assert.Throws<ArgumentException>("type", () => Activator.CreateInstance(Helpers.NonRuntimeType()));
+        }
+    }
+}
diff --git a/src/System.Runtime/tests/System/ArrayTests.cs b/src/System.Runtime/tests/System/ArrayTests.cs
@@ -1431,16 +1431,6 @@ public static void CreateInstance_NegativeLength_ThrowsArgumentOutOfRangeExcepti
             Assert.Throws<ArgumentOutOfRangeException>("lengths[0]", () => Array.CreateInstance(typeof(int), new int[] { -1 }, new int[1]));
         }
 
-#if netcoreapp
-        [Fact]
-        public static void CreateInstance_TypeNotRuntimeType_ThrowsArgumentException()
-        {
-            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), 0));
-            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), new int[1]));
-            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), new int[1], new int[1]));
-        }
-#endif // netcoreapp
-
         [Fact]
         public static void CreateInstance_LengthsNull_ThrowsArgumentNullException()
         {

diff --git a/src/System.Runtime/tests/System/ArrayTests.netcoreapp.cs b/src/System.Runtime/tests/System/ArrayTests.netcoreapp.cs
@@ -139,5 +139,13 @@ public static void Reverse_Generic_InvalidOffsetPlusLength_ThrowsArgumentExcepti
         {
             Assert.Throws<ArgumentException>(null, () => Array.Reverse(new string[arrayLength], index, length));
         }
+
+        [Fact]
+        public static void CreateInstance_TypeNotRuntimeType_ThrowsArgumentException()
+        {
+            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), 0));
+            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), new int[1]));
+            Assert.Throws<ArgumentException>("elementType", () => Array.CreateInstance(Helpers.NonRuntimeType(), new int[1], new int[1]));
+        }
     }
 }