Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/api-doc-tools.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mdoc/Test
diff options
context:
space:
mode:
authorJoel Martinez <joelmartinez@gmail.com>2017-03-15 00:37:58 +0300
committerJoel Martinez <joelmartinez@gmail.com>2017-03-15 18:35:13 +0300
commit25f3a1cc958de76149c4b7b31d116a696f2b6e0b (patch)
treefd808b9c1c4e9cbf9f46df5cf76cd782cd6eab5f /mdoc/Test
parent82def9b9bd018dab780a9f98c674155d085b7ed3 (diff)
mdoc: Resolves issue in fx mode with overridden members.
When a type overrides a member in one framework, but does not in another framework processed after the first, the Member node was being removed, even though the entry remained in teh first framework index file. This Resolves #39
Diffstat (limited to 'mdoc/Test')
-rw-r--r--mdoc/Test/DocTest-framework-inheritance.cs21
-rw-r--r--mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/One.xml7
-rw-r--r--mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/Two.xml6
-rw-r--r--mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassOne.xml42
-rw-r--r--mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassTwo.xml63
-rw-r--r--mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyClass.xml38
6 files changed, 174 insertions, 3 deletions
diff --git a/mdoc/Test/DocTest-framework-inheritance.cs b/mdoc/Test/DocTest-framework-inheritance.cs
index ca18dfff..675541ca 100644
--- a/mdoc/Test/DocTest-framework-inheritance.cs
+++ b/mdoc/Test/DocTest-framework-inheritance.cs
@@ -1,6 +1,15 @@
namespace MyNamespace {
- public abstract class MyBaseClassOne {}
- public abstract class MyBaseClassTwo {}
+ public abstract class MyBaseClassOne
+ {
+ public virtual string AllVirtual {get;}
+ public abstract void AllAbstract();
+ }
+ public abstract class MyBaseClassTwo
+ {
+ public string TwoMember {get;}
+ public virtual string AllVirtual {get;}
+ public abstract void AllAbstract();
+ }
public class MyClass
#if FXONE
@@ -9,5 +18,11 @@ namespace MyNamespace {
#if FXTWO
: MyBaseClassTwo
#endif
- {}
+ {
+ public override void AllAbstract() {}
+
+ #if FXONE
+ public override string AllVirtual { get { return ""; } }
+ #endif
+ }
}
diff --git a/mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/One.xml b/mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/One.xml
index 5c82e3fc..0f2f7d8b 100644
--- a/mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/One.xml
+++ b/mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/One.xml
@@ -3,12 +3,19 @@
<Namespace Name="MyNamespace">
<Type Name="MyNamespace.MyBaseClassOne" Id="T:MyNamespace.MyBaseClassOne">
<Member Id="M:MyNamespace.MyBaseClassOne.#ctor" />
+ <Member Id="M:MyNamespace.MyBaseClassOne.AllAbstract" />
+ <Member Id="P:MyNamespace.MyBaseClassOne.AllVirtual" />
</Type>
<Type Name="MyNamespace.MyBaseClassTwo" Id="T:MyNamespace.MyBaseClassTwo">
<Member Id="M:MyNamespace.MyBaseClassTwo.#ctor" />
+ <Member Id="M:MyNamespace.MyBaseClassTwo.AllAbstract" />
+ <Member Id="P:MyNamespace.MyBaseClassTwo.AllVirtual" />
+ <Member Id="P:MyNamespace.MyBaseClassTwo.TwoMember" />
</Type>
<Type Name="MyNamespace.MyClass" Id="T:MyNamespace.MyClass">
<Member Id="M:MyNamespace.MyClass.#ctor" />
+ <Member Id="M:MyNamespace.MyClass.AllAbstract" />
+ <Member Id="P:MyNamespace.MyClass.AllVirtual" />
</Type>
</Namespace>
</Framework> \ No newline at end of file
diff --git a/mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/Two.xml b/mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/Two.xml
index 10bc5828..15aaa6da 100644
--- a/mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/Two.xml
+++ b/mdoc/Test/en.expected-frameworks-inheritance/FrameworksIndex/Two.xml
@@ -3,12 +3,18 @@
<Namespace Name="MyNamespace">
<Type Name="MyNamespace.MyBaseClassOne" Id="T:MyNamespace.MyBaseClassOne">
<Member Id="M:MyNamespace.MyBaseClassOne.#ctor" />
+ <Member Id="M:MyNamespace.MyBaseClassOne.AllAbstract" />
+ <Member Id="P:MyNamespace.MyBaseClassOne.AllVirtual" />
</Type>
<Type Name="MyNamespace.MyBaseClassTwo" Id="T:MyNamespace.MyBaseClassTwo">
<Member Id="M:MyNamespace.MyBaseClassTwo.#ctor" />
+ <Member Id="M:MyNamespace.MyBaseClassTwo.AllAbstract" />
+ <Member Id="P:MyNamespace.MyBaseClassTwo.AllVirtual" />
+ <Member Id="P:MyNamespace.MyBaseClassTwo.TwoMember" />
</Type>
<Type Name="MyNamespace.MyClass" Id="T:MyNamespace.MyClass">
<Member Id="M:MyNamespace.MyClass.#ctor" />
+ <Member Id="M:MyNamespace.MyClass.AllAbstract" />
</Type>
</Namespace>
</Framework> \ No newline at end of file
diff --git a/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassOne.xml b/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassOne.xml
index 1f242b13..050370cd 100644
--- a/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassOne.xml
+++ b/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassOne.xml
@@ -36,5 +36,47 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
+ <Member MemberName="AllAbstract">
+ <MemberSignature Language="C#" Value="public abstract void AllAbstract ();" />
+ <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void AllAbstract() cil managed" />
+ <MemberType>Method</MemberType>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-one</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-two</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters />
+ <Docs>
+ <summary>To be added.</summary>
+ <remarks>To be added.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="AllVirtual">
+ <MemberSignature Language="C#" Value="public virtual string AllVirtual { get; }" />
+ <MemberSignature Language="ILAsm" Value=".property instance string AllVirtual" />
+ <MemberType>Property</MemberType>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-one</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-two</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <ReturnValue>
+ <ReturnType>System.String</ReturnType>
+ </ReturnValue>
+ <Docs>
+ <summary>To be added.</summary>
+ <value>To be added.</value>
+ <remarks>To be added.</remarks>
+ </Docs>
+ </Member>
</Members>
</Type>
diff --git a/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassTwo.xml b/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassTwo.xml
index 7596f8b8..3b848109 100644
--- a/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassTwo.xml
+++ b/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyBaseClassTwo.xml
@@ -36,5 +36,68 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
+ <Member MemberName="AllAbstract">
+ <MemberSignature Language="C#" Value="public abstract void AllAbstract ();" />
+ <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void AllAbstract() cil managed" />
+ <MemberType>Method</MemberType>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-one</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-two</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters />
+ <Docs>
+ <summary>To be added.</summary>
+ <remarks>To be added.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="AllVirtual">
+ <MemberSignature Language="C#" Value="public virtual string AllVirtual { get; }" />
+ <MemberSignature Language="ILAsm" Value=".property instance string AllVirtual" />
+ <MemberType>Property</MemberType>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-one</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-two</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <ReturnValue>
+ <ReturnType>System.String</ReturnType>
+ </ReturnValue>
+ <Docs>
+ <summary>To be added.</summary>
+ <value>To be added.</value>
+ <remarks>To be added.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="TwoMember">
+ <MemberSignature Language="C#" Value="public string TwoMember { get; }" />
+ <MemberSignature Language="ILAsm" Value=".property instance string TwoMember" />
+ <MemberType>Property</MemberType>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-one</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-two</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <ReturnValue>
+ <ReturnType>System.String</ReturnType>
+ </ReturnValue>
+ <Docs>
+ <summary>To be added.</summary>
+ <value>To be added.</value>
+ <remarks>To be added.</remarks>
+ </Docs>
+ </Member>
</Members>
</Type>
diff --git a/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyClass.xml b/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyClass.xml
index 090b4202..f4ac240c 100644
--- a/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyClass.xml
+++ b/mdoc/Test/en.expected-frameworks-inheritance/MyNamespace/MyClass.xml
@@ -37,5 +37,43 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
+ <Member MemberName="AllAbstract">
+ <MemberSignature Language="C#" Value="public override void AllAbstract ();" />
+ <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance void AllAbstract() cil managed" />
+ <MemberType>Method</MemberType>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-one</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-two</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <ReturnValue>
+ <ReturnType>System.Void</ReturnType>
+ </ReturnValue>
+ <Parameters />
+ <Docs>
+ <summary>To be added.</summary>
+ <remarks>To be added.</remarks>
+ </Docs>
+ </Member>
+ <Member MemberName="AllVirtual">
+ <MemberSignature Language="C#" Value="public override string AllVirtual { get; }" />
+ <MemberSignature Language="ILAsm" Value=".property instance string AllVirtual" />
+ <MemberType>Property</MemberType>
+ <AssemblyInfo>
+ <AssemblyName>DocTest-framework-inheritance-one</AssemblyName>
+ <AssemblyVersion>0.0.0.0</AssemblyVersion>
+ </AssemblyInfo>
+ <ReturnValue>
+ <ReturnType>System.String</ReturnType>
+ </ReturnValue>
+ <Docs>
+ <summary>To be added.</summary>
+ <value>To be added.</value>
+ <remarks>To be added.</remarks>
+ </Docs>
+ </Member>
</Members>
</Type>