[JENKINS-18099] Add test

jenkinsci · May 7, 2014 · 73a3c62 · 73a3c62
1 parent bfa293d
commit 73a3c62
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/src/main/java/hudson/scm/SubversionSCM.java b/src/main/java/hudson/scm/SubversionSCM.java
@@ -165,6 +165,8 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Chmod;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
@@ -2149,6 +2151,11 @@ public String getDisplayName() {
             return "Subversion";
         }
 
+        @Restricted(NoExternalUse.class)
+        void setGlobalExcludedRevprop(String revprop) {
+            globalExcludedRevprop = revprop;
+        }
+
         public String getGlobalExcludedRevprop() {
             return globalExcludedRevprop;
         }

diff --git a/src/test/java/hudson/scm/DefaultSVNLogFilterTest.java b/src/test/java/hudson/scm/DefaultSVNLogFilterTest.java
@@ -1,18 +1,13 @@
 package hudson.scm;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 
+import hudson.scm.subversion.UpdateUpdater;
+import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.HudsonHomeLoader.CopyExisting;
-import org.tmatesoft.svn.core.ISVNLogEntryHandler;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNLogEntry;
-import org.tmatesoft.svn.core.SVNURL;
+import org.tmatesoft.svn.core.*;
 import org.tmatesoft.svn.core.io.SVNRepository;
 import org.tmatesoft.svn.core.wc.SVNClientManager;
 
@@ -153,4 +148,23 @@ public void testExcludedDirPropChanges() throws Exception {
         List<SVNLogEntry> entries = doFilter(filter);
         assertTrue(containsRevs(entries, 1, 2, 3));
     }
+
+    @Bug(18099)
+    public void testGlobalExclusionRevprop() throws Exception {
+        SubversionSCM scm = new SubversionSCM(
+                Arrays.asList(new SubversionSCM.ModuleLocation("file://some/repo", ".")),
+                new UpdateUpdater(), null, null, null, null, null, null, false);
+        scm.getDescriptor().setGlobalExcludedRevprop("ignoreme");
+
+        SVNProperties p = new SVNProperties();
+        p.put("ignoreme", "*");
+
+        Map<String, SVNLogEntryPath> paths = new HashMap<String, SVNLogEntryPath>();
+        paths.put("/foo", new SVNLogEntryPath("/foo", SVNLogEntryPath.TYPE_MODIFIED, null, -1));
+        SVNLogEntry e = new SVNLogEntry(paths, 1234L, p, false);
+
+        SVNLogFilter filter = scm.createSVNLogFilter();
+        assertFalse(filter.isIncluded(e));
+    }
+
 }