Update NUnit syntax

vmuriart · vmuriart · commit 58bc902b521f · 2017-02-08T19:21:07.000-07:00
Use xUnit2 and nUnit3 friendly syntax
diff --git a/setup.py b/setup.py
@@ -373,7 +373,7 @@ def run(self):
     url='https://pythonnet.github.io/',
     license='MIT',
     author="The Python for .Net developers",
-    email="pythondotnet@python.org",
+    author_email="pythondotnet@python.org",
     setup_requires=setup_requires,
     long_description=_get_long_description(),
     ext_modules=[
diff --git a/src/embed_tests/pyinitialize.cs b/src/embed_tests/pyinitialize.cs
@@ -12,8 +12,8 @@ public static void LoadSpecificArgs()
             using (new PythonEngine(args))
             using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
             {
-                Assert.That(argv[0].ToString() == args[0]);
-                Assert.That(argv[1].ToString() == args[1]);
+                Assert.AreEqual(args[0], argv[0].ToString());
+                Assert.AreEqual(args[1], argv[1].ToString());
             }
         }
 
@@ -23,7 +23,7 @@ public static void LoadDefaultArgs()
             using (new PythonEngine())
             using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
             {
-                Assert.That(argv.Length() != 0);
+                Assert.AreNotEqual(0, argv.Length());
             }
         }
 
diff --git a/src/embed_tests/pythonexception.cs b/src/embed_tests/pythonexception.cs
@@ -47,7 +47,7 @@ public void TestMessage()
         [Test]
         public void TestNoError()
         {
-            var e = new PythonException(); //There is no PyErr to fetch
+            var e = new PythonException(); // There is no PyErr to fetch
             Assert.AreEqual("", e.Message);
         }
     }
diff --git a/src/embed_tests/pytuple.cs b/src/embed_tests/pytuple.cs
@@ -16,14 +16,13 @@ public void TestPyTupleEmpty()
         }
 
         [Test]
-        [ExpectedException("Python.Runtime.PythonException")]
         public void TestPyTupleInvalidAppend()
         {
             using (Py.GIL())
             {
                 PyObject s = new PyString("foo");
                 var t = new PyTuple();
-                t.Concat(s);
+                Assert.Throws<PythonException>(() => t.Concat(s));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public static void LoadSpecificArgs()`
`12`	`12`	`using (new PythonEngine(args))`
`13`	`13`	`using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))`
`14`	`14`	`{`
`15`		`- Assert.That(argv[0].ToString() == args[0]);`
`16`		`- Assert.That(argv[1].ToString() == args[1]);`
	`15`	`+ Assert.AreEqual(args[0], argv[0].ToString());`
	`16`	`+ Assert.AreEqual(args[1], argv[1].ToString());`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`@@ -23,7 +23,7 @@ public static void LoadDefaultArgs()`
`23`	`23`	`using (new PythonEngine())`
`24`	`24`	`using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))`
`25`	`25`	`{`
`26`		`- Assert.That(argv.Length() != 0);`
	`26`	`+ Assert.AreNotEqual(0, argv.Length());`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void TestMessage()`
`47`	`47`	`[Test]`
`48`	`48`	`public void TestNoError()`
`49`	`49`	`{`
`50`		`- var e = new PythonException(); //There is no PyErr to fetch`
	`50`	`+ var e = new PythonException(); // There is no PyErr to fetch`
`51`	`51`	`Assert.AreEqual("", e.Message);`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,13 @@ public void TestPyTupleEmpty()`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`[Test]`
`19`		`- [ExpectedException("Python.Runtime.PythonException")]`
`20`	`19`	`public void TestPyTupleInvalidAppend()`
`21`	`20`	`{`
`22`	`21`	`using (Py.GIL())`
`23`	`22`	`{`
`24`	`23`	`PyObject s = new PyString("foo");`
`25`	`24`	`var t = new PyTuple();`
`26`		`- t.Concat(s);`
	`25`	`+ Assert.Throws<PythonException>(() => t.Concat(s));`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`