Author: spouliot
Date: 2005-04-25 12:52:17 -0400 (Mon, 25 Apr 2005)
New Revision: 43552

Modified:
   trunk/mcs/class/corlib/Test/System.Security.Policy/ChangeLog
   trunk/mcs/class/corlib/Test/System.Security.Policy/FileCodeGroupTest.cs
   
trunk/mcs/class/corlib/Test/System.Security.Policy/GacMembershipConditionTest.cs
   trunk/mcs/class/corlib/Test/System.Security.Policy/GacTest.cs
   trunk/mcs/class/corlib/Test/System.Security.Policy/IBuiltInEvidenceTest.cs
   trunk/mcs/class/corlib/Test/System.Security.Policy/SiteTest.cs
   
trunk/mcs/class/corlib/Test/System.Security.Policy/UrlMembershipConditionTest.cs
   trunk/mcs/class/corlib/Test/System.Security.Policy/UrlTest.cs
Log:
2005-04-25  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * FileCodeGroupTest.cs: Revoved tests for Scope property (2.0).
        * GacMembershipConditionTest.cs: Renamed Gac to GacInstalled (new name
        * GacTest.cs: Renamed Gac to GacInstalled (new name in beta2).
        in beta2).
        * IBuiltInEvidenceTest.cs: Renamed Gac to GacInstalled (new name in 
        beta2).
        * SiteTest.cs: Removed [Catogery("NotWorking")] from some 2.0 tests.
        * UrlTest.cs: Removed [Catogery("NotWorking")] from some 2.0 tests.
        * UrlMembershipConditionTest.cs: Removed [Catogery("NotWorking")] from
        some 2.0 tests.



Modified: trunk/mcs/class/corlib/Test/System.Security.Policy/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.Security.Policy/ChangeLog        
2005-04-25 16:41:57 UTC (rev 43551)
+++ trunk/mcs/class/corlib/Test/System.Security.Policy/ChangeLog        
2005-04-25 16:52:17 UTC (rev 43552)
@@ -1,3 +1,16 @@
+2005-04-25  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * FileCodeGroupTest.cs: Revoved tests for Scope property (2.0).
+       * GacMembershipConditionTest.cs: Renamed Gac to GacInstalled (new name
+       * GacTest.cs: Renamed Gac to GacInstalled (new name in beta2).
+       in beta2).
+       * IBuiltInEvidenceTest.cs: Renamed Gac to GacInstalled (new name in 
+       beta2).
+       * SiteTest.cs: Removed [Catogery("NotWorking")] from some 2.0 tests.
+       * UrlTest.cs: Removed [Catogery("NotWorking")] from some 2.0 tests.
+       * UrlMembershipConditionTest.cs: Removed [Catogery("NotWorking")] from
+       some 2.0 tests.
+
 2005-03-18  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * PolicyLevelTest.cs: Remove non-corlib permission classes from the 

Modified: 
trunk/mcs/class/corlib/Test/System.Security.Policy/FileCodeGroupTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Security.Policy/FileCodeGroupTest.cs     
2005-04-25 16:41:57 UTC (rev 43551)
+++ trunk/mcs/class/corlib/Test/System.Security.Policy/FileCodeGroupTest.cs     
2005-04-25 16:52:17 UTC (rev 43552)
@@ -55,9 +55,6 @@
                        // documented as always null
                        Assert.IsNull (cg.AttributeString, "AttributeString");
                        Assert.IsNotNull (cg.PermissionSetName, 
"PermissionSetName");
-#if NET_2_0
-                       Assert.AreEqual (CodeGroupGrantScope.Assembly, 
cg.Scope, "Scope");
-#endif
                }
 
                [Test]
@@ -69,9 +66,6 @@
                        // documented as always null
                        Assert.IsNull (cg.AttributeString, "AttributeString");
                        Assert.IsNotNull (cg.PermissionSetName, 
"PermissionSetName");
-#if NET_2_0
-                       Assert.AreEqual (CodeGroupGrantScope.Assembly, 
cg.Scope, "Scope");
-#endif
                }
 
                [Test]
@@ -83,9 +77,6 @@
                        // documented as always null
                        Assert.IsNull (cg.AttributeString, "AttributeString");
                        Assert.IsNotNull (cg.PermissionSetName, 
"PermissionSetName");
-#if NET_2_0
-                       Assert.AreEqual (CodeGroupGrantScope.Assembly, 
cg.Scope, "Scope");
-#endif
                }
 
                [Test]
@@ -97,9 +88,6 @@
                        // documented as always null
                        Assert.IsNull (cg.AttributeString, "AttributeString");
                        Assert.IsNotNull (cg.PermissionSetName, 
"PermissionSetName");
-#if NET_2_0
-                       Assert.AreEqual (CodeGroupGrantScope.Assembly, 
cg.Scope, "Scope");
-#endif
                }
 
                [Test]
@@ -111,9 +99,6 @@
                        // documented as always null
                        Assert.IsNull (cg.AttributeString, "AttributeString");
                        Assert.IsNotNull (cg.PermissionSetName, 
"PermissionSetName");
-#if NET_2_0
-                       Assert.AreEqual (CodeGroupGrantScope.Assembly, 
cg.Scope, "Scope");
-#endif
                }
 
                [Test]
@@ -125,9 +110,6 @@
                        // documented as always null
                        Assert.IsNull (cg.AttributeString, "AttributeString");
                        Assert.IsNotNull (cg.PermissionSetName, 
"PermissionSetName");
-#if NET_2_0
-                       Assert.AreEqual (CodeGroupGrantScope.Assembly, 
cg.Scope, "Scope");
-#endif
                }
 
                [Test]
@@ -186,9 +168,6 @@
                        Assert.AreEqual (String.Empty, result.AttributeString, 
"AttributeString");
                        Assert.IsFalse (result.PermissionSet.IsUnrestricted (), 
"IsUnrestricted");
                        Assert.AreEqual (0, result.PermissionSet.Count, 
"Count");
-#if NET_2_0
-                       Assert.AreEqual (CodeGroupGrantScope.Assembly, 
cg.Scope, "Scope");
-#endif
                }
 
                [Test]
@@ -200,9 +179,6 @@
                        Assert.AreEqual (String.Empty, result.AttributeString, 
"AttributeString");
                        Assert.IsFalse (result.PermissionSet.IsUnrestricted (), 
"IsUnrestricted");
                        Assert.AreEqual (0, result.PermissionSet.Count, 
"Count");
-#if NET_2_0
-                       Assert.AreEqual (CodeGroupGrantScope.Assembly, 
cg.Scope, "Scope");
-#endif
                }
 
                [Test]

Modified: 
trunk/mcs/class/corlib/Test/System.Security.Policy/GacMembershipConditionTest.cs
===================================================================
--- 
trunk/mcs/class/corlib/Test/System.Security.Policy/GacMembershipConditionTest.cs
    2005-04-25 16:41:57 UTC (rev 43551)
+++ 
trunk/mcs/class/corlib/Test/System.Security.Policy/GacMembershipConditionTest.cs
    2005-04-25 16:52:17 UTC (rev 43552)
@@ -54,8 +54,8 @@
                        e = new Evidence ();
                        Assert.IsFalse (gac.Check (e), "Check (empty)");
                        e.AddHost (new Zone (SecurityZone.MyComputer));
-                       Assert.IsFalse (gac.Check (e), "Check (zone)");
-                       Gac g = new Gac ();
+                       Assert.IsFalse (gac.Check (e), "Check (zone)");
+                       GacInstalled g = new GacInstalled ();
                        e.AddAssembly (g);
                        Assert.IsFalse (gac.Check (e), "Check (gac-assembly)");
                        e.AddHost (g);

Modified: trunk/mcs/class/corlib/Test/System.Security.Policy/GacTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Security.Policy/GacTest.cs       
2005-04-25 16:41:57 UTC (rev 43551)
+++ trunk/mcs/class/corlib/Test/System.Security.Policy/GacTest.cs       
2005-04-25 16:52:17 UTC (rev 43552)
@@ -1,10 +1,10 @@
+//
+// GacInstalledTest.cs - NUnit Test Cases for GacInstalled
 //
-// GacTest.cs - NUnit Test Cases for Gac
-//
 // Author:
 //     Sebastien Pouliot  <[EMAIL PROTECTED]>
 //
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -36,29 +36,29 @@
 
 namespace MonoTests.System.Security.Policy {
 
-       [TestFixture]
-       public class GacTest {
+       [TestFixture]
+       public class GacInstalledTest {
 
                [Test]
                public void Constructor () 
-               {
-                       Gac gac = new Gac ();
+               {
+                       GacInstalled gac = new GacInstalled ();
                        Assert.IsNotNull (gac);
                }
 
                [Test]
                public void Copy ()
-               {
-                       Gac gac = new Gac ();
-                       Gac copy = (Gac) gac.Copy ();
+               {
+                       GacInstalled gac = new GacInstalled ();
+                       GacInstalled copy = (GacInstalled)gac.Copy ();
                        Assert.AreEqual (gac, copy, "Equals");
                        Assert.IsFalse (Object.ReferenceEquals (gac, copy), 
"ReferenceEquals");
                }
 
                [Test]
                public void CreateIdentityPermission ()
-               {
-                       Gac gac = new Gac ();
+               {
+                       GacInstalled gac = new GacInstalled ();
                        IPermission p = gac.CreateIdentityPermission (null);
                        Assert.IsTrue ((p is GacIdentityPermission), 
"GacIdentityPermission");
                        Assert.IsNotNull (p, "CreateIdentityPermission(null)");
@@ -68,26 +68,26 @@
 
                [Test]
                public void Equals ()
-               {
-                       Gac gac = new Gac ();
-                       Assert.IsFalse (gac.Equals (null), "Equals(null)");
-                       Gac g2 = new Gac ();
+               {
+                       GacInstalled gac = new GacInstalled ();
+                       Assert.IsFalse (gac.Equals (null), "Equals(null)");
+                       GacInstalled g2 = new GacInstalled ();
                        Assert.IsTrue (gac.Equals (g2), "Equals(g2)");
                        Assert.IsTrue (g2.Equals (gac), "Equals(gac)");
                }
 
                [Test]
                public void GetHashCode_ ()
-               {
-                       Gac gac = new Gac ();
+               {
+                       GacInstalled gac = new GacInstalled ();
                        Assert.AreEqual (0, gac.GetHashCode ());
                }
 
                [Test]
                public void ToString_ ()
-               {
-                       Gac gac = new Gac ();
-                       Assert.IsTrue (gac.ToString ().StartsWith 
("<System.Security.Policy.Gac version=\"1\"/>"));
+               {
+                       GacInstalled gac = new GacInstalled ();
+                       Assert.IsTrue (gac.ToString ().StartsWith 
("<System.Security.Policy.GacInstalled version=\"1\"/>"));
                }
        }
 }

Modified: 
trunk/mcs/class/corlib/Test/System.Security.Policy/IBuiltInEvidenceTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Security.Policy/IBuiltInEvidenceTest.cs  
2005-04-25 16:41:57 UTC (rev 43551)
+++ trunk/mcs/class/corlib/Test/System.Security.Policy/IBuiltInEvidenceTest.cs  
2005-04-25 16:52:17 UTC (rev 43552)
@@ -102,51 +102,51 @@
                        Assert.AreEqual (19, GetRequiredSize (ad, false), 
"GetRequiredSize-false-2");
                }
 #if NET_2_0
-               [Test]
-               public void Gac_GetRequiredSize ()
-               {
-                       Gac g = new Gac ();
+               [Test]
+               public void GacInstalled_GetRequiredSize ()
+               {
+                       GacInstalled g = new GacInstalled ();
                        Assert.AreEqual (1, GetRequiredSize (g, true), 
"GetRequiredSize-true");
                        Assert.AreEqual (1, GetRequiredSize (g, false), 
"GetRequiredSize-false");
                }
 
-               [Test]
-               public void Gac_InitFromBuffer ()
+               [Test]
+               public void GacInstalled_InitFromBuffer ()
                {
-                       char[] buffer = new char [2] { '\t', '\t' };
-                       Gac g = new Gac ();
+                       char[] buffer = new char [2] { '\t', '\t' };
+                       GacInstalled g = new GacInstalled ();
                        Assert.AreEqual (0, InitFromBuffer (g, buffer, 0), 
"InitFromBuffer-1");
                        Assert.AreEqual (1, InitFromBuffer (g, buffer, 1), 
"InitFromBuffer-2");
                }
 
-               [Test]
-               public void Gac_InitFromBuffer_BadData ()
+               [Test]
+               public void GacInstalled_InitFromBuffer_BadData ()
                {
-                       char [] buffer = new char [1] { '\r' };
-                       Gac g = new Gac ();
+                       char [] buffer = new char [1] { '\r' };
+                       GacInstalled g = new GacInstalled ();
                        Assert.AreEqual (0, InitFromBuffer (g, buffer, 0), 
"InitFromBuffer");
                }
 
                [Test]
-               public void Gac_InitFromBuffer_Null ()
-               {
-                       Gac g = new Gac ();
+               public void GacInstalled_InitFromBuffer_Null ()
+               {
+                       GacInstalled g = new GacInstalled ();
                        Assert.AreEqual (0, InitFromBuffer (g, null, 0), 
"InitFromBuffer");
                }
 
-               [Test]
-               public void Gac_InitFromBuffer_OutOfRange ()
+               [Test]
+               public void GacInstalled_InitFromBuffer_OutOfRange ()
                {
-                       char [] buffer = new char [1] { '\t' };
-                       Gac g = new Gac ();
+                       char [] buffer = new char [1] { '\t' };
+                       GacInstalled g = new GacInstalled ();
                        Assert.AreEqual (4, InitFromBuffer (g, buffer, 4), 
"InitFromBuffer");
                }
 
-               [Test]
-               public void Gac_OutputToBuffer ()
+               [Test]
+               public void GacInstalled_OutputToBuffer ()
                {
-                       char[] buffer = new char [2];
-                       Gac g = new Gac ();
+                       char[] buffer = new char [2];
+                       GacInstalled g = new GacInstalled ();
                        Assert.AreEqual (1, OutputToBuffer (g, buffer, 0, 
false), "OutputToBuffer-false");
                        Assert.AreEqual ('\t', buffer [0], "Buffer-false");
                        Assert.AreEqual (2, OutputToBuffer (g, buffer, 1, 
true), "OutputToBuffer-true");
@@ -154,19 +154,19 @@
                }
 
                [Test]
-               [ExpectedException (typeof (NullReferenceException))]
-               public void Gac_OutputToBuffer_Null ()
-               {
-                       Gac g = new Gac ();
+               [ExpectedException (typeof (NullReferenceException))]
+               public void GacInstalled_OutputToBuffer_Null ()
+               {
+                       GacInstalled g = new GacInstalled ();
                        OutputToBuffer (g, null, 0, false);
                }
 
                [Test]
-               [ExpectedException (typeof (IndexOutOfRangeException))]
-               public void Gac_OutputToBuffer_OutOfRange ()
+               [ExpectedException (typeof (IndexOutOfRangeException))]
+               public void GacInstalled_OutputToBuffer_OutOfRange ()
                {
-                       char[] buffer = new char [1] { '\t' };
-                       Gac g = new Gac ();
+                       char[] buffer = new char [1] { '\t' };
+                       GacInstalled g = new GacInstalled ();
                        OutputToBuffer (g, buffer, 1, false);
                }
 #endif

Modified: trunk/mcs/class/corlib/Test/System.Security.Policy/SiteTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Security.Policy/SiteTest.cs      
2005-04-25 16:41:57 UTC (rev 43551)
+++ trunk/mcs/class/corlib/Test/System.Security.Policy/SiteTest.cs      
2005-04-25 16:52:17 UTC (rev 43552)
@@ -176,9 +176,7 @@
                        Site s3 = new Site ("go-mono.com");
                        Assert ("!Equals", !s.Equals (s3));
                }
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
+
                [Test]
                public void AllChars () 
                {

Modified: 
trunk/mcs/class/corlib/Test/System.Security.Policy/UrlMembershipConditionTest.cs
===================================================================
--- 
trunk/mcs/class/corlib/Test/System.Security.Policy/UrlMembershipConditionTest.cs
    2005-04-25 16:41:57 UTC (rev 43551)
+++ 
trunk/mcs/class/corlib/Test/System.Security.Policy/UrlMembershipConditionTest.cs
    2005-04-25 16:52:17 UTC (rev 43552)
@@ -108,23 +108,12 @@
                }
 
                [Test]
-#if !NET_2_0
                [ExpectedException (typeof (ArgumentException))]
-#else
-               [Category ("NotWorking")]
-#endif
                public void Url_InvalidSite ()
                {
                        UrlMembershipCondition umc = new UrlMembershipCondition 
("http://www.go-mono.*";);
-#if NET_2_0
-                       Assert.AreEqual ("http://www.go-mono.*";, umc.Url, 
"Url");
-                       Assert.AreEqual ("Url - http://www.go-mono.*";, 
umc.ToString (), "ToString");
-#endif
                }
 
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
                [Test]
                public void Url_NoProtocol () 
                {
@@ -138,9 +127,7 @@
                        Assert.AreEqual ("Url - file://WWW.GO-MONO.COM", 
umc.ToString (), "ToString");
 #endif
                }
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
+
                [Test]
                public void Url_WellKnownProtocol () 
                {
@@ -179,9 +166,7 @@
                        Assert.AreEqual ("Url - file://WWW.GO-MONO.COM", 
umc.ToString (), "file-ToString");
 #endif
                }
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
+
                [Test]
                public void Url_UnknownProtocol () 
                {

Modified: trunk/mcs/class/corlib/Test/System.Security.Policy/UrlTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Security.Policy/UrlTest.cs       
2005-04-25 16:41:57 UTC (rev 43551)
+++ trunk/mcs/class/corlib/Test/System.Security.Policy/UrlTest.cs       
2005-04-25 16:52:17 UTC (rev 43552)
@@ -5,7 +5,7 @@
 //     Sebastien Pouliot  <[EMAIL PROTECTED]>
 //
 // (C) 2004 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -51,9 +51,7 @@
                {
                        Url u = new Url (String.Empty);
                }
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
+
                [Test]
                public void Url_NoProtocol () 
                {
@@ -64,9 +62,7 @@
                        Assert.AreEqual ("file://INDEX.HTML", u.Value, "Value");
 #endif
                }
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
+
                [Test]
                public void Url_WellKnownProtocol () 
                {
@@ -102,9 +98,7 @@
                        Url u = new Url 
("http://www.go-mono.com/path/../newpath/index.html";);
                        Assert.AreEqual 
("http://www.go-mono.com/path/../newpath/index.html";, u.Value, "Value");
                }
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
+
                [Test]
                public void Url_GoMonoWebUrl () 
                {
@@ -130,9 +124,6 @@
                        Assert.IsFalse (u.Equals (u3), "!Equals");
                }
 
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
                [Test]
 #if !NET_2_0
                [ExpectedException (typeof (ArgumentException))]
@@ -168,9 +159,7 @@
                        Url u = new Url ("http://www.go-mono.com";);
                        Assert.IsFalse (u.Equals (null), "EqualsNull");
                }
-#if NET_2_0
-               [Category ("NotWorking")]
-#endif
+
                [Test]
                public void Url_LoneStar () 
                {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to