Merge branch 'upstream' into tizen

Change-Id: I4400c6fae623c356170074871ee575b96a4af206

1 files changed, 63 insertions, 0 deletions

diff --git a/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.cs b/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.cs
new file mode 100644
index 0000000000..29fb347ae1
--- /dev/null
+++ b/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.cs
@@ -0,0 +1,63 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+using System;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Runtime.Serialization;
+
+class Test 
+{
+    public static int Main(string[] args)
+    {
+        int retVal = 0;
+        var thrower = new StringThrowerClass();
+        try
+        {
+            thrower.InstanceMethod();
+        }
+
+        catch (RuntimeWrappedException ex)
+        {
+
+	    if ( !ex.WrappedException.ToString().Contains("Inside StringThrower") )
+	    {
+//		Console.WriteLine("Incorrect exception and/or message. Expected RuntimeWrappedException: An object that does not derive "+
+//				  "from System.Exception has been wrapped in a RuntimeWrappedException.\n But actually got: " + ex.InnerException);
+		retVal = -1;
+	    }
+            
+            StreamingContext ctx;
+
+//            TODO: Expose once we have access to FormatterConverter
+//            var info = new SerializationInfo(typeof(RuntimeWrappedException), new FormatterConverter());
+//            ex.GetObjectData(info,ctx);
+//
+            try
+            {
+                ex.GetObjectData(null,ctx);
+            }
+	    catch (ArgumentNullException ex1)
+            {
+                retVal = 100;
+            }
+            catch (Exception ex1)
+            {
+		retVal = -1;
+            }
+
+
+        }
+	catch (Exception ex)
+	{
+//	   Console.WriteLine("Incorrect exception thrown. Expected RuntimeWrappedException, but actually got: " + ex);
+	   retVal = -2;
+	}
+
+
+        return retVal;
+
+
+    }
+}