Add doc overwriting test to inheritedMethods am: b7b2c990c4

Change-Id: Ie6188780acce79926475b0ca49a7fd42f2adaec4

6 files changed, 71 insertions, 3 deletions

diff --git a/core/testdata/format/dac/inheritedMethods/Child.java b/core/testdata/format/dac/inheritedMethods/Child.java
index 6cc2e571f..902f64947 100644
--- a/core/testdata/format/dac/inheritedMethods/Child.java
+++ b/core/testdata/format/dac/inheritedMethods/Child.java
@@ -1,3 +1,8 @@
 public class Child extends Parent {
     public void Bar() { }
+    /**
+     * Do an override subclass baz
+     */
+    @override
+    public void baz() { }
 }
\ No newline at end of file
diff --git a/core/testdata/format/dac/inheritedMethods/Parent.java b/core/testdata/format/dac/inheritedMethods/Parent.java
index 7ba30a795..59d9ab0f3 100644
--- a/core/testdata/format/dac/inheritedMethods/Parent.java
+++ b/core/testdata/format/dac/inheritedMethods/Parent.java
@@ -1,3 +1,10 @@
 public class Parent {
+    /**
+     * Do a superclass foo
+     */
     public void foo() { }
+    /**
+     * Do a superclass baz
+     */
+    public void baz() { }
 }
\ No newline at end of file
diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
index bfeabbc98..a66d0bf6c 100644
--- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
+++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
@@ -51,6 +51,13 @@
             <p></p>
           </td>
         </tr>
+        <tr>
+          <td><span class="identifier">void</span></td>
+          <td>
+            <div><code><a href="#baz()">baz</a>()</code></div>
+            <p>Do an override subclass baz</p>
+          </td>
+        </tr>
       </tbody>
     </table>
     <h2>Public constructors</h2>
@@ -65,5 +72,11 @@
       <h3 class="api-name">Bar</h3>
       <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">void</span> <span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></pre>
     </div>
+<a name="baz()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">baz</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">void</span> <span class="identifier">baz</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+      <p>Do an override subclass baz</p>
+    </div>
   </body>
 </html>
diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
index 4e3ed94ef..4efddeb30 100644
--- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
+++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
@@ -64,8 +64,15 @@
         <tr>
           <td><span class="identifier">void</span></td>
           <td>
+            <div><code><a href="#baz()">baz</a>()</code></div>
+            <p>Do a superclass baz</p>
+          </td>
+        </tr>
+        <tr>
+          <td><span class="identifier">void</span></td>
+          <td>
             <div><code><a href="#foo()">foo</a>()</code></div>
-            <p></p>
+            <p>Do a superclass foo</p>
           </td>
         </tr>
       </tbody>
@@ -77,10 +84,17 @@
       <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">Parent</span><span class="symbol">(</span><span class="symbol">)</span></pre>
     </div>
     <h2>Public methods</h2>
+<a name="baz()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">baz</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">void</span> <span class="identifier">baz</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+      <p>Do a superclass baz</p>
+    </div>
 <a name="foo()"></a>
     <div class="api apilevel-" data-version-added="">
       <h3 class="api-name">foo</h3>
       <pre class="api-signature no-pretty-print"><span class="keyword">public</span> <span class="identifier">void</span> <span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span></pre>
+      <p>Do a superclass foo</p>
     </div>
   </body>
 </html>
diff --git a/core/testdata/format/dac/inheritedMethods/dac/Child.html b/core/testdata/format/dac/inheritedMethods/dac/Child.html
index 77f0fe493..5da7f475d 100644
--- a/core/testdata/format/dac/inheritedMethods/dac/Child.html
+++ b/core/testdata/format/dac/inheritedMethods/dac/Child.html
@@ -51,6 +51,13 @@
             <p></p>
           </td>
         </tr>
+        <tr>
+          <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
+          <td>
+            <div><code><a href="#baz()">baz</a>()</code></div>
+            <p>Do an override subclass baz</p>
+          </td>
+        </tr>
       </tbody>
     </table>
     <table class="responsive" id="inhmethods">
@@ -70,7 +77,9 @@
                   <tr class="api apilevel-" data-version-added="ApiLevel:">
                     <td><code><span class="identifier">Unit</span></code></td>
                     <td width="100%"><code><a href="Parent.html#foo()">foo</a>()</code>
-                      <p></p>
+                      <p>
+                        <p>Do a superclass foo</p>
+                      </p>
                     </td>
                   </tr>
                 </tbody>
@@ -92,5 +101,11 @@
       <h3 class="api-name">Bar</h3>
       <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></pre>
     </div>
+<a name="baz()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">baz</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">baz</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></pre>
+      <p>Do an override subclass baz</p>
+    </div>
   </body>
 </html>
diff --git a/core/testdata/format/dac/inheritedMethods/dac/Parent.html b/core/testdata/format/dac/inheritedMethods/dac/Parent.html
index 15c650e3e..0023368f0 100644
--- a/core/testdata/format/dac/inheritedMethods/dac/Parent.html
+++ b/core/testdata/format/dac/inheritedMethods/dac/Parent.html
@@ -64,8 +64,15 @@
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
           <td>
+            <div><code><a href="#baz()">baz</a>()</code></div>
+            <p>Do a superclass baz</p>
+          </td>
+        </tr>
+        <tr>
+          <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
+          <td>
             <div><code><a href="#foo()">foo</a>()</code></div>
-            <p></p>
+            <p>Do a superclass foo</p>
           </td>
         </tr>
       </tbody>
@@ -77,10 +84,17 @@
       <pre class="api-signature no-pretty-print"><span class="identifier">Parent</span><span class="symbol">(</span><span class="symbol">)</span></pre>
     </div>
     <h2>Public methods</h2>
+<a name="baz()"></a>
+    <div class="api apilevel-" data-version-added="">
+      <h3 class="api-name">baz</h3>
+      <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">baz</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></pre>
+      <p>Do a superclass baz</p>
+    </div>
 <a name="foo()"></a>
     <div class="api apilevel-" data-version-added="">
       <h3 class="api-name">foo</h3>
       <pre class="api-signature no-pretty-print"><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></pre>
+      <p>Do a superclass foo</p>
     </div>
   </body>
 </html>