fix TestGrobufUsages

skbkontur · Jan 5, 2018 · a5fc5d0 · a5fc5d0
1 parent 76f2cf6
commit a5fc5d0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/GrEmit.Tests/TestGrobufUsages.cs b/GrEmit.Tests/TestGrobufUsages.cs
@@ -9,9 +9,6 @@ namespace GrEmit.Tests
     public class TestGrobufUsages
     {
         [Test]
-#if NETCOREAPP2_0
-        [Ignore("Test is failing on dotnetcore: dateTimeOffsetType.GetField(\"m_dateTime\", ...) == null")]
-#endif
         public void DateTimeOffsetPrivateFieldsAccess()
         {
             var method = BuildAccessorMethod();
@@ -27,10 +24,10 @@ private DynamicMethod BuildAccessorMethod()
             using(var il = new GroboIL(method))
             {
                 il.Ldarga(0); // stack: [obj]
-                il.Ldfld(dateTimeOffsetType.GetField("m_dateTime", BindingFlags.Instance | BindingFlags.NonPublic)); // stack: [obj.m_dateTime]
+                il.Ldfld(dateTimeOffsetType.GetField(SelectName("_dateTime", "m_dateTime"), BindingFlags.Instance | BindingFlags.NonPublic)); // stack: [obj.m_dateTime]
 
                 il.Ldarga(0); // stack: [obj]
-                il.Ldfld(dateTimeOffsetType.GetField("m_offsetMinutes", BindingFlags.Instance | BindingFlags.NonPublic)); // stack: [obj.m_offsetMinutes]
+                il.Ldfld(dateTimeOffsetType.GetField(SelectName("_offsetMinutes", "m_offsetMinutes"), BindingFlags.Instance | BindingFlags.NonPublic)); // stack: [obj.m_offsetMinutes]
 
                 il.Call(assertMethod); // stack: []
 
@@ -46,6 +43,15 @@ private static void AssertDateTimeOffsetFields(DateTime dateTime, short offsetMi
             Assert.That(offsetMinutes, Is.EqualTo(15));
         }
 
+        private static string SelectName(string netcoreName, string net45Name)
+        {
+#if NETCOREAPP2_0
+            return netcoreName;
+#else
+            return net45Name;
+#endif
+        }
+
         private readonly Type dateTimeOffsetType = typeof(DateTimeOffset);
         private static readonly DateTimeOffset dateTimeOffset = new DateTimeOffset(new DateTime(2018, 01, 05, 21, 34, 56, DateTimeKind.Unspecified), TimeSpan.FromMinutes(15));
     }