#61: add test runner, fix test

Change AsyncSocket to silently drop disposed connections.
xmppo · Sep 24, 2016 · 0bf1d51 · 0bf1d51
1 parent 3a0feb0
commit 0bf1d51
Show file tree

Hide file tree

Showing 5 changed files with 841 additions and 28 deletions.
diff --git a/Readme.md b/Readme.md
@@ -52,6 +52,7 @@ project. To build the project using `dotnet`, invoke the following command:
 ```console
 $ dotnet restore
 $ dotnet build **/project.json
+$ dotnet test tests/JabberNet.Test/project.json
 ```
 
 Documentation

diff --git a/src/JabberNet/bedrock/net/AsyncSocket.cs b/src/JabberNet/bedrock/net/AsyncSocket.cs
@@ -472,10 +472,19 @@ public override void RequestAccept()
         /// <param name="ar"></param>
         private void ExecuteAccept(IAsyncResult ar)
         {
-            Socket cli = (Socket) m_sock.EndAccept(ar);
-            AsyncSocket cliCon = new AsyncSocket(m_watcher);
-            cliCon.m_sock = cli;
-            AcceptDone(cliCon);
+            try
+            {
+                var cli = m_sock.EndAccept(ar);
+                var cliCon = new AsyncSocket(m_watcher)
+                {
+                    m_sock = cli
+                };
+                AcceptDone(cliCon);
+            }
+            catch (ObjectDisposedException)
+            {
+                // Socket is already disposed; don't accept.
+            }
         }
 
         private void AcceptDone(AsyncSocket cliCon)

diff --git a/src/JabberNet/project.lock.json b/src/JabberNet/project.lock.json
@@ -1,20 +1,15 @@
 {
   "locked": false,
-  "version": 2,
+  "version": 1,
   "targets": {
     ".NETFramework,Version=v4.0": {
       "zlib.net/1.0.4": {
-        "type": "package",
         "compile": {
           "lib/zlib.net.dll": {}
         },
         "runtime": {
           "lib/zlib.net.dll": {}
         }
-      },
-      "JabberNet.Netlib.Dns/2.1.2": {
-        "type": "project",
-        "framework": ".NETFramework,Version=v4.0"
       }
     }
   },
@@ -28,10 +23,6 @@
         "zlib.net.1.0.4.nupkg.sha512",
         "zlib.net.nuspec"
       ]
-    },
-    "JabberNet.Netlib.Dns/2.1.2": {
-      "type": "project",
-      "path": "../JabberNet.Netlib.Dns/project.json"
     }
   },
   "projectFileDependencyGroups": {
@@ -44,7 +35,5 @@
       "System.Security >= 4.0.0",
       "System.Xml >= 4.0.0"
     ]
-  },
-  "tools": {},
-  "projectFileToolGroups": {}
+  }
 }
diff --git a/tests/JabberNet.Test/project.json b/tests/JabberNet.Test/project.json
@@ -3,16 +3,18 @@
     "buildOptions": {
         "debugType": "portable"
     },
+    "frameworks": {
+        "net451": {
+            "frameworkAssemblies": {
+            }
+        }
+    },
     "dependencies": {
         "NUnit": "3.4.1",
         "RhinoMocks": "3.6.1",
+        "dotnet-test-nunit": "3.4.0-beta-2",
 
         "JabberNet": "*"
     },
-    "frameworks": {
-        "net40": {
-            "frameworkAssemblies": {
-            }
-        }
-    }
+    "testRunner": "nunit"
 }