Move unit tests to .NET Core

rickx · Apr 18, 2017 · 737d36f · 737d36f
1 parent 228b6f9
commit 737d36f
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 199 deletions.
diff --git a/SharpAdbClient.Tests/ExceptionTester.cs b/SharpAdbClient.Tests/ExceptionTester.cs
@@ -35,7 +35,7 @@ public static void TestMessageAndInnerConstructor(Func<string, Exception, T> con
             Assert.AreEqual(inner, ex.InnerException);
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         public static void TestSerializationConstructor(Func<SerializationInfo, StreamingContext, T> constructor)
         {
             var info = new SerializationInfo(typeof(T), new FormatterConverter());

diff --git a/SharpAdbClient.Tests/Exceptions/AdbExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/AdbExceptionTests.cs
@@ -24,7 +24,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<AdbException>.TestMessageAndInnerConstructor((message, inner) => new AdbException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {

diff --git a/SharpAdbClient.Tests/Exceptions/CommandAbortingExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/CommandAbortingExceptionTests.cs
@@ -24,7 +24,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<CommandAbortingException>.TestMessageAndInnerConstructor((message, inner) => new CommandAbortingException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {

diff --git a/SharpAdbClient.Tests/Exceptions/DeviceNotFoundException.cs b/SharpAdbClient.Tests/Exceptions/DeviceNotFoundException.cs
@@ -18,7 +18,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<DeviceNotFoundException>.TestMessageAndInnerConstructor((message, inner) => new DeviceNotFoundException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {

diff --git a/SharpAdbClient.Tests/Exceptions/PermissionDeniedExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/PermissionDeniedExceptionTests.cs
@@ -24,7 +24,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<PermissionDeniedException>.TestMessageAndInnerConstructor((message, inner) => new PermissionDeniedException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {

diff --git a/SharpAdbClient.Tests/Exceptions/ShellCommandUnresponsiveExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/ShellCommandUnresponsiveExceptionTests.cs
@@ -25,7 +25,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<ShellCommandUnresponsiveException>.TestMessageAndInnerConstructor((message, inner) => new ShellCommandUnresponsiveException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {

diff --git a/SharpAdbClient.Tests/Exceptions/UnknownOptionExceptionTests.cs b/SharpAdbClient.Tests/Exceptions/UnknownOptionExceptionTests.cs
@@ -24,7 +24,7 @@ public void TestMessageAndInnerConstructor()
             ExceptionTester<UnknownOptionException>.TestMessageAndInnerConstructor((message, inner) => new UnknownOptionException(message, inner));
         }
 
-#if !NETCOREAPP1_0
+#if !NETCOREAPP1_1
         [TestMethod]
         public void TestSerializationConstructor()
         {

diff --git a/SharpAdbClient.Tests/Properties/AssemblyInfo.cs b/SharpAdbClient.Tests/Properties/AssemblyInfo.cs
@@ -1,9 +1,3 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle ( "MADB Tests" )]
-[assembly: AssemblyDescription ( "" )]
-
-
-[assembly: Guid ( "4300994a-cbc1-43b0-bf87-119cd4cf71a3" )]
+[assembly: Guid("4300994a-cbc1-43b0-bf87-119cd4cf71a3")]
diff --git a/SharpAdbClient.Tests/SharpAdbClient.Tests.csproj b/SharpAdbClient.Tests/SharpAdbClient.Tests.csproj
diff --git a/SharpAdbClient.Tests/TcpSocketTests.cs b/SharpAdbClient.Tests/TcpSocketTests.cs
@@ -58,22 +58,12 @@ public void BufferSizeTest()
             socket.Dispose();
         }
 
-        [TestMethod]
-        public void CreateSocketTest()
-        {
-            var winSocket = TcpSocket.CreateSocket(new IPEndPoint(IPAddress.Loopback, 0));
-            Assert.AreEqual(AddressFamily.InterNetwork, winSocket.AddressFamily);
-            Assert.AreEqual(SocketType.Stream, winSocket.SocketType);
-            Assert.AreEqual(ProtocolType.Tcp, winSocket.ProtocolType);
-
-            // Unix sockets cannot be created on Windows machines
-        }
-
         [TestMethod]
         [ExpectedException(typeof(NotSupportedException))]
         public void CreateUnsupportedSocketTest()
         {
-            TcpSocket.CreateSocket(new CustomEndPoint());
+            TcpSocket socket = new TcpSocket();
+            socket.Connect(new CustomEndPoint());
         }
     }
 }
diff --git a/appveyor.yml b/appveyor.yml
@@ -18,6 +18,12 @@ build_script:
   - cmd: dotnet build -c Release --version-suffix beta%APPVEYOR_BUILD_NUMBER%
   - cmd: dotnet pack -c Release --version-suffix beta%APPVEYOR_BUILD_NUMBER%
 
+test_script:
+  - cmd: cd ..\SharpAdbClient.Tests\
+  - cmd: dotnet restore
+  - cmd: dotnet build
+  - cmd: dotnet vstest bin\Debug\netcoreapp1.1\SharpAdbClient.Tests.dll /testcasefilter:TestCategory!=IntegrationTest /logger:Appveyor
+
 on_success:
   - ps: Push-AppveyorArtifact "bin\Release\SharpAdbClient.2.1.0-beta$($env:APPVEYOR_BUILD_NUMBER).nupkg"
   - ps: Push-AppveyorArtifact "bin\Release\SharpAdbClient.2.1.0-beta$($env:APPVEYOR_BUILD_NUMBER).symbols.nupkg"