2004-04-20 Sebastien Pouliot <sebastien@ximian.com>

	* WindowsIdentityTest.cs: Don't fail on Windows for some contructor
	tests (in NET_1_1). Checking for Windows 2003 Server isn't enough as
	the domain must also be Windows 2003 Server based to work. Also skip
	the GetRolesViaReflection when running os POSIX systems.

svn path=/trunk/mcs/; revision=25716

diff --git a/mcs/class/corlib/Test/System.Security.Principal/ChangeLog b/mcs/class/corlib/Test/System.Security.Principal/ChangeLog
index 737ebf3bacaa56f70e5f46421defbba4bddef2df..f3d3780396e1c26975a844673372c76f0c8095e4 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Principal/ChangeLog
+++ b/mcs/class/corlib/Test/System.Security.Principal/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-20  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * WindowsIdentityTest.cs: Don't fail on Windows for some contructor 
+       tests (in NET_1_1). Checking for Windows 2003 Server isn't enough as
+       the domain must also be Windows 2003 Server based to work. Also skip
+       the GetRolesViaReflection when running os POSIX systems.
+
 2004-04-14  Sebastien Pouliot  <sebastien@ximian.com>
 
        * WindowsIdentityTest.cs: Added reflection and serialization tests.

diff --git a/mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs b/mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs
index 3aef9fe639fa2ab2bc8c9a7bc262b9403ff4f1ab..c7a85f78e5d5e1e0eea3fee4f08f233d69bc7b2b 100755 (executable)
--- a/mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Principal/WindowsIdentityTest.cs
@@ -28,6 +28,8 @@ namespace MonoTests.System.Security.Principal {
                // some features works only in Windows 2003 and later
                private bool IsWin2k3orLater {
                        get {
+                               // requires both a W2K3 client and server (domain)
+                               // which I don't have access to debug/support
                                OperatingSystem os = Environment.OSVersion;
                                if (os.Platform != PlatformID.Win32NT)
                                        return false;
@@ -71,15 +73,15 @@ namespace MonoTests.System.Security.Principal {
                {
                        WindowsIdentity wi = WindowsIdentity.GetCurrent ();
                        // should fail with ArgumentException unless
-                       // - running Windows 2003 or later
+                       // - running Windows 2003 or later (both client and domain server)
                        // - running Posix
                        try {
                                WindowsIdentity id = new WindowsIdentity (wi.Name);
-                               if (!IsWin2k3orLater && !IsPosix)
-                                       Fail ("Expected ArgumentException but got none");
+                               /*if (!IsWin2k3orLater && !IsPosix)
+                                       Fail ("Expected ArgumentException but got none");*/
                        }
                        catch (ArgumentException) {
-                               if (IsWin2k3orLater || IsPosix)
+                               if (/*IsWin2k3orLater ||*/ IsPosix)
                                        throw;
                        }
                }
@@ -97,15 +99,15 @@ namespace MonoTests.System.Security.Principal {
                {
                        WindowsIdentity wi = WindowsIdentity.GetCurrent ();
                        // should fail with ArgumentException unless
-                       // - running Windows 2003 or later
+                       // - running Windows 2003 or later (both client and domain server)
                        // - running Posix
                        try {
                                WindowsIdentity id = new WindowsIdentity (wi.Name, null);
-                               if (!IsWin2k3orLater && !IsPosix)
-                                       Fail ("Expected ArgumentException but got none");
+                               /*if (!IsWin2k3orLater && !IsPosix)
+                                       Fail ("Expected ArgumentException but got none");*/
                        }
                        catch (ArgumentException) {
-                               if (IsWin2k3orLater || IsPosix)
+                               if (/*IsWin2k3orLater ||*/ IsPosix)
                                        throw;
                        }
                }
@@ -115,15 +117,15 @@ namespace MonoTests.System.Security.Principal {
                {
                        WindowsIdentity wi = WindowsIdentity.GetCurrent ();
                        // should fail with ArgumentException unless
-                       // - running Windows 2003 or later
+                       // - running Windows 2003 or later (both client and domain server)
                        // - running Posix
                        try {
                                WindowsIdentity id = new WindowsIdentity (wi.Name, wi.AuthenticationType);
-                               if (!IsWin2k3orLater && !IsPosix)
-                                       Fail ("Expected ArgumentException but got none");
+                               /*if (!IsWin2k3orLater && !IsPosix)
+                                       Fail ("Expected ArgumentException but got none");*/
                        }
                        catch (ArgumentException) {
-                               if (IsWin2k3orLater || IsPosix)
+                               if (/*IsWin2k3orLater ||*/ IsPosix)
                                        throw;
                        }
                }
@@ -193,6 +195,10 @@ namespace MonoTests.System.Security.Principal {
                [Test]
                public void GetRolesViaReflection () 
                {
+                       // remove g_warning from being show during unit tests
+                       if (IsPosix)
+                               return;
+
                        WindowsIdentity wi = WindowsIdentity.GetCurrent ();
                        WindowsPrincipal wp = new WindowsPrincipal (wi);
                        string[] roles = GetWindowsIdentityRoles (wi);