#JENKINS-17352 Returned back unit tests, small refactoring

jenkinsci · Mar 28, 2013 · b587a8b · b587a8b
1 parent 052d6fe
commit b587a8b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,6 +39,17 @@
             <url>http://repo.jenkins-ci.org/public/</url>
         </pluginRepository>
     </pluginRepositories>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>  
 
 
diff --git a/src/main/java/hudson/plugins/nested_view/NestedView.java b/src/main/java/hudson/plugins/nested_view/NestedView.java
@@ -62,7 +62,7 @@ public class NestedView extends View implements ViewGroup, StaplerProxy {
      * Name of the subview to show when this tree view is selected.  May be null/empty.
      */
     private String defaultView;
-    private AvailableColumns columns;
+    private NestedViewColumns columns;
 
     @DataBoundConstructor
     public NestedView(String name) {
@@ -122,7 +122,7 @@ public synchronized void onJobRenamed(Item item, String oldName, String newName)
     protected synchronized void submit(StaplerRequest req) throws IOException, ServletException, FormException {
         defaultView = Util.fixEmpty(req.getParameter("defaultView"));
         if (columns == null) {
-            columns = new AvailableColumns();
+            columns = new NestedViewColumns();
         }
         if (columns.getColumns() == null) {
             columns.setColumns(new DescribableList<ListViewColumn, Descriptor<ListViewColumn>>(this));
@@ -158,7 +158,7 @@ public View getDefaultView() {
         return isDefault() ? null : getView(defaultView);
     }
 
-    public AvailableColumns getColumnsToShow() {
+    public NestedViewColumns getColumnsToShow() {
         return columns;
     }
 

diff --git a/...plugins/nested_view/AvailableColumns.java → ...lugins/nested_view/NestedViewColumns.java b/...plugins/nested_view/AvailableColumns.java → ...lugins/nested_view/NestedViewColumns.java
@@ -16,11 +16,17 @@
 import java.util.List;
 
 /**
- * @author sbashkyrtsev
+ * NestedView delegates things related to optional columns to this class.
+ *
+ * @author stanislav bashkirtsev
  */
-public class AvailableColumns {
+public class NestedViewColumns {
     private DescribableList<ListViewColumn, Descriptor<ListViewColumn>> columns;
 
+    public void updateFromForm(StaplerRequest req, JSONObject formData, String key) throws IOException, Descriptor.FormException {
+        columns.rebuildHetero(req, formData, getPossibleColumns(), key);
+    }
+
     public void setColumns(DescribableList<ListViewColumn, Descriptor<ListViewColumn>> columns) {
         this.columns = columns;
     }
@@ -29,10 +35,6 @@ public DescribableList<ListViewColumn, Descriptor<ListViewColumn>> getColumns()
         return columns;
     }
 
-    public void updateFromForm(StaplerRequest req, JSONObject formData, String key) throws IOException, Descriptor.FormException {
-        columns.rebuildHetero(req, formData, nestedViewColumns(), key);
-    }
-
     public boolean isShowStatusColumn() {
         return containsColumnWithDescriptor(StatusColumn.DescriptorImpl.class);
     }
@@ -41,6 +43,10 @@ public boolean isShowWeatherColumn() {
         return containsColumnWithDescriptor(WeatherColumn.DescriptorImpl.class);
     }
 
+    public static List<Descriptor<ListViewColumn>> getPossibleColumns() {
+        return extractOptionalColumns(allViewColumns());
+    }
+
     private boolean containsColumnWithDescriptor(Class<? extends ListViewColumnDescriptor> descriptorClass) {
         for (ListViewColumn column : columns) {
             if (column.getDescriptor().getClass() == descriptorClass) {
@@ -50,10 +56,6 @@ private boolean containsColumnWithDescriptor(Class<? extends ListViewColumnDescr
         return false;
     }
 
-    public static List<Descriptor<ListViewColumn>> nestedViewColumns() {
-        return extractOptionalColumns(allViewColumns());
-    }
-
     private static DescriptorExtensionList<ListViewColumn, Descriptor<ListViewColumn>> allViewColumns() {
         return Jenkins.getInstance().getDescriptorList(ListViewColumn.class);
     }

diff --git a/src/main/resources/hudson/plugins/nested_view/NestedView/configure-entries.jelly b/src/main/resources/hudson/plugins/nested_view/NestedView/configure-entries.jelly
@@ -40,7 +40,7 @@ THE SOFTWARE.
   </f:entry>
   </j:if>
   <f:section title="${%Columns}">
-    <j:invokeStatic var="allColumns" className="hudson.plugins.nested_view.AvailableColumns" method="nestedViewColumns"/>
+    <j:invokeStatic var="allColumns" className="hudson.plugins.nested_view.NestedViewColumns" method="getPossibleColumns"/>
     <f:block>
       <f:hetero-list name="columnsToShow" hasHeader="true"
                      descriptors="${allColumns}"

diff --git a/src/test/java/hudson/plugins/nested_view/NestedViewTest.java b/src/test/java/hudson/plugins/nested_view/NestedViewTest.java
@@ -43,7 +43,6 @@
  * Test interaction of nested-view plugin with Jenkins core.
  * @author Alan Harder
  */
-@Ignore
 public class NestedViewTest extends HudsonTestCase {
 
     public void test() throws Exception {