OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 20:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding some interface default method implementations (#2879)

Browse Source 
* Adding some interface default method implementations rather than catching AbstractMethodError or providing partial implementation classes.

* Show Javadoc warnings and errors, but not ‘Generating …/core/target/site/apidocs/jenkins/model/lazy/class-use/AbstractLazyLoadRunMap.html...’ and the like.

* Javadoc fixes.

* Review comments from @oleg-nenashev.

* Test fixes.

* Remove the unused import
This commit is contained in:
Jesse Glick authored and Oleg Nenashev committed 2017-05-20 12:32:52 +02:00
1 parent 1f4183a9a3
commit d13b1361e1
42 files changed
+231 -399
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/hudson/FunctionsTest.java
+7 -4
View File
@@ -29,6 +29,7 @@ import hudson.model.Item;
import hudson.model.ItemGroup;
import hudson.model.TopLevelItem;
import hudson.model.View;
import hudson.model.ViewGroup;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Arrays;
@@ -131,7 +132,8 @@ public class FunctionsTest {
mockStatic(Stapler.class);
when(Stapler.getCurrentRequest()).thenReturn(req);
View view = mock(View.class);
when(view.getOwnerItemGroup()).thenReturn(parent);
when(view.getOwner()).thenReturn(j);
when(j.getItemGroup()).thenReturn(j);
createMockAncestors(req, createAncestor(view, "."), createAncestor(j, "../.."));
TopLevelItem i = createMockItem(parent, "job/i/");
when(view.getItems()).thenReturn(Arrays.asList(i));
@@ -166,7 +168,7 @@ public class FunctionsTest {
mockStatic(Stapler.class);
when(Stapler.getCurrentRequest()).thenReturn(req);
View view = mock(View.class);
when(view.getOwnerItemGroup()).thenReturn(parent);
when(view.getOwner().getItemGroup()).thenReturn(parent);
createMockAncestors(req, createAncestor(j, "../.."), createAncestor(view, "."));
TopLevelItem i = createMockItem(parent, "job/i/");
when(view.getItems()).thenReturn(Collections.<TopLevelItem>emptyList());
@@ -174,7 +176,7 @@ public class FunctionsTest {
assertEquals("/jenkins/job/i/", result);
}
private interface TopLevelItemAndItemGroup <T extends TopLevelItem> extends TopLevelItem, ItemGroup<T> {}
private interface TopLevelItemAndItemGroup <T extends TopLevelItem> extends TopLevelItem, ItemGroup<T>, ViewGroup {}
@Test
@PrepareForTest({Stapler.class,Jenkins.class})
@@ -187,7 +189,8 @@ public class FunctionsTest {
mockStatic(Stapler.class);
when(Stapler.getCurrentRequest()).thenReturn(req);
View view = mock(View.class);
when(view.getOwnerItemGroup()).thenReturn(parent);
when(view.getOwner()).thenReturn(parent);
when(parent.getItemGroup()).thenReturn(parent);
createMockAncestors(req, createAncestor(j, "../../.."), createAncestor(parent, "../.."), createAncestor(view, "."));
TopLevelItem i = createMockItem(parent, "job/i/", "parent/job/i/");
when(view.getItems()).thenReturn(Arrays.asList(i));