Merge pull request #2603 from stephenc/jenkins-39300

[JENKINS-39300] View.getDisplayName() is ignored when rendering tabs
This commit is contained in:
Stephen Connolly authored and GitHub committed 2016-12-12 15:13:46 +00:00
commit e18b34caaf
19 files changed
+400 -63

No files matched your search

@@ -30,7 +30,7 @@ public class ListViewTest {
mockStatic(Items.class);
mockStatic(ListViewColumn.class);
List<ListViewColumn> columns = Collections.emptyList();
when(ListViewColumn.createDefaultInitialColumnList()).thenReturn(columns);
when(ListViewColumn.createDefaultInitialColumnList(ListView.class)).thenReturn(columns);
ViewGroup owner = mock(ViewGroup.class);
ItemGroup itemGroupOwner = mock(ItemGroup.class);
when(owner.getItemGroup()).thenReturn(itemGroupOwner);
@@ -49,7 +49,7 @@ public class ListViewTest {
mockStatic(Items.class);
mockStatic(ListViewColumn.class);
List<ListViewColumn> columns = Collections.emptyList();
when(ListViewColumn.createDefaultInitialColumnList()).thenReturn(columns);
when(ListViewColumn.createDefaultInitialColumnList(ListView.class)).thenReturn(columns);
ViewGroup owner = mock(ViewGroup.class);
ItemGroup ig = mock(ItemGroup.class);
when(owner.getItemGroup()).thenReturn(ig);