Author: gert
Date: 2005-06-26 03:42:28 -0400 (Sun, 26 Jun 2005)
New Revision: 46515

Modified:
   trunk/mcs/class/System/Test/Microsoft.VisualBasic/ChangeLog
   
trunk/mcs/class/System/Test/Microsoft.VisualBasic/CodeGeneratorFromCompileUnitTest.cs
   
trunk/mcs/class/System/Test/Microsoft.VisualBasic/CodeGeneratorFromTypeTest.cs
Log:
* CodeGeneratorFromCompileUnitTest.cs: Added test for assembly-level attribute
without value. Use Assert insteaad of deprecated Assertion.
* CodeGeneratorFromTypeTest.cs: Use Assert instead of Assertion.


Modified: trunk/mcs/class/System/Test/Microsoft.VisualBasic/ChangeLog
===================================================================
--- trunk/mcs/class/System/Test/Microsoft.VisualBasic/ChangeLog 2005-06-26 
06:41:37 UTC (rev 46514)
+++ trunk/mcs/class/System/Test/Microsoft.VisualBasic/ChangeLog 2005-06-26 
07:42:28 UTC (rev 46515)
@@ -1,5 +1,11 @@
 2005-06-25  Gert Driesen <[EMAIL PROTECTED]>
 
+       * CodeGeneratorFromCompileUnitTest.cs: Added test for assembly-level
+       attribute without value. Use Assert instead of deprecated Assertion.
+       * CodeGeneratorFromTypeTest.cs: Use Assert instead of Assertion.
+
+2005-06-25  Gert Driesen <[EMAIL PROTECTED]>
+
        * CodeGeneratorFromTypeTest.cs: Added tests to verify code generated
        for field and event members.
 

Modified: 
trunk/mcs/class/System/Test/Microsoft.VisualBasic/CodeGeneratorFromCompileUnitTest.cs
===================================================================
--- 
trunk/mcs/class/System/Test/Microsoft.VisualBasic/CodeGeneratorFromCompileUnitTest.cs
       2005-06-26 06:41:37 UTC (rev 46514)
+++ 
trunk/mcs/class/System/Test/Microsoft.VisualBasic/CodeGeneratorFromCompileUnitTest.cs
       2005-06-26 07:42:28 UTC (rev 46515)
@@ -51,7 +51,7 @@
                public void DefaultCodeUnitTest ()
                {
                        Generate ();
-                       Assertion.AssertEquals ("", Code);
+                       Assert.AreEqual ("", Code);
                }
 
                [Test]
@@ -67,7 +67,7 @@
                {
                        codeUnit.ReferencedAssemblies.Add ("System.dll");
                        Generate();
-                       Assertion.AssertEquals ("", Code);
+                       Assert.AreEqual ("", Code);
                }
 
                [Test]
@@ -76,7 +76,7 @@
                        CodeNamespace ns = new CodeNamespace ("A");
                        codeUnit.Namespaces.Add (ns);
                        Generate ();
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "{0}Namespace A{0}End Namespace{0}", 
writer.NewLine), Code);
                }
 
@@ -87,7 +87,7 @@
                        codeUnit.Namespaces.Add (ns);
                        codeUnit.ReferencedAssemblies.Add ("using System;");
                        Generate ();
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "{0}Namespace A{0}End Namespace{0}", 
writer.NewLine), Code);
                }
 
@@ -97,6 +97,18 @@
                        CodeAttributeDeclaration attrDec = new 
CodeAttributeDeclaration ();
                        attrDec.Name = "A";
 
+                       codeUnit.AssemblyCustomAttributes.Add (attrDec);
+                       Generate ();
+                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                               "<Assembly: A()> {0}", writer.NewLine), Code);
+               }
+
+               [Test]
+               public void AttributeWithValueTest ()
+               {
+                       CodeAttributeDeclaration attrDec = new 
CodeAttributeDeclaration ();
+                       attrDec.Name = "A";
+
                        attrDec.Arguments.Add (new CodeAttributeArgument("A1", 
                                new CodePrimitiveExpression(false)));
                        attrDec.Arguments.Add (new CodeAttributeArgument("A2", 
@@ -104,7 +116,7 @@
 
                        codeUnit.AssemblyCustomAttributes.Add (attrDec);
                        Generate ();
-                       Assertion.AssertEquals ("<Assembly: A(A1:=false, 
A2:=true)> " + 
+                       Assert.AreEqual ("<Assembly: A(A1:=false, A2:=true)> " 
+ 
                                writer.NewLine, Code);
                }
 
@@ -119,7 +131,7 @@
                        attrDec.Name = "B";
                        codeUnit.AssemblyCustomAttributes.Add (attrDec);
                        Generate ();
-                       Assertion.AssertEquals 
(string.Format(CultureInfo.InvariantCulture, 
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture, 
                                "<Assembly: A(),  _{0} Assembly: B()> {0}", 
writer.NewLine),
                                Code);
                }
@@ -140,7 +152,7 @@
 
                        Generate ();
 
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "<Assembly: A(),  _{0} Assembly: B()> 
{0}{0}Namespace A{0}End "
                                + "Namespace{0}",writer.NewLine), Code);
                }
@@ -156,7 +168,7 @@
                        codeUnit = new CodeSnippetCompileUnit (sb.ToString ());
                        generator.GenerateCodeFromCompileUnit (codeUnit, 
writer, options);
                        writer.Close ();
-                       Assertion.AssertEquals (sb.ToString() + writer.NewLine, 
+                       Assert.AreEqual (sb.ToString () + writer.NewLine, 
                                                writer.ToString());
                }
        }

Modified: 
trunk/mcs/class/System/Test/Microsoft.VisualBasic/CodeGeneratorFromTypeTest.cs
===================================================================
--- 
trunk/mcs/class/System/Test/Microsoft.VisualBasic/CodeGeneratorFromTypeTest.cs  
    2005-06-26 06:41:37 UTC (rev 46514)
+++ 
trunk/mcs/class/System/Test/Microsoft.VisualBasic/CodeGeneratorFromTypeTest.cs  
    2005-06-26 07:42:28 UTC (rev 46515)
@@ -44,7 +44,7 @@
                public void DefaultTypeTest ()
                {
                        Generate ();
-                       Assertion.AssertEquals 
(string.Format(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "Public Class {0}End Class{0}", 
writer.NewLine), Code);
                }
 
@@ -61,7 +61,7 @@
                {
                        type.Name = "Test1";
                        Generate ();
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "Public Class Test1{0}End Class{0}", 
writer.NewLine), Code);
                }
 
@@ -79,7 +79,7 @@
                        type.CustomAttributes.Add (attrDec);
 
                        Generate ();
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "<A(),  _{0} B()>  _{0}Public Class Test1{0}End 
Class{0}", 
                                writer.NewLine), Code);
                }
@@ -102,7 +102,7 @@
                        type.Members.Add (evt);
 
                        Generate ();
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "Public Class Test1{0}    {0}    <A(),  _{0}    
 B()>  _{0}    "
                                + "Private Event  As System.Void{0}End 
Class{0}", writer.NewLine), Code);
                }
@@ -119,7 +119,7 @@
                        type.Members.Add (evt);
 
                        Generate ();
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "Public Class Test1{0}    {0}    "
                                + "Public Event OnClick As Integer{0}"
                                + "End Class{0}", writer.NewLine), Code);
@@ -143,7 +143,7 @@
                        type.Members.Add (fld);
 
                        Generate ();
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "Public Class Test1{0}    {0}    <A(),  _{0}    
 B()>  _{0}    "
                                + "Private  As System.Void{0}End Class{0}", 
writer.NewLine), Code);
                }
@@ -160,7 +160,7 @@
                        type.Members.Add (fld);
 
                        Generate ();
-                       Assertion.AssertEquals (string.Format 
(CultureInfo.InvariantCulture,
+                       Assert.AreEqual (string.Format 
(CultureInfo.InvariantCulture,
                                "Public Class Test1{0}    {0}    "
                                + "Public Name As Integer{0}"
                                + "End Class{0}", writer.NewLine), Code);

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

Reply via email to