[FIXED JENKINS-19649] viewmask config fix

fixed condition for using the view mask for changelog fixed issue where view mask for changelog option could be enabled when loading config added test for optional configuration sections
jenkinsci · Feb 16, 2014 · ea1acb1 · ea1acb1
1 parent 4663c3c
commit ea1acb1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/perforce/PerforceSCM.java b/src/main/java/hudson/plugins/perforce/PerforceSCM.java
@@ -331,7 +331,7 @@ public PerforceSCM(
             MaskViewConfig useViewMask
             ) {
 
-        this.configVersion = 1L;
+        this.configVersion = 2L;
 
         this.p4User = p4User;
         this.setP4Passwd(p4Passwd);
@@ -651,6 +651,8 @@ public Object readResolve() {
 
         if (configVersion == 1L) {
             this.useViewMaskForChangeLog = this.useViewMaskForSyncing;
+
+            configVersion = 2L;
         }
 
         return this;
@@ -1054,7 +1056,7 @@ public boolean checkout(AbstractBuild build, Launcher launcher,
                 }
 
                 List<Integer> changeNumbersTo;
-                if (useViewMaskForChangeLog) {
+                if (useViewMaskForChangeLog && useViewMask) {
                     changeNumbersTo = depot.getChanges().getChangeNumbersInRange(p4workspace, lastChangeToDisplay, newestChange, viewMask, showIntegChanges);
                 } else {
                     changeNumbersTo = depot.getChanges().getChangeNumbersInRange(p4workspace, lastChangeToDisplay, newestChange, showIntegChanges);

diff --git a/src/test/java/hudson/plugins/perforce/PerforceSCMTest.java b/src/test/java/hudson/plugins/perforce/PerforceSCMTest.java
@@ -5,6 +5,7 @@
 import hudson.model.Hudson;
 import hudson.plugins.perforce.PerforceToolInstallation.DescriptorImpl;
 import hudson.plugins.perforce.browsers.P4Web;
+import hudson.plugins.perforce.config.CleanTypeConfig;
 import hudson.plugins.perforce.config.MaskViewConfig;
 import hudson.plugins.perforce.config.WorkspaceCleanupConfig;
 import hudson.tools.ToolProperty;
@@ -23,8 +24,11 @@
 public class PerforceSCMTest extends HudsonTestCase {
     /// Preserves original behavior of the tests
     public static final DepotType EMPTY_DEPOT = null;
+    public static final DepotType TEST_DEPOT = new DepotType(DepotType.USE_PROJECTPATH_MARKER, null, null, "//...");
     public static final MaskViewConfig EMPTY_MASKVIEW = null;
+    public static final MaskViewConfig TEST_MASKVIEW = new MaskViewConfig("//...", true, false, false);
     public static final WorkspaceCleanupConfig EMPTY_WORKSPACE_CLEANUP = null;
+    public static final WorkspaceCleanupConfig TEST_WORKSPACE_CLEANUP = new WorkspaceCleanupConfig(new CleanTypeConfig("quick", true), true);
 
     /**
      * Makes sure that the configuration survives the round-trip.
@@ -35,7 +39,7 @@ public void testConfigRoundtrip() throws Exception {
         PerforceSCM scm = new PerforceSCM(
         		"user", "pass", "client", "port", "", "exe", "sysRoot",
         		"sysDrive", "label", "counter", "upstreamProject", "shared", "charset", "charset2", "user", false, true, true, true, true, true, false,
-                        false, true, false, false, false, "${basename}", 0, -1, browser, "exclude_user", "exclude_file", true, EMPTY_DEPOT, EMPTY_WORKSPACE_CLEANUP, EMPTY_MASKVIEW);
+                        false, true, false, false, false, "${basename}", 0, -1, browser, "exclude_user", "exclude_file", true, TEST_DEPOT, TEST_WORKSPACE_CLEANUP, TEST_MASKVIEW);
         scm.setProjectPath("path");
         project.setScm(scm);