Clean up .NET Core code on tests

Author: xplicit

tests/ServiceStack.Text.Tests/AttributeTests.cs

@@ -38,8 +38,7 @@ public void Does_get_Multiple_RouteDefault_Attributes()
             // AllAttributes<T>() makes this call to get attrs
 #if NETCORE
             var referenceGeneric =
-                typeof(DefaultWithMultipleAttributes).GetTypeInfo().GetCustomAttributes(true)
-                    .Where(x => x.GetType().IsInstanceOf(typeof(RouteDefaultAttribute)))
+                typeof(DefaultWithMultipleAttributes).GetTypeInfo().GetCustomAttributes(typeof(RouteDefaultAttribute), true)
                     .OfType<RouteDefaultAttribute>();
 #else
             var referenceGeneric =
@@ -52,8 +51,7 @@ public void Does_get_Multiple_RouteDefault_Attributes()
             // AllAttributes() makes this call to get attrs
 #if NETCORE
             var reference =
-                typeof(DefaultWithMultipleAttributes).GetTypeInfo().GetCustomAttributes(true)
-			        .Where(x => x.GetType().IsInstanceOf(typeof(RouteDefaultAttribute))).ToArray();
+                typeof(DefaultWithMultipleAttributes).GetTypeInfo().GetCustomAttributes(typeof(RouteDefaultAttribute), true);
 #else
             var reference =
                 typeof(DefaultWithMultipleAttributes).GetCustomAttributes(typeof(RouteDefaultAttribute), true);
@@ -257,11 +255,11 @@ public RouteTypeIdAttribute(string path, string verbs)
         public string Path { get; set; }
         public string Verbs { get; set; }
 
+        public
 #if !NETCORE
-        public override object TypeId
-#else
-        public object TypeId
+        override
 #endif
+        object TypeId
         {
             get
             {

tests/ServiceStack.Text.Tests/BclStructTests.cs

@@ -60,7 +60,6 @@ public class ExampleType
             public int Foo { get; set; }
         }
 
-#if !NETCORE
         [Test]
         public void Can_serialize_dto_with_enum_flags()
         {
@@ -78,7 +77,6 @@ public void Can_serialize_dto_with_enum_flags()
 
             Assert.That(deserialized.Enum, Is.EqualTo(ExampleEnum.One | ExampleEnum.Four));
         }
-#endif
 
         [DataContract]
         public class Item

tests/ServiceStack.Text.Tests/InterfaceTests.cs

@@ -29,11 +29,7 @@ public void Can_serialize_IMessage()
             var message = new Message<string> { Id = new Guid(), CreatedDate = new DateTime(), Body = "test" };
             var messageString = TypeSerializer.SerializeToString((IMessage<string>)message);
 
-#if NETCORE
-            var assembly = "System.Private.CoreLib";
-#else
-            var assembly = "mscorlib";
-#endif
+            var assembly = typeof(string).GetAssembly().GetName().Name;
 
             Assert.That(messageString, Is.EqualTo(
             "{__type:\"ServiceStack.Messaging.Message`1[[System.String, " + assembly + "]], ServiceStack.Interfaces\","
@@ -80,11 +76,7 @@ public static IEnumerable EndpointExpectations
         {
             get
             {
-#if NETCORE
-                var assembly = "System.Private.CoreLib";
-#else
-                var assembly = "mscorlib";
-#endif
+                var assembly = typeof(string).GetAssembly().GetName().Name;
 
                 yield return new TestCaseData(typeof(Message<string>),
                     "ServiceStack.Messaging.Message`1[[System.String, " + assembly + "]], ServiceStack.Interfaces");

tests/ServiceStack.Text.Tests/JsonTests/PolymorphicListTests.cs

@@ -120,11 +120,7 @@ public void SetUp()
 		{
 			JsConfig.Reset();
 			JsConfig<ICat>.ExcludeTypeInfo = false;
-#if NETCORE
-			assemblyName = GetType().GetTypeInfo().Assembly.GetName().Name;
-#else
-			assemblyName = GetType().Assembly.GetName().Name;
-#endif
+			assemblyName = GetType().GetAssembly().GetName().Name;
 		}
 
 		[Test]

tests/ServiceStack.Text.Tests/TypeConverterTests.cs

@@ -1,8 +1,9 @@
-#if !NETCORE
 using System;
 using System.ComponentModel;
-using System.Security.Policy;
 using NUnit.Framework;
+#if !NETCORE
+using System.Security.Policy;
+#endif
 
 namespace ServiceStack.Text.Tests
 {
@@ -23,8 +24,10 @@ public CustomException(string message) : base(message)
 		[Test]
 		public void View_TypeConverter_outputs()
 		{
+#if !NETCORE
 			var converter1 = TypeDescriptor.GetConverter(typeof(Url));
 			Console.WriteLine(converter1.ConvertToString(new Url("http://io/")));
+#endif
 
 			var converter2 = TypeDescriptor.GetConverter(typeof(Type));
 			Console.WriteLine(converter2.ConvertToString(typeof(TypeConverterTests)));
@@ -36,5 +39,4 @@ public void View_TypeConverter_outputs()
 			//Console.WriteLine(value3.Dump());
 		}
 	}
-}
-#endif
+}

tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs

@@ -12,17 +12,11 @@ public class DateTimeSerializerTests
     {
         public void PrintFormats(DateTime dateTime)
         {
-#if NETCORE
             Log("dateTime.ToShortDateString(): " + dateTime.ToString("d"));
             Log("dateTime.ToLongDateString(): " + dateTime.ToString("D"));
             Log("dateTime.ToShortTimeString(): " + dateTime.ToString("t"));
             Log("dateTime.ToLongTimeString(): " + dateTime.ToString("T"));
-#else
-            Log("dateTime.ToShortDateString(): " + dateTime.ToShortDateString());
-            Log("dateTime.ToLongDateString(): " + dateTime.ToLongDateString());
-            Log("dateTime.ToShortTimeString(): " + dateTime.ToShortTimeString());
-            Log("dateTime.ToLongTimeString(): " + dateTime.ToLongTimeString());
-#endif
+            
             Log("dateTime.ToString(): " + dateTime.ToString());
             Log("DateTimeSerializer.ToShortestXsdDateTimeString(dateTime): " + DateTimeSerializer.ToShortestXsdDateTimeString(dateTime));
             Log("DateTimeSerializer.ToDateTimeString(dateTime): " + DateTimeSerializer.ToDateTimeString(dateTime));

tests/ServiceStack.Text.Tests/project.json

@@ -26,18 +26,20 @@
     "Northwind.Common" : "1.*",
     "ServiceStack.Text" : "1.0.*",
     "ServiceStack.Common" : "1.0.*",
-    "ServiceStack.Client" : "1.0.*",
+    "ServiceStack.Client" : "1.0.*"
   },
   "frameworks": {
    "netcoreapp1.0": { 
-            "imports": "dnxcore50",
-	     "dependencies" : {
-		"System.Drawing.Primitives" : "4.0.0",
-		"System.Collections.Specialized": "4.0.1",
-		"System.Runtime.Serialization.Json": "4.0.2",
-		"System.Collections.NonGeneric": "4.0.1",
-		"System.Diagnostics.TraceSource": "4.0.0"
-            }	
-     }
+      "imports": "dnxcore50",
+      "dependencies" : {
+          "System.Drawing.Primitives" : "4.0.0",
+          "System.Collections.Specialized": "4.0.1",
+          "System.Runtime.Serialization.Json": "4.0.2",
+          "System.Collections.NonGeneric": "4.0.1",
+          "System.Diagnostics.TraceSource": "4.0.0",
+          "System.Reflection.Extensions": "4.0.1",
+          "System.ComponentModel.TypeConverter": "4.1.0"
+      }
+    }
   }
 }