Merge branch 'master' of github.com:jenkinsci/jenkins

core/src/main/java/hudson/model/ListView.java

@@ -329,16 +329,7 @@ public class ListView extends View implements Saveable {
             }
         }
 
-        if (req.getParameter("useincluderegex") != null) {
-            includeRegex = Util.nullify(req.getParameter("includeRegex"));
-            if (includeRegex == null)
-                includePattern = null;
-            else
-                includePattern = Pattern.compile(includeRegex);
-        } else {
-            includeRegex = null;
-            includePattern = null;
-        }
+        setIncludeRegex(req.getParameter("useincluderegex"));
 
         if (columns == null) {
             columns = new DescribableList<ListViewColumn,Descriptor<ListViewColumn>>(this);
@@ -353,6 +344,19 @@ public class ListView extends View implements Saveable {
         String filter = Util.fixEmpty(req.getParameter("statusFilter"));
         statusFilter = filter != null ? "1".equals(filter) : null;
     }
+    
+    public void setIncludeRegex(String includeRegex) {
+        if (includeRegex != null) {
+            this.includeRegex = Util.nullify(includeRegex);
+            if (this.includeRegex == null)
+                this.includePattern = null;
+            else
+                this.includePattern = Pattern.compile(includeRegex);
+        } else {
+            this.includeRegex = null;
+            this.includePattern = null;
+        }
+    }
 
     @Extension
     public static class DescriptorImpl extends ViewDescriptor {

core/src/test/java/hudson/model/ListViewTest.java

@@ -42,4 +42,24 @@ public class ListViewTest {
         lv.add(ig);
         assertEquals(1, lv.getItems().size());
     }
+    
+    @Test
+    @PrepareForTest({ListViewColumn.class,Items.class})
+    public void includeRegexProgrammatic() {
+        mockStatic(Items.class);
+        mockStatic(ListViewColumn.class);
+        List<ListViewColumn> columns = Collections.emptyList();
+        when(ListViewColumn.createDefaultInitialColumnList()).thenReturn(columns);
+        ViewGroup owner = mock(ViewGroup.class);
+        ItemGroup ig = mock(ItemGroup.class);
+        when(owner.getItemGroup()).thenReturn(ig);
+        ListView view = new ListView("test", owner);
+        view.setIncludeRegex(".*");
+        TopLevelItem it = Mockito.mock(TopLevelItem.class);
+        List<TopLevelItem> igContent = Arrays.asList((TopLevelItem) it);
+        when(Items.getAllItems(eq(ig), eq(TopLevelItem.class))).thenReturn(igContent);
+        when(ig.getItems()).thenReturn(igContent);
+        when(it.getRelativeNameFrom(any(ItemGroup.class))).thenReturn("test-item");
+        assertEquals(1, view.getItems().size());
+    }
 }