Format dynamic test

vmuriart · vmuriart · commit 44ae8d20dbbb · 2017-02-14T10:07:40.000-07:00
diff --git a/src/embed_tests/dynamic.cs b/src/embed_tests/dynamic.cs
@@ -1,9 +1,7 @@
-using NUnit.Framework;
-using Python.Runtime;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
+using NUnit.Framework;
+using Python.Runtime;
 
 namespace Python.EmbeddingTest
 {
@@ -20,7 +18,7 @@ public void SetUp()
             gs = PythonEngine.AcquireLock();
 
             /* redirect sys.stdout to a .NET object */
-            this.stream = new outstream();
+            stream = new outstream();
         }
 
         [TearDown]
@@ -48,21 +46,23 @@ public void AssignNone()
         public void AssignObject()
         {
             dynamic sys = Py.Import("sys");
-            sys.stdout = this.stream;
+            sys.stdout = stream;
             // Check whether there are the same object.
             Assert.AreEqual(sys.stdout, stream);
 
-            this.stream.clear();
+            stream.clear();
             PythonEngine.RunSimpleString("print('Hello!')");
             Assert.AreEqual(stream.getvalue(), "Hello!\n");
         }
 
         /// <summary>
         /// When the .NET object was created and used in Python side.
         /// </summary>
+        /// <remarks>
+        /// Needs Pull Request #376 in order for the exception below to show up.
+        /// </remarks>
         [Test]
-        //[Explicit]
-        [Ignore]
+        [Ignore("System.ArgumentException : Cannot pass a GCHandle across AppDomains")]
         public void AssignObjectInPython()
         {
             PythonEngine.RunSimpleString(@"
@@ -71,7 +71,7 @@ from Python.EmbeddingTest import outstream
 sys.stdout = outstream()
 ");
             dynamic sys = Py.Import("sys");
-            var obj = sys.stdout;
+            dynamic obj = sys.stdout;
             Assert.IsTrue(obj is outstream);
         }
 
@@ -84,7 +84,7 @@ public void AssignPyObject()
             dynamic sys = Py.Import("sys");
             dynamic io = Py.Import("io");
             sys.stderr = io.StringIO();
-            var bb = sys.stderr; //Get the PyObject
+            dynamic bb = sys.stderr; //Get the PyObject
             bb.write("Hello!");
             Assert.AreEqual(bb.getvalue().ToString(), "Hello!");
         }
@@ -96,20 +96,20 @@ public void AssignPyObject()
         public void PassObjectInPython()
         {
             dynamic sys = Py.Import("sys");
-            sys.stdout = this.stream;
+            sys.stdout = stream;
 
             //Pass the .NET object in Python side
             PythonEngine.RunSimpleString("import sys\n" +
-            "from io import StringIO\n" +
-            "sys.stderr = sys.stdout\n");
+                                         "from io import StringIO\n" +
+                                         "sys.stderr = sys.stdout\n");
 
             //Compare in Python
-            this.stream.clear();
+            stream.clear();
             PythonEngine.RunSimpleString("import sys\n" +
-            "print((sys.stderr is sys.stdout))");
-            Assert.AreEqual(this.stream.getvalue(), "True\n");
+                                         "print((sys.stderr is sys.stdout))");
+            Assert.AreEqual(stream.getvalue(), "True\n");
 
-            //compare in .NET
+            //Compare in .NET
             Assert.AreEqual(sys.stdout, sys.stderr);
         }
 
@@ -120,15 +120,15 @@ public void PassObjectInPython()
         public void PassPyObjectInNet()
         {
             dynamic sys = Py.Import("sys");
-            sys.stdout = this.stream;
+            sys.stdout = stream;
             sys.stderr = sys.stdout;
 
             //Compare in Python
-            var res = PythonEngine.RunString("import sys\n" +
-            "print(sys.stderr is sys.stdout)");
+            PyObject res = PythonEngine.RunString("import sys\n" +
+                                                  "print(sys.stderr is sys.stdout)");
             Assert.AreEqual(sys.stdout.getvalue().ToString(), "False\n");
 
-            //compare in .NET
+            //Compare in .NET
             Assert.AreEqual(sys.stdout, sys.stderr);
         }
     }
@@ -138,25 +138,34 @@ public void PassPyObjectInNet()
     /// </summary>
     public class outstream
     {
+        private StringBuilder buffer;
+
         public outstream()
         {
-            this.buffer = new StringBuilder();
+            buffer = new StringBuilder();
         }
-        private StringBuilder buffer;
-        public void write(String str)
+
+        public void write(string str)
+        {
+            buffer.Append(str);
+        }
+
+        public void flush()
+        {
+        }
+
+        public void close()
         {
-            this.buffer.Append(str);
         }
-        public void flush() { }
-        public void close() { }
 
         public void clear()
         {
-            this.buffer.Clear();
+            buffer.Clear();
         }
+
         public string getvalue()
         {
-            return this.buffer.ToString();
+            return buffer.ToString();
         }
     }
 }
