Update some documentation tests

diff --git a/mcs/.gitignore b/mcs/.gitignore
index 89943093bfe653fd921e44d87b5b2f70d83b8d1a..e38d2953c572271eb97d54983a315e260931a18c 100644 (file)
--- a/mcs/.gitignore
+++ b/mcs/.gitignore
@@ -13,7 +13,6 @@ tests/*.log
 tests/gtest-*.dll
 tests/test-*.dll
 tests/xml-*.xml
-tests/?xml-*.xml
 tests/test-*.netmodule
 tests/data.xml
 class/Mono.Data.Sqlite/test.db

diff --git a/mcs/tests/.gitattributes b/mcs/tests/.gitattributes
deleted file mode 100644 (file)
index f0e072c..0000000
--- a/mcs/tests/.gitattributes
+++ /dev/null
@@ -1,39 +0,0 @@
-/test-xml-001-ref.xml -crlf
-/test-xml-002-ref.xml -crlf
-/test-xml-003-ref.xml -crlf
-/test-xml-004-ref.xml -crlf
-/test-xml-005-ref.xml -crlf
-/test-xml-006-ref.xml -crlf
-/test-xml-007-ref.xml -crlf
-/test-xml-008-ref.xml -crlf
-/test-xml-009-ref.xml -crlf
-/test-xml-010-ref.xml -crlf
-/test-xml-011-ref.xml -crlf
-/test-xml-012-ref.xml -crlf
-/test-xml-013-ref.xml -crlf
-/test-xml-014-ref.xml -crlf
-/test-xml-015-ref.xml -crlf
-/test-xml-016-ref.xml -crlf
-/test-xml-017-ref.xml -crlf
-/test-xml-018-ref.xml -crlf
-/test-xml-019-ref.xml -crlf
-/test-xml-020-ref.xml -crlf
-/test-xml-021-ref.xml -crlf
-/test-xml-022-ref.xml -crlf
-/test-xml-023-ref.xml -crlf
-/test-xml-024-ref.xml -crlf
-/test-xml-025-ref.xml -crlf
-/test-xml-026-ref.xml -crlf
-/test-xml-027-ref.xml -crlf
-/test-xml-028-ref.xml -crlf
-/test-xml-029-ref.xml -crlf
-/test-xml-030-ref.xml -crlf
-/test-xml-031-ref.xml -crlf
-/test-xml-032-ref.xml -crlf
-/test-xml-033-ref.xml -crlf
-/test-xml-034-ref.xml -crlf
-/test-xml-035-ref.xml -crlf
-/test-xml-036-ref.xml -crlf
-/test-xml-037-ref.xml -crlf
-/test-xml-038-ref.xml -crlf
-/test-xml-050-ref.xml -crlf

diff --git a/mcs/tests/gtest-xml-1-ref.xml b/mcs/tests/gtest-xml-1-ref.xml
deleted file mode 100644 (file)
index a90f1e3..0000000
--- a/mcs/tests/gtest-xml-1-ref.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>gtest-xml-1</name>
-    </assembly>
-    <members>
-        <member name="T:GenericClass`1">
-            <summary>This file throws an error when compiled with XML documentation</summary>
-        </member>
-        <member name="M:GenericClass`1.#ctor(`0)">
-            <summary>This line caused bug #77183</summary>
-        </member>
-    </members>
-</doc>

diff --git a/mcs/tests/gtest-xml-1.cs b/mcs/tests/gtest-xml-1.cs
deleted file mode 100644 (file)
index 68949f2..0000000
--- a/mcs/tests/gtest-xml-1.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Compiler options: -doc:gxml-01.xml
-using System; 
-
-///<summary>This file throws an error when compiled with XML documentation</summary>
-public class GenericClass <gT>
-{
-    gT m_data; 
-
-    ///<summary>This line caused bug #77183</summary>
-    public GenericClass (gT Data)
-    {
-        m_data = Data; 
-    }
-}
-
-class Foo
-{
-    public static void Main () {}
-}

diff --git a/mcs/tests/gtest-xml-2-ref.xml b/mcs/tests/gtest-xml-2-ref.xml
deleted file mode 100644 (file)
index 1bc9cf1..0000000
--- a/mcs/tests/gtest-xml-2-ref.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>\r
-<doc>\r
-    <assembly>\r
-        <name>gtest-xml-2</name>\r
-    </assembly>\r
-    <members>\r
-        <member name="T:Foo">\r
-            <see cref="M:System.Web.Services.Protocols.SoapHttpClientProtocol.Invoke2 ( )"/>\r
-            <see cref="F:Foo.Bar"/>\r
-            <see cref="M:Foo.ListBase(System.String)"/>\r
-            <see cref="T:ListBase(string)"/>\r
-            <see cref="T:ListBase&lt;string)"/><!-- it somehow passes -->\r
-            <see cref="T:List!$%Base()"/><!-- it somehow passes -->\r
-            <see cref="T:$%!"/>\r
-            <see cref=".:Bar"/>\r
-            <see cref="T:List(int)"/>\r
-        </member>\r
-        <member name="F:Foo.Bar">\r
-            hogehoge\r
-        </member>\r
-        <member name="M:Foo.ListBase(System.String)">\r
-            fugafuga\r
-        </member>\r
-        <member name="T:ListBase`1">\r
-            <see cref="T:System.Nullable&lt;System.Int32&gt;" />\r
-            <see cref="T:System.Nullable(System.Int32)" />\r
-        </member>\r
-    </members>\r
-</doc>\r

diff --git a/mcs/tests/gtest-xml-2.cs b/mcs/tests/gtest-xml-2.cs
deleted file mode 100644 (file)
index f7d02dd..0000000
--- a/mcs/tests/gtest-xml-2.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Compiler options: -doc:gxml-02.xml
-
-using System.Collections.Generic;
-
-// <see cref="int?" /> - this is invalid 1584/1658
-// <see cref="List" />
-/// <see cref="M:System.Web.Services.Protocols.SoapHttpClientProtocol.Invoke2 ( )" />
-/// <see cref="Bar" />
-/// <see cref="ListBase(string)" />
-/// <see cref="T:ListBase(string)" />
-/// <see cref="T:ListBase&lt;string)" /><!-- it somehow passes -->
-/// <see cref="T:List!$%Base()" /><!-- it somehow passes -->
-/// <see cref="T:$%!" />
-/// <see cref=".:Bar" />
-/// <see cref="T:List(int)" />
-public class Foo
-{
-       static void Main ()
-       {
-       }
-
-       /// hogehoge
-       public string Bar;
-
-       /// fugafuga
-       public void ListBase (string s)
-       {
-       }
-}
-
-// <see cref="System.Nullable&lt;System.Int32&gt;" /> - cs1658/1574
-/// <see cref="T:System.Nullable&lt;System.Int32&gt;" />
-/// <see cref="T:System.Nullable(System.Int32)" />
-public class ListBase<T>
-{
-}

diff --git a/mcs/tests/gtest-xml-3-ref.xml b/mcs/tests/gtest-xml-3-ref.xml
deleted file mode 100644 (file)
index 4b2d90e..0000000
--- a/mcs/tests/gtest-xml-3-ref.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>\r
-<doc>\r
-    <assembly>\r
-        <name>gtest-xml-3</name>\r
-    </assembly>\r
-    <members>\r
-        <member name="T:Test.DocMe">\r
-            <remarks>T:Test.DocMe</remarks>\r
-            <seealso cref="T:Test.DocMe`1" />\r
-        </member>\r
-        <member name="M:Test.DocMe.UseList(System.Collections.Generic.List{System.Int32})">\r
-            <remarks>M:Test.DocMe.UseList(System.Collections.Generic.List{System.Int32})</remarks>\r
-        </member>\r
-        <member name="M:Test.DocMe.Main">\r
-            <remarks>M:Test.DocMe.Main</remarks>\r
-        </member>\r
-        <member name="T:Test.DocMe`1">\r
-            <remarks>T:Test.DocMe`1</remarks>\r
-        </member>\r
-        <member name="M:Test.DocMe`1.UseList(System.Collections.Generic.List{`0})">\r
-            <remarks>M:Test.DocMe`1.UseList(System.Collections.Generic.List{`0})</remarks>\r
-        </member>\r
-        <member name="M:Test.DocMe`1.UseList``1(System.Collections.Generic.List{``0})">\r
-            <remarks>M:Test.DocMe`1.UseList`1(System.Collections.Generic.List{``0})</remarks>\r
-        </member>\r
-        <member name="M:Test.DocMe`1.RefMethod``1(`0@,``0@)">\r
-            <remarks>M:Test.DocMe`1.RefMethod`1(`0@,``0@)</remarks>\r
-        </member>\r
-    </members>\r
-</doc>\r

diff --git a/mcs/tests/gtest-xml-3.cs b/mcs/tests/gtest-xml-3.cs
deleted file mode 100644 (file)
index 1cb3175..0000000
--- a/mcs/tests/gtest-xml-3.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Compiler options: -doc:gxml-03.xml /warnaserror /warn:4
-
-       // gmcs documents generic members incorrectly
-       using System.Collections.Generic;
-
-       namespace Test {
-               /// <remarks>T:Test.DocMe</remarks>
-               /// <seealso cref="T:Test.DocMe`1" />
-               class DocMe {
-
-                       /// <remarks>M:Test.DocMe.UseList(System.Collections.Generic.List{System.Int32})</remarks>
-                       public static void UseList (List<int> list) {}
-
-                       /// <remarks>M:Test.DocMe.Main</remarks>
-                       public static void Main ()
-                       {
-                       }
-               }
-
-               /// <remarks>T:Test.DocMe`1</remarks>
-               class DocMe<T> {
-                       /// <remarks>M:Test.DocMe`1.UseList(System.Collections.Generic.List{`0})</remarks>
-                       public void UseList (List<T> list) {}
-
-                       /// <remarks>M:Test.DocMe`1.UseList`1(System.Collections.Generic.List{``0})</remarks>
-                       public void UseList<U> (List<U> list) {}
-
-                       /// <remarks>M:Test.DocMe`1.RefMethod`1(`0@,``0@)</remarks>
-                       public void RefMethod<U> (ref T t, ref U u) {}
-               }
-       }
-

diff --git a/mcs/tests/test-xml-057-ref.xml b/mcs/tests/test-xml-057-ref.xml
new file mode 100644 (file)
index 0000000..1f730f2
--- /dev/null
+++ b/mcs/tests/test-xml-057-ref.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>\r
+<doc>\r
+    <assembly>\r
+        <name>test-xml-057</name>\r
+    </assembly>\r
+    <members>\r
+        <member name="T:Test.FirstTestDelegate`1">\r
+            <summary>Documentation Text</summary>\r
+        </member>\r
+        <member name="T:Test.TestInterface">\r
+            <summary>test</summary>\r
+        </member>\r
+    </members>\r
+</doc>\r

diff --git a/mcs/tests/test-xml-057.cs b/mcs/tests/test-xml-057.cs
new file mode 100644 (file)
index 0000000..b5ee5b7
--- /dev/null
+++ b/mcs/tests/test-xml-057.cs
@@ -0,0 +1,20 @@
+// Compiler options: -doc:xml-057.xml /warnaserror /warn:4
+
+namespace Test
+{
+       using System;
+
+       /// <summary>Documentation Text</summary>
+       public delegate void FirstTestDelegate<T> (T obj) where T : Exception;
+
+       /// <summary>test</summary>
+       public interface TestInterface { }
+}
+
+class A
+{
+       static void Main ()
+       {
+       }
+}
+

diff --git a/mcs/tests/test-xml-058-ref.xml b/mcs/tests/test-xml-058-ref.xml
new file mode 100644 (file)
index 0000000..ad9bb65
--- /dev/null
+++ b/mcs/tests/test-xml-058-ref.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>test-xml-058</name>
+    </assembly>
+    <members>
+        <member name="T:GenericClass`1">
+            <summary>This file throws an error when compiled with XML documentation</summary>
+        </member>
+        <member name="M:GenericClass`1.#ctor(`0)">
+            <summary>This line caused bug #77183</summary>
+        </member>
+    </members>
+</doc>

diff --git a/mcs/tests/test-xml-058.cs b/mcs/tests/test-xml-058.cs
new file mode 100644 (file)
index 0000000..efa7e53
--- /dev/null
+++ b/mcs/tests/test-xml-058.cs
@@ -0,0 +1,19 @@
+// Compiler options: -doc:xml-058.xml
+using System; 
+
+///<summary>This file throws an error when compiled with XML documentation</summary>
+public class GenericClass <gT>
+{
+    gT m_data; 
+
+    ///<summary>This line caused bug #77183</summary>
+    public GenericClass (gT Data)
+    {
+        m_data = Data; 
+    }
+}
+
+class Foo
+{
+    public static void Main () {}
+}

diff --git a/mcs/tests/test-xml-059-ref.xml b/mcs/tests/test-xml-059-ref.xml
new file mode 100644 (file)
index 0000000..926ffbb
--- /dev/null
+++ b/mcs/tests/test-xml-059-ref.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>\r
+<doc>\r
+    <assembly>\r
+        <name>test-xml-059</name>\r
+    </assembly>\r
+    <members>\r
+        <member name="T:Foo">\r
+            <see cref="M:System.Web.Services.Protocols.SoapHttpClientProtocol.Invoke2 ( )"/>\r
+            <see cref="F:Foo.Bar"/>\r
+            <see cref="M:Foo.ListBase(System.String)"/>\r
+            <see cref="T:ListBase(string)"/>\r
+            <see cref="T:ListBase&lt;string)"/><!-- it somehow passes -->\r
+            <see cref="T:List!$%Base()"/><!-- it somehow passes -->\r
+            <see cref="T:$%!"/>\r
+            <see cref=".:Bar"/>\r
+            <see cref="T:List(int)"/>\r
+        </member>\r
+        <member name="F:Foo.Bar">\r
+            hogehoge\r
+        </member>\r
+        <member name="M:Foo.ListBase(System.String)">\r
+            fugafuga\r
+        </member>\r
+        <member name="T:ListBase`1">\r
+            <see cref="T:System.Nullable&lt;System.Int32&gt;" />\r
+            <see cref="T:System.Nullable(System.Int32)" />\r
+        </member>\r
+    </members>\r
+</doc>\r

diff --git a/mcs/tests/test-xml-059.cs b/mcs/tests/test-xml-059.cs
new file mode 100644 (file)
index 0000000..6fe120b
--- /dev/null
+++ b/mcs/tests/test-xml-059.cs
@@ -0,0 +1,36 @@
+// Compiler options: -doc:xml-059.xml
+
+using System.Collections.Generic;
+
+// <see cref="int?" /> - this is invalid 1584/1658
+// <see cref="List" />
+/// <see cref="M:System.Web.Services.Protocols.SoapHttpClientProtocol.Invoke2 ( )" />
+/// <see cref="Bar" />
+/// <see cref="ListBase(string)" />
+/// <see cref="T:ListBase(string)" />
+/// <see cref="T:ListBase&lt;string)" /><!-- it somehow passes -->
+/// <see cref="T:List!$%Base()" /><!-- it somehow passes -->
+/// <see cref="T:$%!" />
+/// <see cref=".:Bar" />
+/// <see cref="T:List(int)" />
+public class Foo
+{
+       static void Main ()
+       {
+       }
+
+       /// hogehoge
+       public string Bar;
+
+       /// fugafuga
+       public void ListBase (string s)
+       {
+       }
+}
+
+// <see cref="System.Nullable&lt;System.Int32&gt;" /> - cs1658/1574
+/// <see cref="T:System.Nullable&lt;System.Int32&gt;" />
+/// <see cref="T:System.Nullable(System.Int32)" />
+public class ListBase<T>
+{
+}

diff --git a/mcs/tests/test-xml-060-ref.xml b/mcs/tests/test-xml-060-ref.xml
new file mode 100644 (file)
index 0000000..1d24468
--- /dev/null
+++ b/mcs/tests/test-xml-060-ref.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>\r
+<doc>\r
+    <assembly>\r
+        <name>test-xml-060</name>\r
+    </assembly>\r
+    <members>\r
+        <member name="T:Test.DocMe">\r
+            <remarks>T:Test.DocMe</remarks>\r
+            <seealso cref="T:Test.DocMe`1" />\r
+        </member>\r
+        <member name="M:Test.DocMe.UseList(System.Collections.Generic.List{System.Int32})">\r
+            <remarks>M:Test.DocMe.UseList(System.Collections.Generic.List{System.Int32})</remarks>\r
+        </member>\r
+        <member name="M:Test.DocMe.Main">\r
+            <remarks>M:Test.DocMe.Main</remarks>\r
+        </member>\r
+        <member name="T:Test.DocMe`1">\r
+            <remarks>T:Test.DocMe`1</remarks>\r
+        </member>\r
+        <member name="M:Test.DocMe`1.UseList(System.Collections.Generic.List{`0})">\r
+            <remarks>M:Test.DocMe`1.UseList(System.Collections.Generic.List{`0})</remarks>\r
+        </member>\r
+        <member name="M:Test.DocMe`1.UseList``1(System.Collections.Generic.List{``0})">\r
+            <remarks>M:Test.DocMe`1.UseList`1(System.Collections.Generic.List{``0})</remarks>\r
+        </member>\r
+        <member name="M:Test.DocMe`1.RefMethod``1(`0@,``0@)">\r
+            <remarks>M:Test.DocMe`1.RefMethod`1(`0@,``0@)</remarks>\r
+        </member>\r
+    </members>\r
+</doc>\r

diff --git a/mcs/tests/test-xml-060.cs b/mcs/tests/test-xml-060.cs
new file mode 100644 (file)
index 0000000..e20bd6b
--- /dev/null
+++ b/mcs/tests/test-xml-060.cs
@@ -0,0 +1,32 @@
+// Compiler options: -doc:xml-060.xml /warnaserror /warn:4
+
+       // gmcs documents generic members incorrectly
+       using System.Collections.Generic;
+
+       namespace Test {
+               /// <remarks>T:Test.DocMe</remarks>
+               /// <seealso cref="T:Test.DocMe`1" />
+               class DocMe {
+
+                       /// <remarks>M:Test.DocMe.UseList(System.Collections.Generic.List{System.Int32})</remarks>
+                       public static void UseList (List<int> list) {}
+
+                       /// <remarks>M:Test.DocMe.Main</remarks>
+                       public static void Main ()
+                       {
+                       }
+               }
+
+               /// <remarks>T:Test.DocMe`1</remarks>
+               class DocMe<T> {
+                       /// <remarks>M:Test.DocMe`1.UseList(System.Collections.Generic.List{`0})</remarks>
+                       public void UseList (List<T> list) {}
+
+                       /// <remarks>M:Test.DocMe`1.UseList`1(System.Collections.Generic.List{``0})</remarks>
+                       public void UseList<U> (List<U> list) {}
+
+                       /// <remarks>M:Test.DocMe`1.RefMethod`1(`0@,``0@)</remarks>
+                       public void RefMethod<U> (ref T t, ref U u) {}
+               }
+       }
+